gnome/dconf 0.6
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 30 Dec 2010 03:24:33 +0000 (21:24 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Thu, 30 Dec 2010 03:24:33 +0000 (21:24 -0600)
0.6-libtool.patch [moved from 0.5.1-libtool.patch with 60% similarity]
dconf-0.6-1.cygport [moved from dconf-0.5.1-1.cygport with 67% similarity]
dconf.hint
girepository-dconf1.0.hint [deleted file]

similarity index 60%
rename from 0.5.1-libtool.patch
rename to 0.6-libtool.patch
index b2f3803f6fd7276f5233ada6dde96a6647d7a05b..de0d1f52cb0d232356e88f811d91047ece9ec0ef 100644 (file)
@@ -1,5 +1,5 @@
---- origsrc/dconf-0.5.1/bin/Makefile.am        2010-07-26 09:10:20.000000000 -0500
-+++ src/dconf-0.5.1/bin/Makefile.am    2010-11-07 08:35:50.109565500 -0600
+--- 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
  
@@ -7,25 +7,9 @@
 -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.5.1/client/Makefile.am     2010-09-15 08:34:58.000000000 -0500
-+++ src/dconf-0.5.1/client/Makefile.am 2010-11-07 14:59:19.801428300 -0600
-@@ -1,12 +1,12 @@
- if HAVE_INTROSPECTION
- include $(INTROSPECTION_MAKEFILE)
--dconf-1.0.gir: libdconf.so.0 libdconf.so
-+dconf-1.0.gir: libdconf.la
- dconf_1_0_gir_INCLUDES = Gio-2.0
- dconf_1_0_gir_CFLAGS = $(INCLUDES)
--dconf_1_0_gir_LIBS = dconf
-+dconf_1_0_gir_LIBS = libdconf.la
- dconf_1_0_gir_FILES = dconf-client.c dconf-client.h
--dconf_1_0_gir_SCANNERFLAGS = --no-libtool --identifier-prefix=DConf
-+dconf_1_0_gir_SCANNERFLAGS = --identifier-prefix=DConf
- INTROSPECTION_GIRS = dconf-1.0.gir
- girdir = $(datadir)/gir-1.0
-@@ -20,35 +20,24 @@ AM_CFLAGS = -std=c89 -Wall -Wmissing-pro
+--- 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)
  
  dconf.deps:
        $(AM_V_GEN) echo gio-2.0 > dconf.deps
-@@ -59,4 +48,4 @@ vapidir = $(datadir)/vala/vapi
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = dconf.pc
--CLEANFILES = $(dist_gir_DATA) $(typelib_DATA) dconf.deps libdconf.so.0 libdconf.so
-+CLEANFILES = $(gir_DATA) $(typelib_DATA) dconf.deps
---- origsrc/dconf-0.5.1/configure.ac   2010-09-15 15:11:24.000000000 -0500
-+++ src/dconf-0.5.1/configure.ac       2010-11-07 08:37:11.169677400 -0600
+--- /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_LIBTOOL
  AM_PROG_VALAC([0.9.5])
  
- # Introspection
---- origsrc/dconf-0.5.1/editor/Makefile.am     2010-09-15 08:34:58.000000000 -0500
-+++ src/dconf-0.5.1/editor/Makefile.am 2010-11-07 08:36:11.849595500 -0600
-@@ -2,5 +2,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+-2.0 --pkg libxml-2.0 --pkg dconf
+ # 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.5.1/gsettings/Makefile.am  2010-07-26 09:10:20.000000000 -0500
-+++ src/dconf-0.5.1/gsettings/Makefile.am      2010-11-07 14:50:22.702708000 -0600
+--- 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)
similarity index 67%
rename from dconf-0.5.1-1.cygport
rename to dconf-0.6-1.cygport
index bac25a41d59609a3cfc9d08def3e1035fac14843..da1bf3a96ff8fd4589437264261261b9e049e7dd 100644 (file)
@@ -1,17 +1,14 @@
 inherit gnome2
 
 
-PATCH_URI="0.5.1-libtool.patch"
+PATCH_URI="0.6-libtool.patch"
 
-PKG_NAMES="dconf dconf-service libdconf0 libdconf-devel girepository-dconf1.0 vala-dconf"
+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/"
-girepository_dconf1_0_CONTENTS="usr/*/gir*/dconf-1.0.*"
 vala_dconf_CONTENTS="usr/share/vala*/vapi/dconf.*"
 
-DISTCLEANFILES='client/*.gir'
-
 CYGCONF_ARGS="--libexecdir=/usr/lib/dconf"
 MAKEOPTS+=" vapidir=$(pkg-config --variable=vapidir vala-0.10)"
index 9d431a1fcd66a9a8bdc7d41838bc45d256a4a20e..5936b10aa69699e4d3804b79b5ccca2d2abdb107 100644 (file)
@@ -1,5 +1,5 @@
 category: Gnome
-requires: libdconf0 libglib2.0_0 libgtk2.0_0 libpango1.0_0 libxml2
+requires: libdconf0 libglib2.0_0 libgtk3.0_0 libpango1.0_0 libxml2
 external-source: dconf
 sdesc: "GNOME configuration clients"
 ldesc: "dconf is a low-level configuration system. Its main purpose is 
diff --git a/girepository-dconf1.0.hint b/girepository-dconf1.0.hint
deleted file mode 100644 (file)
index aa9560b..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Gnome
-requires: libdconf0 girepository-GLib2.0
-external-source: dconf
-sdesc: "GNOME configuration client library (GObject Introspection data)"
-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.204596 seconds and 5 git commands to generate.