Hello community,
here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2015-01-08 23:05:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/inkscape (Old)
and /work/SRC/openSUSE:Factory/.inkscape.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape"
Changes:
--------
--- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2014-12-30 00:49:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2015-01-08 23:05:44.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Jan 5 14:25:44 UTC 2015 - dimstar@opensuse.org
+
+- Add inkscape-gc-detection.patch: Use pkg-config to detect bdw-gc.
+
+-------------------------------------------------------------------
New:
----
inkscape-gc-detection.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inkscape.spec ++++++
--- /var/tmp/diff_new_pack.Q2aWiT/_old 2015-01-08 23:05:45.000000000 +0100
+++ /var/tmp/diff_new_pack.Q2aWiT/_new 2015-01-08 23:05:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inkscape
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,8 @@
Patch8: inkscape-0.48.5-librevenge.patch
# PATCH-FIX-UPSTREAM inkscape-fix-build-with-poppler-0.29.patch lp#1399811 mlin@suse.com -- fix build with poppler 0.29 (backported to inkscape 0.48.5)
Patch9: inkscape-fix-build-with-poppler-0.29.patch
+# PATCH-FIX-UPSTREAM inkscape-gc-detection.patch dimstar@opensuse.org -- Use proper pkg-config to find BDW-Garbage Collector >= 6.4
+Patch10: inkscape-gc-detection.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: boost-devel
@@ -169,6 +171,7 @@
%patch4 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
libtoolize --force --copy --install
++++++ inkscape-gc-detection.patch ++++++
Index: inkscape-0.48.5/configure.ac
===================================================================
--- inkscape-0.48.5.orig/configure.ac
+++ inkscape-0.48.5/configure.ac
@@ -187,76 +187,13 @@ if test "x$png_ok" != "xyes"; then
AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
fi
-dnl Handle possible dlopen requirement for libgc
-dnl Isn't this internal to something in autoconf? Couldn't find it...
-AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
- [AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- [AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- [AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
- ])
- ])
- ])
- ])
-
-AC_CHECK_HEADERS([gc.h gc/gc.h],
- [
- # To test for the different required libs, I have to
- # overcome autoconf's caching system, so I change the
- # desired function name. They're all in libgc.
- # The "break" will exit from the top level
- # AC_CHECK_HEADERS.
- gc_libs=""
- AC_CHECK_LIB(gc, GC_init,
- [gc_ok=yes;
- LIBS="-lgc $gc_libs $LIBS";
- break], [gc_ok=no], [$gc_libs])
- gc_libs="-lpthread"
- AC_CHECK_LIB(gc, GC_malloc,
- [gc_ok=yes;
- LIBS="-lgc $gc_libs $LIBS";
- break], [gc_ok=no], [$gc_libs])
- gc_libs="$lt_cv_dlopen_libs"
- AC_CHECK_LIB(gc, GC_realloc,
- [gc_ok=yes;
- LIBS="-lgc $gc_libs $LIBS";
- break], [gc_ok=no], [$gc_libs])
- gc_libs="-lpthread $lt_cv_dlopen_libs"
- AC_CHECK_LIB(gc, GC_free,
- [gc_ok=yes;
- LIBS="-lgc $gc_libs $LIBS";
- break], [gc_ok=no], [$gc_libs])
- break],
- [gc_ok=no])
-if test "x$gc_ok" = "xyes" && test "x$cross_compiling" = "xno" ; then
- AC_MSG_CHECKING([libgc version 6.4+])
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
- #ifdef HAVE_GC_GC_H
- # include