From e3c966fe6babc629f4de6c66c2879ede69db55b4 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 16 Mar 2026 14:24:57 +0100 Subject: [PATCH] gegl, bump to version 0.4.68 (#13835) --- ...{gegl-0.4.64.recipe => gegl-0.4.68.recipe} | 29 +++++++++--- media-libs/gegl/patches/gegl-0.4.64.patchset | 22 --------- media-libs/gegl/patches/gegl-0.4.68.patchset | 45 +++++++++++++++++++ 3 files changed, 67 insertions(+), 29 deletions(-) rename media-libs/gegl/{gegl-0.4.64.recipe => gegl-0.4.68.recipe} (87%) delete mode 100644 media-libs/gegl/patches/gegl-0.4.64.patchset create mode 100644 media-libs/gegl/patches/gegl-0.4.68.patchset diff --git a/media-libs/gegl/gegl-0.4.64.recipe b/media-libs/gegl/gegl-0.4.68.recipe similarity index 87% rename from media-libs/gegl/gegl-0.4.64.recipe rename to media-libs/gegl/gegl-0.4.68.recipe index ae3db8fb3..5c42d7862 100644 --- a/media-libs/gegl/gegl-0.4.64.recipe +++ b/media-libs/gegl/gegl-0.4.68.recipe @@ -9,15 +9,15 @@ artistic filters and more forms of image processing GEGL can also be used from t HOMEPAGE="https://gegl.org/" COPYRIGHT="Øyvind Kolås" LICENSE="GNU LGPL v3" -REVISION="2" -SOURCE_URI="https://download.gimp.org/pub/gegl/0.4/gegl-$portVersion.tar.xz" -CHECKSUM_SHA256="0de1c9dd22c160d5e4bdfc388d292f03447cca6258541b9a12fed783d0cf7c60" +REVISION="1" +SOURCE_URI="https://download.gimp.org/pub/gegl/${portVersion%.*}/gegl-$portVersion.tar.xz" +CHECKSUM_SHA256="5002309b9a701260658e8b3a61540fd5673887cef998338e1992524a33b23ae3" PATCHES="gegl-$portVersion.patchset" ARCHITECTURES="ALL !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="0.463.1" +libVersion="0.467.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -72,9 +72,13 @@ REQUIRES_devel=" gegl$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" +PROVIDES_doc=" + gegl_doc + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel -# gobject_introspection${secondaryArchSuffix}_devel devel:libavcodec$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libbabl_0.1$secondaryArchSuffix @@ -95,8 +99,8 @@ BUILD_REQUIRES=" devel:libpangocairo_1.0$secondaryArchSuffix devel:libpangoft2_1.0$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix >= 148 - devel:libpoppler_glib$secondaryArchSuffix >= 8.29 + devel:libpoppler$secondaryArchSuffix >= 155 + devel:libpoppler_glib$secondaryArchSuffix >= 8.31 devel:libraw$secondaryArchSuffix devel:librsvg_2$secondaryArchSuffix devel:libtiff$secondaryArchSuffix @@ -107,10 +111,14 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:cmake cmd:find cmd:gcc$secondaryArchSuffix + cmd:gi_docgen cmd:make cmd:meson + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:ninja cmd:perl cmd:pkg_config$secondaryArchSuffix @@ -153,4 +161,11 @@ INSTALL() packageEntries devel \ $developDir \ $dataDir/gir-1.0 + + # documentation package + mkdir -p $documentationDir/packages + mv $dataDir/doc/gegl-0.4 $documentationDir/packages + rm -rf $dataDir/doc + packageEntries doc \ + $documentationDir } diff --git a/media-libs/gegl/patches/gegl-0.4.64.patchset b/media-libs/gegl/patches/gegl-0.4.64.patchset deleted file mode 100644 index a678edb08..000000000 --- a/media-libs/gegl/patches/gegl-0.4.64.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From c41334f8563aa30dcb8a4df1403a5053025a5e40 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 11 Feb 2021 12:10:59 +1000 -Subject: Disable execinfo - - -diff --git a/meson.build b/meson.build -index c800c3b..51be2ff 100644 ---- a/meson.build -+++ b/meson.build -@@ -301,7 +301,7 @@ w3m = find_program('w3m', - # Required Dependencies - - config.set('HAVE_UNISTD_H', cc.has_header('unistd.h')) --config.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) -+#config.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) - config.set('HAVE_FSYNC', cc.has_function('fsync')) - config.set('HAVE_MALLOC_TRIM', cc.has_function('malloc_trim')) - config.set('HAVE_STRPTIME', cc.has_function('strptime')) --- -2.51.0 - diff --git a/media-libs/gegl/patches/gegl-0.4.68.patchset b/media-libs/gegl/patches/gegl-0.4.68.patchset new file mode 100644 index 000000000..ccfa6aabd --- /dev/null +++ b/media-libs/gegl/patches/gegl-0.4.68.patchset @@ -0,0 +1,45 @@ +From b2f9a4a7f98fef6dccf109290d36fea316d8b49b Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 11 Feb 2021 12:10:59 +1000 +Subject: Disable execinfo + + +diff --git a/meson.build b/meson.build +index 083bc7a..42a4886 100644 +--- a/meson.build ++++ b/meson.build +@@ -324,7 +324,7 @@ w3m = find_program('w3m', + # Required Dependencies + + config.set('HAVE_UNISTD_H', cc.has_header('unistd.h')) +-config.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) ++#config.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) + config.set('HAVE_FSYNC', cc.has_function('fsync')) + config.set('HAVE_MALLOC_TRIM', cc.has_function('malloc_trim')) + config.set('HAVE_STRPTIME', cc.has_function('strptime')) +-- +2.52.0 + + +From 1dc0b4a5143dfdbc29eab7fc12bfbf5d0b33750d Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Mon, 2 Feb 2026 08:58:34 +0100 +Subject: Fix building documentation with gi-docgen (babl issue?) + + +diff --git a/docs/reference/meson.build b/docs/reference/meson.build +index 1aa904d..246b530 100644 +--- a/docs/reference/meson.build ++++ b/docs/reference/meson.build +@@ -47,7 +47,7 @@ if build_gi_docgen + '--output-dir=@OUTPUT@', + '--no-namespace-dir', + '--content-dir=@0@'.format(meson.current_source_dir()), +- '--add-include-path=@0@'.format(get_option('prefix') / 'share' / 'gir-1.0'), ++ '--add-include-path=@0@'.format(('/boot/system') / 'data' / 'gir-1.0'), + '@INPUT@', + ], + depend_files: [ +-- +2.52.0 +