File libvmime-sotag.diff of Package libvmime

Overview Repositories Revisions Requests Users Attributes Meta

File libvmime-sotag.diff of Package libvmime

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-06-25 23:04 +0200

AFAICS, VMIME broke its API between 0.4.x and 0.8.x without updating
soversions, hence no trust that it's right now. Add -release suffix
unconditionally.

---
 SConstruct |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Index: vmime/SConstruct
===================================================================
--- vmime.orig/SConstruct
+++ vmime/SConstruct
@@ -1017,7 +1017,7 @@ vmime_pc.write("Name: " + packageRealNam
 vmime_pc.write("Description: " + packageDescription + "\n")
 vmime_pc.write("Version: " + packageVersion + "\n")
 vmime_pc.write("Requires: " + vmime_pc_requires + "\n")
-vmime_pc.write("Libs: -L${libdir} -l" + packageVersionedGenericName + " " + vmime_pc_libs + "\n")
+vmime_pc.write("Libs: -L${libdir} -l" + packageVersionedGenericName + "-" + str(packageVersion) + " " + vmime_pc_libs + "\n")
 #vmime_pc.write("Cflags: -I${includedir}/" + packageVersionedGenericName + "\n")
 vmime_pc.write("Cflags: -I${includedir}/" + "\n")
 
@@ -1090,7 +1090,7 @@ def generateAutotools(target, source, en
 	vmime_pc_in.write("Description: " + packageDescription + "\n")
 	vmime_pc_in.write("Version: @VERSION@\n")
 	vmime_pc_in.write("Requires: @GSASL_REQUIRED@\n")
-	vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
+	vmime_pc_in.write("Libs: -L${libdir} -l@GENERIC_VERSIONED_LIBRARY_NAME@-@PACKAGE_VERSION@ @GSASL_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @LIBICONV@ @PTHREAD_LIBS@ @VMIME_ADDITIONAL_PC_LIBS@\n")
 	#vmime_pc_in.write("Cflags: -I${includedir}/@GENERIC_VERSIONED_LIBRARY_NAME@\n")
 	vmime_pc_in.write("Cflags: -I${includedir}/ @LIBGNUTLS_CFLAGS@\n")
 	vmime_pc_in.close()
@@ -1162,8 +1162,7 @@ INCLUDES = -I$(prefix)/include -I$(top_s
 
 	Makefile_am.write('lib_LTLIBRARIES = ' + packageVersionedName + '.la\n')
 	Makefile_am.write(packageVersionedName + '_la_LDFLAGS = -export-dynamic -version-info '
-#		+ '@LIBRARY_VERSION@ -release @LIBRARY_RELEASE@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n')
-		+ '@LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n')
+		+ '@LIBRARY_VERSION@ -release @PACKAGE_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@\n')
 
 	sourceFiles = []  # for conversion:   subpath/file.cpp --> subpath_file.cpp
 	                  # used to avoid collision when two files have the same name if different dirs

Places

File libvmime-sotag.diff of Package libvmime

Places