dconf 0.14.1
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Wed, 19 Dec 2012 08:10:53 +0000 (02:10 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Wed, 19 Dec 2012 08:10:53 +0000 (02:10 -0600)
13 files changed:
0.12.1-libtool.patch [deleted file]
0.14.1-cygwin.patch [new file with mode: 0644]
0.14.1-libtool.patch [new file with mode: 0644]
dconf-0.12.1-1.cygport [deleted file]
dconf-editor.hint [deleted file]
dconf-service.hint [deleted file]
dconf.cygport [new file with mode: 0644]
dconf.hint [deleted file]
libdconf-dbus1-devel.hint [deleted file]
libdconf-dbus1_0.hint [deleted file]
libdconf-devel.hint [deleted file]
libdconf0.hint [deleted file]
vala-dconf.hint [deleted file]

diff --git a/0.12.1-libtool.patch b/0.12.1-libtool.patch
deleted file mode 100644 (file)
index 5c6b97a..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
---- origsrc/dconf-0.12.1/bin/Makefile.am       2012-03-19 08:31:24.000000000 -0500
-+++ src/dconf-0.12.1/bin/Makefile.am   2012-05-02 00:25:48.434811200 -0500
-@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/common -I$(to
- bin_PROGRAMS = dconf
- dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
--dconf_LDADD = $(gio_LIBS) ../client/libdconf.so.0
-+dconf_LDADD = $(gio_LIBS) ../client/libdconf.la
- dconf_SOURCES = dconf.vala dconf-update.vala dconf-dump.vala ../gvdb/gvdb-builder.c gvdb.vapi
- completiondir = $(sysconfdir)/bash_completion.d
---- origsrc/dconf-0.12.1/client/libdconf_la_vala.stamp 1969-12-31 18:00:00.000000000 -0600
-+++ src/dconf-0.12.1/client/libdconf_la_vala.stamp     2012-05-02 00:27:23.335239200 -0500
-@@ -0,0 +1 @@
-+timestamp
---- origsrc/dconf-0.12.1/client/Makefile.am    2012-03-26 09:29:26.000000000 -0500
-+++ src/dconf-0.12.1/client/Makefile.am        2012-05-02 00:27:12.142599000 -0500
-@@ -2,37 +2,24 @@ AM_CFLAGS = -std=c89 -Wall -Wmissing-pro
- CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
- INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
--shlibdir=$(libdir)
--shlib_PROGRAMS = libdconf.so.0.0.0
--nodist_noinst_DATA = libdconf.so.0 libdconf.so
--
--libdconf.so.0 libdconf.so: libdconf.so.0.0.0
--      $(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
--
--install-data-hook:
--      ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0
--      ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
--
--uninstall-hook:
--      rm -f $(DESTDIR)$(shlibdir)/libdconf.so.0
--      rm -f $(DESTDIR)$(shlibdir)/libdconf.so
-+lib_LTLIBRARIES = libdconf.la
- dconfinclude_HEADERS = \
-       dconf-client.h  \
-       dconf.h
--libdconf_so_0_0_0_LDADD = $(gio_LIBS)
--libdconf_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.0
--libdconf_so_0_0_0_SOURCES = \
-+libdconf_la_LIBADD = $(gio_LIBS)
-+libdconf_la_LDFLAGS = -version-info 0:0:0 -no-undefined
-+libdconf_la_SOURCES = \
-       ../common/dconf-shmdir.c        \
-       ../common/dconf-paths.c         \
-       ../engine/dconf-engine.c        \
-       ../gvdb/gvdb-reader.c           \
-       dconf-client.vala engine.vapi
--libdconf_so_0_0_0_VALAFLAGS = --library dconf --pkg=gio-2.0
-+libdconf_la_VALAFLAGS = --library dconf --pkg=gio-2.0
- EXTRA_DIST = dconf.vapi extra-docs.c
--dconf.vapi: libdconf.so.0
-+dconf.vapi: libdconf.la
- dconf.deps:
-       $(AM_V_GEN) echo gio-2.0 > dconf.deps
-@@ -43,4 +30,4 @@ vapidir = $(datadir)/vala/vapi
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dconf.pc
--CLEANFILES = dconf.deps libdconf.so.0 libdconf.so
-+CLEANFILES = dconf.deps
---- origsrc/dconf-0.12.1/configure.ac  2012-05-01 00:08:56.000000000 -0500
-+++ src/dconf-0.12.1/configure.ac      2012-05-02 00:27:37.256035400 -0500
-@@ -13,6 +13,7 @@ AM_SILENT_RULES([yes])
- # Check for programs
- AC_PROG_CC
-+AC_PROG_LIBTOOL
- AM_PROG_VALAC([0.15.1])
- # Use GSettings
---- origsrc/dconf-0.12.1/dbus-1/Makefile.am    2012-03-26 09:29:26.000000000 -0500
-+++ src/dconf-0.12.1/dbus-1/Makefile.am        2012-05-02 00:29:13.793557100 -0500
-@@ -7,28 +7,12 @@ dconf_dbus_1include_HEADERS = dconf-dbus
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dconf-dbus-1.pc
--shlibdir = $(libdir)
--shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
-+lib_LTLIBRARIES = libdconf-dbus-1.la
--libdconf_dbus_1_so_0_0_0_LDADD = $(glib_LIBS) $(dbus_LIBS)
--libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
--libdconf_dbus_1_so_0_0_0_SOURCES = \
-+libdconf_dbus_1_la_LIBADD = $(glib_LIBS) $(dbus_LIBS)
-+libdconf_dbus_1_la_LDFLAGS = -version-info 0:0:0 -no-undefined
-+libdconf_dbus_1_la_SOURCES = \
-       ../engine/dconf-engine.c        \
-       ../common/dconf-shmdir.c        \
-       ../gvdb/gvdb-reader.c           \
-       dconf-dbus-1.c
--
--noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
--
--libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
--      $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
--
--install-data-hook:
--      ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
--      ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
--
--uninstall-hook:
--      rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
--      rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
--
--CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
---- origsrc/dconf-0.12.1/editor/Makefile.am    2012-03-06 22:49:37.000000000 -0600
-+++ src/dconf-0.12.1/editor/Makefile.am        2012-05-02 00:29:28.765413400 -0500
-@@ -3,7 +3,7 @@ bin_PROGRAMS = dconf-editor
- AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
- AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
- CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
--dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
-+dconf_editor_LDADD = ../client/libdconf.la $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
- dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
- desktopdir = $(datadir)/applications
---- origsrc/dconf-0.12.1/gsettings/Makefile.am 2012-03-26 09:29:26.000000000 -0500
-+++ src/dconf-0.12.1/gsettings/Makefile.am     2012-05-02 00:30:27.868793900 -0500
-@@ -1,11 +1,11 @@
- AM_CFLAGS = -std=c89 -Wall -Wmissing-prototypes -Wwrite-strings -fPIC -DPIC
- INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/gvdb -I$(top_srcdir)/engine $(gio_CFLAGS)
--giomodules_PROGRAMS = libdconfsettings.so
-+giomodules_LTLIBRARIES = libdconfsettings.la
--libdconfsettings_so_LDADD = $(gio_LIBS)
--libdconfsettings_so_LDFLAGS = -shared
--libdconfsettings_so_SOURCES = \
-+libdconfsettings_la_LIBADD = $(gio_LIBS)
-+libdconfsettings_la_LDFLAGS = -shared -module -avoid-version -no-undefined
-+libdconfsettings_la_SOURCES = \
-       ../engine/dconf-engine.c        \
-       ../common/dconf-shmdir.c        \
-       ../gvdb/gvdb-reader.c           \
diff --git a/0.14.1-cygwin.patch b/0.14.1-cygwin.patch
new file mode 100644 (file)
index 0000000..3cd1946
--- /dev/null
@@ -0,0 +1,72 @@
+--- origsrc/dconf-0.14.1/tests/engine.c        2012-10-23 10:27:50.000000000 -0500
++++ src/dconf-0.14.1/tests/engine.c    2012-12-19 01:49:36.222263700 -0600
+@@ -10,6 +10,9 @@
+ #include <stdio.h>
+ #include <dlfcn.h>
+ #include <math.h>
++#ifdef __CYGWIN__
++#include <sys/cygwin.h>
++#endif
+ /* Interpose to catch fopen("/etc/dconf/profile/user") */
+ static const gchar *filename_to_replace;
+@@ -20,6 +23,12 @@ fopen (const char *filename,
+        const char *mode)
+ {
+   static FILE * (*real_fopen) (const char *, const char *);
++#ifdef __CYGWIN__
++  static void *RTLD_NEXT = NULL;
++
++  if (!RTLD_NEXT)
++    RTLD_NEXT = dlopen ("/usr/bin/cygwin1.dll", 0);
++#endif
+   if (!real_fopen)
+     real_fopen = dlsym (RTLD_NEXT, "fopen");
+@@ -877,6 +886,10 @@ test_watch_sync (void)
+ int
+ main (int argc, char **argv)
+ {
++#ifdef __CYGWIN__
++  cygwin_internal (CW_HOOK, "fopen", fopen);
++#endif
++
+   g_setenv ("XDG_CONFIG_HOME", "/HOME/.config", TRUE);
+   g_unsetenv ("DCONF_PROFILE");
+--- origsrc/dconf-0.14.1/tests/shm.c   2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/tests/shm.c       2012-12-19 01:45:23.269795600 -0600
+@@ -7,6 +7,9 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <dlfcn.h>
++#ifdef __CYGWIN__
++#include <sys/cygwin.h>
++#endif
+ #include "../shm/dconf-shm.h"
+ #include "tmpdir.h"
+@@ -88,6 +91,12 @@ ssize_t
+ pwrite (int fd, const void *buf, size_t count, off_t offset)
+ {
+   static ssize_t (* real_pwrite) (int, const void *, size_t, off_t);
++#ifdef __CYGWIN__
++  static void *RTLD_NEXT = NULL;
++
++  if (!RTLD_NEXT)
++    RTLD_NEXT = dlopen ("/usr/bin/cygwin1.dll", 0);
++#endif
+   if (!real_pwrite)
+     real_pwrite = dlsym (RTLD_NEXT, "pwrite");
+@@ -140,6 +149,10 @@ main (int argc, char **argv)
+   gchar *temp;
+   gint status;
++#ifdef __CYGWIN__
++  cygwin_internal (CW_HOOK, "pwrite", pwrite);
++#endif
++
+   temp = dconf_test_create_tmpdir ();
+   g_setenv ("XDG_RUNTIME_DIR", temp, TRUE);
diff --git a/0.14.1-libtool.patch b/0.14.1-libtool.patch
new file mode 100644 (file)
index 0000000..d92024e
--- /dev/null
@@ -0,0 +1,296 @@
+--- origsrc/dconf-0.14.1/bin/Makefile.am       2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/bin/Makefile.am   2012-12-19 01:17:53.262420600 -0600
+@@ -11,7 +11,7 @@ dconf_CFLAGS = \
+       -w
+ dconf_LDADD = \
+-      ../client/libdconf.so.1         \
++      ../client/libdconf.la   \
+       $(gio_LIBS)
+ dconf_SOURCES = \
+--- origsrc/dconf-0.14.1/client/Makefile.am    2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/client/Makefile.am        2012-12-19 01:20:47.826405100 -0600
+@@ -1,21 +1,8 @@
+ include $(top_srcdir)/Makefile.gtester
+-shlibdir=$(libdir)
+-shlib_PROGRAMS = libdconf.so.1.0.0
+-nodist_noinst_DATA = libdconf.so.1 libdconf.so
++lib_LTLIBRARIES = libdconf.la
+ noinst_LIBRARIES = libdconf-client.a
+-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
+-      $(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
+-
+-install-data-hook:
+-      ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
+-      ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
+-
+-uninstall-hook:
+-      rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
+-      rm -f $(DESTDIR)$(shlibdir)/libdconf.so
+-
+ dconfinclude_HEADERS = dconf.h
+ dconfclientinclude_HEADERS = dconf-client.h
+ dconfclientincludedir = $(dconfincludedir)/client
+@@ -24,16 +11,16 @@ libdconf_client_a_CFLAGS = $(gio_CFLAGS)
+ libdconf_client_a_SOURCES = \
+       dconf-client.c
+-libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
+-libdconf_so_1_0_0_LDADD = \
+-      ../engine/libdconf-engine-shared.a              \
+-      ../common/libdconf-common-shared.a              \
+-      ../gdbus/libdconf-gdbus-thread-shared.a         \
+-      ../gvdb/libgvdb-shared.a                        \
+-      ../shm/libdconf-shm-shared.a                    \
++libdconf_la_CFLAGS = $(libdconf_client_a_CFLAGS)
++libdconf_la_LIBADD = \
++      ../engine/libdconf-engine-shared.la             \
++      ../common/libdconf-common-shared.la             \
++      ../gdbus/libdconf-gdbus-thread-shared.la        \
++      ../gvdb/libgvdb-shared.la                       \
++      ../shm/libdconf-shm-shared.la                   \
+       $(gio_LIBS)
+-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
+-libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
++libdconf_la_LDFLAGS = -version-number 1:0:0 -no-undefined
++libdconf_la_SOURCES = $(libdconf_client_a_SOURCES)
+ EXTRA_DIST = dconf.vapi dconf.deps
+@@ -42,5 +29,3 @@ vapidir = $(datadir)/vala/vapi
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = dconf.pc
+-
+-CLEANFILES = libdconf.so.1 libdconf.so
+--- origsrc/dconf-0.14.1/common/Makefile.am    2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/common/Makefile.am        2012-12-19 01:37:35.867061700 -0600
+@@ -5,15 +5,16 @@ dconfcommoninclude_HEADERS = \
+       dconf-changeset.h       \
+       dconf-paths.h
+-noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a
++noinst_LIBRARIES = libdconf-common.a
++noinst_LTLIBRARIES = libdconf-common-shared.la libdconf-common-hidden.la
+ libdconf_common_a_CFLAGS = $(glib_CFLAGS)
+ libdconf_common_a_SOURCES = \
+       dconf-changeset.c       \
+       dconf-paths.c
+-libdconf_common_shared_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC
+-libdconf_common_shared_a_SOURCES = $(libdconf_common_a_SOURCES)
++libdconf_common_shared_la_CFLAGS = $(libdconf_common_a_CFLAGS)
++libdconf_common_shared_la_SOURCES = $(libdconf_common_a_SOURCES)
+-libdconf_common_hidden_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC -fvisibility=hidden
+-libdconf_common_hidden_a_SOURCES = $(libdconf_common_a_SOURCES)
++libdconf_common_hidden_la_CFLAGS = $(libdconf_common_a_CFLAGS) -fvisibility=hidden
++libdconf_common_hidden_la_SOURCES = $(libdconf_common_a_SOURCES)
+--- origsrc/dconf-0.14.1/configure.ac  2012-11-01 10:09:05.000000000 -0500
++++ src/dconf-0.14.1/configure.ac      2012-12-19 01:28:19.970266200 -0600
+@@ -19,7 +19,7 @@ fi
+ # Check for programs
+ AC_PROG_CC
+ AM_PROG_VALAC([0.17.0])
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ # Use GSettings
+--- origsrc/dconf-0.14.1/dbus-1/Makefile.am    2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/dbus-1/Makefile.am        2012-12-19 01:46:22.214167000 -0600
+@@ -1,14 +1,16 @@
+ include $(top_srcdir)/Makefile.gtester
+-noinst_LIBRARIES = libdconf-libdbus-1.a libdconf-libdbus-1-shared.a
++lib_LTLIBRARIES = libdconf-dbus-1.la
++noinst_LIBRARIES = libdconf-libdbus-1.a
++noinst_LTLIBRARIES = libdconf-libdbus-1-shared.la
+ libdconf_libdbus_1_a_CFLAGS = $(dbus_CFLAGS) $(glib_CFLAGS)
+ libdconf_libdbus_1_a_SOURCES = \
+       dconf-libdbus-1.h               \
+       dconf-libdbus-1.c
+-libdconf_libdbus_1_shared_a_CFLAGS = $(libdconf_libdbus_1_a_CFLAGS) -fPIC -DPIC
+-libdconf_libdbus_1_shared_a_SOURCES = $(libdconf_libdbus_1_a_SOURCES)
++libdconf_libdbus_1_shared_la_CFLAGS = $(libdconf_libdbus_1_a_CFLAGS)
++libdconf_libdbus_1_shared_la_SOURCES = $(libdconf_libdbus_1_a_SOURCES)
+ dconf_dbus_1includedir = $(includedir)/dconf-dbus-1
+ dconf_dbus_1include_HEADERS = dconf-dbus-1.h
+@@ -16,32 +18,14 @@ dconf_dbus_1include_HEADERS = dconf-dbus
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = dconf-dbus-1.pc
+-shlibdir = $(libdir)
+-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0
+-
+-libdconf_dbus_1_so_0_0_0_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS) -fPIC -DPIC
+-libdconf_dbus_1_so_0_0_0_LDADD = \
+-      ../engine/libdconf-engine-shared.a              \
+-      ../common/libdconf-common-hidden.a              \
+-      ./libdconf-libdbus-1-shared.a                   \
+-      ../gvdb/libgvdb-shared.a                        \
+-      ../shm/libdconf-shm-shared.a                    \
++libdconf_dbus_1_la_CFLAGS = $(dbus_CFLAGS) $(gio_CFLAGS)
++libdconf_dbus_1_la_LIBADD = \
++      ../engine/libdconf-engine-shared.la             \
++      ../common/libdconf-common-hidden.la             \
++      libdconf-libdbus-1-shared.la                    \
++      ../gvdb/libgvdb-shared.la                       \
++      ../shm/libdconf-shm-shared.la                   \
+        $(dbus_LIBS)                                   \
+       $(glib_LIBS)
+-libdconf_dbus_1_so_0_0_0_LDFLAGS = -shared -Wl,-soname=libdconf-dbus-1.so.0
+-libdconf_dbus_1_so_0_0_0_SOURCES = dconf-dbus-1.c
+-
+-nodist_noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
+-
+-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
+-      $(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
+-
+-install-data-hook:
+-      ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
+-      ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+-
+-uninstall-hook:
+-      rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
+-      rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+-
+-CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
++libdconf_dbus_1_la_LDFLAGS = -version-number 0:0:0 -no-undefined
++libdconf_dbus_1_la_SOURCES = dconf-dbus-1.c
+--- origsrc/dconf-0.14.1/editor/Makefile.am    2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/editor/Makefile.am        2012-12-19 01:23:49.282783800 -0600
+@@ -7,7 +7,7 @@ bin_PROGRAMS = dconf-editor
+ 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         \
++      ../client/libdconf.la           \
+       $(gtk_LIBS)                     \
+       $(gee_LIBS)                     \
+       $(gmodule_LIBS)                 \
+--- origsrc/dconf-0.14.1/engine/Makefile.am    2012-11-01 10:03:15.000000000 -0500
++++ src/dconf-0.14.1/engine/Makefile.am        2012-12-19 01:24:24.040771800 -0600
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/Makefile.gtester
+-noinst_LIBRARIES = libdconf-engine.a libdconf-engine-shared.a
++noinst_LIBRARIES = libdconf-engine.a
++noinst_LTLIBRARIES = libdconf-engine-shared.la
+ libdconf_engine_a_CFLAGS = $(glib_CFLAGS)
+ libdconf_engine_a_SOURCES = \
+@@ -14,5 +15,5 @@ libdconf_engine_a_SOURCES = \
+       dconf-engine.h                  \
+       dconf-engine.c
+-libdconf_engine_shared_a_CFLAGS = $(libdconf_engine_a_CFLAGS) -fPIC -DPIC
+-libdconf_engine_shared_a_SOURCES = $(libdconf_engine_a_SOURCES)
++libdconf_engine_shared_la_CFLAGS = $(libdconf_engine_a_CFLAGS)
++libdconf_engine_shared_la_SOURCES = $(libdconf_engine_a_SOURCES)
+--- origsrc/dconf-0.14.1/gdbus/Makefile.am     2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/gdbus/Makefile.am 2012-12-19 01:25:35.500859100 -0600
+@@ -2,20 +2,21 @@ include $(top_srcdir)/Makefile.gtester
+ noinst_LIBRARIES = \
+       libdconf-gdbus-thread.a                 \
+-      libdconf-gdbus-thread-shared.a          \
+-      libdconf-gdbus-filter.a                 \
+-      libdconf-gdbus-filter-shared.a
++      libdconf-gdbus-filter.a
++noinst_LTLIBRARIES = \
++      libdconf-gdbus-thread-shared.la         \
++      libdconf-gdbus-filter-shared.la
+ libdconf_gdbus_thread_a_CFLAGS = $(gio_CFLAGS)
+ libdconf_gdbus_thread_a_SOURCES = \
+       dconf-gdbus-thread.c
+-libdconf_gdbus_thread_shared_a_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS) -fPIC -DPIC
+-libdconf_gdbus_thread_shared_a_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
++libdconf_gdbus_thread_shared_la_CFLAGS = $(libdconf_gdbus_thread_a_CFLAGS)
++libdconf_gdbus_thread_shared_la_SOURCES = $(libdconf_gdbus_thread_a_SOURCES)
+ libdconf_gdbus_filter_a_CFLAGS = $(gio_CFLAGS)
+ libdconf_gdbus_filter_a_SOURCES = \
+       dconf-gdbus-filter.c
+-libdconf_gdbus_filter_shared_a_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS) -fPIC -DPIC
+-libdconf_gdbus_filter_shared_a_SOURCES = $(libdconf_gdbus_filter_a_SOURCES)
++libdconf_gdbus_filter_shared_la_CFLAGS = $(libdconf_gdbus_filter_a_CFLAGS)
++libdconf_gdbus_filter_shared_la_SOURCES = $(libdconf_gdbus_filter_a_SOURCES)
+--- origsrc/dconf-0.14.1/gsettings/Makefile.am 2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/gsettings/Makefile.am     2012-12-19 01:26:40.903599900 -0600
+@@ -1,18 +1,18 @@
+ include $(top_srcdir)/Makefile.gtester
+-giomodules_PROGRAMS = libdconfsettings.so
++giomodules_LTLIBRARIES = libdconfsettings.la
+-libdconfsettings_so_LDADD = \
+-      ../engine/libdconf-engine-shared.a              \
+-      ../gvdb/libgvdb-shared.a                        \
+-      ../gdbus/libdconf-gdbus-thread-shared.a         \
+-      ../common/libdconf-common-hidden.a              \
+-      ../shm/libdconf-shm-shared.a                    \
++libdconfsettings_la_LIBADD = \
++      ../engine/libdconf-engine-shared.la             \
++      ../gvdb/libgvdb-shared.la                       \
++      ../gdbus/libdconf-gdbus-thread-shared.la        \
++      ../common/libdconf-common-hidden.la             \
++      ../shm/libdconf-shm-shared.la                   \
+       $(gio_LIBS)
+-libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC
+-libdconfsettings_so_LDFLAGS = -shared
+-libdconfsettings_so_SOURCES = \
++libdconfsettings_la_CFLAGS = $(gio_CFLAGS)
++libdconfsettings_la_LDFLAGS = -module -avoid-version -no-undefined
++libdconfsettings_la_SOURCES = \
+       dconfsettingsbackend.c
+ uninstall-hook:
+--- origsrc/dconf-0.14.1/gvdb/Makefile.am      2012-08-13 22:35:15.000000000 -0500
++++ src/dconf-0.14.1/gvdb/Makefile.am  2012-12-19 01:27:06.583068700 -0600
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/Makefile.gtester
+-noinst_LIBRARIES = libgvdb.a libgvdb-shared.a
++noinst_LIBRARIES = libgvdb.a
++noinst_LTLIBRARIES = libgvdb-shared.la
+ libgvdb_a_CFLAGS = $(glib_CFLAGS)
+ libgvdb_a_SOURCES = \
+@@ -10,5 +11,5 @@ libgvdb_a_SOURCES = \
+       gvdb-reader.h   \
+       gvdb-reader.c
+-libgvdb_shared_a_CFLAGS = $(libgvdb_a_CFLAGS) -fPIC -DPIC
+-libgvdb_shared_a_SOURCES = $(libgvdb_a_SOURCES)
++libgvdb_shared_la_CFLAGS = $(libgvdb_a_CFLAGS)
++libgvdb_shared_la_SOURCES = $(libgvdb_a_SOURCES)
+--- origsrc/dconf-0.14.1/shm/Makefile.am       2012-11-01 10:03:15.000000000 -0500
++++ src/dconf-0.14.1/shm/Makefile.am   2012-12-19 01:27:43.294168500 -0600
+@@ -1,11 +1,12 @@
+ include $(top_srcdir)/Makefile.gtester
+-noinst_LIBRARIES = libdconf-shm.a libdconf-shm-shared.a
++noinst_LIBRARIES = libdconf-shm.a
++noinst_LTLIBRARIES = libdconf-shm-shared.la
+ libdconf_shm_a_CFLAGS = $(glib_CFLAGS)
+ libdconf_shm_a_SOURCES = \
+       dconf-shm.h             \
+       dconf-shm.c
+-libdconf_shm_shared_a_CFLAGS = $(libdconf_shm_a_CFLAGS) -fPIC -DPIC
+-libdconf_shm_shared_a_SOURCES = $(libdconf_shm_a_SOURCES)
++libdconf_shm_shared_la_CFLAGS = $(libdconf_shm_a_CFLAGS)
++libdconf_shm_shared_la_SOURCES = $(libdconf_shm_a_SOURCES)
diff --git a/dconf-0.12.1-1.cygport b/dconf-0.12.1-1.cygport
deleted file mode 100644 (file)
index 744da22..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-inherit gnome2
-
-
-PATCH_URI="0.12.1-libtool.patch"
-
-DEPEND="gnome-common
-       pkgconfig(dbus-1)
-       pkgconfig(gtk+-3.0)
-       pkgconfig(libxml-2.0)
-       vala(gtk+-3.0)
-       vala(libxml-2.0)"
-
-PKG_NAMES="dconf dconf-editor dconf-service libdconf0 libdconf-devel
-           libdconf-dbus1_0 libdconf-dbus1-devel vala-dconf"
-dconf_CONTENTS="usr/bin/dconf.exe usr/share/doc/"
-dconf_editor_CONTENTS="etc/postinstall usr/bin/dconf-editor.exe usr/share/applications/
-                       usr/share/dconf-editor/ usr/share/glib-2.0/schemas/ usr/share/icons/"
-dconf_service_CONTENTS="etc/ usr/lib/dconf/ usr/lib/gio/ usr/share/dbus-1/"
-libdconf0_CONTENTS="usr/bin/cygdconf-0.dll"
-libdconf_devel_CONTENTS="usr/include/dconf/ usr/lib/libdconf.*
-                         usr/lib/pkgconfig/dconf.pc usr/share/gtk-doc/"
-libdconf_dbus1_0_CONTENTS="usr/bin/cygdconf-dbus-1-0.dll"
-libdconf_dbus1_devel_CONTENTS="usr/include/dconf-dbus-1/ usr/lib/libdconf-dbus-1.*
-                               usr/lib/pkgconfig/dconf-dbus-1.pc"
-vala_dconf_CONTENTS="usr/share/vala*/vapi/dconf.*"
-
-CYGCONF_ARGS="--libexecdir=/usr/lib/dconf"
-
-KEEP_LA_FILES="none"
diff --git a/dconf-editor.hint b/dconf-editor.hint
deleted file mode 100644 (file)
index 2bf6e49..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: libdconf0 libglib2.0_0 libgtk3_0 libpango1.0_0 libxml2
-external-source: dconf
-sdesc: "GNOME configuration GUI editor"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/dconf-service.hint b/dconf-service.hint
deleted file mode 100644 (file)
index b0be718..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: dbus gvfs libglib2.0_0
-external-source: dconf
-sdesc: "GNOME configuration server"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/dconf.cygport b/dconf.cygport
new file mode 100644 (file)
index 0000000..f9743c2
--- /dev/null
@@ -0,0 +1,52 @@
+inherit gnome2
+
+NAME="dconf"
+VERSION=0.14.1
+RELEASE=1
+CATEGORY="GNOME"
+SUMMARY="GNOME configuration system"
+DESCRIPTION="dconf is a low-level configuration system. Its main purpose is
+to provide a backend to GSettings on platforms that don't already have
+configuration storage systems."
+
+PATCH_URI="
+       0.14.1-libtool.patch
+       0.14.1-cygwin.patch
+"
+
+DEPEND="gnome-common
+       pkgconfig(dbus-1)
+       pkgconfig(gtk+-3.0)
+       pkgconfig(libxml-2.0)
+       vala(gtk+-3.0)
+       vala(libxml-2.0)"
+
+PKG_NAMES="dconf dconf-editor dconf-service libdconf1 libdconf-devel
+           libdconf-dbus1_0 libdconf-dbus1-devel vala-dconf"
+dconf_SUMMARY="${SUMMARY} (client utility)"
+dconf_CONTENTS="etc/bash_completion.d/ usr/bin/dconf.exe usr/share/doc/
+                usr/share/man/man1/dconf.*"
+dconf_editor_SUMMARY="${SUMMARY} (GUI preferences editor)"
+dconf_editor_CONTENTS="etc/postinstall/ usr/bin/dconf-editor.exe usr/share/applications/
+                       usr/share/dconf-editor/ usr/share/glib-2.0/schemas/
+                       usr/share/icons/ usr/share/locale/ usr/share/man/man1/dconf-editor.*"
+dconf_service_REQUIRES="gvfs"
+dconf_service_CONTENTS="etc/postinstall/ usr/lib/dconf/ usr/lib/gio/ usr/share/dbus-1/
+                         usr/share/man/man1/dconf-service.* usr/share/man/man7/"
+libdconf1_SUMMARY="${SUMMARY} client library (GDBus runtime)"
+libdconf1_REQUIRES="dconf-service"
+libdconf1_CONTENTS="usr/bin/cygdconf-1.dll"
+libdconf_devel_SUMMARY="${SUMMARY} client library (GDBus development)"
+libdconf_devel_CONTENTS="usr/include/dconf/ usr/lib/libdconf.*
+                         usr/lib/pkgconfig/dconf.pc usr/share/gtk-doc/"
+libdconf_dbus1_0_SUMMARY="${SUMMARY} client library (libdbus runtime)"
+libdconf_dbus1_0_REQUIRES="dconf-service"
+libdconf_dbus1_0_CONTENTS="usr/bin/cygdconf-dbus-1-0.dll"
+libdconf_dbus1_devel_SUMMARY="${SUMMARY} client library (libdbus development)"
+libdconf_dbus1_devel_CONTENTS="usr/include/dconf-dbus-1/ usr/lib/libdconf-dbus-1.*
+                               usr/lib/pkgconfig/dconf-dbus-1.pc"
+vala_dconf_SUMMARY="${SUMMARY} client library (Vala bindings)"
+vala_dconf_CONTENTS="usr/share/vala*/vapi/dconf.*"
+
+CYGCONF_ARGS="--libexecdir=/usr/lib/dconf"
+MAKEOPTS+=" completiondir=/etc/bash_completion.d"
diff --git a/dconf.hint b/dconf.hint
deleted file mode 100644 (file)
index 9c325a8..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-category: Gnome
-requires: libdconf0 libglib2.0_0
-sdesc: "GNOME configuration client"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/libdconf-dbus1-devel.hint b/libdconf-dbus1-devel.hint
deleted file mode 100644 (file)
index b949a21..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: libdconf-dbus1_0 libdbus1-devel libglib2.0-devel
-external-source: dconf
-sdesc: "GNOME configuration client library (libdbus development)"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/libdconf-dbus1_0.hint b/libdconf-dbus1_0.hint
deleted file mode 100644 (file)
index ad2ea2b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: dconf-service libdbus1_3 libglib2.0_0
-external-source: dconf
-sdesc: "GNOME configuration client library (libdbus runtime)"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/libdconf-devel.hint b/libdconf-devel.hint
deleted file mode 100644 (file)
index 1d6bab0..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: libdconf0 libglib2.0-devel
-external-source: dconf
-sdesc: "GNOME configuration client library (GDBus development)"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/libdconf0.hint b/libdconf0.hint
deleted file mode 100644 (file)
index bf52598..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: dconf-service libglib2.0_0
-external-source: dconf
-sdesc: "GNOME configuration client library (GDBus runtime)"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
diff --git a/vala-dconf.hint b/vala-dconf.hint
deleted file mode 100644 (file)
index 2b01b77..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: vala
-external-source: dconf
-sdesc: "GNOME configuration client library (Vala bindings)"
-ldesc: "dconf is a low-level configuration system. Its main purpose is 
-to provide a backend to GSettings on platforms that don't already have 
-configuration storage systems."
This page took 0.051015 seconds and 5 git commands to generate.