dconf 0.22.0
authorYaakov Selkowitz <yselkowi@redhat.com>
Sun, 4 Jan 2015 19:30:04 +0000 (13:30 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Sun, 4 Jan 2015 19:30:04 +0000 (13:30 -0600)
0.22.0-cygwin-tests.patch [moved from 0.14.1-cygwin.patch with 73% similarity]
0.22.0-libtool.patch [moved from 0.16.1-libtool.patch with 83% similarity]
dconf.cygport

similarity index 73%
rename from 0.14.1-cygwin.patch
rename to 0.22.0-cygwin-tests.patch
index 3cd194681706fe195ac557de6fd76491d73b39e6..f660f5422c9625306bb657335056dc526fbc1d42 100644 (file)
@@ -1,6 +1,6 @@
---- 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 @@
+--- origsrc/dconf-0.22.0/tests/engine.c        2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/tests/engine.c    2015-01-04 13:16:04.982798900 -0600
+@@ -13,6 +13,9 @@
  #include <stdio.h>
  #include <dlfcn.h>
  #include <math.h>
@@ -10,7 +10,7 @@
  
  /* Interpose to catch fopen("/etc/dconf/profile/user") */
  static const gchar *filename_to_replace;
-@@ -20,6 +23,12 @@ fopen (const char *filename,
+@@ -23,6 +26,12 @@ fopen (const char *filename,
         const char *mode)
  {
    static FILE * (*real_fopen) (const char *, const char *);
@@ -23,7 +23,7 @@
  
    if (!real_fopen)
      real_fopen = dlsym (RTLD_NEXT, "fopen");
-@@ -877,6 +886,10 @@ test_watch_sync (void)
+@@ -1740,6 +1749,10 @@ test_sync (void)
  int
  main (int argc, char **argv)
  {
 +  cygwin_internal (CW_HOOK, "fopen", fopen);
 +#endif
 +
+   g_setenv ("XDG_RUNTIME_DIR", "/RUNTIME/", TRUE);
    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 @@
+--- origsrc/dconf-0.22.0/tests/shm.c   2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/tests/shm.c       2015-01-04 13:16:04.998398900 -0600
+@@ -10,6 +10,9 @@
  #include <fcntl.h>
  #include <errno.h>
  #include <dlfcn.h>
@@ -46,7 +46,7 @@
  
  #include "../shm/dconf-shm.h"
  #include "tmpdir.h"
-@@ -88,6 +91,12 @@ ssize_t
+@@ -91,6 +94,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);
@@ -59,7 +59,7 @@
  
    if (!real_pwrite)
      real_pwrite = dlsym (RTLD_NEXT, "pwrite");
-@@ -140,6 +149,10 @@ main (int argc, char **argv)
+@@ -143,6 +152,10 @@ main (int argc, char **argv)
    gchar *temp;
    gint status;
  
similarity index 83%
rename from 0.16.1-libtool.patch
rename to 0.22.0-libtool.patch
index a8d7aa6afec76de3819dc3de261298f4caa4e899..9ecdd00579b364ea5b40a67dd5a4bcd00f37f923 100644 (file)
@@ -1,5 +1,5 @@
---- origsrc/dconf-0.16.1/bin/Makefile.am       2013-07-16 11:20:20.000000000 -0500
-+++ src/dconf-0.16.1/bin/Makefile.am   2013-08-05 19:27:41.745400100 -0500
+--- origsrc/dconf-0.22.0/bin/Makefile.am       2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/bin/Makefile.am   2015-01-04 13:12:57.985272800 -0600
 @@ -11,7 +11,7 @@ dconf_CFLAGS = \
        -w
  
@@ -9,8 +9,8 @@
        $(gio_LIBS)
  
  dconf_SOURCES = \
---- origsrc/dconf-0.16.1/client/Makefile.am    2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/client/Makefile.am        2013-08-05 19:29:26.967418400 -0500
+--- origsrc/dconf-0.22.0/client/Makefile.am    2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/client/Makefile.am        2015-01-04 13:12:57.985272800 -0600
 @@ -1,21 +1,8 @@
  include $(top_srcdir)/Makefile.gtester
  
  pkgconfig_DATA = dconf.pc
 -
 -CLEANFILES = libdconf.so.1 libdconf.so
---- origsrc/dconf-0.16.1/common/Makefile.am    2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/common/Makefile.am        2013-08-05 19:30:07.008708700 -0500
-@@ -5,15 +5,16 @@ dconfcommoninclude_HEADERS = \
-       dconf-changeset.h       \
+--- origsrc/dconf-0.22.0/common/Makefile.am    2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/common/Makefile.am        2015-01-04 13:12:57.985272800 -0600
+@@ -6,7 +6,8 @@ dconfcommoninclude_HEADERS = \
+       dconf-error.h           \
        dconf-paths.h
  
 -noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a
@@ -78,7 +78,8 @@
  
  libdconf_common_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
  libdconf_common_a_SOURCES = \
-       dconf-changeset.c       \
+@@ -14,8 +15,8 @@ libdconf_common_a_SOURCES = \
+       dconf-error.c           \
        dconf-paths.c
  
 -libdconf_common_shared_a_CFLAGS = $(libdconf_common_a_CFLAGS) -fPIC -DPIC
 -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.16.1/configure.ac  2013-07-16 11:24:09.000000000 -0500
-+++ src/dconf-0.16.1/configure.ac      2013-08-05 19:38:45.910388200 -0500
-@@ -19,7 +19,7 @@ fi
- # Check for programs
- AC_PROG_CC
- AM_PROG_VALAC([0.17.0])
+--- origsrc/dconf-0.22.0/configure.ac  2014-09-19 11:23:46.000000000 -0500
++++ src/dconf-0.22.0/configure.ac      2015-01-04 13:12:57.985272800 -0600
+@@ -21,7 +21,7 @@ AC_PROG_CC
+ AC_CHECK_LIB(c, dlsym, LIBDL="", [AC_CHECK_LIB(dl, dlsym, LIBDL="-ldl")])
+ AC_SUBST(LIBDL)
+ AM_PROG_VALAC([0.18.0])
 -AC_PROG_RANLIB
 +AC_PROG_LIBTOOL
  AC_ARG_ENABLE(man,
                [AS_HELP_STRING([--enable-man],
                                [generate man pages [default=yes]])],,
---- origsrc/dconf-0.16.1/dbus-1/Makefile.am    2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/dbus-1/Makefile.am        2013-08-05 19:31:42.142150000 -0500
+--- origsrc/dconf-0.22.0/dbus-1/Makefile.am    2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/dbus-1/Makefile.am        2015-01-04 13:12:58.000872900 -0600
 @@ -1,14 +1,15 @@
  include $(top_srcdir)/Makefile.gtester
  
 -CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
 +libdconf_dbus_1_la_LDFLAGS = -shared -version-number 0:0:0 -no-undefined
 +libdconf_dbus_1_la_SOURCES = dconf-dbus-1.c
---- origsrc/dconf-0.16.1/editor/Makefile.am    2013-07-16 11:20:20.000000000 -0500
-+++ src/dconf-0.16.1/editor/Makefile.am        2013-08-05 19:32:04.659437900 -0500
+--- origsrc/dconf-0.22.0/editor/Makefile.am    2014-09-19 11:19:46.000000000 -0500
++++ src/dconf-0.22.0/editor/Makefile.am        2015-01-04 13:12:58.000872900 -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
  
        $(gtk_LIBS)                     \
        $(gee_LIBS)                     \
        $(gmodule_LIBS)                 \
---- origsrc/dconf-0.16.1/engine/Makefile.am    2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/engine/Makefile.am        2013-08-05 19:32:26.703698800 -0500
+--- origsrc/dconf-0.22.0/engine/Makefile.am    2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/engine/Makefile.am        2015-01-04 13:12:58.000872900 -0600
 @@ -1,6 +1,7 @@
  include $(top_srcdir)/Makefile.gtester
  
  
  libdconf_engine_a_CFLAGS = $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
  libdconf_engine_a_SOURCES = \
-@@ -15,5 +16,5 @@ libdconf_engine_a_SOURCES = \
+@@ -16,5 +17,5 @@ libdconf_engine_a_SOURCES = \
        dconf-engine.h                  \
        dconf-engine.c
  
 -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.16.1/gdbus/Makefile.am     2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/gdbus/Makefile.am 2013-08-05 19:33:19.163699300 -0500
+--- origsrc/dconf-0.22.0/gdbus/Makefile.am     2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/gdbus/Makefile.am 2015-01-04 13:12:58.000872900 -0600
 @@ -2,20 +2,21 @@ include $(top_srcdir)/Makefile.gtester
  
  noinst_LIBRARIES = \
 -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.16.1/gsettings/Makefile.am 2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/gsettings/Makefile.am     2013-08-05 19:40:15.125491000 -0500
+--- origsrc/dconf-0.22.0/gsettings/Makefile.am 2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/gsettings/Makefile.am     2015-01-04 13:12:58.016472900 -0600
 @@ -1,18 +1,18 @@
  include $(top_srcdir)/Makefile.gtester
  
        dconfsettingsbackend.c
  
  uninstall-hook:
---- origsrc/dconf-0.16.1/gvdb/Makefile.am      2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/gvdb/Makefile.am  2013-08-05 19:34:26.491550200 -0500
+--- origsrc/dconf-0.22.0/gvdb/Makefile.am      2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/gvdb/Makefile.am  2015-01-04 13:12:58.016472900 -0600
 @@ -1,6 +1,7 @@
  include $(top_srcdir)/Makefile.gtester
  
 -libgvdb_shared_a_SOURCES = $(libgvdb_a_SOURCES)
 +libgvdb_shared_la_CFLAGS = $(libgvdb_a_CFLAGS)
 +libgvdb_shared_la_SOURCES = $(libgvdb_a_SOURCES)
---- origsrc/dconf-0.16.1/shm/Makefile.am       2013-07-16 11:20:19.000000000 -0500
-+++ src/dconf-0.16.1/shm/Makefile.am   2013-08-05 19:34:52.298026300 -0500
+--- origsrc/dconf-0.22.0/shm/Makefile.am       2014-03-03 14:58:21.000000000 -0600
++++ src/dconf-0.22.0/shm/Makefile.am   2015-01-04 13:12:58.016472900 -0600
 @@ -1,11 +1,12 @@
  include $(top_srcdir)/Makefile.gtester
  
index ea206cc4ebf425069f402620d83cdc22d259a18f..a83dfd2f517d0ce66fbbe80955d640b28f4373c2 100644 (file)
@@ -1,7 +1,7 @@
 inherit gnome2
 
 NAME="dconf"
-VERSION=0.18.0
+VERSION=0.22.0
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="GNOME configuration system"
@@ -10,8 +10,8 @@ to provide a backend to GSettings on platforms that don't already have
 configuration storage systems."
 
 PATCH_URI="
-       0.16.1-libtool.patch
-       0.14.1-cygwin.patch
+       0.22.0-libtool.patch
+       0.22.0-cygwin-tests.patch
 "
 
 DEPEND="gnome-common
@@ -30,7 +30,7 @@ dconf_CONTENTS="etc/bash_completion.d/ usr/bin/dconf.exe usr/share/doc/
 dconf_editor_CATEGORY="GNOME"
 dconf_editor_SUMMARY="${SUMMARY} (GUI preferences editor)"
 dconf_editor_CONTENTS="etc/postinstall/ usr/bin/dconf-editor.exe usr/share/applications/
-                       usr/share/glib-2.0/schemas/
+                       usr/share/appdata/ usr/share/glib-2.0/schemas/
                        usr/share/icons/ usr/share/locale/ usr/share/man/man1/dconf-editor.*"
 dconf_service_CATEGORY="GNOME"
 dconf_service_CONTENTS="etc/postinstall/ usr/libexec/ usr/lib/gio/ usr/share/dbus-1/
This page took 0.032672 seconds and 5 git commands to generate.