helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2025-12-31 13:38:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gimp: fix gimptool buildpaths errors

Browse Source 
gimptool is used in GIMP plugin compilation. It does need a CC
definition, provide it as the current CC with "--sysroot=..." removed.

gimptool also need the gimp .pc file which is in gimp-dev. Split
gimptool in its own package to avoid circular dependencies.

Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 061f5c7f82b905f3a75183852b3a8fbff7e50e17)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Yoann Congal 2024-10-15 23:59:33 +02:00 committed by Armin Kuster
parent a566dc9168
commit 1383f1d909
2 changed files with 106 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
meta-gnome/recipes-gimp/gimp/gimp/0001-gimptool-allow-default-CC-override.patch Normal file
View File

@ -0,0 +1,85 @@
From 7e5b986cb7797a6535fe2471b9a5fb7c00821f51 Mon Sep 17 00:00:00 2001
From: Yoann Congal <yoann.congal@smile.fr>
Date: Sun, 13 Oct 2024 01:00:10 +0200
Subject: [PATCH] gimptool: allow default CC override
From: Yoann Congal <yoann.congal@smile.fr>
In OE, CC contains sysroot path. Storing CC in binary then leads to
non-reproducibility.
This commit add a new configure option "--with-default-cc='cmd'" for
force the CC stored in gimptool to a reproducible value.
Upstream-Status: Inappropriate [does not apply on master (upstream has moved to meson)]
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
---
app-tools/Makefile.am | 2 +-
configure.ac | 13 +++++++++++++
tools/Makefile.am | 2 +-
tools/gimptool.c | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/app-tools/Makefile.am b/app-tools/Makefile.am
index a7cd4ce..81a3a00 100644
--- a/app-tools/Makefile.am
+++ b/app-tools/Makefile.am
@@ -67,7 +67,7 @@ AM_CPPFLAGS = \
-DMANDIR=\""$(mandir)"\" \
-DGIMPPLUGINDIR=\""$(gimpplugindir)"\" \
-DGIMPDATADIR=\""$(gimpdatadir)"\" \
- -DCC=\""$(CC)"\" \
+ -DDEFAULT_CC=\""@DEFAULT_CC@"\" \
-DGIMPDIR=\""$(gimpdir)"\" \
-DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \
-I$(top_srcdir) \
diff --git a/configure.ac b/configure.ac
index a88b7cc..d90b6db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2457,6 +2457,19 @@ fi
AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
AC_SUBST(DESKTOP_DATADIR)
+######################
+# Determine default CC
+######################
+
+AC_ARG_WITH(default-cc, [ --with-default-cc="cmd" default CC to print in gimptool (default=CC)])
+
+if test "x$with_default_cc" != x; then
+ DEFAULT_CC=$with_default_cc
+else
+ DEFAULT_CC=CC
+fi
+
+AC_SUBST(DEFAULT_CC)
#####################
# Check for XML tools
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 420b9b1..ccabde8 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -87,7 +87,7 @@ AM_CPPFLAGS = \
-DMANDIR=\""$(mandir)"\" \
-DGIMPPLUGINDIR=\""$(gimpplugindir)"\" \
-DGIMPDATADIR=\""$(gimpdatadir)"\" \
- -DCC=\""$(CC)"\" \
+ -DDEFAULT_CC=\""@DEFAULT_CC@"\" \
-DGIMPDIR=\""$(gimpdir)"\" \
-DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\" \
-I$(top_srcdir) \
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 21fc043..bbf3fa5 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -280,7 +280,7 @@ find_out_env_flags (void)
else if (msvc_syntax)
env_cc = "cl -MD";
else
- env_cc = CC;
+ env_cc = DEFAULT_CC;
if (g_ascii_strncasecmp (env_cc, "cl", 2) == 0 &&
g_ascii_strncasecmp (env_cc, "clang", 5) != 0)

21
meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb
View File

@ -49,6 +49,7 @@ SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \
file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch \
file://0001-file-tiff-load-fix-mismatching-variable-type.patch \
file://0001-metadata-shut-up-a-weird-warning.patch \
file://0001-gimptool-allow-default-CC-override.patch \
"
SRC_URI[sha256sum] = "50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e"
@ -74,6 +75,26 @@ FILES:${PN} += "${datadir}/metainfo"
RDEPENDS:${PN} += "mypaint-brushes-1.0"
# gimptool
# gimptool needs a CC definition, use current CC without sysroot
python __anonymous() {
import shlex
CC_WITHOUT_SYSROOT = shlex.join(filter(lambda x: not x.startswith("--sysroot="), shlex.split(d.getVar("CC"))))
d.setVar("CC_WITHOUT_SYSROOT", CC_WITHOUT_SYSROOT)
}
EXTRA_OECONF += "--with-default-cc='${CC_WITHOUT_SYSROOT}'"
# Split gimptool in its own package
PACKAGE_BEFORE_PN += "${PN}-gimptool"
FILES:${PN}-gimptool += "${bindir}/gimptool-2.0"
# gimptool depends on gimp .pc file being installed and tools to build the plugin.
RDEPENDS:${PN}-gimptool += "${PN}-dev packagegroup-core-buildessential"
INSANE_SKIP:${PN}-gimptool += "dev-deps"
CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux"
CVE_STATUS[CVE-2009-0581] = "cpe-incorrect: The current version (2.10.38) is not affected."
CVE_STATUS[CVE-2009-0723] = "cpe-incorrect: The current version (2.10.38) is not affected."