mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-11 11:47:02 +02:00
gimp: update to 3.0.2.
Co-authored-by: classabbyamp <void@placeviolette.net> fixes: #54803 closes: #54835 [via git-merge-pr]
This commit is contained in:
parent
3d82d0cfcb
commit
149f6a23de
2 changed files with 80 additions and 6 deletions
74
srcpkgs/gimp/patches/cross.patch
Normal file
74
srcpkgs/gimp/patches/cross.patch
Normal file
|
@ -0,0 +1,74 @@
|
|||
horrible hack to allow for both building the splash image and generating gir in cross-builds
|
||||
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1964,6 +1964,19 @@
|
||||
endif
|
||||
|
||||
if meson.can_run_host_binaries() and have_gobject_introspection
|
||||
+ if meson.is_cross_build()
|
||||
+ native_gimp_exe = find_program([gimpconsole_exe_name, gimpmain_exe_name],
|
||||
+ native: true, required: false)
|
||||
+ native_gimp_run_env=environment()
|
||||
+ native_gimp_run_env.set('GIMP_GLOBAL_BUILD_ROOT', meson.global_build_root())
|
||||
+ native_gimp_run_env.set('GIMP_GLOBAL_SOURCE_ROOT', meson.global_source_root())
|
||||
+ if get_option('debug-self-in-build')
|
||||
+ native_gimp_run_env.set('GIMP_DEBUG_SELF', '1')
|
||||
+ endif
|
||||
+ native_gimp_run_env.set('GIMP_SELF_IN_BUILD', native_gimp_exe.full_path())
|
||||
+ native_gimp_exe_depends = [native_gimp_exe]
|
||||
+ endif
|
||||
+
|
||||
if enable_console_bin
|
||||
gimp_real_exe = gimpconsole_exe
|
||||
else
|
||||
--- a/gimp-data/images/meson.build
|
||||
+++ b/gimp-data/images/meson.build
|
||||
@@ -1,18 +1,34 @@
|
||||
## Splash Image and Welcome Dialog ##
|
||||
|
||||
-splash = custom_target('gimp-splash.png',
|
||||
- input : [ 'export-splash.py' ],
|
||||
- output: [ 'gimp-splash.png', ],
|
||||
- depends: [ gimp_exe_depends ],
|
||||
- command: [ gimp_exe, '-nidfs',
|
||||
- files('gimp-splash.xcf.xz'),
|
||||
- '--batch-interpreter', 'python-fu-eval',
|
||||
- '-b', '-', '--quit'],
|
||||
- feed: true,
|
||||
- build_by_default: true,
|
||||
- env: gimp_run_env,
|
||||
- install_dir: gimpdatadir / 'images',
|
||||
- install: true)
|
||||
+if not meson.is_cross_build()
|
||||
+ splash = custom_target('gimp-splash.png',
|
||||
+ input : [ 'export-splash.py' ],
|
||||
+ output: [ 'gimp-splash.png', ],
|
||||
+ depends: [ gimp_exe_depends ],
|
||||
+ command: [ gimp_exe, '-nidfs',
|
||||
+ files('gimp-splash.xcf.xz'),
|
||||
+ '--batch-interpreter', 'python-fu-eval',
|
||||
+ '-b', '-', '--quit'],
|
||||
+ feed: true,
|
||||
+ build_by_default: true,
|
||||
+ env: gimp_run_env,
|
||||
+ install_dir: gimpdatadir / 'images',
|
||||
+ install: true)
|
||||
+else
|
||||
+ splash = custom_target('gimp-splash.png',
|
||||
+ input : [ 'export-splash.py' ],
|
||||
+ output: [ 'gimp-splash.png', ],
|
||||
+ depends: [],
|
||||
+ command: [ gimp_exe, '-nidfs',
|
||||
+ files('gimp-splash.xcf.xz'),
|
||||
+ '--batch-interpreter', 'python-fu-eval',
|
||||
+ '-b', '-', '--quit'],
|
||||
+ feed: true,
|
||||
+ build_by_default: true,
|
||||
+ env: native_gimp_run_env,
|
||||
+ install_dir: gimpdatadir / 'images',
|
||||
+ install: true)
|
||||
+endif
|
||||
|
||||
## Windows Installer's Splash Image and Intro Banner ##
|
||||
|
|
@ -1,14 +1,13 @@
|
|||
# Template file for 'gimp'
|
||||
pkgname=gimp
|
||||
version=3.0.0
|
||||
version=3.0.2
|
||||
revision=1
|
||||
build_style=meson
|
||||
build_helper="gir qemu"
|
||||
configure_args="-Dcheck-update=no -Drevision=$revision -Denable-default-bin=enabled
|
||||
-Dbug-report-url=https://github.com/void-linux/void-packages/issues/new/choose"
|
||||
hostmakedepends="pkg-config xdg-utils perl libxslt gjs LuaJIT desktop-file-utils
|
||||
AppStream gettext gi-docgen gobject-introspection
|
||||
yelp-tools librsvg-devel glib-devel"
|
||||
AppStream gettext gi-docgen gobject-introspection yelp-tools librsvg-devel glib-devel"
|
||||
makedepends="babl-devel gtk+3-devel gegl-devel libgexiv2-devel libgirepository-devel
|
||||
libmypaint-devel mypaint-brushes librsvg-devel glib-networking appstream-glib-devel
|
||||
libXmu-devel ghostscript-devel libmng-devel aalib-devel libXpm-devel libopenexr-devel
|
||||
|
@ -23,11 +22,12 @@ maintainer="fosslinux <fosslinux@aussies.space>"
|
|||
license="GPL-3.0-only"
|
||||
homepage="https://www.gimp.org"
|
||||
distfiles="https://download.gimp.org/gimp/v${version%.*}/gimp-${version/+rc/-RC}.tar.xz"
|
||||
checksum=93f1ca3d9d1bd8cac0e52c49fb886cbbe4b28222ee835bf1319e3287901d2d20
|
||||
checksum=546ddc30cb2d0e79123c7fcb4d78211e1ee7a6aace91a6a0ad8cbcbf6ea571a2
|
||||
lib32disabled=yes
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
hostmakedepends+=" gimp"
|
||||
configure_args+=" -Dcan-crosscompile-gir=true -Dgi-docgen=disabled"
|
||||
fi
|
||||
|
||||
if [ -n "$XBPS_CHECK_PKGS" ]; then
|
||||
|
@ -50,9 +50,9 @@ gimp-devel_package() {
|
|||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/share/gir-1.0
|
||||
vmove usr/share/vala
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
vmove usr/share/gir-1.0
|
||||
vmove usr/share/vala
|
||||
vmove usr/share/doc
|
||||
fi
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue