diff options
| author | wiz <wiz> | 2009-08-14 15:47:31 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-08-14 15:47:31 +0000 |
| commit | d1da52c166d84c210e41665dce41e43916b77f47 (patch) | |
| tree | a66603f2822fa1daec7fbc44e93978fceba30744 /x11 | |
| parent | 3033f7988a8c3e85b15795dcd85cd69858ea047e (diff) | |
| download | pkgsrc-d1da52c166d84c210e41665dce41e43916b77f47.tar.gz | |
Fix build with libxklavier-4.0, and depend on it.
Bump PKGREVISION.
Patch from gentoo, linked to by hasso.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libgnomekbd/Makefile | 6 | ||||
| -rw-r--r-- | x11/libgnomekbd/distinfo | 3 | ||||
| -rw-r--r-- | x11/libgnomekbd/patches/patch-ac | 13 |
3 files changed, 18 insertions, 4 deletions
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index fbeadf84fe7..fb066684e31 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2009/07/22 09:01:54 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2009/08/14 15:47:31 wiz Exp $ # DISTNAME= libgnomekbd-2.26.0 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnomekbd/2.26/} EXTRACT_SUFX= .tar.bz2 @@ -16,8 +17,6 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes -CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ -MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool gmake msgfmt @@ -29,6 +28,7 @@ PKGCONFIG_OVERRIDE+= libgnomekbdui.pc.in .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=4.0 .include "../../x11/libxklavier/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo index 33f8c0b957f..d009beccef6 100644 --- a/x11/libgnomekbd/distinfo +++ b/x11/libgnomekbd/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.8 2009/03/15 14:49:01 jmcneill Exp $ +$NetBSD: distinfo,v 1.9 2009/08/14 15:47:31 wiz Exp $ SHA1 (libgnomekbd-2.26.0.tar.bz2) = 0b7543df516271e16198135323471b2107dca0ec RMD160 (libgnomekbd-2.26.0.tar.bz2) = 0a4b5d133efc8b08482d1dc27cdf2ca56655fd48 Size (libgnomekbd-2.26.0.tar.bz2) = 413560 bytes SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98 +SHA1 (patch-ac) = e492d0edf4a02d4fe5016f50f7f80aab40bffb93 SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126 SHA1 (patch-ae) = da103d07fcd3053ad0993b98542a6815dbc5e42b SHA1 (patch-af) = 0c2569c177846e75e58922b38c9bb8f4fe762162 diff --git a/x11/libgnomekbd/patches/patch-ac b/x11/libgnomekbd/patches/patch-ac new file mode 100644 index 00000000000..668be09e26d --- /dev/null +++ b/x11/libgnomekbd/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.4 2009/08/14 15:47:31 wiz Exp $ + +--- libgnomekbd/gkbd-indicator.c.orig 2009-03-13 23:01:12.000000000 +0000 ++++ libgnomekbd/gkbd-indicator.c +@@ -717,7 +717,7 @@ gkbd_indicator_global_init (void) + globals.registry = + xkl_config_registry_get_instance (globals.engine); + +- xkl_config_registry_load (globals.registry); ++ xkl_config_registry_load (globals.registry, FALSE); + + gconf_client = gconf_client_get_default (); + |