From 13d139b934a705dfef377699ae6b753d9aa4ddfb Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 24 Aug 2016 18:16:15 +0200 Subject: cairo: upgrade pixman to release 0.34.0, cairo to release 1.14.6 * from pixman-0.24.4.patch drop: - Android support config.sub: obsoleted by new upstream autoconf - configure Mac OS X 10.4 (unsupported) linker warning - configure getisax Solaris check: it's unclear why this would give a wrong result on Linux, it certainly does't on Fedora 24... - __inline__ workaround looks fixed upstream * drop pixman-0.24.4.android.patch: obsoleted by new upstream autoconf * from cairo-1.10.2.patch drop: - Makefile.win32.common: drop this for now, we don't build cairo on windows and paths in this patch are still dmake INPATH... - Android support config.sub: obsoleted by new upstream autoconf - configure "libpng15" should be obsolete since it's overridden by png_CFLAGS/png_LIBS anyway - configure Mac OS X 10.4 (unsupported) linker warning - cairo-output-stream.c: fixed upstream - cairo-ft-font.c: presumed obsolete, FcResultOutOfMemory added in 2004 * drop cairo.dlsym.lcdfilter.patch: FT_Library_SetLcdFilter since 2.3.0 so exists in RHEL 6 baseline (2.3.11) * drop cairo-1.10.2-oldfontconfig.patch: RHEL 6 baseline has fontconfig 2.8.0 so 2.2.95 isn't "too new" * drop cairo-1.10.2.wntmsc.patch: we don't build cairo on windows currently, and this doesn't apply * drop no-flto-clang.patch: fixed upstream * remove definition of COMPRESS var that appears to be completely unused Change-Id: I5d782b9267c348c266ef369db2f8ac2c3c70b90d Reviewed-on: https://gerrit.libreoffice.org/28365 Tested-by: Jenkins Reviewed-by: Michael Stahl --- download.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'download.lst') diff --git a/download.lst b/download.lst index 711984bdb56a..58bae02c789f 100644 --- a/download.lst +++ b/download.lst @@ -12,7 +12,7 @@ export BREAKPAD_TARBALL := breakpad.zip export BREAKPAD_MD5SUM := 415ce291aa6f2ee1d5db7b62bf62ade8 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz -export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz +export CAIRO_TARBALL := 23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz export CDR_MD5SUM := e369f30b5b861ee0fc4f9e6cbad701fe export CDR_TARBALL := libcdr-0.1.3.tar.bz2 export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz @@ -131,7 +131,7 @@ export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2 export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2 -export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 +export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9 export PNG_TARBALL := libpng-1.6.24.tar.gz export POPPLER_MD5SUM := 38c758d84437378ec4f5aae9f875301d -- cgit