From aab221b8a2ffe57848ed2c6cbd15e44fb5195fd7 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 16 Sep 2009 01:15:32 +0000 Subject: Upgrading Xfce to 4.6.1. This is for PR #40984. This is based on work from dieter roelants. Thank you Dieter. Also I had done some work independently on this. Hopefully, I am getting this all committed at one time. The changelogs are at http://www.xfce.org/documentation/changelogs/4.6.1 http://www.xfce.org/documentation/changelogs/4.6.0 Also don't need the xfce4-dev-tools for building. (It is only needed when building from SVN source.) --- x11/libxfce4gui/Makefile | 23 ++++++++++---- x11/libxfce4gui/PLIST | 67 +++++++++++++++++++++------------------- x11/libxfce4gui/buildlink3.mk | 11 +++---- x11/libxfce4gui/distinfo | 9 +++--- x11/libxfce4gui/patches/patch-aa | 13 ++++++++ 5 files changed, 75 insertions(+), 48 deletions(-) create mode 100644 x11/libxfce4gui/patches/patch-aa (limited to 'x11/libxfce4gui') diff --git a/x11/libxfce4gui/Makefile b/x11/libxfce4gui/Makefile index 00786a1a09b..ab203188af0 100644 --- a/x11/libxfce4gui/Makefile +++ b/x11/libxfce4gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: Makefile,v 1.28 2009/09/16 01:15:34 reed Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -6,18 +6,29 @@ PKG_DESTDIR_SUPPORT= user-destdir DISTNAME= libxfcegui4-${XFCE4_VERSION} PKGNAME= libxfce4gui-${XFCE4_VERSION} -PKGREVISION= 2 CATEGORIES= x11 COMMENT= Xfce widget library -USE_TOOLS+= msgfmt -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc +PKGCONFIG_OVERRIDE= libxfce4kbd-private/libxfce4kbd-private-1.0.pc.in +PKGCONFIG_OVERRIDE+= libxfcegui4/libxfcegui4-1.0.pc.in -PKGCONFIG_OVERRIDE= libxfcegui4/libxfcegui4-1.0.pc.in +CONFIGURE_ARGS+= --disable-gladeui +EGDIR= ${XFCE4_EGBASE}/xfconf/xfce-perchannel-xml +PKG_SYSCONFSUBDIR= xdg +CONF_FILES= ${EGDIR}/xfce4-keyboard-shortcuts.xml \ + ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml + +MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/include/xfce4 +MAKE_DIRS+= ${XFCE4_EGBASE} ${XFCE4_EGBASE:Q}/xfconf ${EGDIR} +OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4 ${PKG_SYSCONFDIR}/xfce4/xfconf +OWN_DIRS+= ${PKG_SYSCONFDIR}/xfce4/xfconf/xfce-perchannel-xml + +.include "../../devel/libglade/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libxfce4gui/PLIST b/x11/libxfce4gui/PLIST index f37a6696625..9d404a343f2 100644 --- a/x11/libxfce4gui/PLIST +++ b/x11/libxfce4gui/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:25:00 joerg Exp $ +@comment $NetBSD: PLIST,v 1.21 2009/09/16 01:15:34 reed Exp $ +include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h +include/xfce4/libxfce4kbd-private/xfce-shortcuts.h include/xfce4/libxfcegui4/dialogs.h include/xfce4/libxfcegui4/gtk_style.h include/xfce4/libxfcegui4/gtktoxevent.h @@ -10,7 +14,6 @@ include/xfce4/libxfcegui4/libxfcegui4.h include/xfce4/libxfcegui4/netk-application.h include/xfce4/libxfcegui4/netk-class-group.h include/xfce4/libxfcegui4/netk-enum-types.h -include/xfce4/libxfcegui4/netk-marshal.h include/xfce4/libxfcegui4/netk-pager.h include/xfce4/libxfcegui4/netk-screen.h include/xfce4/libxfcegui4/netk-tasklist.h @@ -39,40 +42,43 @@ include/xfce4/libxfcegui4/xfce_decorbutton.h include/xfce4/libxfcegui4/xfce_decortoggle.h include/xfce4/libxfcegui4/xfce_framebox.h include/xfce4/libxfcegui4/xfce_iconbutton.h -include/xfce4/libxfcegui4/xfce_marshal.h include/xfce4/libxfcegui4/xfce_menubutton.h include/xfce4/libxfcegui4/xfce_movehandler.h include/xfce4/libxfcegui4/xfce_scaled_image.h include/xfce4/libxfcegui4/xfce_systemtray.h include/xfce4/libxfcegui4/xfce_togglebutton.h include/xfce4/libxfcegui4/xinerama.h +lib/libglade/2.0/libxfce4.la +lib/libxfce4kbd-private.la lib/libxfcegui4.la +lib/pkgconfig/libxfce4kbd-private-1.0.pc lib/pkgconfig/libxfcegui4-1.0.pc -share/doc/libxfcegui4/XfceAboutDialog.html -share/doc/libxfcegui4/XfceAppMenuItem.html -share/doc/libxfcegui4/XfceFramebox.html -share/doc/libxfcegui4/XfceHeading.html -share/doc/libxfcegui4/XfceIconTheme.html -share/doc/libxfcegui4/XfceTitledDialog.html -share/doc/libxfcegui4/home.png -share/doc/libxfcegui4/index.html -share/doc/libxfcegui4/index.sgml -share/doc/libxfcegui4/left.png -share/doc/libxfcegui4/libxfcegui4-Standard-Macros.html -share/doc/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html -share/doc/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html -share/doc/libxfcegui4/libxfcegui4-XfceFileChooser.html -share/doc/libxfcegui4/libxfcegui4-core.html -share/doc/libxfcegui4/libxfcegui4-dialogs.html -share/doc/libxfcegui4/libxfcegui4-fundamentals.html -share/doc/libxfcegui4/libxfcegui4-netk.html -share/doc/libxfcegui4/libxfcegui4-xfce-exec.html -share/doc/libxfcegui4/libxfcegui4.devhelp -share/doc/libxfcegui4/libxfcegui4.devhelp2 -share/doc/libxfcegui4/reference.html -share/doc/libxfcegui4/right.png -share/doc/libxfcegui4/style.css -share/doc/libxfcegui4/up.png +share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html +share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html +share/gtk-doc/html/libxfcegui4/XfceFramebox.html +share/gtk-doc/html/libxfcegui4/XfceHeading.html +share/gtk-doc/html/libxfcegui4/XfceIconTheme.html +share/gtk-doc/html/libxfcegui4/XfceTitledDialog.html +share/gtk-doc/html/libxfcegui4/home.png +share/gtk-doc/html/libxfcegui4/index.html +share/gtk-doc/html/libxfcegui4/index.sgml +share/gtk-doc/html/libxfcegui4/left.png +share/gtk-doc/html/libxfcegui4/libxfcegui4-Standard-Macros.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gdk-extensions.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html +share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html +share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp +share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2 +share/gtk-doc/html/libxfcegui4/reference.html +share/gtk-doc/html/libxfcegui4/right.png +share/gtk-doc/html/libxfcegui4/style.css +share/gtk-doc/html/libxfcegui4/up.png share/icons/hicolor/48x48/apps/xfce-edit.png share/icons/hicolor/48x48/apps/xfce-filemanager.png share/icons/hicolor/48x48/apps/xfce-games.png @@ -121,12 +127,12 @@ share/locale/lt/LC_MESSAGES/libxfcegui4.mo share/locale/lv/LC_MESSAGES/libxfcegui4.mo share/locale/mk/LC_MESSAGES/libxfcegui4.mo share/locale/mr/LC_MESSAGES/libxfcegui4.mo -share/locale/nb_NO/LC_MESSAGES/libxfcegui4.mo +share/locale/nb/LC_MESSAGES/libxfcegui4.mo share/locale/nl/LC_MESSAGES/libxfcegui4.mo share/locale/pa/LC_MESSAGES/libxfcegui4.mo share/locale/pl/LC_MESSAGES/libxfcegui4.mo +share/locale/pt/LC_MESSAGES/libxfcegui4.mo share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo -share/locale/pt_PT/LC_MESSAGES/libxfcegui4.mo share/locale/ro/LC_MESSAGES/libxfcegui4.mo share/locale/ru/LC_MESSAGES/libxfcegui4.mo share/locale/si/LC_MESSAGES/libxfcegui4.mo @@ -134,7 +140,6 @@ share/locale/sk/LC_MESSAGES/libxfcegui4.mo share/locale/sq/LC_MESSAGES/libxfcegui4.mo share/locale/sv/LC_MESSAGES/libxfcegui4.mo share/locale/ta/LC_MESSAGES/libxfcegui4.mo -share/locale/th/LC_MESSAGES/libxfcegui4.mo share/locale/tr/LC_MESSAGES/libxfcegui4.mo share/locale/uk/LC_MESSAGES/libxfcegui4.mo share/locale/ur/LC_MESSAGES/libxfcegui4.mo diff --git a/x11/libxfce4gui/buildlink3.mk b/x11/libxfce4gui/buildlink3.mk index 3d1c51d41c7..7f7d2b6c3c5 100644 --- a/x11/libxfce4gui/buildlink3.mk +++ b/x11/libxfce4gui/buildlink3.mk @@ -1,21 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:56:58 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $ BUILDLINK_TREE+= libxfce4gui .if !defined(LIBXFCE4GUI_BUILDLINK3_MK) LIBXFCE4GUI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.4.3nb1 -BUILDLINK_ABI_DEPENDS.libxfce4gui?= libxfce4gui>=4.4.3nb2 +BUILDLINK_API_DEPENDS.libxfce4gui+= libxfce4gui>=4.6.0 BUILDLINK_PKGSRCDIR.libxfce4gui?= ../../x11/libxfce4gui -.include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/xfconf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libxfce4util/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../devel/xfce4-dev-tools/buildlink3.mk" -.include "../../devel/glib2/buildlink3.mk" .endif # LIBXFCE4GUI_BUILDLINK3_MK BUILDLINK_TREE+= -libxfce4gui diff --git a/x11/libxfce4gui/distinfo b/x11/libxfce4gui/distinfo index 19f208f0b71..fa98d38db15 100644 --- a/x11/libxfce4gui/distinfo +++ b/x11/libxfce4gui/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2008/12/17 12:50:03 hira Exp $ +$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $ -SHA1 (libxfcegui4-4.4.3.tar.bz2) = 4f1ab2fb035b0aaeb01cbef15d7378726037bcc9 -RMD160 (libxfcegui4-4.4.3.tar.bz2) = c0155a89e35d88d3c2e25fc2f38630309d50e916 -Size (libxfcegui4-4.4.3.tar.bz2) = 621245 bytes +SHA1 (libxfcegui4-4.6.1.tar.bz2) = 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 +RMD160 (libxfcegui4-4.6.1.tar.bz2) = 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568 +Size (libxfcegui4-4.6.1.tar.bz2) = 650666 bytes +SHA1 (patch-aa) = c054345fcb2aa5c516009d0740ac0abc3ba15706 diff --git a/x11/libxfce4gui/patches/patch-aa b/x11/libxfce4gui/patches/patch-aa new file mode 100644 index 00000000000..2531cce5a9e --- /dev/null +++ b/x11/libxfce4gui/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.3 2009/09/16 01:15:33 reed Exp $ + +--- libxfce4kbd-private/Makefile.in.orig 2009-03-08 20:41:51.000000000 +0000 ++++ libxfce4kbd-private/Makefile.in +@@ -360,7 +360,7 @@ top_srcdir = @top_srcdir@ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(LIBXFCE4UTIL_LIBS) \ + @ENABLE_KEYBOARD_LIBRARY_TRUE@ $(XFCONF_LIBS) + +-@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml ++@ENABLE_KEYBOARD_LIBRARY_TRUE@settingsdir = $(datadir)/examples/xfce4/xfconf/xfce-perchannel-xml + @ENABLE_KEYBOARD_LIBRARY_TRUE@settings_DATA = xfce4-keyboard-shortcuts.xml + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfigdir = $(libdir)/pkgconfig + @ENABLE_KEYBOARD_LIBRARY_TRUE@pkgconfig_DATA = libxfce4kbd-private-1.0.pc -- cgit v1.2.3