Sat Sep 12 19:21:01 2009 UTC ()
Add patch from drochner that gets f-spot further (when autostarting
gconfd-2).

Bump PKGREVISION.


(wiz)
diff -r1.68 -r1.69 pkgsrc/devel/GConf/Makefile
diff -r1.24 -r1.25 pkgsrc/devel/GConf/distinfo
diff -r0 -r1.1 pkgsrc/devel/GConf/patches/patch-ah
cvs diff -r1.68 -r1.69 pkgsrc/devel/GConf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/GConf/Makefile 2009/06/14 22:57:59 1.68
+++ pkgsrc/devel/GConf/Makefile 2009/09/12 19:21:00 1.69
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.68 2009/06/14 22:57:59 joerg Exp $ 1# $NetBSD: Makefile,v 1.69 2009/09/12 19:21:00 wiz Exp $
2# 2#
3 3
4.include "../../devel/GConf/Makefile.common" 4.include "../../devel/GConf/Makefile.common"
 5PKGREVISION= 1
5 6
6CONFIGURE_ARGS+= --disable-gtk 7CONFIGURE_ARGS+= --disable-gtk
7CONFIGURE_ARGS+= ac_cv_header_ldap_h=no 8CONFIGURE_ARGS+= ac_cv_header_ldap_h=no
8 9
9CONFLICTS+= GConf2-[0-9]* 10CONFLICTS+= GConf2-[0-9]*
10 11
11OWN_DIRS= ${PKG_SYSCONFDIR}/2 12OWN_DIRS= ${PKG_SYSCONFDIR}/2
12OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults 13OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults
13OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory 14OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory
14OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.system 15OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.system
15 16
16EGDIR= ${PREFIX}/share/examples/GConf 17EGDIR= ${PREFIX}/share/examples/GConf
17CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path 18CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
cvs diff -r1.24 -r1.25 pkgsrc/devel/GConf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/GConf/distinfo 2009/05/19 23:56:04 1.24
+++ pkgsrc/devel/GConf/distinfo 2009/09/12 19:21:00 1.25
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.24 2009/05/19 23:56:04 wiz Exp $ 1$NetBSD: distinfo,v 1.25 2009/09/12 19:21:00 wiz Exp $
2 2
3SHA1 (GConf-2.26.2.tar.bz2) = bf5323d974fa22165de2144100234647fd50ef17 3SHA1 (GConf-2.26.2.tar.bz2) = bf5323d974fa22165de2144100234647fd50ef17
4RMD160 (GConf-2.26.2.tar.bz2) = 280cd55dc3562445c716b88dfddba4ddd2508786 4RMD160 (GConf-2.26.2.tar.bz2) = 280cd55dc3562445c716b88dfddba4ddd2508786
5Size (GConf-2.26.2.tar.bz2) = 1474738 bytes 5Size (GConf-2.26.2.tar.bz2) = 1474738 bytes
6SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0 6SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
7SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a 7SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a
8SHA1 (patch-ad) = 9ddd396a544cd64a2d7e1929c6852c529b1f45ee 8SHA1 (patch-ad) = 9ddd396a544cd64a2d7e1929c6852c529b1f45ee
9SHA1 (patch-ae) = 9c91e159d1aadd5e602012fdf18173bbfdf5b4ef 9SHA1 (patch-ae) = 9c91e159d1aadd5e602012fdf18173bbfdf5b4ef
10SHA1 (patch-af) = 63bb82324e365e80d689850bcc75f6bd923f8b47 10SHA1 (patch-af) = 63bb82324e365e80d689850bcc75f6bd923f8b47
11SHA1 (patch-ag) = d9a4347443f114785f236c76881cce1b8881c81d 11SHA1 (patch-ag) = d9a4347443f114785f236c76881cce1b8881c81d
 12SHA1 (patch-ah) = 66485f9aeef7e6023c60f58cc054924f3cac4972
File Added: pkgsrc/devel/GConf/patches/patch-ah
$NetBSD: patch-ah,v 1.1 2009/09/12 19:21:00 wiz Exp $

--- gconf/gconf-client.c.orig	2009-05-14 17:14:07.000000000 +0200
+++ gconf/gconf-client.c
@@ -168,6 +168,7 @@ gconf_client_get_type (void)
         (GInstanceInitFunc) gconf_client_init
       };
 
+      g_type_init();
       client_type = g_type_register_static (G_TYPE_OBJECT,
                                             "GConfClient",
                                             &client_info,