dconf: updated to 0.24.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dconf: updated to 0.24.0
From: coypu <coypu%sdf.org@localhost>
Date: Wed, 27 Jan 2016 12:21:52 +0000
Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Wed Jan 27 14:21:52 2016 +0200
Changeset:	226171669bc9a7005730029a6425477255cd4c5f

Modified Files:
	dconf/Makefile
	dconf/Makefile.common
	dconf/PLIST
	dconf/buildlink3.mk
	dconf/distinfo
Removed Files:
	dconf/patches/patch-aa
	dconf/patches/patch-editor_Makefile.in

Log Message:
dconf: updated to 0.24.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=226171669bc9a7005730029a6425477255cd4c5f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dconf/Makefile                         | 14 ++++++--
 dconf/Makefile.common                  | 12 +------
 dconf/PLIST                            | 60 +---------------------------------
 dconf/buildlink3.mk                    |  5 ++-
 dconf/distinfo                         | 10 +++---
 dconf/patches/patch-aa                 | 13 --------
 dconf/patches/patch-editor_Makefile.in | 22 -------------
 7 files changed, 20 insertions(+), 116 deletions(-)

diffs:
diff --git a/dconf/Makefile b/dconf/Makefile
index 9da87d8..b2aae30 100644
--- a/dconf/Makefile
+++ b/dconf/Makefile
@@ -1,12 +1,22 @@
 # $NetBSD: Makefile,v 1.26 2015/09/07 12:02:06 jperkin Exp $
 
-PKGREVISION= 1
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+
 .include "Makefile.common"
 
-CONFIGURE_ARGS+= --disable-editor
+CONFIGURE_ARGS+=	--disable-editor
 
 PKGCONFIG_OVERRIDE+=	client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
 
+SUBST_CLASSES=		sysdir
+SUBST_MESSAGE.sysdir=	Fixes hard-coded dconf database directory name
+SUBST_STAGE.sysdir=	post-configure
+SUBST_FILES.sysdir=	engine/dconf-engine-source-system.c
+SUBST_FILES.sysdir+=	tests/engine.c
+SUBST_FILES.sysdir+=	bin/dconf-update.c
+SUBST_FILES.sysdir+=	bin/dconf-update.vala
+SUBST_SED.sysdir=	-e s,/etc/dconf,${PKG_SYSCONFDIR}/dconf,g
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
diff --git a/dconf/Makefile.common b/dconf/Makefile.common
index 9b251de..7038729 100644
--- a/dconf/Makefile.common
+++ b/dconf/Makefile.common
@@ -2,12 +2,11 @@
 #
 # used by devel/dconf-editor/Makefile
 
-DISTNAME=	dconf-0.22.0
+DISTNAME=	dconf-0.24.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dconf/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://wiki.gnome.org/Projects/dconf
 COMMENT=	Backend for gsettings
 LICENSE=	gnu-lgpl-v2.1
@@ -16,12 +15,3 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c99
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake intltool msgfmt
-
-SUBST_CLASSES+=		sysdir
-SUBST_MESSAGE.sysdir=	Fixes hard-coded dconf database directory name
-SUBST_STAGE.sysdir=	post-configure
-SUBST_FILES.sysdir=	engine/dconf-engine-source-system.c
-SUBST_FILES.sysdir+=	tests/engine.c
-SUBST_FILES.sysdir+=	bin/dconf-update.c
-SUBST_FILES.sysdir+=	bin/dconf-update.vala
-SUBST_SED.sysdir=	-e s,/etc/dconf,${PKG_SYSCONFDIR}/dconf,g
diff --git a/dconf/PLIST b/dconf/PLIST
index a494417..22e2b4b 100644
--- a/dconf/PLIST
+++ b/dconf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/09/10 10:54:46 prlw1 Exp $
+@comment $NetBSD$
 bin/dconf
 include/dconf-dbus-1/dconf-dbus-1.h
 include/dconf/client/dconf-client.h
@@ -16,7 +16,6 @@ lib/libdconf.so.1.0.0
 lib/pkgconfig/dconf-dbus-1.pc
 lib/pkgconfig/dconf.pc
 libexec/dconf-service
-man/man1/dconf-editor.1
 man/man1/dconf-service.1
 man/man1/dconf.1
 man/man7/dconf.7
