Update to cairo-1.16.0.
This commit is contained in:
parent
1e742f9206
commit
68a444c85e
|
@ -1,73 +1,7 @@
|
||||||
diff -Paur --no-dereference -- libcairo.upstream/build/config.sub libcairo/build/config.sub
|
|
||||||
--- libcairo.upstream/build/config.sub
|
|
||||||
+++ libcairo/build/config.sub
|
|
||||||
@@ -1348,7 +1348,7 @@
|
|
||||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
|
||||||
| -sym* | -kopensolaris* \
|
|
||||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
||||||
- | -aos* | -aros* \
|
|
||||||
+ | -aos* | -aros* | -sortix* \
|
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
||||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
|
||||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
|
||||||
diff -Paur --no-dereference -- libcairo.upstream/build/configure.ac.warnings libcairo/build/configure.ac.warnings
|
|
||||||
--- libcairo.upstream/build/configure.ac.warnings
|
|
||||||
+++ libcairo/build/configure.ac.warnings
|
|
||||||
@@ -36,16 +36,6 @@
|
|
||||||
dnl We also abuse the warning-flag facility to enable other compiler
|
|
||||||
dnl options. Namely, the following:
|
|
||||||
|
|
||||||
-dnl -flto working really needs a test link, not just a compile
|
|
||||||
-
|
|
||||||
-safe_MAYBE_WARN="$MAYBE_WARN"
|
|
||||||
-MAYBE_WARN="$MAYBE_WARN -flto"
|
|
||||||
-AC_TRY_LINK([],[
|
|
||||||
- int main(int argc, char **argv) { return 0; }
|
|
||||||
-],[],[
|
|
||||||
- MAYBE_WARN="$safe_MAYBE_WARN"
|
|
||||||
-])
|
|
||||||
-
|
|
||||||
MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
|
|
||||||
|
|
||||||
dnl Also to turn various gcc/glibc-specific preprocessor checks
|
|
||||||
diff -Paur --no-dereference -- libcairo.upstream/configure libcairo/configure
|
diff -Paur --no-dereference -- libcairo.upstream/configure libcairo/configure
|
||||||
--- libcairo.upstream/configure
|
--- libcairo.upstream/configure
|
||||||
+++ libcairo/configure
|
+++ libcairo/configure
|
||||||
@@ -18159,33 +18159,6 @@
|
@@ -33026,7 +33026,7 @@
|
||||||
MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
|
|
||||||
-erroff=E_ENUM_TYPE_MISMATCH_OP"
|
|
||||||
|
|
||||||
-
|
|
||||||
-
|
|
||||||
-safe_MAYBE_WARN="$MAYBE_WARN"
|
|
||||||
-MAYBE_WARN="$MAYBE_WARN -flto"
|
|
||||||
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
-/* end confdefs.h. */
|
|
||||||
-
|
|
||||||
-int
|
|
||||||
-main ()
|
|
||||||
-{
|
|
||||||
-
|
|
||||||
- int main(int argc, char **argv) { return 0; }
|
|
||||||
-
|
|
||||||
- ;
|
|
||||||
- return 0;
|
|
||||||
-}
|
|
||||||
-_ACEOF
|
|
||||||
-if ac_fn_c_try_link "$LINENO"; then :
|
|
||||||
-
|
|
||||||
-else
|
|
||||||
-
|
|
||||||
- MAYBE_WARN="$safe_MAYBE_WARN"
|
|
||||||
-
|
|
||||||
-fi
|
|
||||||
-rm -f core conftest.err conftest.$ac_objext \
|
|
||||||
- conftest$ac_exeext conftest.$ac_ext
|
|
||||||
-
|
|
||||||
MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
|
|
||||||
|
|
||||||
MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
|
|
||||||
@@ -31800,7 +31773,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,15 +10,3 @@ diff -Paur --no-dereference -- libcairo.upstream/configure libcairo/configure
|
||||||
|
|
||||||
$as_echo "#define HAS_PIXMAN_GLYPHS 1" >>confdefs.h
|
$as_echo "#define HAS_PIXMAN_GLYPHS 1" >>confdefs.h
|
||||||
|
|
||||||
diff -Paur --no-dereference -- libcairo.upstream/configure.ac libcairo/configure.ac
|
|
||||||
--- libcairo.upstream/configure.ac
|
|
||||||
+++ libcairo/configure.ac
|
|
||||||
@@ -662,7 +662,7 @@
|
|
||||||
image_LIBS=$pixman_LIBS
|
|
||||||
])
|
|
||||||
|
|
||||||
-if pkg-config --exists 'pixman-1 >= 0.27.1'; then
|
|
||||||
+if ${PKG_CONFIG:-pkg-config} --exists 'pixman-1 >= 0.27.1'; then
|
|
||||||
AC_DEFINE([HAS_PIXMAN_GLYPHS], 1, [Enable pixman glyph cache])
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
NAME=libcairo
|
NAME=libcairo
|
||||||
BUILD_LIBRARIES='libz libbz2 libpng libfreetype libfontconfig? librsvg? libexpat? libpixman libglib?'
|
BUILD_LIBRARIES='libz libbz2 libpng libfreetype libfontconfig? librsvg? libexpat? libpixman libglib?'
|
||||||
VERSION=1.12.14
|
VERSION=1.16.0
|
||||||
DISTNAME=cairo-$VERSION
|
DISTNAME=cairo-$VERSION
|
||||||
COMPRESSION=tar.xz
|
COMPRESSION=tar.xz
|
||||||
ARCHIVE=$DISTNAME.$COMPRESSION
|
ARCHIVE=$DISTNAME.$COMPRESSION
|
||||||
SHA256SUM=96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13
|
SHA256SUM=5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
|
||||||
UPSTREAM_SITE=https://www.cairographics.org/releases
|
UPSTREAM_SITE=https://www.cairographics.org/releases
|
||||||
UPSTREAM_ARCHIVE=$ARCHIVE
|
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||||
|
LICENSE='LGPL-2.1-only OR MPL-1.1'
|
||||||
BUILD_SYSTEM=configure
|
BUILD_SYSTEM=configure
|
||||||
CONFIGURE_ARGS='--without-x --disable-valgrind --disable-xlib --enable-xlib=no --enable-xcb=no --enable-xlib-xcb=no --enable-xcb-shm=no --enable-glx=no'
|
CONFIGURE_ARGS='--without-x --disable-valgrind --disable-xlib --enable-xlib=no --enable-xcb=no --enable-xlib-xcb=no --enable-xcb-shm=no --enable-glx=no'
|
||||||
MAKE_VARS='V=1'
|
MAKE_VARS='V=1'
|
||||||
|
|
|
@ -1,45 +1,3 @@
|
||||||
rm -rf -- 'boilerplate/cairo-boilerplate-constructors.c'
|
rm -rf -- 'boilerplate/cairo-boilerplate-constructors.c'
|
||||||
rm -rf -- 'doc/public/xml/'
|
rm -rf -- 'doc/public/xml'
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.0.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.10.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.12.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.2.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.4.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.6.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-1.8.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-TBD.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-deprecated.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/api-index-full.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-device.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-font-face.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-font-options.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-ft.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-image.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-matrix.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-paths.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-pattern.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-pdf.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-png.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-ps.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-quartz-fonts.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-quartz.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-raster-source.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-recording.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-region.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-scaled-font.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-script.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-status.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-surface.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-svg.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-text.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-transforms.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-types.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-user-fonts.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-version.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-win32-fonts.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-win32.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-xcb.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-xlib-xrender.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo-xlib.xml'
|
|
||||||
rm -rf -- 'doc/public/xml/cairo.xml'
|
|
||||||
rm -rf -- 'test/cairo-test-constructors.c'
|
rm -rf -- 'test/cairo-test-constructors.c'
|
||||||
|
|
Loading…
Reference in New Issue