pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 163068 from graphics

Browse Source 
- add ImageMagick-6.8.4.0-fix-wand.pc.patch to fix build of e.g.
  emacs and xine-lib, who rely on pkg-config --libs Wand returning
  actually MagickWand and not MagickCore (looks like a copy&paste
  error of upstream) (forwarded request 163063 from coolo)

OBS-URL: https://build.opensuse.org/request/show/163068
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=90
This commit is contained in:
Stephan Kulow 2013-04-07 12:29:18 +00:00 committed by Git OBS Bridge
commit 2fe9059195
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ImageMagick-6.8.4.0-fix-wand.pc.patch Normal file
View File

@ -0,0 +1,17 @@
Index: ImageMagick-6.8.4-0/wand/Wand.pc.in
===================================================================
--- ImageMagick-6.8.4-0.orig/wand/Wand.pc.in
+++ ImageMagick-6.8.4-0/wand/Wand.pc.in
@@ -2,10 +2,10 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
+libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
Name: MagickWand
-Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
+Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
Version: @PACKAGE_VERSION@
Requires: MagickCore
Libs: -L${libdir} -l${libname}

8
ImageMagick.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Apr 7 12:00:44 UTC 2013 - coolo@suse.com
- add ImageMagick-6.8.4.0-fix-wand.pc.patch to fix build of e.g.
emacs and xine-lib, who rely on pkg-config --libs Wand returning
actually MagickWand and not MagickCore (looks like a copy&paste
error of upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 29 09:37:28 UTC 2013 - pgajdos@suse.com Fri Mar 29 09:37:28 UTC 2013 - pgajdos@suse.com

33
ImageMagick.spec
View File

@ -68,6 +68,8 @@ Patch3: ImageMagick-6.8.4.0-rpath.patch
Patch10: ImageMagick-6.8.4.0-test-signatures.patch Patch10: ImageMagick-6.8.4.0-test-signatures.patch
# will ask upstream if needed, or if other solution exists # will ask upstream if needed, or if other solution exists
Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch
# PATCH-FIX-UPSTREAM ImageMagick-6.8.4.0-fix-wand.pc.patch fix e.g. emacs build, pkg-config --libs Wand returns wrong lib
Patch12: ImageMagick-6.8.4.0-fix-wand.pc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick %package -n perl-PerlMagick
@ -131,6 +133,7 @@ BuildArch: noarch
%patch3 -p1 %patch3 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
@ -390,34 +393,4 @@ support multiple generations of an image in memory at one time.
HTML documentation for ImageMagick library and scene examples. HTML documentation for ImageMagick library and scene examples.
%changelog %changelog