@@ -29,7 +28,6 @@ share/gtk-doc/html/dconf/ch01.html
 share/gtk-doc/html/dconf/dconf-DConfChangeset.html
 share/gtk-doc/html/dconf/dconf-DConfError.html
 share/gtk-doc/html/dconf/dconf-dconf-Paths.html
-share/gtk-doc/html/dconf/dconf-editor.html
 share/gtk-doc/html/dconf/dconf-overview.html
 share/gtk-doc/html/dconf/dconf-service.html
 share/gtk-doc/html/dconf/dconf-tool.html
@@ -46,61 +44,5 @@ share/gtk-doc/html/dconf/right.png
 share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up-insensitive.png
 share/gtk-doc/html/dconf/up.png
-share/locale/an/LC_MESSAGES/dconf.mo
-share/locale/ar/LC_MESSAGES/dconf.mo
-share/locale/as/LC_MESSAGES/dconf.mo
-share/locale/be/LC_MESSAGES/dconf.mo
-share/locale/bg/LC_MESSAGES/dconf.mo
-share/locale/bn_IN/LC_MESSAGES/dconf.mo
-share/locale/ca/LC_MESSAGES/dconf.mo
-share/locale/ca@valencia/LC_MESSAGES/dconf.mo
-share/locale/cs/LC_MESSAGES/dconf.mo
-share/locale/da/LC_MESSAGES/dconf.mo
-share/locale/de/LC_MESSAGES/dconf.mo
-share/locale/el/LC_MESSAGES/dconf.mo
-share/locale/en_GB/LC_MESSAGES/dconf.mo
-share/locale/eo/LC_MESSAGES/dconf.mo
-share/locale/es/LC_MESSAGES/dconf.mo
-share/locale/et/LC_MESSAGES/dconf.mo
-share/locale/eu/LC_MESSAGES/dconf.mo
-share/locale/fa/LC_MESSAGES/dconf.mo
-share/locale/fi/LC_MESSAGES/dconf.mo
-share/locale/fr/LC_MESSAGES/dconf.mo
-share/locale/fur/LC_MESSAGES/dconf.mo
-share/locale/gl/LC_MESSAGES/dconf.mo
-share/locale/he/LC_MESSAGES/dconf.mo
-share/locale/hi/LC_MESSAGES/dconf.mo
-share/locale/hu/LC_MESSAGES/dconf.mo
-share/locale/id/LC_MESSAGES/dconf.mo
-share/locale/it/LC_MESSAGES/dconf.mo
-share/locale/ja/LC_MESSAGES/dconf.mo
-share/locale/ko/LC_MESSAGES/dconf.mo
-share/locale/lt/LC_MESSAGES/dconf.mo
-share/locale/lv/LC_MESSAGES/dconf.mo
-share/locale/ml/LC_MESSAGES/dconf.mo
-share/locale/mr/LC_MESSAGES/dconf.mo
-share/locale/nb/LC_MESSAGES/dconf.mo
-share/locale/nl/LC_MESSAGES/dconf.mo
-share/locale/pa/LC_MESSAGES/dconf.mo
-share/locale/pl/LC_MESSAGES/dconf.mo
-share/locale/pt/LC_MESSAGES/dconf.mo
-share/locale/pt_BR/LC_MESSAGES/dconf.mo
-share/locale/ru/LC_MESSAGES/dconf.mo
-share/locale/sk/LC_MESSAGES/dconf.mo
-share/locale/sl/LC_MESSAGES/dconf.mo
-share/locale/sr/LC_MESSAGES/dconf.mo
-share/locale/sr@latin/LC_MESSAGES/dconf.mo
-share/locale/sv/LC_MESSAGES/dconf.mo
-share/locale/ta/LC_MESSAGES/dconf.mo
-share/locale/te/LC_MESSAGES/dconf.mo
-share/locale/tg/LC_MESSAGES/dconf.mo
-share/locale/th/LC_MESSAGES/dconf.mo
-share/locale/tr/LC_MESSAGES/dconf.mo
-share/locale/ug/LC_MESSAGES/dconf.mo
-share/locale/uk/LC_MESSAGES/dconf.mo
-share/locale/vi/LC_MESSAGES/dconf.mo
-share/locale/zh_CN/LC_MESSAGES/dconf.mo
-share/locale/zh_HK/LC_MESSAGES/dconf.mo
-share/locale/zh_TW/LC_MESSAGES/dconf.mo
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
diff --git a/dconf/buildlink3.mk b/dconf/buildlink3.mk
index 9a20dbe..1f0630b 100644
--- a/dconf/buildlink3.mk
+++ b/dconf/buildlink3.mk
@@ -5,9 +5,8 @@ BUILDLINK_TREE+=	dconf
 .if !defined(DCONF_BUILDLINK3_MK)
 DCONF_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.dconf+=	dconf>=0.11.0
