From 05be12954c239a48dd4bc32b8040058812ce5e2a Mon Sep 17 00:00:00 2001 From: Olivier Duchateau Date: Sat, 3 Jan 2015 17:47:50 +0000 Subject: [PATCH] - Gnome is default icons theme [1], not switched to Adwaita because Thunar and some Xfce's specific widgets still use stock icons (deprecated since GTK3 3.10, and not available in x11-themes/adwaita-icon-theme) - Bump PORTREVISION PR: 183690 [1] Requested by: Rostislav Krasny --- mail/xfce4-mailwatch-plugin/Makefile | 6 ++++- misc/xfce4-appfinder/Makefile | 7 ++++++ sysutils/xfce4-settings/Makefile | 16 ++++++++----- x11-wm/xfce4-panel/Makefile | 12 ++++++---- .../files/patch-plugins_actions_actions.c | 23 +++++++++++++++++++ x11/libexo/Makefile | 11 ++++++++- 6 files changed, 63 insertions(+), 12 deletions(-) create mode 100644 x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index 5c668e5a2594..d95ff9b92e43 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-mailwatch-plugin PORTVERSION= 1.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R} @@ -25,4 +25,8 @@ USE_XORG= x11 CONFIGURE_ARGS=--enable-ipv6 +post-patch: + ${REINPLACE_CMD} -e 's|xfce-mail|mail-send|' \ + ${WRKSRC}/panel-plugin/mailwatch-plugin.c + .include diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile index 73d0ed92def3..1165d10c0435 100644 --- a/misc/xfce4-appfinder/Makefile +++ b/misc/xfce4-appfinder/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfce4-appfinder PORTVERSION= 4.10.1 +PORTREVISION= 1 CATEGORIES= misc xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} @@ -30,4 +31,10 @@ CONFIGURE_ARGS+=--enable-nls CONFIGURE_ARGS+=--disable-nls .endif +post-patch: + ${REINPLACE_CMD} -e 's|=gtk-find|=system-search|' \ + ${WRKSRC}/data/xfce4-appfinder.desktop.in + ${REINPLACE_CMD} -e 's|=gtk-execute|=system-run|' \ + ${WRKSRC}/data/xfce4-run.desktop.in + .include diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index 472a1075929d..e1141e17294c 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.10.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} @@ -12,14 +12,18 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce 4 settings application -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= glib20 gtk20 intltool intlhack USE_XFCE= configenv garcon libexo libmenu libutil xfconf USE_XORG= inputproto x11 xi -USES= libtool pathfix pkgconfig gmake tar:bzip2 +USES= libtool pkgconfig gmake tar:bzip2 CONFIGURE_ARGS= --enable-pluggable-dialogs \ --enable-gio-unix @@ -77,10 +81,10 @@ CONFIGURE_ARGS+=--disable-sound-settings .endif post-patch: - # until xfce4-icon-theme is back we rely on Tango - @${REINPLACE_CMD} -e 's|Rodent|Tango|g' \ +# GNOME is default icon theme + @${REINPLACE_CMD} -e 's|Rodent|gnome|g' \ ${WRKSRC}/dialogs/appearance-settings/main.c - @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Tango|; \ + @${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="gnome|; \ s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \ ${WRKSRC}/xfsettingsd/xsettings.xml @${REINPLACE_CMD} -e 's|xkl_config_registry_load (settings->priv->xkl_registry)|xkl_config_registry_load (settings->priv->xkl_registry, FALSE)|g; \ diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 7859b2d5e9cb..45b186244e70 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -3,7 +3,7 @@ PORTNAME= xfce4-panel PORTVERSION= 4.10.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} @@ -12,15 +12,19 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce's panel -LIB_DEPENDS= libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \ - libcairo.so:${PORTSDIR}/graphics/cairo \ +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LICENSE_DISTFILES= ${WRKSRC}/COPYING \ + ${WRKSRC}/COPYING.LIB + +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib USES= desktop-file-utils gmake libtool:keepla pathfix perl5 \ pkgconfig tar:bzip2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GNOME= glib20 gtk20 intltool intlhack +USE_GNOME= glib20 gtk20 intltool intlhack libwnck USE_LDCONFIG= yes USE_XFCE= configenv garcon libexo libmenu libutil xfconf USE_XORG= x11 sm diff --git a/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c b/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c new file mode 100644 index 000000000000..58384b8c5593 --- /dev/null +++ b/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c @@ -0,0 +1,23 @@ +'system-hibernate' and 'system-suspend' icons don't exist when Gnome or +Adwaita are default icons theme. + +--- plugins/actions/actions.c.orig 2013-05-05 15:47:07 UTC ++++ plugins/actions/actions.c +@@ -181,7 +181,7 @@ static ActionEntry action_entries[] = + N_("_Hibernate"), + N_("Do you want to suspend to disk?"), + N_("Hibernating computer in %d seconds."), +- "system-hibernate" ++ "xfsm-hibernate" + }, + { ACTION_TYPE_SUSPEND, + "suspend", +@@ -189,7 +189,7 @@ static ActionEntry action_entries[] = + N_("Sus_pend"), + N_("Do you want to suspend to RAM?"), + N_("Suspending computer in %d seconds."), +- "system-suspend" ++ "xfsm-suspend" + }, + { ACTION_TYPE_RESTART, + "restart", diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile index 7258ec7aaf30..645b5e6af26b 100644 --- a/x11/libexo/Makefile +++ b/x11/libexo/Makefile @@ -3,7 +3,7 @@ PORTNAME= libexo PORTVERSION= 0.10.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/exo/${PORTVERSION:R} @@ -13,6 +13,11 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Application library for the Xfce desktop environment +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LICENSE_DISTFILES= ${WRKSRC}/COPYING \ + ${WRKSRC}/COPYING.LIB + BUILD_DEPENDS= p5-URI>=1.60:${PORTSDIR}/net/p5-URI RUN_DEPENDS= p5-URI>=1.60:${PORTSDIR}/net/p5-URI @@ -50,4 +55,8 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif +post-patch: + ${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \ + ${WRKSRC}/exo-open/exo-mail-reader.desktop.in + .include