From eec04b6c1e491d97f7c607056f6f2d7e26203889 Mon Sep 17 00:00:00 2001 From: roy Date: Thu, 26 Mar 2009 16:49:45 +0000 Subject: We need to link against libgnomeui as dependant libs no longer do. Fix some pkglint warnings and add PKG_DESTDIR support. --- x11/fast-user-switch-applet/Makefile | 11 ++-- x11/fast-user-switch-applet/distinfo | 5 +- x11/fast-user-switch-applet/patches/patch-ab | 17 ++++++ x11/fast-user-switch-applet/patches/patch-ac | 84 ++++++++++++++++++++++++++++ x11/fast-user-switch-applet/patches/patch-ad | 12 ++++ 5 files changed, 123 insertions(+), 6 deletions(-) create mode 100644 x11/fast-user-switch-applet/patches/patch-ab create mode 100644 x11/fast-user-switch-applet/patches/patch-ac create mode 100644 x11/fast-user-switch-applet/patches/patch-ad (limited to 'x11') diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile index d008925ad1c..292542a2018 100644 --- a/x11/fast-user-switch-applet/Makefile +++ b/x11/fast-user-switch-applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2009/03/08 15:56:47 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2009/03/26 16:49:45 roy Exp $ # DISTNAME= fast-user-switch-applet-2.24.0 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ignore-your.tv/fusa/ COMMENT= Switch between users from the GNOME Panel +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= gdm>=2.16.0:../../x11/gdm GNU_CONFIGURE= yes @@ -22,25 +24,24 @@ USE_X11= yes .include "../../mk/bsd.prefs.mk" EVAL_PREFIX= PREFIX.gdm -PREFIX.gdm_DEFAULT= ${LOCALBASE} +PREFIX.gdm_DEFAULT= ${PREFIX} CONFIGURE_ARGS+= --with-gdm-setup=${PREFIX.gdm}/sbin/gdmsetup .if defined(PKG_SYSCONFDIR.gdm) CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR.gdm}/custom.conf .else -CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFBASE}/gdm/custom.conf +CONFIGURE_ARGS+= --with-gdm-config=${PKG_SYSCONFDIR}/gdm/custom.conf .endif GCONF_SCHEMAS= fast-user-switch-applet.schemas BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.0 -BUILDLINK_DEPMETHOD.libXt?= build - .include "../../devel/GConf/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../mk/omf-scrollkeeper.mk" diff --git a/x11/fast-user-switch-applet/distinfo b/x11/fast-user-switch-applet/distinfo index 8ce56f25bc6..dd3b8ae4922 100644 --- a/x11/fast-user-switch-applet/distinfo +++ b/x11/fast-user-switch-applet/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.9 2008/10/25 00:36:12 wiz Exp $ +$NetBSD: distinfo,v 1.10 2009/03/26 16:49:45 roy Exp $ SHA1 (fast-user-switch-applet-2.24.0.tar.bz2) = 8f3c99fa18b8b0a666964174f832e961bb9b9520 RMD160 (fast-user-switch-applet-2.24.0.tar.bz2) = 4fdffd1b3a8ad3cc566e7796b001a73c1541f053 Size (fast-user-switch-applet-2.24.0.tar.bz2) = 936189 bytes SHA1 (patch-aa) = b15502d11ce651fe2e055e8a3e1f717b517138fe +SHA1 (patch-ab) = 7e38dd38c6d1846fb48a46a9b06d3ee266a8ff50 +SHA1 (patch-ac) = 80b764341d70d1fcc02c362e7dc3bc14bade30e1 +SHA1 (patch-ad) = c32ae791cd9c517b89274f75b0fd166037c2edfd diff --git a/x11/fast-user-switch-applet/patches/patch-ab b/x11/fast-user-switch-applet/patches/patch-ab new file mode 100644 index 00000000000..3039b03ea3b --- /dev/null +++ b/x11/fast-user-switch-applet/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.1 2009/03/26 16:49:46 roy Exp $ + +--- configure.ac 2009-03-26 15:39:22.000000000 +0000 ++++ configure.ac 2009-03-26 15:39:09.000000000 +0000 +@@ -47,10 +47,12 @@ + PANEL_REQUIRED_VERSION=2.0.0 + GLADE_REQUIRED_VERSION=2.0.0 + GLIB_REQUIRED_VERSION=2.15.3 ++GNOMEUI_REQUIRED_VERSION=2.6.0 + + PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION) + AC_SUBST(APPLET_CFLAGS) + AC_SUBST(APPLET_LIBS) diff --git a/x11/fast-user-switch-applet/patches/patch-ac b/x11/fast-user-switch-applet/patches/patch-ac new file mode 100644 index 00000000000..a1bc9e8deec --- /dev/null +++ b/x11/fast-user-switch-applet/patches/patch-ac @@ -0,0 +1,84 @@ +$NetBSD: patch-ac,v 1.1 2009/03/26 16:49:46 roy Exp $ + +--- configure 2009-03-26 16:02:51.000000000 +0000 ++++ configure 2009-03-26 16:06:55.000000000 +0000 +@@ -21191,6 +21191,7 @@ + PANEL_REQUIRED_VERSION=2.0.0 + GLADE_REQUIRED_VERSION=2.0.0 + GLIB_REQUIRED_VERSION=2.15.3 ++GNOMEUI_REQUIRED_VERSION=2.6.0 + + + +@@ -21325,10 +21326,12 @@ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION + libglade-2.0 >= \$GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= \$GNOMEUI_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -21336,6 +21339,7 @@ + pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null` + else + pkg_failed=yes +@@ -21352,10 +21356,12 @@ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= \$PANEL_REQUIRED_VERSION + libglade-2.0 >= \$GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= \$GNOMEUI_REQUIRED_VERSION + gio-2.0 >= \$GLIB_REQUIRED_VERSION\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 +@@ -21363,6 +21369,7 @@ + pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION" 2>/dev/null` + else + pkg_failed=yes +@@ -21385,11 +21392,13 @@ + APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION"` + else + APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION"` + fi + # Put the nasty error message in config.log where it belongs +@@ -21398,6 +21407,7 @@ + { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met: + + $APPLET_PKG_ERRORS +@@ -21412,6 +21422,7 @@ + echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION + libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION + libglade-2.0 >= $GLADE_REQUIRED_VERSION ++ libgnomeui-2.0 >= $GNOMEUI_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION) were not met: + + $APPLET_PKG_ERRORS diff --git a/x11/fast-user-switch-applet/patches/patch-ad b/x11/fast-user-switch-applet/patches/patch-ad new file mode 100644 index 00000000000..15eba05b358 --- /dev/null +++ b/x11/fast-user-switch-applet/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2009/03/26 16:49:46 roy Exp $ + +--- src/applet.c 2009-03-26 16:08:23.000000000 +0000 ++++ src/applet.c 2009-03-26 16:08:40.000000000 +0000 +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include + -- cgit v1.2.3