diff options
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | PKGBUILD.autotools | 5 | ||||
| -rw-r--r-- | babl-0.1-name-change-autotools.patch | 31 | ||||
| -rw-r--r-- | babl-0.1-name-change-meson.patch | 32 |
4 files changed, 68 insertions, 4 deletions
@@ -35,10 +35,10 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") source=("https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz" - 'babl-0.1-name-change-meson.patch::https://gitlab.gnome.org/GNOME/gimp/-/commit/04a78154e1af5e30dcedde6dbaa321be3f0e24b1.patch' + 'babl-0.1-name-change-meson.patch' 'linux.gpl') sha256sums=('313a205475d1ff03c5c4d9602f09f5c975ba6c1c79d8843e2396f9fe2abdf7a8' - '40c8175505598219e379bfd25c3b0a37bbd42ac35c06990683f1dca622a0a6a1' + 'e012d022fe53eaf4cd2fc08f07cb0377fb14c8f791e42d13027983e41f7f4fc2' '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3') prepare() { diff --git a/PKGBUILD.autotools b/PKGBUILD.autotools index de2832f8272c..ce28bacc1cec 100644 --- a/PKGBUILD.autotools +++ b/PKGBUILD.autotools @@ -35,9 +35,10 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") source=("https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}-autotools.tar.bz2" - 'babl-0.1-name-change-autotools.patch::https://gitlab.gnome.org/GNOME/gimp/-/commit/09ece8f6f99756ed84ded47d9da6e2f5cbda5375.patch' + 'babl-0.1-name-change-autotools.patch' 'linux.gpl') -sha256sums=('028bb8f825c492037d09720694c3a3096f1af5d6347eaa84970b43c476713ee7' +sha256sums=('810761c432224157f45c5104ded58245acb95d2070a538caa516327c5b0e0f58' + 'e92f88fbfb31514b1be47d303f69a5020c9fffdd6f4557fceeaab36b7881eb78' '1003bbf5fc292d0d63be44562f46506f7b2ca5729770da9d38d3bb2e8a2f36b3') prepare() { diff --git a/babl-0.1-name-change-autotools.patch b/babl-0.1-name-change-autotools.patch new file mode 100644 index 000000000000..1a8b85143441 --- /dev/null +++ b/babl-0.1-name-change-autotools.patch @@ -0,0 +1,31 @@ +From 09ece8f6f99756ed84ded47d9da6e2f5cbda5375 Mon Sep 17 00:00:00 2001 +From: Jehan <jehan@girinstud.io> +Date: Fri, 9 Dec 2022 16:34:11 +0100 +Subject: [PATCH] Issue #8948: Autotools build does not support the new + babl-0.1 naming. + +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd4b2a53a11..7d35d558dba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -707,8 +707,11 @@ AC_SUBST(ISO_CODES_LOCALEDIR) + # Checks for required libraries + ############################### + +-PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],, +- [add_deps_error([babl >= babl_required_version])]) ++PKG_CHECK_MODULES(BABL, [babl-0.1 >= babl_required_version],, ++ [ ++ PKG_CHECK_MODULES(BABL, [babl >= babl_required_version],, ++ [add_deps_error([babl-0.1 >= babl_required_version])]) ++ ]) + PKG_CHECK_MODULES(GEGL, gegl-gegl_major_minor_version >= gegl_required_version,, + [add_deps_error([gegl-gegl_major_minor_version >= gegl_required_version])]) + PKG_CHECK_MODULES(ATK, atk >= atk_required_version,, +-- +GitLab + diff --git a/babl-0.1-name-change-meson.patch b/babl-0.1-name-change-meson.patch new file mode 100644 index 000000000000..d1e0e5320fb6 --- /dev/null +++ b/babl-0.1-name-change-meson.patch @@ -0,0 +1,32 @@ +From 04a78154e1af5e30dcedde6dbaa321be3f0e24b1 Mon Sep 17 00:00:00 2001 +From: Jehan <jehan@girinstud.io> +Date: Mon, 5 Dec 2022 14:34:48 +0100 +Subject: [PATCH] meson: take into account babl's pkg-config name change. + +See babl!52 (babl commit b8da847) and gimp#8912. +--- + meson.build | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 45b72d017f1..155fc166ec6 100644 +--- a/meson.build ++++ b/meson.build +@@ -340,7 +340,13 @@ mscms = platform_windows ? cc.find_library('mscms') : no_dep + atk_minver = '2.4.0' + atk = dependency('atk', version: '>='+atk_minver) + babl_minver = '0.1.98' +-babl = dependency('babl', version: '>='+babl_minver) ++babl = dependency('babl-0.1', version: '>='+babl_minver, required: false) ++if not babl.found() ++ # babl changed its pkg-config name from 'babl' to 'babl-0.1' in version ++ # 0.1.100 (0.1.99 dev cycle more exactly). 'babl-0.1' is checked in priority ++ # because it would be a newer version. ++ babl = dependency('babl', version: '>='+babl_minver) ++endif + cairo_minver = '1.12.2' + cairo = dependency('cairo', version: '>='+cairo_minver) + +-- +GitLab + |