Patchwork [meta-oe,1/2] imagemagick: update to upstream version 6.8.5-9

login
register
mail settings
Submitter Marko Lindqvist
Date June 6, 2013, 7:07 a.m.
Message ID <1370502445-22258-1-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/51209/
State Superseded, archived
Headers show

Comments

Marko Lindqvist - June 6, 2013, 7:07 a.m.
LICENSE: 2013 added to (c) years

PerlMagic_MakePatch.patch now part of upstream

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch |   11 -----------
 .../remove.dist-lzip.patch                                  |    0
 .../{imagemagick_6.7.5.bb => imagemagick_6.8.5.bb}          |   11 ++++-------
 3 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
 rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.5}/remove.dist-lzip.patch (100%)
 rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.5.bb} (83%)
Martin Jansa - June 11, 2013, 4:05 p.m.
On Thu, Jun 06, 2013 at 10:07:24AM +0300, Marko Lindqvist wrote:
> LICENSE: 2013 added to (c) years
> 
> PerlMagic_MakePatch.patch now part of upstream
> 
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
>  .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch |   11 -----------
>  .../remove.dist-lzip.patch                                  |    0
>  .../{imagemagick_6.7.5.bb => imagemagick_6.8.5.bb}          |   11 ++++-------
>  3 files changed, 4 insertions(+), 18 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
>  rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.5}/remove.dist-lzip.patch (100%)
>  rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.5.bb} (83%)

Creates new QA issues which need to be fixed before merge:

imagemagick-6.8.5: imagemagick: Files/directories were installed but not shipped
  /usr/lib/ImageMagick-6.8.5
  /usr/lib/ImageMagick-6.8.5/config-Q16
  /usr/lib/ImageMagick-6.8.5/config-Q16/configure.xml
  /usr/share/ImageMagick-6
  /usr/share/ImageMagick-6/locale.xml
  /usr/share/ImageMagick-6/francais.xml
  /usr/share/ImageMagick-6/english.xml

> 
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
> deleted file mode 100644
> index f8ad0af..0000000
> --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- /tmp/Makefile.PL.in	2008-10-01 10:39:38.000000000 +0200
> -+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in	2008-10-01 10:40:25.000000000 +0200
> -@@ -87,6 +87,8 @@
> - 
> -    # Use same compiler as ImageMagick
> -    'PERLMAINCC'	=> '@PERLMAINCC@ @OPENMP_CFLAGS@',
> -+   'AR' => '@AR@',
> -+   'LD' => '@PERLMAINCC@',
> - 
> -    # Set Perl installation prefix to ImageMagick installation prefix
> - #   'PREFIX'	=> '@prefix@',
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.5/remove.dist-lzip.patch
> similarity index 100%
> rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
> rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.5/remove.dist-lzip.patch
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.5.bb
> similarity index 83%
> rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
> rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.5.bb
> index 2f0fad5..6cb3b4a 100644
> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.5.bb
> @@ -1,19 +1,16 @@
>  DESCRIPTION = "ImageMagick is an image convertion tools"
>  SECTION = "console/utils"
>  LICENSE = "ImageMagick"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f"
>  # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
>  DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw"
>  
> -PR = "r5"
> -
> -PATCHSET = "6"
> +PATCHSET = "9"
>  SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
> -           file://PerlMagic_MakePatch.patch \
>             file://remove.dist-lzip.patch \
>  "
> -SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a"
> -SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
> +SRC_URI[md5sum] = "27b3b24a1a86aedade11820f108289e5"
> +SRC_URI[sha256sum] = "b88ac6551619837fc226c4c878ddc1f0adb106644cefbc88bb02abd55706b3fc"
>  
>  S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
>  
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
deleted file mode 100644
index f8ad0af..0000000
--- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
+++ /dev/null
@@ -1,11 +0,0 @@ 
---- /tmp/Makefile.PL.in	2008-10-01 10:39:38.000000000 +0200
-+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in	2008-10-01 10:40:25.000000000 +0200
-@@ -87,6 +87,8 @@
- 
-    # Use same compiler as ImageMagick
-    'PERLMAINCC'	=> '@PERLMAINCC@ @OPENMP_CFLAGS@',
-+   'AR' => '@AR@',
-+   'LD' => '@PERLMAINCC@',
- 
-    # Set Perl installation prefix to ImageMagick installation prefix
- #   'PREFIX'	=> '@prefix@',
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.5/remove.dist-lzip.patch
similarity index 100%
rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.5/remove.dist-lzip.patch
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.5.bb
similarity index 83%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.5.bb
index 2f0fad5..6cb3b4a 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.5.bb
@@ -1,19 +1,16 @@ 
 DESCRIPTION = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f"
 # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw"
 
-PR = "r5"
-
-PATCHSET = "6"
+PATCHSET = "9"
 SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
-           file://PerlMagic_MakePatch.patch \
            file://remove.dist-lzip.patch \
 "
-SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a"
-SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
+SRC_URI[md5sum] = "27b3b24a1a86aedade11820f108289e5"
+SRC_URI[sha256sum] = "b88ac6551619837fc226c4c878ddc1f0adb106644cefbc88bb02abd55706b3fc"
 
 S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"