diff mbox series

[meta-gnome,v2] babl: upgrade 0.1.94 -> 0.1.96

Message ID 1661758883-5274-1-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-gnome,v2] babl: upgrade 0.1.94 -> 0.1.96 | expand

Commit Message

Mingyu Wang (Fujitsu) Aug. 29, 2022, 7:41 a.m. UTC 
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>
---
 ...t-run-git-rev-parse-during-configure.patch | 35 -------------------
 .../babl/{babl_0.1.94.bb => babl_0.1.96.bb}   |  6 ++--
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch
 rename meta-gnome/recipes-gimp/babl/{babl_0.1.94.bb => babl_0.1.96.bb} (76%)
diff mbox series

Patch

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 bb129a4178..0000000000
--- a/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From 0e41b11b23c91293d1b39a8ec4cb80c68fb26ad7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 28 Apr 2022 07:35:31 -0700
-Subject: [PATCH] meson: Do not run git rev-parse during configure
-
-This option will try to deduce if babl is being built from git tree or
-release tarball, there should be a better way like checking for .git
-directory etc. instead of doing git operations needing network
-
-see
-https://gitlab.gnome.org/GNOME/babl/-/commit/2dc7fc403fe427a889913ef0cfb71de85b4326ec#note_1439732
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 7e7a935..649b456 100644
---- a/meson.build
-+++ b/meson.build
-@@ -451,7 +451,7 @@ if git_bin.found() and run_command(
-     git_bin,
-     'rev-parse',
-     '--is-inside-work-tree',
--    check: true,
-+    check: false,
- ).returncode() == 0
-   git_version_h = vcs_tag(
-     input : 'git-version.h.in',
--- 
-2.36.0
-
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.94.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.96.bb
similarity index 76%
rename from meta-gnome/recipes-gimp/babl/babl_0.1.94.bb
rename to meta-gnome/recipes-gimp/babl/babl_0.1.96.bb
index 7161356c11..85cc7793cc 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"
 CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore "
 CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore "
 
-SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz \
-           file://0001-meson-Do-not-run-git-rev-parse-during-configure.patch \
-           "
-SRC_URI[sha256sum] = "b6a8b28f55e0c17f5031fb7959e72ffe0fbf8196d1968ad6efc98d1b492c3bbe"
+SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
+SRC_URI[sha256sum] = "33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6"
 
 BBCLASSEXTEND = "native"