commit fbd31040846a702b05ea2a218874a03e3778cef4 Author: Tim Biermann <tbier@posteo.de> Date: Sun Mar 27 18:02:44 2022 +0200 cairo-32: 1.17.4 -> 1.17.6 diff --git a/cairo-32/.footprint b/cairo-32/.footprint index 88c9745..8fe2352 100644 --- a/cairo-32/.footprint +++ b/cairo-32/.footprint @@ -5,14 +5,14 @@ drwxr-xr-x root/root usr/lib32/cairo/ -rwxr-xr-x root/root usr/lib32/cairo/libcairo-sphinx.so -rwxr-xr-x root/root usr/lib32/cairo/libcairo-trace.so lrwxrwxrwx root/root usr/lib32/libcairo-gobject.so -> libcairo-gobject.so.2 -lrwxrwxrwx root/root usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11704.0 --rwxr-xr-x root/root usr/lib32/libcairo-gobject.so.2.11704.0 +lrwxrwxrwx root/root usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11706.0 +-rwxr-xr-x root/root usr/lib32/libcairo-gobject.so.2.11706.0 lrwxrwxrwx root/root usr/lib32/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2 -lrwxrwxrwx root/root usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11704.0 --rwxr-xr-x root/root usr/lib32/libcairo-script-interpreter.so.2.11704.0 +lrwxrwxrwx root/root usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11706.0 +-rwxr-xr-x root/root usr/lib32/libcairo-script-interpreter.so.2.11706.0 lrwxrwxrwx root/root usr/lib32/libcairo.so -> libcairo.so.2 -lrwxrwxrwx root/root usr/lib32/libcairo.so.2 -> libcairo.so.2.11704.0 --rwxr-xr-x root/root usr/lib32/libcairo.so.2.11704.0 +lrwxrwxrwx root/root usr/lib32/libcairo.so.2 -> libcairo.so.2.11706.0 +-rwxr-xr-x root/root usr/lib32/libcairo.so.2.11706.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-fc.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-ft.pc @@ -20,6 +20,7 @@ drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-pdf.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-png.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-ps.pc +-rw-r--r-- root/root usr/lib32/pkgconfig/cairo-script-interpreter.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-script.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-svg.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-tee.pc @@ -27,5 +28,4 @@ drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xcb.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xlib-xrender.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xlib.pc --rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xml.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo.pc diff --git a/cairo-32/.signature b/cairo-32/.signature index ac8d3b7..d84a67e 100644 --- a/cairo-32/.signature +++ b/cairo-32/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXf9QLUtPIc2hnYv+NI3w+JU3MLGyyUdMe+l5cx/rlwVf0Odgj+uhPZ0oStda36DeKM7ce6xciY6I3rpKJU7Lfwk= -SHA256 (Pkgfile) = 752ca883f3db5ab50f1abd7e7d7b5122bb2ee7b48e2053e247c47e1f1e0483cb -SHA256 (.footprint) = 0041541eafb98048ad71581b908628e22362bfb0dc1a18f4fb18ac9c0729cdfa -SHA256 (cairo-1.17.4.tar.xz) = 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 -SHA256 (xlib-xcb.diff) = 70cd3783381bf73ea7fccd5c2db43956b10865a9c54d5edd251dbcdb9b595a43 -SHA256 (fix-library-versioning.diff) = ba678534bbfb2ae8d2397b015f77d30719efee7bb7992dbd2c8e5f2fa5fd8efc +RWSwxGo/zH7eXQJNDF4eVM42QBPTo/d5yW4/QYaP7tQ+HyF6bH4hnYJZiT0srRpsS4zkYXGUOUtQ2sXI+CZf+qis//TIRs+zIAM= +SHA256 (Pkgfile) = 80db93988eee187b1219a814012a84bcaf43fef9806dcff265128ba32deed313 +SHA256 (.footprint) = 8eb5a581c18bc94e08f1a27059f3b4581d5c200ec363fb7180076783cca73130 +SHA256 (cairo-1.17.6.tar.bz2) = 90496d135c9ef7612c98f8ee358390cdec0825534573778a896ea021155599d2 +SHA256 (fix-cairo-sphinx.patch) = 775b9ef5d265e8f20860268dca6e520a411402a6c38cb6dc95fa405f119b5d54 diff --git a/cairo-32/Pkgfile b/cairo-32/Pkgfile index b5251b0..458e321 100644 --- a/cairo-32/Pkgfile +++ b/cairo-32/Pkgfile @@ -4,14 +4,13 @@ # Depends on: cairo fontconfig-32 glib-32 xorg-libpixman-32 xorg-libxext-32 xorg-libxrender-32 xorg-xcb-util-32 name=cairo-32 -version=1.17.4 +version=1.17.6 release=1 -source=(https://cairographics.org/snapshots/${name%-*}-$version.tar.xz - xlib-xcb.diff fix-library-versioning.diff) +source=(https://gitlab.freedesktop.org/cairo/cairo/-/archive/$version/cairo-$version... + fix-cairo-sphinx.patch) build() { - patch -p1 -d ${name%-*}-$version -i $SRC/fix-library-versioning.diff - patch -p1 -d ${name%-*}-$version -i $SRC/xlib-xcb.diff + patch -d cairo-$version -p1 -i $SRC/fix-cairo-sphinx.patch meson setup build ${name%-*}-$version \ --prefix=/usr \ diff --git a/cairo-32/fix-cairo-sphinx.patch b/cairo-32/fix-cairo-sphinx.patch new file mode 100644 index 0000000..0cd274d --- /dev/null +++ b/cairo-32/fix-cairo-sphinx.patch @@ -0,0 +1,12 @@ +diff -Nru cairo-1.17.6.orig/util/cairo-sphinx/meson.build cairo-1.17.6/util/cairo-sphinx/meson.build +--- cairo-1.17.6.orig/util/cairo-sphinx/meson.build 2022-03-21 12:22:22.986979702 +0100 ++++ cairo-1.17.6/util/cairo-sphinx/meson.build 2022-03-23 14:32:49.390005446 +0100 +@@ -19,7 +19,7 @@ + include_directories: [incbase], + c_args: ['-DLIBDIR="@0@"'.format(libdir)] + pthread_c_args, + dependencies: deps + [glib_dep, rt_dep, libcairo_dep, cairoboilerplate_dep, libcairoscript_dep], +- link_with: [libcairosphinx], ++ link_with: [libcairo, libcairosphinx], + link_args: extra_link_args, + install: true, + ) diff --git a/cairo-32/fix-library-versioning.diff b/cairo-32/fix-library-versioning.diff deleted file mode 100644 index c006f69..0000000 --- a/cairo-32/fix-library-versioning.diff +++ /dev/null @@ -1,94 +0,0 @@ -commit e9ccb1d8d095482e4139da658e679d5aad56b184 -Author: Tim-Philipp Müller <tim@centricular.com> -Date: Tue Dec 15 00:12:55 2020 +0000 - - meson: fix library versioning - - Fixes #442 - -diff --git a/meson.build b/meson.build -index b159b4071..53a9af343 100644 ---- a/meson.build -+++ b/meson.build -@@ -3,8 +3,6 @@ project('cairo', 'c', 'cpp', - version: run_command(find_program('version.py'), check: true).stdout().strip(), - ) - --cc = meson.get_compiler('c') -- - # Keep in sync with configure.ac! - freetype_required_version = '>= 9.7.3' - fontconfig_required_version = '>= 2.2.95' -@@ -16,6 +14,27 @@ libudev_required_version = '>= 136' - libdrm_required_version = '>= 2.4' - glib_required_version = '>= 2.14' - -+# library versioning -+version_arr = meson.project_version().split('.') -+cairo_version_major = version_arr[0].to_int() -+cairo_version_minor = version_arr[1].to_int() -+cairo_version_micro = version_arr[2].to_int() -+ -+# The libtool shared library version stuff. -+# Try and maintain compatibility with the previous library versioning. -+cairo_version_sonum = cairo_version_major + 1 -+cairo_version = cairo_version_major * 10000 + cairo_version_minor * 100 + cairo_version_micro -+ -+if cairo_version_minor % 2 == 1 -+ # unstable release -+ cairo_libversion = '@0@.@1@.0'.format(cairo_version_sonum, cairo_version) -+else -+ # stable release -+ cairo_libversion = '@0@.@1@.@2@'.format(cairo_version_sonum, cairo_version, cairo_version_micro) -+endif -+ -+cc = meson.get_compiler('c') -+ - if cc.get_id() == 'msvc' - # Basic usage in the cairo type system that causes spammy and useless warnings - add_project_arguments('/wd4244', '/wd4146', -diff --git a/src/meson.build b/src/meson.build -index 5bd1a57ee..f5d741eae 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -299,8 +299,8 @@ libcairo = library('cairo', cairo_sources, - c_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'], - cpp_args: cairo_no_warn_c_args + pthread_c_args + ['-DHAVE_CONFIG_H'], - link_args: extra_link_args, -- soversion: '2', -- version: '2.' + ''.join(meson.project_version().split('.')) + '.0', -+ soversion: cairo_version_sonum, -+ version: cairo_libversion, - install: true, - include_directories: incbase, - ) -diff --git a/util/cairo-gobject/meson.build b/util/cairo-gobject/meson.build -index 200fd8705..bf24242a0 100644 ---- a/util/cairo-gobject/meson.build -+++ b/util/cairo-gobject/meson.build -@@ -12,8 +12,8 @@ libcairogobject = library('cairo-gobject', cairo_gobject_sources, - include_directories: [incbase, incsrc], - dependencies: [glib_dep, gobject_dep], - link_with: [libcairo], -- soversion: '2', -- version: '2.' + ''.join(meson.project_version().split('.')) + '.0', -+ soversion: cairo_version_sonum, -+ version: cairo_libversion, - install: true, - ) - -diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build -index a782ec63f..8cedc6834 100644 ---- a/util/cairo-script/meson.build -+++ b/util/cairo-script/meson.build -@@ -30,8 +30,8 @@ libcairoscript = library('cairo-script-interpreter', - include_directories: [incbase, incsrc], - dependencies: deps, - link_with: [libcairo], -- soversion: '2', -- version: '2.' + ''.join(meson.project_version().split('.')) + '.0', -+ soversion: cairo_version_sonum, -+ version: cairo_libversion, - install: true, - ) - diff --git a/cairo-32/xlib-xcb.diff b/cairo-32/xlib-xcb.diff deleted file mode 100644 index bfc1816..0000000 --- a/cairo-32/xlib-xcb.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git i/meson.build w/meson.build -index b159b4071..2a1c68891 100644 ---- i/meson.build -+++ w/meson.build -@@ -313,7 +313,7 @@ endif - - if feature_conf.get('CAIRO_HAS_XCB_SURFACE', 0) == 1 and feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1 - # FIXME: automagic -- x11xcb_dep = dependency('x11-xcb', required: false) -+ x11xcb_dep = dependency('x11-xcb', required: get_option('xlib-xcb')) - if x11xcb_dep.found() - deps += [x11xcb_dep] - feature_conf.set('CAIRO_HAS_XLIB_XCB_FUNCTIONS', 1) -diff --git i/meson_options.txt w/meson_options.txt -index ff11fe7ed..d1ae959e1 100644 ---- i/meson_options.txt -+++ w/meson_options.txt -@@ -17,6 +17,7 @@ option('qt', type : 'feature', value : 'disabled') - option('tee', type : 'feature', value : 'disabled') - option('xcb', type : 'feature', value : 'auto') - option('xlib', type : 'feature', value : 'auto') -+option('xlib-xcb', type : 'feature', value : 'disabled') - #option('xml', type : 'feature', value : 'disabled') - option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml surfaces -