[Xfce4-commits] [xfce/xfconf] 01/02: Uncommit the bump of the soname and bump the soname version instead, as this solution seems to require less effort targeting xfce 4.14.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   l   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfconf.

commit 1d99b4575a7e12d1a85b3e67d4d950f201bfd8d2
Author: Ali Abdallah <aliovx at gmail.com>
Date:   Tue Jun 6 21:02:53 2017 +0200

    Uncommit the bump of the soname and bump the soname version instead, as
    this solution seems to require less effort targeting xfce 4.14.
---
 configure.ac.in                                 |  4 ++--
 xfconf-query/Makefile.am                        |  2 +-
 xfconf/Makefile.am                              | 12 ++++++------
 xfconf/abicheck.sh                              |  2 +-
 xfconf/{libxfconf-1.pc.in => libxfconf-0.pc.in} |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 7651f5d..cea77f0 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -7,7 +7,7 @@ dnl
 
 dnl version info
 m4_define([libxfconf_verinfo], [2:0:0])
-m4_define([libxfconf_version_api], [1])
+m4_define([libxfconf_version_api], [0])
 m4_define([xfconf_version_major], [4])
 m4_define([xfconf_version_minor], [13])
 m4_define([xfconf_version_micro], [0])
@@ -228,7 +228,7 @@ tests/reset-properties/Makefile
 tests/object-bindings/Makefile
 tests/property-changed-signal/Makefile
 xfconf/Makefile
-xfconf/libxfconf-1.pc
+xfconf/libxfconf-0.pc
 xfconf-perl/Makefile.PL
 xfconf-perl/Makefile
 xfconf-perl/Xfconf.pm
diff --git a/xfconf-query/Makefile.am b/xfconf-query/Makefile.am
index 2426e1b..bd2e8c2 100644
--- a/xfconf-query/Makefile.am
+++ b/xfconf-query/Makefile.am
@@ -23,7 +23,7 @@ xfconf_query_LDFLAGS = \
 
 xfconf_query_LDADD = \
 	$(top_builddir)/common/libxfconf-gvaluefuncs.la \
-	$(top_builddir)/xfconf/libxfconf-$(LIBXFCONF_VERSION_API).la \
+	$(top_builddir)/xfconf/libxfconf-0.la \
 	$(GLIB_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(GIO_UNIX_LIBS)
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
index 51a0b1b..7cf962d 100644
--- a/xfconf/Makefile.am
+++ b/xfconf/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"xfconf\" \
 	$(PLATFORM_CPPFLAGS)
 
-lib_LTLIBRARIES = libxfconf-1.la
+lib_LTLIBRARIES = libxfconf-0.la
 
 libxfconfincludedir = $(includedir)/xfce4/xfconf-$(LIBXFCONF_VERSION_API)/xfconf
 libxfconfinclude_HEADERS = \
@@ -15,7 +15,7 @@ libxfconfinclude_HEADERS = \
 	xfconf-types.h \
 	xfconf.h
 
-libxfconf_1_la_SOURCES = \
+libxfconf_0_la_SOURCES = \
 	$(libxfconfinclude_HEADERS) \
 	xfconf-binding.c \
 	xfconf-cache.c \
@@ -25,21 +25,21 @@ libxfconf_1_la_SOURCES = \
 	xfconf.c \
 	$(top_srcdir)/common/xfconf-types.c
 
-libxfconf_1_la_CFLAGS = \
+libxfconf_0_la_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(GIO_CFLAGS) \
         $(GIO_UNIX_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(PLATFORM_CFLAGS)
 
-libxfconf_1_la_LDFLAGS = \
+libxfconf_0_la_LDFLAGS = \
 	-export-dynamic \
 	-version-info $(LIBXFCONF_VERINFO) \
 	-export-symbols-regex "^[^_].*" \
 	-no-undefined \
 	$(PLATFORM_LDFLAGS)
 
-libxfconf_1_la_LIBADD = \
+libxfconf_0_la_LIBADD = \
 	$(top_builddir)/common/libxfconf-common.la \
 	$(top_builddir)/common/libxfconf-gvaluefuncs.la \
 	$(top_builddir)/common/libxfconf-dbus.la \
@@ -49,7 +49,7 @@ libxfconf_1_la_LIBADD = \
 	$(GTHREAD_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libxfconf-1.pc
+pkgconfig_DATA = libxfconf-0.pc
 
 
 EXTRA_DIST = \
diff --git a/xfconf/abicheck.sh b/xfconf/abicheck.sh
index e6ab2ee..7731f9f 100755
--- a/xfconf/abicheck.sh
+++ b/xfconf/abicheck.sh
@@ -20,5 +20,5 @@
 
 trap 'rm expected-abi actual-abi' EXIT
 ${CPP:-cpp} -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/xfconf.symbols | sed 's/ G_GNUC.*$//;s/ PRIVATE//;/^ *$/d;/^#/d' | sort >expected-abi
-${NM:-nm} .libs/libxfconf-1.so* | awk '/ [DRTG] / {print $3}' | sort | uniq > actual-abi
+${NM:-nm} .libs/libxfconf-0.so* | awk '/ [DRTG] / {print $3}' | sort | uniq > actual-abi
 diff -u expected-abi actual-abi
diff --git a/xfconf/libxfconf-1.pc.in b/xfconf/libxfconf-0.pc.in
similarity index 89%
rename from xfconf/libxfconf-1.pc.in
rename to xfconf/libxfconf-0.pc.in
index bfa9140..b424788 100644
--- a/xfconf/libxfconf-1.pc.in
+++ b/xfconf/libxfconf-0.pc.in
@@ -7,7 +7,7 @@ libxfconf_api_version=@LIBXFCONF_VERSION_API@
 
 Name: @PACKAGE_TARNAME@
 Description: Configuration library for Xfce
-Requires: gio-2.0 gio-unix-2.0
+Requires: gobject-2.0 dbus-1 dbus-glib-1
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lxfconf-${libxfconf_api_version}
 Cflags: -I${includedir}/xfce4/xfconf-${libxfconf_api_version}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.