Skip to content

Commit cfd18e8

Browse files
committed
do not build with ghostscript
1 parent e11a910 commit cfd18e8

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
#!/bin/bash -e
22
# Drop LibRaw support which is not compatible with the current version of ImageMagick
33
sed -i '/BuildRequires.*LibRaw/d; /--with-raw/d' ImageMagick.spec.in
4-
5-
sed -i '/AutoReq: no/a Requires: config(ImageMagick-libs) = 7.1.0-16 libICE.so.6()(64bit) libIex-3_1.so.30()(64bit) libIlmThread-3_1.so.30()(64bit) libImath-3_1.so.29()(64bit) libOpenEXR-3_1.so.30()(64bit) libOpenEXRCore-3_1.so.30()(64bit) libOpenEXRUtil-3_1.so.30()(64bit) libSM.so.6()(64bit) libX11.so.6()(64bit) libXext.so.6()(64bit) libXt.so.6()(64bit) libbz2.so.1()(64bit) libc.so.6()(64bit) libc.so.6(GLIBC_2.11)(64bit) libc.so.6(GLIBC_2.14)(64bit) libc.so.6(GLIBC_2.17)(64bit) libc.so.6(GLIBC_2.2.5)(64bit) libc.so.6(GLIBC_2.3)(64bit) libc.so.6(GLIBC_2.3.4)(64bit) libc.so.6(GLIBC_2.33)(64bit) libc.so.6(GLIBC_2.34)(64bit) libc.so.6(GLIBC_2.4)(64bit) libc.so.6(GLIBC_2.6)(64bit) libc.so.6(GLIBC_2.7)(64bit) libcairo.so.2()(64bit) libfontconfig.so.1()(64bit) libfreetype.so.6()(64bit) libgcc_s.so.1()(64bit) libgcc_s.so.1(GCC_3.3.1)(64bit) libgdk_pixbuf-2.0.so.0()(64bit) libgio-2.0.so.0()(64bit) libglib-2.0.so.0()(64bit) libgobject-2.0.so.0()(64bit) libgomp.so.1()(64bit) libgomp.so.1(GOMP_1.0)(64bit) libgomp.so.1(GOMP_4.0)(64bit) libgomp.so.1(GOMP_4.5)(64bit) libgomp.so.1(OMP_1.0)(64bit) libgomp.so.1(OMP_3.0)(64bit) libharfbuzz.so.0()(64bit) libjbig.so.2.1()(64bit) libjpeg.so.62()(64bit) libjpeg.so.62(LIBJPEG_6.2)(64bit) liblcms2.so.2()(64bit) libltdl.so.7()(64bit) liblzma.so.5()(64bit) liblzma.so.5(XZ_5.0)(64bit) libm.so.6()(64bit) libm.so.6(GLIBC_2.2.5)(64bit) libm.so.6(GLIBC_2.29)(64bit) libopenjp2.so.7()(64bit) libpango-1.0.so.0()(64bit) libpangocairo-1.0.so.0()(64bit) libpng16.so.16()(64bit) libpng16.so.16(PNG16_0)(64bit) libraqm.so.0()(64bit) librsvg-2.so.2()(64bit) libtiff.so.5()(64bit) libtiff.so.5(LIBTIFF_4.0)(64bit) libwebp.so.7()(64bit) libwebpdemux.so.2()(64bit) libwebpmux.so.3()(64bit) libwmflite-0.2.so.7()(64bit) libxml2.so.2()(64bit) libxml2.so.2(LIBXML2_2.4.30)(64bit) libxml2.so.2(LIBXML2_2.6.0)(64bit) libz.so.1()(64bit) rtld(GNU_HASH)' ImageMagick.spec.in

rpms/entrypoint.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ TARGET_ARCH=$2
2222
echo "Preparing to build Imagemagick $IMAGEMAGICK_VERSION for $TARGET_ARCH..."
2323

2424
git clone --depth 1 -b "$IMAGEMAGICK_VERSION" https://github.com/ImageMagick/ImageMagick.git
25-
26-
# Generate updated .src.rpm
2725
cd ImageMagick
2826

2927
# Drop LQR support
3028
sed -i '/BuildRequires.*lqr/d; /--with-lqr/d' ImageMagick.spec.in
31-
sed -i '/%package lib/a AutoReq: no' ImageMagick.spec.in
29+
30+
# Drop Raqm support
31+
sed -i '/BuildRequires.*raqm/d; s/--with-raqm/--without-raqm/' ImageMagick.spec.in
32+
33+
# Drop ghostscript support
34+
sed -i '/BuildRequires.*ghostscript-devel/d; s/--with-gslib/--without-gslib/' ImageMagick.spec.in
3235

3336
AFTER_CHECKOUT_HOOK_SCRIPT="../after-checkout-${BASE_IMAGE//:/}-$IMAGEMAGICK_VERSION.sh"
3437
if [ -x "$AFTER_CHECKOUT_HOOK_SCRIPT" ]; then
@@ -47,13 +50,8 @@ rpmbuild --rebuild --nocheck --target "$TARGET_ARCH" "ImageMagick-$IMAGEMAGICK_V
4750
echo "Imagemagick $IMAGEMAGICK_VERSION for $TARGET_ARCH built successfully."
4851
ls -lR /root/rpmbuild/RPMS
4952

50-
if [ "$TARGET_ARCH" = "aarch64" ]; then
51-
echo "Tests for this architecture are not available yet"
52-
exit 0
53-
fi
54-
5553
echo "Testing package expected dependencies"
56-
rpm -qp --requires /root/rpmbuild/RPMS/${TARGET_ARCH}/ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm | grep -qEv 'libcdt|libcgraph|libgvc|libgs|libMagickCore|libMagickWand'
54+
rpm -qp --requires /root/rpmbuild/RPMS/${TARGET_ARCH}/ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm | grep -qEv 'libgs'
5755

5856
echo "Installing packages"
5957
yum install -y /root/rpmbuild/RPMS/${TARGET_ARCH}/ImageMagick-libs-$IMAGEMAGICK_VERSION.$TARGET_ARCH.rpm

0 commit comments

Comments
 (0)