Update to gconf2-2.32.0.

ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:32:49 +00:00
parent 5848cef3b6
commit 0ba118740d
8 changed files with 60 additions and 41 deletions

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.41 2010/08/02 07:25:50 espie Exp $
# $OpenBSD: Makefile,v 1.42 2010/09/30 07:32:49 ajacoutot Exp $
COMMENT-main= configuration database system for GNOME
COMMENT-polkit= PolicyKit integration for GConf2
GNOME_PROJECT= GConf
GNOME_VERSION= 2.28.1
GNOME_VERSION= 2.32.0
PKGNAME-main= gconf2-${GNOME_VERSION}
PKGNAME-polkit= gconf2-polkit-${GNOME_VERSION}
REVISION-main = 2
SHARED_LIBS += gconf-2 6.2 # .5.5
SHARED_LIBS += gconf-2 6.2 # 5.5
CATEGORIES= devel
CATEGORIES-polkit= devel sysutils
@ -29,15 +28,15 @@ PERMIT_DISTFILES_CDROM= Yes
WANTLIB += c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 pcre pthread z
WANTLIB-main += ${WANTLIB}
WANTLIB-main += ${WANTLIB} gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
WANTLIB-main += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-main += Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 expat
WANTLIB-main += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB-main += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
WANTLIB-main += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB-main += xcb xcb-render xcb-render-util z
WANTLIB-main += xcb xcb-render xcb-render-util z ORBit-2 xml2 dbus-glib-1
WANTLIB-polkit += ${WANTLIB}
WANTLIB-polkit += ${WANTLIB} gconf-2 polkit-gobject-1
WANTLIB-polkit += ORBit-2 c dbus-1 dbus-glib-1 eggdbus-1 gio-2.0 glib-2.0
WANTLIB-polkit += gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread z
@ -47,14 +46,14 @@ MODULES= devel/gettext \
MULTI_PACKAGES= -main -polkit
LIB_DEPENDS-main= ${LIB_DEPENDS} \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
ORBit-2.>=2.0::devel/ORBit2 \
xml2.>=9::textproc/libxml \
dbus-glib-1::x11/dbus-glib
::x11/gtk+2 \
::devel/ORBit2 \
::textproc/libxml \
::x11/dbus-glib
LIB_DEPENDS-polkit= ${LIB_DEPENDS} \
gconf-2.>=6::devel/gconf2 \
polkit-gobject-1::sysutils/polkit
::devel/gconf2 \
::sysutils/polkit
USE_X11= Yes
@ -62,6 +61,8 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--without-openldap \
--enable-defaults-service

View File