-BUILDLINK_ABI_DEPENDS.dconf?=	dconf>=0.14.0
-BUILDLINK_PKGSRCDIR.dconf?=	../../devel/dconf
+BUILDLINK_ABI_DEPENDS.dconf+=	dconf>=0.24.0
+BUILDLINK_PKGSRCDIR.dconf?=	../../wip/dconf
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/dconf/distinfo b/dconf/distinfo
index 8cdd87e..5741b85 100644
--- a/dconf/distinfo
+++ b/dconf/distinfo
@@ -1,8 +1,6 @@
 $NetBSD: distinfo,v 1.10 2015/11/03 03:27:22 agc Exp $
 
-SHA1 (dconf-0.22.0.tar.xz) = d1a03938451b19a53f0d2fd09b6c737542fdd4c4
-RMD160 (dconf-0.22.0.tar.xz) = a69abcb409ebdb3a72923ecbb23cbf5b43a5f98c
-SHA512 (dconf-0.22.0.tar.xz) = fee502b599da3634934eadc3d9fc138f2036118e88edadf0e3dc157f8e689ee1fee057342a296197b126e5f657fcb2bb1f399b6a3ffa9ff5fdcc3119d9433d9b
-Size (dconf-0.22.0.tar.xz) = 393260 bytes
-SHA1 (patch-aa) = c786bb85c3971f918294293df7c03fabf1ff201e
-SHA1 (patch-editor_Makefile.in) = 5caa945a7b792daa36fb090741b05e38f0f3945a
+SHA1 (dconf-0.24.0.tar.xz) = 81fa57987b8ca92ec4b11225358356ea7e2d5391
+RMD160 (dconf-0.24.0.tar.xz) = 60fcdd4ca2aa09a1102cbdb3586bb462d2292eae
+SHA512 (dconf-0.24.0.tar.xz) = 8c2092f1a3002df386686473e6841d600665b3d2ae0e24625c9943b1a636706ecafc31e05f0db48958bbfd666680bb107f47978a9d867b151d1c61fc3c3b591a
+Size (dconf-0.24.0.tar.xz) = 218512 bytes
diff --git a/dconf/patches/patch-aa b/dconf/patches/patch-aa
deleted file mode 100644
index 8c973b2..0000000
--- a/dconf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2013/09/30 11:42:13 obache Exp $
-
---- configure.orig	2013-09-23 21:29:29.000000000 +0000
-+++ configure
-@@ -5423,7 +5423,7 @@ if test "${enable_gcov+set}" = set; then
- fi
- 
- 
--if test "x$enable_gcov" == "xyes"; then
-+if test "x$enable_gcov" = "xyes"; then
-   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
-   LDFLAGS="$LDFLAGS -lgcov"
- fi
diff --git a/dconf/patches/patch-editor_Makefile.in b/dconf/patches/patch-editor_Makefile.in
deleted file mode 100644
index 06f0af6..0000000
--- a/dconf/patches/patch-editor_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-editor_Makefile.in,v 1.4 2013/09/30 11:42:13 obache Exp $
-
---- editor/Makefile.in.orig	2013-09-23 21:29:28.000000000 +0000
-+++ editor/Makefile.in
-@@ -103,7 +103,7 @@ nodist_dconf_editor_OBJECTS = dconf_edit
- dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \
- 	$(nodist_dconf_editor_OBJECTS)
- am__DEPENDENCIES_1 =
--dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
-+dconf_editor_DEPENDENCIES = \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
-@@ -355,7 +355,7 @@ TEST_PROGS = 
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client
- dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
- dconf_editor_LDADD = \
--	../client/libdconf.so.1		\
-+	$(prefix)/lib/libdconf.so.1	\
- 	$(gtk_LIBS)			\
- 	$(gee_LIBS)			\
- 	$(gmodule_LIBS)			\
Prev by Date: gnome-core: use wip/clutter-gst
Next by Date: Imported dconf as wip/dconf
Previous by Thread: gnome-core: use wip/clutter-gst
Next by Thread: Imported dconf as wip/dconf
Indexes:
Home | Main Index | Thread Index | Old Index