diff options
| author | Ali Abdallah <aliovx@gmail.com> | 2017-06-06 21:02:53 +0200 |
|---|---|---|
| committer | Ali Abdallah <aliovx@gmail.com> | 2017-06-06 21:02:53 +0200 |
| commit | 1d99b4575a7e12d1a85b3e67d4d950f201bfd8d2 (patch) | |
| tree | 65146046316bd7b2a61a154517b7a92c16bd391f /xfconf | |
| parent | 60e8bada5aae79d31abc83f287852f1c36a82d05 (diff) | |
| download | xfconf-1d99b4575a7e12d1a85b3e67d4d950f201bfd8d2.tar.gz | |
Uncommit the bump of the soname and bump the soname version instead, as
this solution seems to require less effort targeting xfce 4.14.
Diffstat (limited to 'xfconf')
| -rw-r--r-- | xfconf/Makefile.am | 12 | ||||
| -rwxr-xr-x | xfconf/abicheck.sh | 2 | ||||
| -rw-r--r-- | xfconf/libxfconf-0.pc.in (renamed from xfconf/libxfconf-1.pc.in) | 2 |
3 files changed, 8 insertions, 8 deletions
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 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} |