From 1af04c0ed64b4bbe9956e7d94eeb1aec876708cf Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 19 Jun 2017 15:26:27 +0200 Subject: [PATCH] cairo: Update from 1.4.8 to 1.4.10 This required rebuilding cairo-using packages due to a shared library name change (libcairo.so.2 -> libcairo.so). --- packages/gegl/build.sh | 1 + packages/gnuplot/build.sh | 1 + packages/graphviz/build.sh | 1 + packages/harfbuzz/build.sh | 1 + packages/imagemagick/build.sh | 11 +++++++++-- packages/libcairo/build.sh | 4 ++-- packages/librsvg/build.sh | 4 ++-- packages/pango/build.sh | 4 ++-- packages/poppler/build.sh | 1 + packages/texlive/build.sh | 1 + packages/zbar/build.sh | 2 +- 11 files changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/gegl/build.sh b/packages/gegl/build.sh index 2b08d4bf6..ef8c532de 100644 --- a/packages/gegl/build.sh +++ b/packages/gegl/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://gegl.org/ TERMUX_PKG_DESCRIPTION="Data flow based image processing framework" local _MAJOR_VERSION=0.3 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.18 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.gimp.org/pub/gegl/$_MAJOR_VERSION/gegl-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_FOLDERNAME=gegl-$TERMUX_PKG_VERSION TERMUX_PKG_SHA256=d7858ef26ede136d14e3de188a9e9c0de7707061a9fb96d7d615fab4958491fb diff --git a/packages/gnuplot/build.sh b/packages/gnuplot/build.sh index 751b117f3..e64ae5b86 100644 --- a/packages/gnuplot/build.sh +++ b/packages/gnuplot/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://gnuplot.info/ TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility" TERMUX_PKG_VERSION=5.0.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no --with-bitmap-terminals" diff --git a/packages/graphviz/build.sh b/packages/graphviz/build.sh index 8d84c6796..f8ae42b9e 100644 --- a/packages/graphviz/build.sh +++ b/packages/graphviz/build.sh @@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.graphviz.org/ TERMUX_PKG_DESCRIPTION="Rich set of graph drawing tools" TERMUX_PKG_MAINTAINER="Dustin DeWeese @HackerFoo" TERMUX_PKG_VERSION=2.40.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=ca5218fade0204d59947126c38439f432853543b0818d9d728c589dfe7f3a421 TERMUX_PKG_DEPENDS="libandroid-glob,libcairo,pango,libexpat,libltdl,librsvg,libgd" diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh index 0cc980677..a41254864 100644 --- a/packages/harfbuzz/build.sh +++ b/packages/harfbuzz/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz/ TERMUX_PKG_DESCRIPTION="OpenType text shaping engine" TERMUX_PKG_VERSION=1.4.6 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293 TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="freetype,glib,libbz2,libpng,libgraphite" diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh index 76a3ab03f..a06677915 100644 --- a/packages/imagemagick/build.sh +++ b/packages/imagemagick/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://www.imagemagick.org/ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats" -TERMUX_PKG_VERSION="7.0.5-6" +TERMUX_PKG_VERSION="7.0.6-0" TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=f60c3e3466ccbf9a0e643284ffec3467363edf9611f16a98387f927a974b49ab +TERMUX_PKG_SHA256=31587e2aa4d46301461329fd88d4ed6fccb0bd4ae786d629a153df72dbac89ee TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-largefile --without-x @@ -16,3 +16,10 @@ ac_cv_func_ftime=no ac_cv_header_complex_h=no" TERMUX_PKG_RM_AFTER_INSTALL="bin/Magick-config bin/MagickCore-config bin/MagickWand-config bin/Wand-config share/ImageMagick-6/francais.xml share/man/man1/Magick-config.1 share/man/man1/MagickCore-config.1 share/man/man1/MagickWand-config.1 share/man/man1/Wand-config.1" TERMUX_PKG_DEPENDS="fftw, pango, glib, libbz2, libjpeg-turbo, liblzma, libpng, libtiff, libxml2, openjpeg, littlecms" + +termux_step_pre_configure() { + if [ $TERMUX_ARCH = "i686" ]; then + # Avoid "libMagickCore-7.Q16HDRI.so: error: undefined reference to '__atomic_load'": + LDFLAGS+=" -latomic" + fi +} diff --git a/packages/libcairo/build.sh b/packages/libcairo/build.sh index 9fb8579a6..e8ab0f65d 100644 --- a/packages/libcairo/build.sh +++ b/packages/libcairo/build.sh @@ -1,8 +1,8 @@ TERMUX_PKG_HOMEPAGE=https://cairographics.org TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library" -TERMUX_PKG_VERSION=1.14.8 +TERMUX_PKG_VERSION=1.14.10 TERMUX_PKG_SRCURL=https://cairographics.org/releases/cairo-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20 +TERMUX_PKG_SHA256=7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09 TERMUX_PKG_DEPENDS="libandroid-support, libpixman, fontconfig, freetype" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gtk-doc-html --enable-xlib=no" TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc/html" diff --git a/packages/librsvg/build.sh b/packages/librsvg/build.sh index 7e3484bf5..81c0018d6 100644 --- a/packages/librsvg/build.sh +++ b/packages/librsvg/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo" -TERMUX_PKG_VERSION=2.40.16 +TERMUX_PKG_VERSION=2.40.17 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e +TERMUX_PKG_SHA256=e6f6c5cbecc405bb945c7cd15061276035ae3173bbb3bb25e8a916779c7f69cc TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection --disable-pixbuf-loader" diff --git a/packages/pango/build.sh b/packages/pango/build.sh index b65b131d3..1b57363e3 100644 --- a/packages/pango/build.sh +++ b/packages/pango/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.pango.org/ TERMUX_PKG_DESCRIPTION="Library for laying out and rendering text" _MAJOR_VERSION=1.40 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.5 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.6 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/pango/${_MAJOR_VERSION}/pango-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9 +TERMUX_PKG_SHA256=ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573 TERMUX_PKG_DEPENDS="fontconfig,glib,harfbuzz,libcairo" diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh index 4518998a4..03a5176bc 100644 --- a/packages/poppler/build.sh +++ b/packages/poppler/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/ TERMUX_PKG_DESCRIPTION="PDF rendering library" TERMUX_PKG_VERSION=0.55.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=537f2bc60d796525705ad9ca8e46899dcc99c2e9480b80051808bae265cdc658 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz # libcairo and littlecms is used by pdftocairo: diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh index 27aa12970..68fd22faa 100644 --- a/packages/texlive/build.sh +++ b/packages/texlive/build.sh @@ -4,6 +4,7 @@ TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" _MAJOR_VERSION=20170524 _MINOR_VERSION= TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz TERMUX_PKG_SHA256="0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa" TERMUX_PKG_DEPENDS="freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz-icu, perl, xz-utils, wget, gnupg" diff --git a/packages/zbar/build.sh b/packages/zbar/build.sh index 182fa65f2..7ebd80f46 100644 --- a/packages/zbar/build.sh +++ b/packages/zbar/build.sh @@ -1,7 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://zbar.sourceforge.net TERMUX_PKG_DESCRIPTION="Software suite for reading bar codes from various sources" TERMUX_PKG_VERSION=0.10 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_REVISION=5 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6 TERMUX_PKG_DEPENDS="imagemagick"