dconf 0.7.2
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Sun, 6 Mar 2011 22:02:16 +0000 (16:02 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Sun, 6 Mar 2011 22:02:16 +0000 (16:02 -0600)
0.6-libtool.patch [deleted file]
0.7.2-libtool.patch [new file with mode: 0644]
dconf-0.6-1.cygport [deleted file]
dconf-0.7.2-1.cygport [new file with mode: 0644]
dconf-editor.hint [new file with mode: 0644]
dconf.hint
libdconf-dbus1-devel.hint [new file with mode: 0644]
libdconf-dbus1_0.hint [new file with mode: 0644]
libdconf-devel.hint
libdconf0.hint

diff --git a/0.6-libtool.patch b/0.6-libtool.patch
deleted file mode 100644 (file)
index de0d1f5..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
---- origsrc/dconf-0.6/bin/Makefile.am  2010-08-03 15:24:14.000000000 -0500
-+++ src/dconf-0.6/bin/Makefile.am      2010-12-29 20:50:14.038081700 -0600
-@@ -4,5 +4,5 @@ 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 ../gvdb/gvdb-builder.c gvdb.vapi fixes.vapi
---- origsrc/dconf-0.6/client/Makefile.am       2010-12-21 11:25:23.000000000 -0600
-+++ src/dconf-0.6/client/Makefile.am   2010-12-29 20:50:14.038081700 -0600
-@@ -3,35 +3,24 @@ CFLAGS += -Wno-error
- 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_LDFLAGS = -shared -Wl,-soname=libdconf.so.0 $(gio_LIBS)
--libdconf_so_0_0_0_SOURCES = \
-+libdconf_la_LDFLAGS = -version-info 0:0:0 -no-undefined
-+libdconf_la_LIBADD = $(gio_LIBS)
-+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
---- /dev/null
-+++ src/dconf-0.6/client/libdconf_la_vala.stamp
-@@ -0,0 +1,1
-+timestamp
---- origsrc/dconf-0.6/configure.ac     2010-12-21 11:33:48.000000000 -0600
-+++ src/dconf-0.6/configure.ac 2010-12-29 20:50:14.053681800 -0600
-@@ -12,6 +12,7 @@ AM_SILENT_RULES([yes])
- # Check for programs
- AC_PROG_CC
-+AC_PROG_LIBTOOL
- AM_PROG_VALAC([0.9.5])
- # Gtk-doc support
---- origsrc/dconf-0.6/editor/Makefile.am       2010-12-18 10:36:32.000000000 -0600
-+++ src/dconf-0.6/editor/Makefile.am   2010-12-29 20:51:29.261412900 -0600
-@@ -3,5 +3,5 @@ bin_PROGRAMS = dconf-editor
- AM_CFLAGS = $(gtk_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client 
- AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg libxml-2.0 --pkg dconf
- CFLAGS += -Wno-error
--dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
-+dconf_editor_LDADD = ../client/libdconf.la $(gtk_LIBS) $(gee_LIBS) $(libxml_LIBS)
- dconf_editor_SOURCES = dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
---- origsrc/dconf-0.6/gsettings/Makefile.am    2010-12-21 11:26:46.000000000 -0600
-+++ src/dconf-0.6/gsettings/Makefile.am        2010-12-29 20:50:14.069281800 -0600
-@@ -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 = -module -avoid-version -shared
--libdconfsettings_so_SOURCES = \
-+libdconfsettings_la_LIBADD = $(gio_LIBS)
-+libdconfsettings_la_LDFLAGS = -module -avoid-version -no-undefined
-+libdconfsettings_la_SOURCES = \
-       ../engine/dconf-engine.c        \
-       ../common/dconf-shmdir.c        \
-       ../gvdb/gvdb-reader.c           \
diff --git a/0.7.2-libtool.patch b/0.7.2-libtool.patch
new file mode 100644 (file)
index 0000000..78d52b6
--- /dev/null
@@ -0,0 +1,133 @@
+--- origsrc/dconf-0.7.2/bin/Makefile.am        2011-01-31 09:45:31.000000000 -0600
++++ src/dconf-0.7.2/bin/Makefile.am    2011-03-06 14:40:53.625256800 -0600
+@@ -5,5 +5,5 @@ 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 ../gvdb/gvdb-builder.c gvdb.vapi fixes.vapi
+--- origsrc/dconf-0.7.2/client/Makefile.am     2011-01-31 09:45:31.000000000 -0600
++++ src/dconf-0.7.2/client/Makefile.am 2011-03-06 14:42:28.239421700 -0600
+@@ -2,37 +2,24 @@ AM_CFLAGS = -std=c89 -Wall -Wmissing-pro
+ CFLAGS += -Wno-error
+ 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
+--- origsrc/dconf-0.7.2/client/libdconf_la_vala.stamp
++++ src/dconf-0.7.2/client/libdconf_la_vala.stamp
+@@ -0,0 +1,1 @@
++timestamp
+--- origsrc/dconf-0.7.2/configure.ac   2011-02-05 09:28:02.000000000 -0600
++++ src/dconf-0.7.2/configure.ac       2011-03-06 14:42:40.797443600 -0600
+@@ -13,6 +13,7 @@ AM_SILENT_RULES([yes])
+ # Check for programs
+ AC_PROG_CC
++AC_PROG_LIBTOOL
+ AM_PROG_VALAC([0.11.4])
+ # Gtk-doc support
+--- origsrc/dconf-0.7.2/dbus-1/Makefile.am     2011-01-31 09:45:31.000000000 -0600
++++ src/dconf-0.7.2/dbus-1/Makefile.am 2011-03-06 15:06:01.833509600 -0600
+@@ -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.7.2/editor/Makefile.am     2011-01-17 23:48:29.000000000 -0600
++++ src/dconf-0.7.2/editor/Makefile.am 2011-03-06 14:42:57.099472100 -0600
+@@ -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
+-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.7.2/gsettings/Makefile.am  2011-01-31 09:45:31.000000000 -0600
++++ src/dconf-0.7.2/gsettings/Makefile.am      2011-03-06 14:43:39.359945700 -0600
+@@ -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 = -module -avoid-version -no-undefined
++libdconfsettings_la_SOURCES = \
+       ../engine/dconf-engine.c        \
+       ../common/dconf-shmdir.c        \
+       ../gvdb/gvdb-reader.c           \
diff --git a/dconf-0.6-1.cygport b/dconf-0.6-1.cygport
deleted file mode 100644 (file)
index da1bf3a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-inherit gnome2
-
-
-PATCH_URI="0.6-libtool.patch"
-
-PKG_NAMES="dconf dconf-service libdconf0 libdconf-devel vala-dconf"
-dconf_CONTENTS="usr/bin/*.exe usr/share/doc/"
-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/ usr/lib/lib* usr/lib/pkgconfig/ usr/share/gtk-doc/"
-vala_dconf_CONTENTS="usr/share/vala*/vapi/dconf.*"
-
-CYGCONF_ARGS="--libexecdir=/usr/lib/dconf"
-MAKEOPTS+=" vapidir=$(pkg-config --variable=vapidir vala-0.10)"
diff --git a/dconf-0.7.2-1.cygport b/dconf-0.7.2-1.cygport
new file mode 100644 (file)
index 0000000..09c190f
--- /dev/null
@@ -0,0 +1,20 @@
+inherit gnome2
+
+
+PATCH_URI="0.7.2-libtool.patch"
+
+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="usr/bin/dconf-editor.exe usr/share/applications/ usr/share/dconf-editor/"
+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.*"
+
+# requires vala-0.11
+CYGCONF_ARGS="--libexecdir=/usr/lib/dconf ac_cv_path_VALAC= "
diff --git a/dconf-editor.hint b/dconf-editor.hint
new file mode 100644 (file)
index 0000000..2bf6e49
--- /dev/null
@@ -0,0 +1,7 @@
+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."
index 5936b10aa69699e4d3804b79b5ccca2d2abdb107..9c325a80f9f8a09eec915759f7897cf45bb2fd3b 100644 (file)
@@ -1,7 +1,6 @@
 category: Gnome
-requires: libdconf0 libglib2.0_0 libgtk3.0_0 libpango1.0_0 libxml2
-external-source: dconf
-sdesc: "GNOME configuration clients"
+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
new file mode 100644 (file)
index 0000000..b949a21
--- /dev/null
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..ad2ea2b
--- /dev/null
@@ -0,0 +1,7 @@
+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."
index a1d8b49c41b953d64642677db1eaa38e49dd6285..1d6bab0bc62bf9b11edc5529d0a700bcf3d4f0aa 100644 (file)
@@ -1,7 +1,7 @@
 category: Gnome
 requires: libdconf0 libglib2.0-devel
 external-source: dconf
-sdesc: "GNOME configuration client library (development)"
+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."
index 78ec58b947a68a292cbf1629a4de9d0557a4e99a..bf52598b89b2eb6d06169a92ae7ab82182d3c58a 100644 (file)
@@ -1,7 +1,7 @@
 category: Gnome
 requires: dconf-service libglib2.0_0
 external-source: dconf
-sdesc: "GNOME configuration client library (runtime)"
+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."
This page took 0.032657 seconds and 5 git commands to generate.