[gentoo-commits] gentoo-x86 commit in media-gfx/graphicsmagick/files: graphicsmagick-1.3.19-flags.patch graphicsmagick-1.3.19-perl.patch graphicsmagick-1.3.19-freetype.patch

[gentoo-commits] gentoo-x86 commit in media-gfx/graphicsmagick/files: graphicsmagick-1.3.19-flags.patch graphicsmagick-1.3.19-perl.patch graphicsmagick-1.3.19-freetype.patch

[Tim Harder (radhermit)]

radhermit    14/01/02 09:01:51

  Added:                graphicsmagick-1.3.19-flags.patch
                        graphicsmagick-1.3.19-perl.patch
                        graphicsmagick-1.3.19-freetype.patch
  Log:
  Version bump. Add webp use flag, fix perl bindings build issue (bug #456180, patch by Tiziano Müller), and fix generated config file flags (bug #479560).
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.1                  media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-flags.patch?rev=1.1&content-type=text/plain

Index: graphicsmagick-1.3.19-flags.patch
===================================================================
Fix various preprocessor, compiler, and linker flags added to config wrappers.
Previously they would add build time flags to the files which is incorrect.

--- GraphicsMagick-1.3.19/configure.ac
+++ GraphicsMagick-1.3.19/configure.ac
@@ -346,6 +346,7 @@
 
 AC_OPENMP([C])
 CFLAGS="$OPENMP_CFLAGS $CFLAGS"
+MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS"
 #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS"
 #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS"
 AC_SUBST(OPENMP_CFLAGS)
@@ -3407,9 +3408,10 @@
 MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/  */ /g'`
 #LIBS=`echo $LIBS | sed -e 's/  */ /g'`
 
-MAGICK_API_CFLAGS=$CFLAGS
+MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/  */ /g'`
 MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
+MAGICK_API_CXXFLAGS=""
+MAGICK_API_LDFLAGS="-L$LIB_DIR"
 MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
 MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
 
@@ -3440,6 +3442,7 @@
 
 AC_SUBST(MAGICK_API_CFLAGS)
 AC_SUBST(MAGICK_API_CPPFLAGS)
+AC_SUBST(MAGICK_API_CXXFLAGS)
 AC_SUBST(MAGICK_API_PC_CPPFLAGS)
 AC_SUBST(MAGICK_API_LDFLAGS)
 AC_SUBST(MAGICK_API_LIBS)
--- GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
+++ GraphicsMagick-1.3.19/magick/GraphicsMagick-config.in
@@ -30,7 +30,7 @@
       echo @PACKAGE_VERSION@
       ;;
     --cflags)
-      echo '@CFLAGS@'
+      echo '@MAGICK_API_CFLAGS@'
       ;;
     --cppflags)
       echo '@MAGICK_API_CPPFLAGS@'
--- GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
+++ GraphicsMagick-1.3.19/Magick++/bin/GraphicsMagick++-config.in
@@ -33,7 +33,7 @@
       echo '@MAGICK_API_CPPFLAGS@'
       ;;
     --cxxflags)
-      echo '@CXXFLAGS@'
+      echo '@MAGICK_API_CXXFLAGS@'
       ;;
     --ldflags)
       echo '@MAGICK_API_LDFLAGS@'



1.1                  media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-perl.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-perl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-perl.patch?rev=1.1&content-type=text/plain

Index: graphicsmagick-1.3.19-perl.patch
===================================================================
Link perl bindings against built libraries instead of system libraries (bug #456180).

--- GraphicsMagick-1.3.19/PerlMagick/Makefile.PL.in
+++ GraphicsMagick-1.3.19/PerlMagick/Makefile.PL.in
@@ -23,7 +23,7 @@
 my $magick_BIN_DIR="$ENV{'DESTDIR'}@BIN_DIR@";
 my $magick_DEP_LIBS='@MAGICK_DEP_LIBS@';
 my $magick_PERLMAINCC='@PERLMAINCC@';
-my $magick_LIB_DIR="$ENV{'DESTDIR'}@MAGICKLIBDIR@";
+my $magick_LIB_DIR="../magick/.libs";
 
 # Compute test specification
 my $delegate_tests='t/*.t';



1.1                  media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/graphicsmagick/files/graphicsmagick-1.3.19-freetype.patch?rev=1.1&content-type=text/plain

Index: graphicsmagick-1.3.19-freetype.patch
===================================================================
https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940

--- GraphicsMagick-1.3.19/configure.ac
+++ GraphicsMagick-1.3.19/configure.ac
@@ -2283,8 +2284,8 @@
     then
       freetype_prefix=`${freetype_config} --prefix`
       freetype_exec_prefix=`${freetype_config} --exec-prefix`
-      LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
-      CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
+      LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
+      CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
     fi
 
 dnl First see if there is a library