From 8f498ec4123be177f24af9194fcb48f2c20e72f9 Mon Sep 17 00:00:00 2001 From: kenmays Date: Sun, 30 Nov 2025 22:49:01 -0800 Subject: [PATCH] cairo: bump to 1.18.4 (#12985) --- x11-libs/cairo/cairo-1.16.0.recipe | 115 -------------- ...1.18-1.18.0.recipe => cairo-1.18.4.recipe} | 22 +-- x11-libs/cairo/patches/cairo-1.16.0.patchset | 144 ------------------ ...-1.18.0.patchset => cairo-1.18.4.patchset} | 46 ++++-- x11-libs/cairo/xcairo-1.16.0.recipe | 128 ---------------- ....18-1.18.0.recipe => xcairo-1.18.4.recipe} | 24 +-- 6 files changed, 59 insertions(+), 420 deletions(-) delete mode 100644 x11-libs/cairo/cairo-1.16.0.recipe rename x11-libs/cairo/{cairo1.18-1.18.0.recipe => cairo-1.18.4.recipe} (87%) delete mode 100644 x11-libs/cairo/patches/cairo-1.16.0.patchset rename x11-libs/cairo/patches/{cairo-1.18.0.patchset => cairo-1.18.4.patchset} (60%) delete mode 100644 x11-libs/cairo/xcairo-1.16.0.recipe rename x11-libs/cairo/{xcairo1.18-1.18.0.recipe => xcairo-1.18.4.recipe} (87%) diff --git a/x11-libs/cairo/cairo-1.16.0.recipe b/x11-libs/cairo/cairo-1.16.0.recipe deleted file mode 100644 index 4cd2c6a81..000000000 --- a/x11-libs/cairo/cairo-1.16.0.recipe +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY="Multi-platform 2D graphics library" -DESCRIPTION="Cairo is a 2D graphics library with support for multiple output \ -devices. Currently supported output targets include the X Window \ -System (via both Xlib and XCB), quartz, win32, and image buffers, \ -as well as PDF, PostScript, and SVG file output. Experimental backends \ -include OpenGL, BeOS, OS/2, and DirectFB." -HOMEPAGE="http://cairographics.org/" -COPYRIGHT="2000, 2002, 2004-2007 Keith Packard - 2002-2003 University of Southern California - 2004-2010 Red Hat, Inc. - 2005-2010 Mozilla Corporation - 2006-2009 Adrian Johnson - 2007-2009 Chris Wilson - 2006-2013 Intel Corporation - 2011 Andrea Canciani - 2011 Samsung Electronics - 2010-2011 Linaro Limited - 2009-2010 Eric Anholt - 2002-2010 many others" -LICENSE="GNU LGPL v2.1 - MPL v1.1" -REVISION="6" -SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz" -CHECKSUM_SHA256="5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" -PATCHES="cairo-$portVersion.patchset" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -# This recipe MUST be kept in sync with xcairo! - -libVersion="2.11600.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - cairo$secondaryArchSuffix = $portVersion - lib:libcairo$secondaryArchSuffix = $libVersionCompat - lib:libcairo_gobject$secondaryArchSuffix = $libVersionCompat - lib:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libfontconfig$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpixman_1$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " - -PROVIDES_devel=" - cairo${secondaryArchSuffix}_devel = $portVersion - devel:libcairo$secondaryArchSuffix = $libVersionCompat - devel:libcairo_gobject$secondaryArchSuffix = $libVersionCompat - devel:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - cairo$secondaryArchSuffix == $portVersion base - devel:libglib_2.0$secondaryArchSuffix - devel:libfontconfig$secondaryArchSuffix - devel:libpixman_1$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libfontconfig$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libpixman_1$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:gtkdocize - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -defineDebugInfoPackage cairo$secondaryArchSuffix \ - "$libDir"/libcairo.so.$libVersion \ - "$libDir"/libcairo-gobject.so.$libVersion \ - "$libDir"/libcairo-script-interpreter.so.$libVersion - -BUILD() -{ - autoreconf -vfi - - export CFLAGS="-D__BSD_VISIBLE -g -O2" - runConfigure ./configure \ - --disable-static --enable-shared - make $jobArgs -} - -INSTALL() -{ - make install - - rm $libDir/libcairo*.la - - prepareInstalledDevelLibs \ - libcairo \ - libcairo-gobject \ - libcairo-script-interpreter - fixPkgconfig - - packageEntries devel \ - $developDir -} diff --git a/x11-libs/cairo/cairo1.18-1.18.0.recipe b/x11-libs/cairo/cairo-1.18.4.recipe similarity index 87% rename from x11-libs/cairo/cairo1.18-1.18.0.recipe rename to x11-libs/cairo/cairo-1.18.4.recipe index dd0f76841..09e655110 100644 --- a/x11-libs/cairo/cairo1.18-1.18.0.recipe +++ b/x11-libs/cairo/cairo-1.18.4.recipe @@ -21,7 +21,7 @@ LICENSE="GNU LGPL v2.1 MPL v1.1" REVISION="1" SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz" -CHECKSUM_SHA256="243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64" +CHECKSUM_SHA256="445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb" SOURCE_DIR="cairo-$portVersion" PATCHES="cairo-$portVersion.patchset" @@ -30,11 +30,11 @@ SECONDARY_ARCHITECTURES="x86" # This recipe MUST be kept in sync with xcairo! -libVersion="2.11800.0" +libVersion="2.11804.4" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - cairo1.18$secondaryArchSuffix = $portVersion + cairo$secondaryArchSuffix = $portVersion lib:libcairo$secondaryArchSuffix = $libVersionCompat lib:libcairo_gobject$secondaryArchSuffix = $libVersionCompat lib:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat @@ -49,23 +49,22 @@ REQUIRES=" lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix " +REPLACES=" + cairo1.18$secondaryArchSuffix + " PROVIDES_devel=" - cairo1.18${secondaryArchSuffix}_devel = $portVersion + cairo${secondaryArchSuffix}_devel = $portVersion devel:libcairo$secondaryArchSuffix = $libVersionCompat devel:libcairo_gobject$secondaryArchSuffix = $libVersionCompat devel:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - cairo1.18$secondaryArchSuffix == $portVersion base + cairo$secondaryArchSuffix == $portVersion base devel:libglib_2.0$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libpixman_1$secondaryArchSuffix " -CONFLICTS_devel=" - cairo${secondaryArchSuffix}_devel - xcairo${secondaryArchSuffix}_devel - " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -88,7 +87,7 @@ BUILD_PREREQUIRES=" pygments_python310 " -defineDebugInfoPackage cairo1.18$secondaryArchSuffix \ +defineDebugInfoPackage cairo$secondaryArchSuffix \ "$libDir"/libcairo.so.$libVersion \ "$libDir"/libcairo-gobject.so.$libVersion \ "$libDir"/libcairo-script-interpreter.so.$libVersion @@ -96,7 +95,7 @@ defineDebugInfoPackage cairo1.18$secondaryArchSuffix \ BUILD() { meson \ - --buildtype=release \ + --buildtype=debugoptimized \ --prefix=$prefix \ --libdir=$libDir \ --libexecdir=$binDir \ @@ -131,6 +130,7 @@ INSTALL() TEST() { + # 252 Passed, 324 Failed [0 crashed, 10 expected], 31 Skipped cd build/test cairo-test-suite } diff --git a/x11-libs/cairo/patches/cairo-1.16.0.patchset b/x11-libs/cairo/patches/cairo-1.16.0.patchset deleted file mode 100644 index d45c58365..000000000 --- a/x11-libs/cairo/patches/cairo-1.16.0.patchset +++ /dev/null @@ -1,144 +0,0 @@ -From 7fa107c58c2809a9059128e754ce65d96be1e29e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 3 Oct 2014 18:33:08 +0000 -Subject: Haiku patch - - -diff --git a/configure.ac b/configure.ac -index 5e33c96..3baa8a8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -270,6 +270,11 @@ CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [ - AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") - AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta") - ;; -+ *-*-haiku) -+ beos_LIBS="" -+ AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") -+ AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork") -+ ;; - *) - use_beos="no (requires a BeOS platform)" - ;; --- -2.30.2 - - -From cc2b20d99233178bfdc567c0d56ed23bb50825ec Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 6 Oct 2014 18:07:36 +0200 -Subject: Add missing include fenv.h. - - -diff --git a/test/cairo-test.c b/test/cairo-test.c -index d93468b..9d5901d 100644 ---- a/test/cairo-test.c -+++ b/test/cairo-test.c -@@ -40,6 +40,7 @@ - #include - #endif - #include -+#include - #include - #if HAVE_FCFINI - #include --- -2.30.2 - - -From 922d7a3f67ebee8dcb0365d04023450e7e17574f Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Fri, 21 Nov 2014 22:11:40 +0000 -Subject: link tests against libnetwork. - - -diff --git a/perf/Makefile.am b/perf/Makefile.am -index 40b35bc..ee150d9 100644 ---- a/perf/Makefile.am -+++ b/perf/Makefile.am -@@ -11,7 +11,7 @@ AM_CPPFLAGS = \ - -I$(top_builddir)/src \ - $(CAIRO_CFLAGS) - --AM_LDFLAGS = $(CAIRO_LDFLAGS) -+AM_LDFLAGS = $(CAIRO_LDFLAGS) -lnetwork - - SUBDIRS = micro - -diff --git a/test/Makefile.am b/test/Makefile.am -index e3c42ea..6ce956f 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -94,7 +94,7 @@ cairo_test_suite_LDADD = \ - $(top_builddir)/test/pdiff/libpdiff.la \ - $(top_builddir)/boilerplate/libcairoboilerplate.la \ - $(top_builddir)/src/libcairo.la \ -- $(CAIRO_LDADD) -+ $(CAIRO_LDADD) -lnetwork - cairo_test_suite_DEPENDENCIES = \ - $(top_builddir)/test/pdiff/libpdiff.la \ - $(top_builddir)/boilerplate/libcairoboilerplate.la \ -@@ -211,7 +211,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - $(CAIRO_CFLAGS) --AM_LDFLAGS = $(CAIRO_LDFLAGS) -+AM_LDFLAGS = $(CAIRO_LDFLAGS) -lnetwork - - $(top_builddir)/boilerplate/libcairoboilerplate.la: $(top_builddir)/src/libcairo.la - cd $(top_builddir)/boilerplate && $(MAKE) $(AM_MAKEFLAGS) libcairoboilerplate.la --- -2.30.2 - - -From 6fb43c65d687a5fa703b0f7457d6464bc2929ac4 Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Fri, 17 Dec 2021 22:56:11 -0500 -Subject: Xlib: Do not attempt to use shm. - - -diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c -index 1ee1e3d..9803115 100644 ---- a/src/cairo-xlib-surface-shm.c -+++ b/src/cairo-xlib-surface-shm.c -@@ -37,12 +37,12 @@ - - #include "cairoint.h" - --#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS -+#if 1 - - #include "cairo-xlib-private.h" - #include "cairo-xlib-surface-private.h" - --#if !HAVE_X11_EXTENSIONS_XSHM_H || !(HAVE_X11_EXTENSIONS_SHMPROTO_H || HAVE_X11_EXTENSIONS_SHMSTR_H) -+#if 1 - void _cairo_xlib_display_init_shm (cairo_xlib_display_t *display) {} - - cairo_surface_t * -diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c -index 2a6d896..c46f660 100644 ---- a/src/cairo-xlib-surface.c -+++ b/src/cairo-xlib-surface.c -@@ -70,7 +70,9 @@ - - #include - #include -+#ifndef __HAIKU__ - #include -+#endif - - #define XLIB_COORD_MAX 32767 - -@@ -1390,7 +1392,7 @@ _cairo_xlib_surface_acquire_source_image (void *abstract_surf - *image_extra = NULL; - *image_out = (cairo_image_surface_t *) - _cairo_xlib_surface_get_shm (abstract_surface, FALSE); -- if (*image_out) -+ if (*image_out) - return (*image_out)->base.status; - - extents.x = extents.y = 0; --- -2.30.2 - diff --git a/x11-libs/cairo/patches/cairo-1.18.0.patchset b/x11-libs/cairo/patches/cairo-1.18.4.patchset similarity index 60% rename from x11-libs/cairo/patches/cairo-1.18.0.patchset rename to x11-libs/cairo/patches/cairo-1.18.4.patchset index a2070d785..a81243ba3 100644 --- a/x11-libs/cairo/patches/cairo-1.18.0.patchset +++ b/x11-libs/cairo/patches/cairo-1.18.4.patchset @@ -1,11 +1,11 @@ -From d3376558b01b9445e8805a7666174ef0c5d7cef8 Mon Sep 17 00:00:00 2001 +From 3d8d925c4bb5af8d01eaf5b52b1282f3f8195e79 Mon Sep 17 00:00:00 2001 From: Begasus Date: Sun, 24 Sep 2023 15:41:34 +0200 Subject: Xlib: Do not attempt to use shm. diff --git a/src/cairo-xlib-surface-shm.c b/src/cairo-xlib-surface-shm.c -index 10f947d..94b811f 100644 +index 85a0369..6c0a7da 100644 --- a/src/cairo-xlib-surface-shm.c +++ b/src/cairo-xlib-surface-shm.c @@ -37,12 +37,12 @@ @@ -24,7 +24,7 @@ index 10f947d..94b811f 100644 { display->shm = NULL; diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c -index 84d5362..748a808 100644 +index fac2911..259eea8 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -79,7 +79,9 @@ @@ -38,20 +38,20 @@ index 84d5362..748a808 100644 #define DEBUG 0 -- -2.37.3 +2.51.0 -From b750af6bae4047f3959c515b3c4056a7a33f0077 Mon Sep 17 00:00:00 2001 +From 587e812c45c75309525f378f2130f2ec8abc7878 Mon Sep 17 00:00:00 2001 From: Begasus Date: Sun, 24 Sep 2023 16:57:05 +0200 Subject: Fix linking and building the tests diff --git a/meson.build b/meson.build -index 9100152..554071c 100644 +index cc13180..2b688f1 100644 --- a/meson.build +++ b/meson.build -@@ -41,7 +41,7 @@ cflags = [] +@@ -44,7 +44,7 @@ cflags = [] if cc.get_id() != 'msvc' cflags += [ '-Wmissing-declarations', @@ -60,7 +60,7 @@ index 9100152..554071c 100644 '-Wpointer-arith', '-Wwrite-strings', '-Wsign-compare', -@@ -488,6 +488,14 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled() +@@ -484,6 +484,14 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled() endif endif @@ -73,8 +73,34 @@ index 9100152..554071c 100644 +endif + if host_machine.system() == 'windows' - add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp']) + add_languages('cpp', native: false) -- -2.37.3 +2.51.0 + + +From a9cf1735bebd329fb5b7aaaa6d49d438dba05a9d Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Wed, 26 Nov 2025 13:19:05 +0100 +Subject: Fix for mismatching cpu_set_t and CPU_ISSET + + +diff --git a/perf/cairo-perf-micro.c b/perf/cairo-perf-micro.c +index 618272e..323521d 100644 +--- a/perf/cairo-perf-micro.c ++++ b/perf/cairo-perf-micro.c +@@ -52,6 +52,11 @@ + #define CAIRO_PERF_ITERATION_MS_DEFAULT 2000 + #define CAIRO_PERF_ITERATION_MS_FAST 5 + ++#ifdef __HAIKU__ ++#define cpu_set_t cpuset_t ++#define CPU_ISSET CPUSET_ISSET ++#endif ++ + typedef struct _cairo_perf_case { + CAIRO_PERF_RUN_DECL (*run); + cairo_bool_t (*enabled) (cairo_perf_t *perf); +-- +2.51.0 diff --git a/x11-libs/cairo/xcairo-1.16.0.recipe b/x11-libs/cairo/xcairo-1.16.0.recipe deleted file mode 100644 index eae3b4cc6..000000000 --- a/x11-libs/cairo/xcairo-1.16.0.recipe +++ /dev/null @@ -1,128 +0,0 @@ -SUMMARY="Multi-platform 2D graphics library (with Xlib surfaces)" -DESCRIPTION="Cairo is a 2D graphics library with support for multiple output \ -devices. Currently supported output targets include the X Window \ -System (via both Xlib and XCB), quartz, win32, and image buffers, \ -as well as PDF, PostScript, and SVG file output. Experimental backends \ -include OpenGL, BeOS, OS/2, and DirectFB." -HOMEPAGE="http://cairographics.org/" -COPYRIGHT="2000, 2002, 2004-2007 Keith Packard - 2002-2003 University of Southern California - 2004-2010 Red Hat, Inc. - 2005-2010 Mozilla Corporation - 2006-2009 Adrian Johnson - 2007-2009 Chris Wilson - 2006-2013 Intel Corporation - 2011 Andrea Canciani - 2011 Samsung Electronics - 2010-2011 Linaro Limited - 2009-2010 Eric Anholt - 2002-2010 many others" -LICENSE="GNU LGPL v2.1 - MPL v1.1" -REVISION="5" -SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz" -CHECKSUM_SHA256="5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" -PATCHES="cairo-$portVersion.patchset" -SOURCE_DIR="cairo-$portVersion" - -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" - -# This recipe MUST be kept in sync with cairo! - -libVersion="2.11600.0" -libVersionCompat="$libVersion compat >= ${libVersion%%.*}" - -PROVIDES=" - xcairo$secondaryArchSuffix = $portVersion - lib:libcairo$secondaryArchSuffix = $libVersionCompat - lib:libcairo_gobject$secondaryArchSuffix = $libVersionCompat - lib:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libfontconfig$secondaryArchSuffix - lib:libfreetype$secondaryArchSuffix - lib:libglib_2.0$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libpixman_1$secondaryArchSuffix - lib:libpng16$secondaryArchSuffix - lib:libz$secondaryArchSuffix - - lib:libX11$secondaryArchSuffix - lib:libXext$secondaryArchSuffix - " -CONFLICTS=" - cairo$secondaryArchSuffix - " - -PROVIDES_devel=" - xcairo${secondaryArchSuffix}_devel = $portVersion - devel:libcairo$secondaryArchSuffix = $libVersionCompat - devel:libcairo_gobject$secondaryArchSuffix = $libVersionCompat - devel:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat - " -REQUIRES_devel=" - xcairo$secondaryArchSuffix == $portVersion base - devel:libglib_2.0$secondaryArchSuffix - devel:libfontconfig$secondaryArchSuffix - devel:libpixman_1$secondaryArchSuffix - - devel:libX11$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libfontconfig$secondaryArchSuffix - devel:libfreetype$secondaryArchSuffix - devel:libglib_2.0$secondaryArchSuffix - devel:libpixman_1$secondaryArchSuffix - devel:libpng16$secondaryArchSuffix - devel:libz$secondaryArchSuffix - - devel:libX11$secondaryArchSuffix - devel:libXext$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc$secondaryArchSuffix - cmd:gtkdocize - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:pkg_config$secondaryArchSuffix - " - -defineDebugInfoPackage xcairo$secondaryArchSuffix \ - "$libDir"/libcairo.so.$libVersion \ - "$libDir"/libcairo-gobject.so.$libVersion \ - "$libDir"/libcairo-script-interpreter.so.$libVersion - -BUILD() -{ - autoreconf -fi - export CFLAGS="-D__BSD_VISIBLE -g -O2" - - runConfigure ./configure \ - --disable-static --enable-shared \ - --enable-xlib - make $jobArgs -} - -INSTALL() -{ - make install - - rm $libDir/libcairo*.la - - prepareInstalledDevelLibs \ - libcairo \ - libcairo-gobject \ - libcairo-script-interpreter - fixPkgconfig - - packageEntries devel \ - $developDir -} diff --git a/x11-libs/cairo/xcairo1.18-1.18.0.recipe b/x11-libs/cairo/xcairo-1.18.4.recipe similarity index 87% rename from x11-libs/cairo/xcairo1.18-1.18.0.recipe rename to x11-libs/cairo/xcairo-1.18.4.recipe index d9853f33a..415f9b9f0 100644 --- a/x11-libs/cairo/xcairo1.18-1.18.0.recipe +++ b/x11-libs/cairo/xcairo-1.18.4.recipe @@ -21,7 +21,7 @@ LICENSE="GNU LGPL v2.1 MPL v1.1" REVISION="1" SOURCE_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz" -CHECKSUM_SHA256="243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64" +CHECKSUM_SHA256="445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb" SOURCE_DIR="cairo-$portVersion" PATCHES="cairo-$portVersion.patchset" @@ -30,11 +30,11 @@ SECONDARY_ARCHITECTURES="x86" # This recipe MUST be kept in sync with cairo! -libVersion="2.11800.0" +libVersion="2.11804.4" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - xcairo1.18$secondaryArchSuffix = $portVersion + xcairo$secondaryArchSuffix = $portVersion lib:libcairo$secondaryArchSuffix = $libVersionCompat lib:libcairo_gobject$secondaryArchSuffix = $libVersionCompat lib:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat @@ -52,28 +52,27 @@ REQUIRES=" lib:libX11$secondaryArchSuffix lib:libXext$secondaryArchSuffix " +REPLACES=" + xcairo1.18$secondaryArchSuffix + " CONFLICTS=" - cairo1.18$secondaryArchSuffix + cairo$secondaryArchSuffix " PROVIDES_devel=" - xcairo1.18${secondaryArchSuffix}_devel = $portVersion + xcairo${secondaryArchSuffix}_devel = $portVersion devel:libcairo$secondaryArchSuffix = $libVersionCompat devel:libcairo_gobject$secondaryArchSuffix = $libVersionCompat devel:libcairo_script_interpreter$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - xcairo1.18$secondaryArchSuffix == $portVersion base + xcairo$secondaryArchSuffix == $portVersion base devel:libglib_2.0$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libpixman_1$secondaryArchSuffix devel:libX11$secondaryArchSuffix " -CONFLICTS_devel=" - cairo${secondaryArchSuffix}_devel - xcairo${secondaryArchSuffix}_devel - " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -99,7 +98,7 @@ BUILD_PREREQUIRES=" pygments_python310 " -defineDebugInfoPackage xcairo1.18$secondaryArchSuffix \ +defineDebugInfoPackage xcairo$secondaryArchSuffix \ "$libDir"/libcairo.so.$libVersion \ "$libDir"/libcairo-gobject.so.$libVersion \ "$libDir"/libcairo-script-interpreter.so.$libVersion @@ -107,7 +106,7 @@ defineDebugInfoPackage xcairo1.18$secondaryArchSuffix \ BUILD() { meson \ - --buildtype=release \ + --buildtype=debugoptimized \ --prefix=$prefix \ --libdir=$libDir \ --libexecdir=$binDir \ @@ -115,6 +114,7 @@ BUILD() --includedir=$includeDir \ --sysconfdir=$settingsDir \ -Dgtk_doc=true \ + -Dtests=disabled \ build ninja -C build }