From 7656d562190780a1ccb2087b794f5dae08aa7e50 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 14 Aug 2021 22:51:05 +0200 Subject: [PATCH 1/3] img2pdf: disable tests tests need ImageMagick6 --- srcpkgs/img2pdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template index 206bf3cbccc6..42eb463d4359 100644 --- a/srcpkgs/img2pdf/template +++ b/srcpkgs/img2pdf/template @@ -5,10 +5,10 @@ revision=1 build_style=python3-module hostmakedepends="python3-pikepdf python3-setuptools" depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter" -checkdepends="colord exiftool ghostscript ImageMagick6 mupdf-tools netpbm poppler python3-numpy python3-pdfrw python3-pytest python3-scipy" short_desc="Lossless conversion of raster images to PDF" maintainer="Philipp David " license="GPL-3.0-or-later" homepage="https://gitlab.mister-muffin.de/josch/img2pdf" distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz" checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552 +make_check=no # depends on ImageMagick6 From 7e8e75ae471388df5b77f678ee98da49569d3f03 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 14 Aug 2021 22:52:41 +0200 Subject: [PATCH 2/3] ImageMagick6: remove package --- srcpkgs/ImageMagick6/template | 86 ----------------------------------- srcpkgs/ImageMagick6/update | 1 - srcpkgs/libmagick6 | 1 - srcpkgs/libmagick6-devel | 1 - srcpkgs/libmagick6-perl | 1 - 5 files changed, 90 deletions(-) delete mode 100644 srcpkgs/ImageMagick6/template delete mode 100644 srcpkgs/ImageMagick6/update delete mode 120000 srcpkgs/libmagick6 delete mode 120000 srcpkgs/libmagick6-devel delete mode 120000 srcpkgs/libmagick6-perl diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template deleted file mode 100644 index 213d98a37659..000000000000 --- a/srcpkgs/ImageMagick6/template +++ /dev/null @@ -1,86 +0,0 @@ -# Template file for 'ImageMagick6' -pkgname=ImageMagick6 -version=6.9.12.12 -revision=2 -_majorver=${version%.*} -_patchver=${version##*.} -wrksrc="${pkgname}-${_majorver}-${_patchver}" -build_style=gnu-configure -configure_args="--without-autotrace --with-wmf=yes - --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes - --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1 - --with-magick-plus-plus --with-modules --enable-shared --with-rsvg - --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static" -hostmakedepends="automake libtool pkg-config" -makedepends="djvulibre-devel fftw-devel ghostscript-devel glib-devel lcms2-devel - libXt-devel libgomp-devel libltdl-devel librsvg-devel libwebp-devel - libwmf-devel ocl-icd-devel pango-devel" -short_desc="Package for display and interactive manipulation of images" -maintainer="Orphaned " -license="ImageMagick" -homepage="https://www.imagemagick.org/" -distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz" -checksum=2a5edb741828cacf42e07344a0aa7141dc657bf9dcfad6f6cd3e2774afeea47d - -keep_libtool_archives=yes -conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml" - -subpackages="libmagick6 libmagick6-devel" - -conflicts="ImageMagick>=0" - -if [ -z "$CROSS_BUILD" ]; then - # XXX native perl uses XBPS_TARGET_CFLAGS (-mtune=generic) - configure_args+=" --with-perl --with-perl-options=INSTALLDIRS=vendor" - hostmakedepends+=" perl" - subpackages+=" libmagick6-perl" -fi - -pre_configure() { - autoreconf -if -} - -do_check() { - # Disable failing checks - sed -i '/validate-formats/d' Makefile - - make check -} - -post_install() { - vlicense LICENSE - vlicense NOTICE -} - -libmagick6_package() { - short_desc="ImageMagick6 low-level image manipulation libraries" - pkg_install() { - vmove "usr/lib/libMagick*.so.*" - vmove "usr/lib/ImageMagick*" - vmove "usr/share/ImageMagick*" - } -} - -libmagick6-devel_package() { - depends="fftw-devel fontconfig-devel lcms2-devel libXt-devel - libgomp-devel libltdl-devel libmagick6>=${version}_${revision}" - short_desc="ImageMagick6 low-level image manipulation development files" - conflicts="libmagick-devel>=0" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/doc - vmove "usr/bin/*-config" - vmove "usr/lib/*.so" - vmove "usr/lib/*.la" - vmove "usr/share/man/man1/*-config.1" - } -} - -libmagick6-perl_package() { - short_desc="ImageMagick6 perl library bindings" - pkg_install() { - vmove usr/lib/perl5 - vmove usr/share/man/man3 - } -} diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update deleted file mode 100644 index 6a9f7e46a667..000000000000 --- a/srcpkgs/ImageMagick6/update +++ /dev/null @@ -1 +0,0 @@ -pattern='/archive/refs/tags/\K[\d\.]+-\d+(?=\.tar\.gz)' diff --git a/srcpkgs/libmagick6 b/srcpkgs/libmagick6 deleted file mode 120000 index 235c8fb44d97..000000000000 --- a/srcpkgs/libmagick6 +++ /dev/null @@ -1 +0,0 @@ -ImageMagick6 \ No newline at end of file diff --git a/srcpkgs/libmagick6-devel b/srcpkgs/libmagick6-devel deleted file mode 120000 index 235c8fb44d97..000000000000 --- a/srcpkgs/libmagick6-devel +++ /dev/null @@ -1 +0,0 @@ -ImageMagick6 \ No newline at end of file diff --git a/srcpkgs/libmagick6-perl b/srcpkgs/libmagick6-perl deleted file mode 120000 index 235c8fb44d97..000000000000 --- a/srcpkgs/libmagick6-perl +++ /dev/null @@ -1 +0,0 @@ -ImageMagick6 \ No newline at end of file From 34339b4c4cf370d3ae7dcd896196e5a725a4e734 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 14 Aug 2021 22:53:22 +0200 Subject: [PATCH 3/3] removed-packages: add ImageMagick6, bump revision --- srcpkgs/removed-packages/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3b1dbd467489..f462be45c5bc 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=48 +revision=49 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -180,6 +180,10 @@ replaces=" icecat-i18n-xh<=78.6.1_1 icecat-i18n-zh-CN<=78.6.1_1 icecat-i18n-zh-TW<=78.6.1_1 + ImageMagick6<=6.9.12.12_2 + libmagick6<=6.9.12.12_2 + libmagick6-devel<=6.9.12.12_2 + libmagick6-perl<=6.9.12.12_2 ioquake3-rpi<=20130506_2 isl16<=0.16_2 js<=1.8.5_11