dconf 0.26.0
authorYaakov Selkowitz <yselkowi@redhat.com>
Mon, 20 Mar 2017 20:05:13 +0000 (15:05 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Mon, 20 Mar 2017 20:05:13 +0000 (15:05 -0500)
0.22.0-libtool.patch
dconf.cygport

index 085a8d3633b7e245a9590476df3121bd11c43734..90699ca2e8d9db7309ae184581c261ac45a7fe55 100644 (file)
  AC_ARG_ENABLE(man,
                [AS_HELP_STRING([--enable-man],
                                [generate man pages [default=yes]])],,
---- 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
--noinst_LIBRARIES = libdconf-libdbus-1.a libdconf-libdbus-1-shared.a
-+noinst_LIBRARIES = libdconf-libdbus-1.a
-+noinst_LTLIBRARIES = libdconf-libdbus-1-shared.la
- libdconf_libdbus_1_a_CFLAGS = $(dbus_CFLAGS) $(glib_CFLAGS) -DG_LOG_DOMAIN=\"dconf\"
- 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 +17,16 @@ 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_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 = -shared -version-number 0:0:0 -no-undefined
-+libdconf_dbus_1_la_SOURCES = dconf-dbus-1.c
 --- 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 @@
index 7237d1961fc822a405496d01c66d02c29b4c8128..bb2eb2f98e3f1740e78bf44b0a8a7c463bc54151 100644 (file)
@@ -1,7 +1,7 @@
 inherit gnome2
 
 NAME="dconf"
-VERSION=0.24.0
+VERSION=0.26.0
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="GNOME configuration system"
@@ -15,18 +15,16 @@ PATCH_URI="
 "
 
 DEPEND="gnome-common
-       pkgconfig(dbus-1)
        pkgconfig(libxml-2.0)
        vala(libxml-2.0)"
 
-PKG_NAMES="dconf dconf-service libdconf1 libdconf-devel libdconf-doc
-           libdconf-dbus1_0 libdconf-dbus1-devel vala-dconf"
+PKG_NAMES="dconf dconf-service libdconf1 libdconf-devel libdconf-doc vala-dconf"
 dconf_CATEGORY="GNOME"
 dconf_SUMMARY="${SUMMARY} (client utility)"
 dconf_CONTENTS="etc/bash_completion.d/ usr/bin/dconf.exe usr/share/doc/
                 usr/share/man/man1/dconf.*"
 dconf_service_CATEGORY="GNOME"
-dconf_service_CONTENTS="etc/postinstall/ usr/libexec/ usr/lib/gio/ usr/share/dbus-1/
+dconf_service_CONTENTS="usr/libexec/ 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"
@@ -37,12 +35,6 @@ libdconf_devel_CONTENTS="usr/include/dconf/ usr/lib/libdconf.* usr/lib/pkgconfig
 libdconf_doc_CATEGORY="Doc"
 libdconf_doc_SUMMARY="${SUMMARY} client library (API documentation)"
 libdconf_doc_CONTENTS="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.*"
 
This page took 0.023916 seconds and 5 git commands to generate.