GIMP: fix build for x86 arch

This commit is contained in:
Gerasim Troeglazov
2025-03-18 22:42:35 +10:00
parent eb27290019
commit d989ec52dc
2 changed files with 65 additions and 16 deletions

View File

@@ -8,7 +8,7 @@ and 3rd party plugins."
HOMEPAGE="https://www.gimp.org/"
COPYRIGHT="The GIMP Team"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://download.gimp.org/mirror/pub/gimp/v3.0/gimp-$portVersion.tar.xz"
CHECKSUM_SHA256="93f1ca3d9d1bd8cac0e52c49fb886cbbe4b28222ee835bf1319e3287901d2d20"
SOURCE_DIR="gimp-$portVersion"
@@ -207,16 +207,6 @@ BUILD()
-Dxcursor=disabled \
-Denable-console-bin=true
export LIBRARY_PATH=$LIBRARY_PATH:\
$sourceDir/Build/libgimp:\
$sourceDir/Build/libgimpbase:\
$sourceDir/Build/libgimpcolor:\
$sourceDir/Build/libgimpconfig:\
$sourceDir/Build/libgimpmath:\
$sourceDir/Build/libgimpmodule:\
$sourceDir/Build/libgimpthumb:\
$sourceDir/Build/libgimpwidgets
ninja -C Build
cp -f $portDir/additional-files/gimp-splash.png $sourceDir/Build/gimp-data/images/

View File

@@ -1,4 +1,4 @@
From a22e12e011690977bc5826054f80ef571de176f0 Mon Sep 17 00:00:00 2001
From 28d7133683a5c63e3999b92405ddf47009f6a36a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 Mar 2024 23:23:49 +1000
Subject: Fix build for Haiku
@@ -134,7 +134,7 @@ index 55cebf1..9e37373 100644
2.48.1
From 3e8baba15961106c115969b7bcf9caa309855fd3 Mon Sep 17 00:00:00 2001
From de7a4210a4fe4672387cf05304e85e880dd0eb63 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 Mar 2024 23:24:11 +1000
Subject: Use load_image instead g_spawn_async
@@ -205,7 +205,7 @@ index bfa08e8..6aeb5b4 100644
2.48.1
From 13b460d568babd880a586a33590394306c91949e Mon Sep 17 00:00:00 2001
From 74aa08caaaa39bc3036666a331da955a5f236dcf Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 Mar 2024 23:24:33 +1000
Subject: Fix preferences dialog freeze
@@ -235,7 +235,7 @@ index 170d42e..07f66ea 100644
2.48.1
From be1e1c24b0ad882ce815c2a5844f5311424340d5 Mon Sep 17 00:00:00 2001
From fd51bb274caee0b1f766ae4a534cb0f074862666 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 Mar 2024 23:26:30 +1000
Subject: Disable signal handlers
@@ -312,7 +312,7 @@ index 0c00c2f..4deaf32 100644
2.48.1
From cc68de82f1bf1fcd0b364c94435a81f12e43ff8f Mon Sep 17 00:00:00 2001
From a85d7d2cbdb9393299b672f67ca36ea1be1473b8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Mar 2025 18:14:59 +1000
Subject: Implement open url
@@ -349,3 +349,62 @@ index d242ff2..96bc331 100644
--
2.48.1
From ebb0ac38a7403d98bdf2230d8ac1e711d560ddb9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Mar 2025 12:08:38 +0000
Subject: Remove generate introspection
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 0a71df8..a98499e 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -504,44 +504,6 @@ else
'--quiet',
]
- libgimp_gir = gnome.generate_gir(
- libgimp,
- libgimpbase,
- libgimpcolor,
- libgimpconfig,
- libgimpmath,
- libgimpmodule,
-
- sources: libgimp_introspectable_files,
- nsversion: gimp_api_version,
- namespace: 'Gimp',
- identifier_prefix: 'Gimp',
- symbol_prefix: 'gimp',
- export_packages: 'gimp-' + gimp_api_version,
- header: 'libgimp/gimp.h',
- includes: libgimp_gir_includes,
- extra_args: gir_args,
- include_directories: rootInclude,
- install: true,
- )
-
- libgimpui_gir = gnome.generate_gir(
- libgimpui,
- libgimpwidgets,
-
- sources: libgimpui_introspectable_files,
- nsversion: gimp_api_version,
- namespace: 'GimpUi',
- identifier_prefix: 'Gimp',
- symbol_prefix: [ 'gimp_ui', 'gimp' ],
- export_packages: 'gimp-ui-' + gimp_api_version,
- header: 'libgimp/gimpui.h',
- includes: [ libgimp_gir_includes, 'Gtk-3.0', libgimp_gir[0] ],
- extra_args: gir_args,
- include_directories: rootInclude,
- install: true,
- )
-
if platform_osx
g_ir_compiler = find_program('g-ir-compiler')
gimp_exe_typelib = custom_target('macos-typelib.stamp',
--
2.48.1