pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/fast-user-switch-applet We need to link against li...
details: https://anonhg.NetBSD.org/pkgsrc/rev/db9786331fc1
branches: trunk
changeset: 556657:db9786331fc1
user: roy <roy%pkgsrc.org@localhost>
date: Thu Mar 26 16:49:45 2009 +0000
description:
We need to link against libgnomeui as dependant libs no longer do.
Fix some pkglint warnings and add PKG_DESTDIR support.
diffstat:
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(-)
diffs (186 lines):
diff -r 17e588896a57 -r db9786331fc1 x11/fast-user-switch-applet/Makefile
--- a/x11/fast-user-switch-applet/Makefile Thu Mar 26 14:32:39 2009 +0000
+++ b/x11/fast-user-switch-applet/Makefile Thu Mar 26 16:49:45 2009 +0000
@@ -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 @@
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 @@
.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 -r 17e588896a57 -r db9786331fc1 x11/fast-user-switch-applet/distinfo
--- a/x11/fast-user-switch-applet/distinfo Thu Mar 26 14:32:39 2009 +0000
+++ b/x11/fast-user-switch-applet/distinfo Thu Mar 26 16:49:45 2009 +0000
@@ -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 -r 17e588896a57 -r db9786331fc1 x11/fast-user-switch-applet/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/fast-user-switch-applet/patches/patch-ab Thu Mar 26 16:49:45 2009 +0000
@@ -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 -r 17e588896a57 -r db9786331fc1 x11/fast-user-switch-applet/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/fast-user-switch-applet/patches/patch-ac Thu Mar 26 16:49:45 2009 +0000
@@ -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 -r 17e588896a57 -r db9786331fc1 x11/fast-user-switch-applet/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/fast-user-switch-applet/patches/patch-ad Thu Mar 26 16:49:45 2009 +0000
@@ -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 <glib/gi18n.h>
+
+ #include <string.h>
++#include <unistd.h>
+
+ #include <gdk/gdkkeysyms.h>
+
Home |
Main Index |
Thread Index |
Old Index