From ef99e9ceeebef32a905d1aaf308a271df998da7a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 20 2018 14:31:53 +0000 Subject: rebase(drop) perl_linkpage.patch Apparently(?) it's no longer needed, *crosses fingers* --- diff --git a/GraphicsMagick-1.3.14-perl_linkage.patch b/GraphicsMagick-1.3.14-perl_linkage.patch deleted file mode 100644 index db504a0..0000000 --- a/GraphicsMagick-1.3.14-perl_linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in ---- GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in.perl_linkage 2012-02-25 14:43:38.000000000 -0600 -+++ GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in 2012-02-26 07:35:38.542731280 -0600 -@@ -78,7 +78,7 @@ WriteMakefile - 'INSTALLBIN' => $magick_BIN_DIR, - - # Library specification -- 'LIBS' => ["-L$magick_LIB_DIR -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS"], -+ 'LIBS' => ["-L$magick_LIB_DIR -L../magick/.libs -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS"], - - # Perl binary name (if a Perl binary is built) - 'MAP_TARGET' => 'PerlMagick', diff --git a/GraphicsMagick-1.3.31-perl_linkage.patch b/GraphicsMagick-1.3.31-perl_linkage.patch new file mode 100644 index 0000000..9511eb1 --- /dev/null +++ b/GraphicsMagick-1.3.31-perl_linkage.patch @@ -0,0 +1,12 @@ +diff -up GraphicsMagick-1.3.31/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.31/PerlMagick/Makefile.PL.in +--- GraphicsMagick-1.3.31/PerlMagick/Makefile.PL.in.perl_linkage 2018-11-20 08:09:30.804633076 -0600 ++++ GraphicsMagick-1.3.31/PerlMagick/Makefile.PL.in 2018-11-20 08:10:29.460027024 -0600 +@@ -78,7 +78,7 @@ WriteMakefile + 'INSTALLBIN' => $magick_BIN_DIR, + + # Library specification +- 'LIBS' => ["-L$magick_LIB_DIR $magick_LDFLAGS $magick_API_LIBS"], ++ 'LIBS' => ["-L$magick_LIB_DIR -L../magick/.libs $magick_LDFLAGS $magick_API_LIBS"], + + # Perl binary name (if a Perl binary is built) + 'MAP_TARGET' => 'PerlMagick', diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 4160be5..5db2f39 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -39,7 +39,7 @@ Url: http://www.graphicsmagick.org/ Patch100: GraphicsMagick-1.3.16-multilib.patch ## upstreamable patches -Patch50: GraphicsMagick-1.3.14-perl_linkage.patch +Patch50: GraphicsMagick-1.3.31-perl_linkage.patch ## upstream patches @@ -156,7 +156,8 @@ however. %prep %setup -q -%patch50 -p1 -b .perl_linkage +## keep reference in case we still need this (hopefully not) -- rex +#patch50 -p1 -b .perl_linkage %patch100 -p1 -b .multilib for f in ChangeLog.{2006,2008,2009,2012} NEWS.txt ; do @@ -203,6 +204,7 @@ find %{buildroot} -name "*.bs" |xargs rm -fv find %{buildroot} -name ".packlist" |xargs rm -fv find %{buildroot} -name "perllocal.pod" |xargs rm -fv +ls -l %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so chmod 755 %{buildroot}%{perl_vendorarch}/auto/Graphics/Magick/Magick.so # perlmagick: build files list