Both 0.95.6 and 0.95.7 shipped libwraster with a soname version of 5.
However, in 0.95.6, libwraster.map still listed the symbols as version 3.
In commit d458304, included in 0.95.7, this was bumped to 5.

However, there are now two different libwraster5's in the wild, causing
issues for reverse dependencies of libwraster (e.g., wdm) as in Debian
bug #811304 [1]:

  wdmLogin: /usr/lib/x86_64-linux-gnu/libwraster.so.5: version `LIBWRASTER3'
     not found

This patch is based on the Debian fix by Andreas Metzler, dropping the
symbol version back down to 3 until the next soname version bump.

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811304
---
 configure.ac      | 5 +++++
 wrlib/Makefile.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 844c024..8834c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,11 @@ WRASTER_REVISION=0
 WRASTER_AGE=0
 WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
 AC_SUBST(WRASTER_VERSION)
+dnl After next soname bump drop this and use WRASTER_VERSION as argument
+dnl for generate-mapfile-from-header.sh
+dnl http://bugs.debian.org/811304
+WRASTER_SYMBOL_VERSION=3
+AC_SUBST([WRASTER_SYMBOL_VERSION])
 dnl
 dnl libWINGs
 WINGS_CURRENT=4
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index ee1c04d..9496dd5 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -99,5 +99,5 @@ wrlib.pc: Makefile
 if HAVE_LD_VERSION_SCRIPT
 libwraster.map: $(include_HEADERS) 
$(top_srcdir)/script/generate-mapfile-from-header.sh
        $(AM_V_GEN)$(top_srcdir)/script/generate-mapfile-from-header.sh \
-               -n LIBWRASTER -v $(WRASTER_VERSION) 
$(srcdir)/$(include_HEADERS) > libwraster.map
+               -n LIBWRASTER -v $(WRASTER_SYMBOL_VERSION) 
$(srcdir)/$(include_HEADERS) > libwraster.map
 endif
-- 
2.5.0


-- 
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.

Reply via email to