diff --git a/cairo-32/.footprint b/cairo-32/.footprint index b0940c5e..0067880f 100644 --- a/cairo-32/.footprint +++ b/cairo-32/.footprint @@ -1,16 +1,17 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/cairo/ +-rwxr-xr-x root/root usr/lib32/cairo/libcairo-fdr.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.11708.0 --rwxr-xr-x root/root usr/lib32/libcairo-gobject.so.2.11708.0 +lrwxrwxrwx root/root usr/lib32/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11800.0 +-rwxr-xr-x root/root usr/lib32/libcairo-gobject.so.2.11800.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.11708.0 --rwxr-xr-x root/root usr/lib32/libcairo-script-interpreter.so.2.11708.0 +lrwxrwxrwx root/root usr/lib32/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11800.0 +-rwxr-xr-x root/root usr/lib32/libcairo-script-interpreter.so.2.11800.0 lrwxrwxrwx root/root usr/lib32/libcairo.so -> libcairo.so.2 -lrwxrwxrwx root/root usr/lib32/libcairo.so.2 -> libcairo.so.2.11708.0 --rwxr-xr-x root/root usr/lib32/libcairo.so.2.11708.0 +lrwxrwxrwx root/root usr/lib32/libcairo.so.2 -> libcairo.so.2.11800.0 +-rwxr-xr-x root/root usr/lib32/libcairo.so.2.11800.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 @@ -21,6 +22,7 @@ drwxr-xr-x root/root usr/lib32/pkgconfig/ -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 -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xcb-shm.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xcb.pc -rw-r--r-- root/root usr/lib32/pkgconfig/cairo-xlib-xrender.pc diff --git a/cairo-32/.signature b/cairo-32/.signature index 988795d1..689bd666 100644 --- a/cairo-32/.signature +++ b/cairo-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXfFXKu6ktVIBeEhdvQw25zAj84o0vwFv6OpYmmTiwmIFDln2MrKJVLWZ7Ofx0lj1hVcLrfbwOw4Z5q4niGv9rg0= -SHA256 (Pkgfile) = 854213f8db9cb7264b4e69c212dce600a06f6e2e63646bf26259e181e1fac934 -SHA256 (.footprint) = 86878c6db55190377208d89d291449629163ee82a094b79786f6df85e692c888 -SHA256 (cairo-1.17.8.tar.bz2) = ead4724423eb969f98b456fe1e3ee1e1741fe1c8dfb1a41ca12afa81a6c1665f +RWSwxGo/zH7eXUKNPfx6qgsOqAAU91eTZT/FhQ5VhYFp7W1bRZFAQUOCoHkWpphtrzTwQdxhPWtcSZBNS52RIiHzLh2H3AFITw0= +SHA256 (Pkgfile) = d06397f40d50bacc7b982bd744571b0e5b5b14b9f79c573d12865a854c810170 +SHA256 (.footprint) = 2dad4f64d941072f964da50c2ee75400ee23d7e3ea929ef7d79b867f2137216c +SHA256 (cairo-1.18.0.tar.bz2) = abf8fba4d510086a492783c3e0828e90b32734738fd80906595617d229d02bab diff --git a/cairo-32/Pkgfile b/cairo-32/Pkgfile index c217ec5a..116fda01 100644 --- a/cairo-32/Pkgfile +++ b/cairo-32/Pkgfile @@ -4,7 +4,7 @@ # 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.8 +version=1.18.0 release=1 source=(https://gitlab.freedesktop.org/cairo/cairo/-/archive/$version/cairo-$version.tar.bz2) diff --git a/cairo-32/fix-cairo-sphinx.patch b/cairo-32/fix-cairo-sphinx.patch deleted file mode 100644 index 0cd274d9..00000000 --- a/cairo-32/fix-cairo-sphinx.patch +++ /dev/null @@ -1,12 +0,0 @@ -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, - )