[csw-devel] SF.net SVN: gar:[21024] csw/mgar/pkg/dconf/trunk
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Tue May 7 14:15:42 CEST 2013
Revision: 21024
http://gar.svn.sourceforge.net/gar/?rev=21024&view=rev
Author: slowfranklin
Date: 2013-05-07 12:15:42 +0000 (Tue, 07 May 2013)
Log Message:
-----------
dconf/trunk: Add checkpkg overrides and move dconf-editor to its own package
Modified Paths:
--------------
csw/mgar/pkg/dconf/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch
Modified: csw/mgar/pkg/dconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 10:44:26 UTC (rev 21023)
+++ csw/mgar/pkg/dconf/trunk/Makefile 2013-05-07 12:15:42 UTC (rev 21024)
@@ -5,7 +5,7 @@
VERSION = 0.5.1
GARTYPE = v2
-DESCRIPTION = low-level configuration system for glib
+DESCRIPTION = Low-level configuration system for glib
define BLURB
dconf is a low-level configuration system. Its main purpose is to
provide a backend to GSettings on platforms that dont already have
@@ -15,6 +15,11 @@
MASTER_SITES = $(GNOME_MIRROR)
DISTFILES = $(DISTNAME).tar.bz2
GARCOMPILER = GNU
+# g-ir-scanner chokes on linking an uninstalled library if LINKER_DIRECT and
+# LINKER_IGNORE aren't reset
+LINKER_DIRECT =
+LINKER_IGNORE =
+REINPLACE_USRSHARE += editor/dconf-model.c
# for xproto
EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
@@ -31,19 +36,35 @@
BUILD_DEP_PKGS += CSWpkgconfig
BUILD_DEP_PKGS += CSWglib2devel
BUILD_DEP_PKGS += CSWgtk2devel
+BUILD_DEP_PKGS_CSWdconf-editor += CSWlibfreetype6-dev
-RUNTIME_DEP_PKGS += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS += CSWglib2
-RUNTIME_DEP_PKGS += CSWlibdbus
+# as suggested by checkpkg
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibdconf0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWpango
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWdconf-editor += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibdconf0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWdconf += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWdconf += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWdconf += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWdconf += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWdconf += CSWlibgio2-0-0
-PACKAGES += CSWdconf
-SPKG_DESC_CSWdconf = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0
-
-PACKAGES += CSWlibdconf0
-SPKG_DESC_CSWlibdconf0 = $(DESCRIPTION), library
-PKGFILES_CSWlibdconf0 += $(call pkgfiles_lib,libdconf.so)
-
PACKAGES += CSWlibdconf-dev
SPKG_DESC_CSWlibdconf-dev = $(DESCRIPTION), development files
PKGFILES_CSWlibdconf-dev += $(PKGFILES_DEVEL)
@@ -51,15 +72,68 @@
PKGFILES_CSWlibdconf-dev += $(call baseisadirs,$(datadir),vala/vapi/dconf\.vapi)
RUNTIME_DEP_PKGS_CSWlibdconf-dev += CSWlibdconf0
+PACKAGES += CSWlibdconf0
+SPKG_DESC_CSWlibdconf0 = $(DESCRIPTION), library
+PKGFILES_CSWlibdconf0 += $(call pkgfiles_lib,libdconf.so.0)
+
+PACKAGES += CSWdconf-editor
+SPKG_DESC_CSWdconf-editor = $(DESCRIPTION), configuration editor
+PKGFILES_CSWdconf-editor += $(bindir)/dconf-editor
+
+PACKAGES += CSWdconf
+SPKG_DESC_CSWdconf = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWdconf += CSWlibdconf0
+# PKGFILES is catchall
+
PATCHFILES += 0000-Add-mkdtemp-replacement-function.patch
PATCHFILES += 0001-Use-statvfs-for-checking-filesystem-type.patch
PATCHFILES += 0002-Remove-linker-flags-remove-c89-request.patch
PATCHFILES += 0003-Add-gio-includes.patch
+PATCHFILES += 0000-Replace-posix_fallocate-with-ftruncate.patch
CONFIGURE_ARGS = $(DIRPATHS)
# package must be compiled in C99 mode; add __EXTENSIONS__ so the headers expose
# all interfaces that go beyong C99, cf man standards.5
CONFIGURE_ARGS += CFLAGS="-std=c99 -D__EXTENSIONS__"
+# see above comment for LINKER_DIRECT and LINKER_IGNORE
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libthread.so.1
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpangoft2-1.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpangocairo-1.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libpango-1.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libintl.so.8
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgtk-x11-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgobject-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgmodule-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libglib-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgio-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgdk-x11-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libfreetype.so.6
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libfontconfig.so.1
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libdconf.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libcairo.so.2
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libatk-1.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf-editor += no-direct-binding|/opt/csw/bin/dconf-editor|is|not|directly|bound|to|soname|libxml2.so.2
+CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgcc_s.so.1
+CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgio-2.0.so.0
+CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libglib-2.0.so.0
+CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libgobject-2.0.so.0
+CHECKPKG_OVERRIDES_CSWlibdconf0 += no-direct-binding|/opt/csw/lib/libdconf.so.0.0.0|is|not|directly|bound|to|soname|libintl.so.8
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libdconf.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libgio-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libglib-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libgobject-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/bin/dconf|is|not|directly|bound|to|soname|libintl.so.8
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgcc_s.so.1
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgio-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libglib-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libgobject-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/lib/gio/modules/libdconfsettings.so|is|not|directly|bound|to|soname|libintl.so.8
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libgio-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libglib-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libgobject-2.0.so.0
+CHECKPKG_OVERRIDES_CSWdconf += no-direct-binding|/opt/csw/libexec/dconf-service|is|not|directly|bound|to|soname|libintl.so.8
+
include gar/category.mk
Added: csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch
===================================================================
--- csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch (rev 0)
+++ csw/mgar/pkg/dconf/trunk/files/0000-Replace-posix_fallocate-with-ftruncate.patch 2013-05-07 12:15:42 UTC (rev 21024)
@@ -0,0 +1,25 @@
+From a4a0bfa35e99fccb8466ffea72b2eb5d978f3feb Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Mon, 6 May 2013 13:34:12 +0200
+Subject: [PATCH] Replace posix_fallocate() with ftruncate
+
+---
+ engine/dconf-engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
+index cf57431..a3f487a 100644
+--- a/engine/dconf-engine.c
++++ b/engine/dconf-engine.c
+@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *engine)
+
+ if (fd >= 0)
+ {
+- if (posix_fallocate (fd, 0, 1) == 0)
++ if (ftruncate(fd, 1) == 0)
+ {
+ engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0);
+
+--
+1.8.1.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list