@ -1,5 +1,5 @@
MD5 (GConf-2.28.1.tar.bz2) = J2Y/rwr09qbVNN6ScPbSSg==
RMD160 (GConf-2.28.1.tar.bz2) = nuO25oVTmXoSjKK0mZLd++FXYJs=
SHA1 (GConf-2.28.1.tar.bz2) = lE4GeoW0Pnp3i57iRPhVCJMaSaA=
SHA256 (GConf-2.28.1.tar.bz2) = U8R3+QhgV7DISBahyXngFTe4YvvKy2r0ti+M/+xLMAA=
SIZE (GConf-2.28.1.tar.bz2) = 1476141
MD5 (GConf-2.32.0.tar.bz2) = sWHaahqwkLZJrtMREAOwuw==
RMD160 (GConf-2.32.0.tar.bz2) = nvatymnlrI4jhvKPWvjoxcn7tS4=
SHA1 (GConf-2.32.0.tar.bz2) = JxHHtTdh0seJESux+YnxwabeUmU=
SHA256 (GConf-2.32.0.tar.bz2) = VN0d1/SZKKnMQldL727wSBdTdw/BmYbcIAS7t/rJd6A=
SIZE (GConf-2.32.0.tar.bz2) = 1541688

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-defaults_Makefile_in,v 1.2 2010/03/30 12:52:30 ajacoutot Exp $
--- defaults/Makefile.in.orig Tue Mar 30 13:40:07 2010
+++ defaults/Makefile.in Tue Mar 30 14:31:47 2010
@@ -273,7 +273,7 @@ gconf_defaults_mechanism_SOURCES = \
$OpenBSD: patch-defaults_Makefile_in,v 1.3 2010/09/30 07:32:49 ajacoutot Exp $
--- defaults/Makefile.in.orig Mon Sep 27 20:04:55 2010
+++ defaults/Makefile.in Tue Sep 28 08:00:26 2010
@@ -306,7 +306,7 @@ gconf_defaults_mechanism_SOURCES = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gconf_Makefile_in,v 1.15 2010/03/30 12:52:30 ajacoutot Exp $
--- gconf/Makefile.in.orig Tue Mar 30 13:40:07 2010
+++ gconf/Makefile.in Tue Mar 30 14:31:47 2010
@@ -314,7 +314,7 @@ INCLUDES = \
$OpenBSD: patch-gconf_Makefile_in,v 1.16 2010/09/30 07:32:49 ajacoutot Exp $
--- gconf/Makefile.in.orig Mon Sep 27 20:04:55 2010
+++ gconf/Makefile.in Tue Sep 28 08:00:26 2010
@@ -353,7 +353,7 @@ INCLUDES = \
-DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \
-DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
-DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-gconf_gconf-client_c,v 1.1 2009/10/24 10:23:02 ajacoutot Exp $
$OpenBSD: patch-gconf_gconf-client_c,v 1.2 2010/09/30 07:32:49 ajacoutot Exp $
http://bugzilla.gnome.org/show_bug.cgi?id=582865
--- gconf/gconf-client.c.orig Fri Oct 23 06:38:24 2009
+++ gconf/gconf-client.c Fri Oct 23 06:38:40 2009
@@ -2025,7 +2025,7 @@ gconf_client_lookup (GConfClient *client,
--- gconf/gconf-client.c.orig Sun Sep 26 20:50:02 2010
+++ gconf/gconf-client.c Tue Sep 28 08:00:26 2010
@@ -2163,7 +2163,7 @@ gconf_client_lookup (GConfClient *client,
{
g_free (dir);
trace ("Negative cache hit on %s", key);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gconf_gconfd_c,v 1.2 2010/03/30 12:52:30 ajacoutot Exp $
--- gconf/gconfd.c.orig Tue Mar 23 00:36:20 2010
+++ gconf/gconfd.c Tue Mar 30 14:31:47 2010
@@ -637,7 +637,7 @@ system_bus_message_handler (DBusConnection *connection
$OpenBSD: patch-gconf_gconfd_c,v 1.3 2010/09/30 07:32:49 ajacoutot Exp $
--- gconf/gconfd.c.orig Sat Aug 28 23:11:12 2010
+++ gconf/gconfd.c Tue Sep 28 08:00:26 2010
@@ -667,7 +667,7 @@ system_bus_message_handler (DBusConnection *connection
gconf_log (GCL_DEBUG, "System defaults changed. Notifying.");

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2010/07/07 16:40:22 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2010/09/30 07:32:49 ajacoutot Exp $
lib/GConf/2/libgconfbackend-oldxml.so
lib/GConf/2/libgconfbackend-xml.so
lib/gio/modules/libgsettingsgconfbackend.so
@lib lib/libgconf-2.so.${LIBgconf-2_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.2 2010/08/02 07:25:50 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2010/09/30 07:32:49 ajacoutot Exp $
@pkgpath devel/gconf2
%%SHARED%%
@unexec-delete rm -fr /var/db/gconf/gconf.xml.defaults/*
@ -6,6 +6,8 @@
@unexec-delete rm -fr /var/db/gconf/gconf.xml.system/*
@bin bin/gconf-merge-tree
@bin bin/gconftool-2
@bin bin/gsettings-data-convert
bin/gsettings-schema-convert
include/gconf/
include/gconf/2/
include/gconf/2/gconf/
@ -20,10 +22,14 @@ include/gconf/2/gconf/gconf-value.h
include/gconf/2/gconf/gconf.h
lib/GConf/
lib/GConf/2/
lib/GConf/2/libgconfbackend-oldxml.a
lib/GConf/2/libgconfbackend-oldxml.la
lib/GConf/2/libgconfbackend-xml.a
lib/GConf/2/libgconfbackend-xml.la
@comment lib/GConf/2/libgconfbackend-oldxml.a
@comment lib/GConf/2/libgconfbackend-oldxml.la
@comment lib/GConf/2/libgconfbackend-xml.a
@comment lib/GConf/2/libgconfbackend-xml.la
lib/gio/
lib/gio/modules/
@comment lib/gio/modules/libgsettingsgconfbackend.a
@comment lib/gio/modules/libgsettingsgconfbackend.la
lib/libgconf-2.a
lib/libgconf-2.la
lib/pkgconfig/
@ -31,6 +37,8 @@ lib/pkgconfig/gconf-2.0.pc
@bin libexec/gconf-sanity-check-2
@bin libexec/gconfd-2
@man man/man1/gconftool-2.1
@man man/man1/gsettings-data-convert.1
@man man/man1/gsettings-schema-convert.1
share/aclocal/gconf-2.m4
share/dbus-1/
share/dbus-1/services/
@ -47,13 +55,19 @@ share/examples/gconf2/gconf.xml.defaults/
@sample /var/db/gconf/gconf.xml.defaults/
share/examples/gconf2/gconf.xml.mandatory/
@sample /var/db/gconf/gconf.xml.mandatory/
share/examples/gconf2/xdg/
@sample ${SYSCONFDIR}/xdg/
share/examples/gconf2/xdg/autostart/
@sample ${SYSCONFDIR}/xdg/autostart/
share/examples/gconf2/xdg/autostart/gsettings-data-convert.desktop
@sample ${SYSCONFDIR}/xdg/autostart/gsettings-data-convert.desktop
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/gconf/
share/gtk-doc/html/gconf/ch01.html
share/gtk-doc/html/gconf/gconf-GConfClient.html
share/gtk-doc/html/gconf/gconf-gconf-backend.html
share/gtk-doc/html/gconf/gconf-gconf-changeset.html
share/gtk-doc/html/gconf/gconf-gconf-client.html
share/gtk-doc/html/gconf/gconf-gconf-engine.html
share/gtk-doc/html/gconf/gconf-gconf-error.html
share/gtk-doc/html/gconf/gconf-gconf-internals.html
@ -140,6 +154,9 @@ share/locale/hi/LC_MESSAGES/
share/locale/hi/LC_MESSAGES/GConf2.mo
share/locale/hr/LC_MESSAGES/GConf2.mo
share/locale/hu/LC_MESSAGES/GConf2.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/GConf2.mo
share/locale/id/LC_MESSAGES/GConf2.mo
share/locale/is/
share/locale/is/LC_MESSAGES/