[magics] 21/31: Link against libMagPlus
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 11:09:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository magics.
commit 1efcc6cc2aee4c46f11b8c5c243732e0565a8eb5
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Dec 14 14:02:21 2013 +0000
Link against libMagPlus
---
debian/patches/metview_fixes.patch | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/patches/metview_fixes.patch b/debian/patches/metview_fixes.patch
index 8f96127..41a35ca 100644
--- a/debian/patches/metview_fixes.patch
+++ b/debian/patches/metview_fixes.patch
@@ -1,12 +1,17 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Link MagPlusQt.so against libdrivers, libMagPlus to resolve symbols
+Last-Updated: 2013-12-14
+Forwarded: not-needed
+
Index: magics++-2.18.15/src/drivers/Makefile.am
===================================================================
---- magics++-2.18.15.orig/src/drivers/Makefile.am 2013-12-13 03:23:14.000000000 +0000
-+++ magics++-2.18.15/src/drivers/Makefile.am 2013-12-14 10:15:46.000000000 +0000
+--- magics++-2.18.15.orig/src/drivers/Makefile.am 2013-12-14 13:56:56.000000000 +0000
++++ magics++-2.18.15/src/drivers/Makefile.am 2013-12-14 14:00:13.000000000 +0000
@@ -99,6 +99,7 @@
libMagPlusQt_la_LDFLAGS = $(QT_LIBS) -version-info $(MAGICS_LIBRARY_CURRENT):$(MAGICS_LIBRARY_REVISION):$(MAGICS_LIBRARY_AGE)
libMagPlusQt_la_SOURCES = $(QT_la_S)
AM_CPPFLAGS += -I$(METVIEW_HOME)/src/libUtil -I$(top_srcdir)/src/drivers/MgQ $(QT_CPPFLAGS)
-+libMagPlusQt_la_LIBADD = libdrivers.la
++libMagPlusQt_la_LIBADD = libMagPlus.la libdrivers.la
endif
BUILT_SOURCES = $(QT_la_built)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list