summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gimp
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2022-08-29 15:41:23 +0800
committerKhem Raj <raj.khem@gmail.com>2022-08-29 08:44:19 -0700
commiteb60f284105246d2842235c44902ebbf8dbda0bc (patch)
tree9318eeaf1abc3e353bf573318dece4ac5c44b4f5 /meta-gnome/recipes-gimp
parent8be78c7a8483eb8e1836ac8110fc0f92b6aed096 (diff)
downloadmeta-openembedded-eb60f284105246d2842235c44902ebbf8dbda0bc.tar.gz
babl: upgrade 0.1.94 -> 0.1.96
0001-meson-Do-not-run-git-rev-parse-during-configure.patch removed since it's not available in 0.1.96 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gimp')
-rw-r--r--meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch35
-rw-r--r--meta-gnome/recipes-gimp/babl/babl_0.1.96.bb (renamed from meta-gnome/recipes-gimp/babl/babl_0.1.94.bb)6
2 files changed, 2 insertions, 39 deletions
diff --git a/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch b/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch
deleted file mode 100644
index bb129a417..000000000
--- a/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 0e41b11b23c91293d1b39a8ec4cb80c68fb26ad7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 28 Apr 2022 07:35:31 -0700
4Subject: [PATCH] meson: Do not run git rev-parse during configure
5
6This option will try to deduce if babl is being built from git tree or
7release tarball, there should be a better way like checking for .git
8directory etc. instead of doing git operations needing network
9
10see
11https://gitlab.gnome.org/GNOME/babl/-/commit/2dc7fc403fe427a889913ef0cfb71de85b4326ec#note_1439732
12
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 meson.build | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/meson.build b/meson.build
21index 7e7a935..649b456 100644
22--- a/meson.build
23+++ b/meson.build
24@@ -451,7 +451,7 @@ if git_bin.found() and run_command(
25 git_bin,
26 'rev-parse',
27 '--is-inside-work-tree',
28- check: true,
29+ check: false,
30 ).returncode() == 0
31 git_version_h = vcs_tag(
32 input : 'git-version.h.in',
33--
342.36.0
35
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.94.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.96.bb
index 7161356c1..85cc7793c 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.94.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.96.bb
@@ -14,9 +14,7 @@ DEPENDS += "lcms"
14CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " 14CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore "
15CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " 15CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore "
16 16
17SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz \ 17SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
18 file://0001-meson-Do-not-run-git-rev-parse-during-configure.patch \ 18SRC_URI[sha256sum] = "33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6"
19 "
20SRC_URI[sha256sum] = "b6a8b28f55e0c17f5031fb7959e72ffe0fbf8196d1968ad6efc98d1b492c3bbe"
21 19
22BBCLASSEXTEND = "native" 20BBCLASSEXTEND = "native"