From 79d3242cef99cec8e8de668f9aa51fbb94bb4582 Mon Sep 17 00:00:00 2001 From: jperkin Date: Tue, 21 Apr 2015 08:56:37 +0000 Subject: Update Xfce to 4.12.0. This is a very large change, and incorporates the 4.8, 4.10, and 4.12 major Xfce releases since 4.6.2, our previous pkgsrc release. For more information about the thousands of changes in each major release since then, please see: Xfce 4.12 announcement: http://www.xfce.org/about/news Xfce 4.12 tour: http://www.xfce.org/about/tour Xfce 4.10 announcement: http://www.xfce.org/about/news/?post=1335571200 Xfce 4.10 tour: http://www.xfce.org/about/tour410 Xfce 4.8 announcement: http://www.xfce.org/about/news/?post=1295136000 Xfce 4.8 tour: http://www.xfce.org/about/tour48 The pkgsrc changes since then are: New packages: archivers/xfce4-thunar-archive graphics/elementary-xfce-icon-theme mail/xfce4-mailwatch-plugin misc/xfce4-time-out-plugin multimedia/xfce4-thunar-media-tags sysutils/xfce4-mount-plugin sysutils/xfce4-taskmanager sysutils/xfce4-thunar-vcs sysutils/xfce4-verve-plugin x11/xfce4-garcon x11/xfce4-notifyd x11/xfce4-tumbler x11/xfce4-whiskermenu-plugin Renamed packages: devel/xfconf to devel/xfce4-conf x11/libxfce4menu to x11/libxfce4ui x11/xfce4-screenshooter-plugin to x11/xfce4-screenshooter Updated packages: audio/xfce4-mixer audio/xfce4-xmms-plugin devel/xfce4-dev-tools editors/xfce4-mousepad graphics/ristretto meta-pkgs/xfce4-extras meta-pkgs/xfce4 misc/xfce4-weather-plugin multimedia/xfce4-mpc-plugin net/xfce4-wavelan-plugin sysutils/xfce4-appfinder sysutils/xfce4-battery-plugin sysutils/xfce4-cpugraph-plugin sysutils/xfce4-diskperf-plugin sysutils/xfce4-fsguard-plugin sysutils/xfce4-genmon-plugin sysutils/xfce4-netload-plugin sysutils/xfce4-quicklauncher-plugin sysutils/xfce4-systemload-plugin sysutils/xfce4-thunar sysutils/xfce4-xarchiver sysutils/xfce4-xkb-plugin textproc/xfce4-dict-plugin time/xfce4-datetime-plugin time/xfce4-orage time/xfce4-timer-plugin wm/xfce4-wm-themes wm/xfce4-wm x11/libxfce4gui x11/libxfce4util x11/xfce4-clipman-plugin x11/xfce4-desktop x11/xfce4-exo x11/xfce4-eyes-plugin x11/xfce4-gtk2-engine x11/xfce4-notes-plugin x11/xfce4-panel x11/xfce4-places-plugin x11/xfce4-session x11/xfce4-settings x11/xfce4-terminal Removed packages: sysutils/xfce4-volman x11/xfce4-utils This is based on a huge amount of work by the NetBSDfr team and Youri Mouton, who takes over as MAINTAINER, and has been tested by Youri on a large number of platforms prior to commit. A massive thanks to them. Any issues with the import are mine alone as the committer-by-proxy. --- x11/xfce4-session/Makefile | 35 ++++++++++------ x11/xfce4-session/PLIST | 47 +++++++++++----------- x11/xfce4-session/buildlink3.mk | 17 -------- x11/xfce4-session/distinfo | 14 ++++--- x11/xfce4-session/patches/patch-ab | 13 ------ x11/xfce4-session/patches/patch-ac | 7 ++-- .../patches/patch-scripts_Makefile.in | 20 +++++++++ .../patches/patch-scripts_startxfce4.in | 23 +++++++++++ .../patches/patch-settings_xfce4-session.xml | 14 +++++++ 9 files changed, 116 insertions(+), 74 deletions(-) delete mode 100644 x11/xfce4-session/buildlink3.mk delete mode 100644 x11/xfce4-session/patches/patch-ab create mode 100644 x11/xfce4-session/patches/patch-scripts_Makefile.in create mode 100644 x11/xfce4-session/patches/patch-scripts_startxfce4.in create mode 100644 x11/xfce4-session/patches/patch-settings_xfce4-session.xml (limited to 'x11/xfce4-session') diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index 8daee516215..9de6842b5c5 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.48 2014/05/05 00:48:37 ryoon Exp $ +# $NetBSD: Makefile,v 1.49 2015/04/21 08:56:45 jperkin Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" -DISTNAME= xfce4-session-${XFCE4_VERSION} -PKGREVISION= 21 +DISTNAME= xfce4-session-4.10.1 CATEGORIES= x11 +MASTER_SITES+= http://archive.xfce.org/src/xfce/xfce4-session/4.10/ + +HOMEPAGE= http://docs.xfce.org/xfce/xfce4-session/start COMMENT= Xfce session manager PKGCONFIG_OVERRIDE+= libxfsm/xfce4-session-2.0.pc.in @@ -28,18 +30,27 @@ MAKE_DIRS+= ${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images MAKE_DIRS+= ${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images +#CONF_FILES= ${EGDIR}/applications/xfce-session-settings.desktop \ + ${PKG_SYSCONFDIR}/applications/xfce-session-settings.desktop +#CONF_FILES+= ${EGDIR}/applications/xfce4-session-logout.desktop \ + ${PKG_SYSCONFDIR}/applications/xfce4-session-logout.desktop +CONF_FILES= ${EGDIR}/autostart/xscreensaver.desktop \ + ${PKG_SYSCONFDIR}/autostart/xscreensaver.desktop CONF_FILES= ${EGDIR}/xfconf/xfce-perchannel-xml/xfce4-session.xml \ - ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml -CONF_FILES+= ${EGDIR}/autostart/xfce4-tips-autostart.desktop \ - ${PKG_SYSCONFDIR}/autostart/xfce4-tips-autostart.desktop + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +CONF_FILES+= ${EGDIR}/Xft.xrdb \ + ${PKG_SYSCONFDIR}/xfce4/Xft.xrdb +CONF_FILES+= ${EGDIR}/xinitrc \ + ${PKG_SYSCONFDIR}/xfce4/xinitrc + +.if !empty(Darwin-*-*) +.include "../../sysutils/consolekit/buildlink3.mk" +.endif .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../sysutils/dbus/buildlink3.mk" -.include "../../sysutils/dbus-glib/buildlink3.mk" +.include "../../security/policykit/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.include "../../x11/libxfce4util/buildlink3.mk" +.include "../../x11/libxfce4ui/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST index 4e087e769d8..2dc7577bdc8 100644 --- a/x11/xfce4-session/PLIST +++ b/x11/xfce4-session/PLIST @@ -1,25 +1,28 @@ -@comment $NetBSD: PLIST,v 1.15 2009/09/16 01:15:36 reed Exp $ +@comment $NetBSD: PLIST,v 1.16 2015/04/21 08:56:45 jperkin Exp $ +bin/startxfce4 bin/xfce4-session bin/xfce4-session-logout bin/xfce4-session-settings -bin/xfce4-tips +bin/xflock4 include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h lib/libxfsm-4.6.la lib/pkgconfig/xfce4-session-2.0.pc -lib/xfce4/splash/engines/libbalou.la -lib/xfce4/splash/engines/libmice.la -lib/xfce4/splash/engines/libsimple.la -libexec/balou-export-theme -libexec/balou-install-theme -libexec/xfsm-shutdown-helper +lib/xfce4/session/balou-export-theme +lib/xfce4/session/balou-install-theme +lib/xfce4/session/splash-engines/libbalou.la +lib/xfce4/session/splash-engines/libmice.la +lib/xfce4/session/splash-engines/libsimple.la +lib/xfce4/session/xfsm-shutdown-helper man/man1/xfce4-session-logout.1 man/man1/xfce4-session.1 share/applications/xfce-session-settings.desktop -share/examples/xfce4/autostart/xfce4-tips-autostart.desktop +share/applications/xfce4-session-logout.desktop +share/examples/xfce4/Xft.xrdb +share/examples/xfce4/autostart/xscreensaver.desktop share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml +share/examples/xfce4/xinitrc share/icons/hicolor/128x128/apps/xfce4-session.png -share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png share/icons/hicolor/48x48/apps/xfce4-session.png share/icons/hicolor/48x48/apps/xfce4-splash.png share/icons/hicolor/48x48/apps/xfsm-hibernate.png @@ -27,15 +30,15 @@ share/icons/hicolor/48x48/apps/xfsm-logout.png share/icons/hicolor/48x48/apps/xfsm-reboot.png share/icons/hicolor/48x48/apps/xfsm-shutdown.png share/icons/hicolor/48x48/apps/xfsm-suspend.png -share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png -share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png -share/icons/hicolor/72x72/apps/xfsm-trash-normal.png share/icons/hicolor/scalable/apps/xfce4-session.svg share/icons/hicolor/scalable/apps/xfsm-shutdown.svg share/locale/am/LC_MESSAGES/xfce4-session.mo share/locale/ar/LC_MESSAGES/xfce4-session.mo +share/locale/ast/LC_MESSAGES/xfce4-session.mo share/locale/az/LC_MESSAGES/xfce4-session.mo share/locale/be/LC_MESSAGES/xfce4-session.mo +share/locale/bg/LC_MESSAGES/xfce4-session.mo +share/locale/bn/LC_MESSAGES/xfce4-session.mo share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo share/locale/ca/LC_MESSAGES/xfce4-session.mo share/locale/cs/LC_MESSAGES/xfce4-session.mo @@ -56,11 +59,14 @@ share/locale/gl/LC_MESSAGES/xfce4-session.mo share/locale/gu/LC_MESSAGES/xfce4-session.mo share/locale/he/LC_MESSAGES/xfce4-session.mo share/locale/hi/LC_MESSAGES/xfce4-session.mo +share/locale/hr/LC_MESSAGES/xfce4-session.mo share/locale/hu/LC_MESSAGES/xfce4-session.mo share/locale/id/LC_MESSAGES/xfce4-session.mo +share/locale/is/LC_MESSAGES/xfce4-session.mo share/locale/it/LC_MESSAGES/xfce4-session.mo share/locale/ja/LC_MESSAGES/xfce4-session.mo share/locale/ka/LC_MESSAGES/xfce4-session.mo +share/locale/kk/LC_MESSAGES/xfce4-session.mo share/locale/ko/LC_MESSAGES/xfce4-session.mo share/locale/lt/LC_MESSAGES/xfce4-session.mo share/locale/lv/LC_MESSAGES/xfce4-session.mo @@ -69,6 +75,7 @@ share/locale/mr/LC_MESSAGES/xfce4-session.mo share/locale/ms/LC_MESSAGES/xfce4-session.mo share/locale/nb/LC_MESSAGES/xfce4-session.mo share/locale/nl/LC_MESSAGES/xfce4-session.mo +share/locale/nn/LC_MESSAGES/xfce4-session.mo share/locale/pa/LC_MESSAGES/xfce4-session.mo share/locale/pl/LC_MESSAGES/xfce4-session.mo share/locale/pt/LC_MESSAGES/xfce4-session.mo @@ -78,23 +85,17 @@ share/locale/ru/LC_MESSAGES/xfce4-session.mo share/locale/si/LC_MESSAGES/xfce4-session.mo share/locale/sk/LC_MESSAGES/xfce4-session.mo share/locale/sq/LC_MESSAGES/xfce4-session.mo +share/locale/sr/LC_MESSAGES/xfce4-session.mo share/locale/sv/LC_MESSAGES/xfce4-session.mo share/locale/ta/LC_MESSAGES/xfce4-session.mo +share/locale/te/LC_MESSAGES/xfce4-session.mo share/locale/tr/LC_MESSAGES/xfce4-session.mo +share/locale/ug/LC_MESSAGES/xfce4-session.mo share/locale/uk/LC_MESSAGES/xfce4-session.mo share/locale/ur/LC_MESSAGES/xfce4-session.mo +share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo share/locale/vi/LC_MESSAGES/xfce4-session.mo share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo share/themes/Default/balou/logo.png share/themes/Default/balou/themerc -share/xfce4/doc/C/images/xfsm-advanced.png -share/xfce4/doc/C/images/xfsm-general.png -share/xfce4/doc/C/images/xfsm-splash.png -share/xfce4/doc/C/xfce4-session.html -share/xfce4/doc/fr/images/xfsm-advanced.png -share/xfce4/doc/fr/images/xfsm-general.png -share/xfce4/doc/fr/images/xfsm-splash.png -share/xfce4/doc/fr/xfce4-session.html -share/xfce4/tips/tips -share/xfce4/tips/tips.dat diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk deleted file mode 100644 index 1809c28e65f..00000000000 --- a/x11/xfce4-session/buildlink3.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.42 2014/05/05 00:48:37 ryoon Exp $ - -BUILDLINK_TREE+= xfce4-session - -.if !defined(XFCE4_SESSION_BUILDLINK3_MK) -XFCE4_SESSION_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.xfce4-session+= xfce4-session>=4.6.0 -BUILDLINK_ABI_DEPENDS.xfce4-session+= xfce4-session>=4.6.1nb21 -BUILDLINK_PKGSRCDIR.xfce4-session?= ../../x11/xfce4-session - -.include "../../devel/glib2/buildlink3.mk" -.include "../../devel/xfconf/buildlink3.mk" -.include "../../x11/libxfce4gui/buildlink3.mk" -.endif # XFCE4_SESSION_BUILDLINK3_MK - -BUILDLINK_TREE+= -xfce4-session diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo index bf378ebe382..78ad1ad40dc 100644 --- a/x11/xfce4-session/distinfo +++ b/x11/xfce4-session/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.12 2009/09/16 01:15:36 reed Exp $ +$NetBSD: distinfo,v 1.13 2015/04/21 08:56:45 jperkin Exp $ -SHA1 (xfce4-session-4.6.1.tar.bz2) = 760e05bf73783521b3ce34e91aa187c74018ab8c -RMD160 (xfce4-session-4.6.1.tar.bz2) = 0cab4a0ca2b0d7718cde546d98bac1c87a7ba4f0 -Size (xfce4-session-4.6.1.tar.bz2) = 1365247 bytes -SHA1 (patch-ab) = f1c7a041a91f91a56ac7c8cf64e74a203be905f5 -SHA1 (patch-ac) = 549dccc70ae31f14291d3bf2c191ad8379139c63 +SHA1 (xfce4-session-4.10.1.tar.bz2) = b33d2ced61a9cbacff4f5709959e02d4d1c3836f +RMD160 (xfce4-session-4.10.1.tar.bz2) = c8c72d954ebb22085e4c4d7d14ab7b9dbfdab6b4 +Size (xfce4-session-4.10.1.tar.bz2) = 1273015 bytes +SHA1 (patch-ac) = 0fc28a4a34455470cd893c3240f184058a31d89e +SHA1 (patch-scripts_Makefile.in) = da968583217fe713de60e8466df8ec602a54453d +SHA1 (patch-scripts_startxfce4.in) = b85727681bf67975d45980656c4312d70d067d9b +SHA1 (patch-settings_xfce4-session.xml) = dcba5873ec78cd822b4bbc19af3677ab10b1cab3 diff --git a/x11/xfce4-session/patches/patch-ab b/x11/xfce4-session/patches/patch-ab deleted file mode 100644 index 59043a5e889..00000000000 --- a/x11/xfce4-session/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2009/09/16 01:15:33 reed Exp $ - ---- xfce4-tips/Makefile.in.orig 2009-02-25 20:29:50.000000000 +0000 -+++ xfce4-tips/Makefile.in -@@ -309,7 +309,7 @@ xfce4_tips_CFLAGS = \ - xfce4_tips_LDADD = \ - @LIBXFCEGUI4_LIBS@ - --desktopdir = $(sysconfdir)/xdg/autostart -+desktopdir = $(datadir)/examples/xfce4/autostart - desktop_in_files = xfce4-tips-autostart.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - EXTRA_DIST = \ diff --git a/x11/xfce4-session/patches/patch-ac b/x11/xfce4-session/patches/patch-ac index 019de5feb4d..a0a20a16e9a 100644 --- a/x11/xfce4-session/patches/patch-ac +++ b/x11/xfce4-session/patches/patch-ac @@ -1,8 +1,9 @@ -$NetBSD: patch-ac,v 1.1 2009/09/16 01:15:33 reed Exp $ +$NetBSD: patch-ac,v 1.2 2015/04/21 08:56:45 jperkin Exp $ ---- settings/Makefile.in.orig 2009-02-25 20:29:49.000000000 +0000 +Adjust config path. +--- settings/Makefile.in.orig 2013-05-05 15:33:59.000000000 +0000 +++ settings/Makefile.in -@@ -334,7 +334,7 @@ xfce4_session_settings_LDADD = \ +@@ -418,7 +418,7 @@ xfce4_session_settings_LDADD = \ xfce4_session_settings_DEPENDENCIES = \ $(top_builddir)/libxfsm/libxfsm-4.6.la diff --git a/x11/xfce4-session/patches/patch-scripts_Makefile.in b/x11/xfce4-session/patches/patch-scripts_Makefile.in new file mode 100644 index 00000000000..f92d1f6ccb9 --- /dev/null +++ b/x11/xfce4-session/patches/patch-scripts_Makefile.in @@ -0,0 +1,20 @@ +$NetBSD: patch-scripts_Makefile.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Adjust config path. +--- scripts/Makefile.in.orig 2013-05-05 15:33:59.000000000 +0000 ++++ scripts/Makefile.in +@@ -329,12 +329,12 @@ edit = $(SED) \ + -e "s,@_docdir_\@,$$(dirname $(docdir)),g" \ + -e "s,@_sysconfdir_\@,$(sysconfdir),g" + +-conffilesdir = @sysconfdir@/xdg/xfce4 ++conffilesdir = $(datadir)/examples/xfce4 + conffiles_DATA = \ + xinitrc \ + Xft.xrdb + +-autostartdir = $(sysconfdir)/xdg/autostart ++autostartdir = $(datadir)/examples/xfce4/autostart + autostart_in_files = xscreensaver.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ diff --git a/x11/xfce4-session/patches/patch-scripts_startxfce4.in b/x11/xfce4-session/patches/patch-scripts_startxfce4.in new file mode 100644 index 00000000000..45146d587e2 --- /dev/null +++ b/x11/xfce4-session/patches/patch-scripts_startxfce4.in @@ -0,0 +1,23 @@ +$NetBSD: patch-scripts_startxfce4.in,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Portability fix +--- scripts/startxfce4.in.orig 2013-05-05 15:33:55.000000000 +0000 ++++ scripts/startxfce4.in +@@ -24,7 +24,7 @@ then + OPTS="" + for OPT in $* + do +- if test "x$OPT" == "x--help" ++ if test "x$OPT" = "x--help" + then + # print help and exit + echo "Usage:" +@@ -37,7 +37,7 @@ then + echo + + exit 0 +- elif test "x$OPT" == "x--with-ck-launch" ++ elif test "x$OPT" = "x--with-ck-launch" + then + # try to launch xfce4-session with ck-launch-session in xinitrc + XFCE4_SESSION_WITH_CK="1" diff --git a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml new file mode 100644 index 00000000000..1ae4317dee1 --- /dev/null +++ b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml @@ -0,0 +1,14 @@ +$NetBSD: patch-settings_xfce4-session.xml,v 1.1 2015/04/21 08:56:45 jperkin Exp $ + +Look for the right thunar binary. +--- settings/xfce4-session.xml.orig 2013-05-05 15:33:55.000000000 +0000 ++++ settings/xfce4-session.xml +@@ -21,7 +21,7 @@ + + + +- ++ + + + -- cgit v1.2.3