Attachment 9340 Details for Bug 19078 – Patch to the cauldron mgarepo checkout to update to latest IM-6.x release

[patch] Patch to the cauldron mgarepo checkout to update to latest IM-6.x release

svn1.diff (text/plain), 1.81 KB, created by Shlomi Fish on 2017-05-26 21:03:30 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Shlomi Fish

Created: 2017-05-26 21:03:30 CEST

Size: 1.81 KB

patch

obsolete

>Index: SOURCES/sha1.lst
>===================================================================
>--- SOURCES/sha1.lst	(revision 1104920)
>+++ SOURCES/sha1.lst	(working copy)
>@@ -1,4 +1,4 @@
>-8d3b15ef80a5611688d56f94830fd7bd382c66d7  ImageMagick-6.9.5-10.tar.xz
>+e5bc9fc3f8aab26b4037c01e234e3167957f6671  ImageMagick-6.9.8-6.tar.xz
> b0d9dc4ec2e7a1c406cdbfb23db489648765996d  ImageMagick.pdf.bz2
> f900180b450d12a3bf855bad264ea6c48e7fbd0d  magick-icon_16x16.png
> d0d0e9271d8a99621d50688d2fe57e17b88600a5  magick-icon_32x32.png
>Index: SPECS/imagemagick.spec
>===================================================================
>--- SPECS/imagemagick.spec	(revision 1104920)
>+++ SPECS/imagemagick.spec	(working copy)
>@@ -12,10 +12,10 @@
> # V E R S I O N   P A R T S
> 
> # their "official" version
>-%define rversion 6.9.5
>+%define rversion 6.9.8
> 
> # their "minor" version
>-%define minor_rev 10
>+%define minor_rev 6
> 
> # some other funny version
> # (aw) from the docs: Versions with Q8 in the name are 8 bits-per-pixel
>@@ -28,8 +28,8 @@
> # the full file version
> %define dversion %{rversion}-%{minor_rev}
> 
>-%define major 2
>-%define cppmajor 6
>+%define major 4
>+%define cppmajor 7
> 
> %define libname %mklibname magick-6 %{qlev} %{major}
> %define libcpp %mklibname magick++-6 %{qlev} %{cppmajor}
>@@ -264,11 +264,12 @@
> %multiarch_includes %{buildroot}%{_includedir}/ImageMagick-6/magick/magick-baseconfig.h
> 
> # fix invalid rights
>-chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so \
>+chmod 755 \
>         %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Q16/Q16.so
>+        # %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so
> 
> # nuke rpath
>-chrpath -d %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so
>+# chrpath -d %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so
> 
> # icons
> install -m 755 -d %{buildroot}%{_liconsdir} \

Index: SOURCES/sha1.lst
===================================================================
--- SOURCES/sha1.lst	(revision 1104920)
+++ SOURCES/sha1.lst	(working copy)
@@ -1,4 +1,4 @@
-8d3b15ef80a5611688d56f94830fd7bd382c66d7  ImageMagick-6.9.5-10.tar.xz
+e5bc9fc3f8aab26b4037c01e234e3167957f6671  ImageMagick-6.9.8-6.tar.xz
 b0d9dc4ec2e7a1c406cdbfb23db489648765996d  ImageMagick.pdf.bz2
 f900180b450d12a3bf855bad264ea6c48e7fbd0d  magick-icon_16x16.png
 d0d0e9271d8a99621d50688d2fe57e17b88600a5  magick-icon_32x32.png
Index: SPECS/imagemagick.spec
===================================================================
--- SPECS/imagemagick.spec	(revision 1104920)
+++ SPECS/imagemagick.spec	(working copy)
@@ -12,10 +12,10 @@
 # V E R S I O N   P A R T S
 
 # their "official" version
-%define rversion 6.9.5
+%define rversion 6.9.8
 
 # their "minor" version
-%define minor_rev 10
+%define minor_rev 6
 
 # some other funny version
 # (aw) from the docs: Versions with Q8 in the name are 8 bits-per-pixel
@@ -28,8 +28,8 @@
 # the full file version
 %define dversion %{rversion}-%{minor_rev}
 
-%define major 2
-%define cppmajor 6
+%define major 4
+%define cppmajor 7
 
 %define libname %mklibname magick-6 %{qlev} %{major}
 %define libcpp %mklibname magick++-6 %{qlev} %{cppmajor}
@@ -264,11 +264,12 @@
 %multiarch_includes %{buildroot}%{_includedir}/ImageMagick-6/magick/magick-baseconfig.h
 
 # fix invalid rights
-chmod 755 %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so \
+chmod 755 \
         %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Q16/Q16.so
+        # %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so
 
 # nuke rpath
-chrpath -d %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so
+# chrpath -d %{buildroot}%{perl_vendorarch}/auto/Image/Magick/Magick.so
 
 # icons
 install -m 755 -d %{buildroot}%{_liconsdir} \

Actions: View | Diff

Attachments on bug 19078: 9340 | 10115 | 10116