tags 648141 + pending
thanks
Dear maintainer,
I've prepared an NMU for cairo (versioned as 1.10.2-6.2) and uploaded it
to DELAYED/3. Please feel free to tell me if I should delay it longer.
--
Jakub Wilk
diffstat for cairo-1.10.2 cairo-1.10.2
changelog | 8 ++++++++
ltmain_as-needed.patch | 8 ++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff -Nru cairo-1.10.2/debian/changelog cairo-1.10.2/debian/changelog
--- cairo-1.10.2/debian/changelog 2011-07-29 19:01:38.000000000 +0200
+++ cairo-1.10.2/debian/changelog 2011-12-13 19:06:11.000000000 +0100
@@ -1,3 +1,11 @@
+cairo (1.10.2-6.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Refresh the ltmain-as-needed patch (closes: #648141). Thanks to Nobuhiro
+ Iwamatsu for the bug report and the initial patch.
+
+ -- Jakub Wilk <jw...@debian.org> Tue, 13 Dec 2011 19:06:10 +0100
+
cairo (1.10.2-6.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru cairo-1.10.2/debian/ltmain_as-needed.patch cairo-1.10.2/debian/ltmain_as-needed.patch
--- cairo-1.10.2/debian/ltmain_as-needed.patch 2011-03-26 11:11:26.000000000 +0100
+++ cairo-1.10.2/debian/ltmain_as-needed.patch 2011-12-13 19:04:54.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- cairo.orig/build/ltmain.sh 2010-06-26 16:12:17.428175248 +0200
+++ cairo/build/ltmain.sh 2010-06-26 16:13:17.044176141 +0200
-@@ -4716,6 +4716,11 @@
+@@ -5800,6 +5800,11 @@
arg=$func_stripname_result
;;
@@ -14,7 +14,7 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+@@ -6163,6 +6168,15 @@
lib=
found=no
case $deplib in
@@ -27,6 +27,6 @@
+ fi
+ continue
+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
