mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 17:33:25 +00:00
Merge branch 'bruno/gimp34-deb-testing' into 'master'
Draft: gitlab-ci, build: Move to Debian Trixie on GIMP 3.4 Closes #13001, #13106, #13492, and #13647 See merge request GNOME/gimp!2289
This commit is contained in:
commit
0f86423872
3 changed files with 4 additions and 7 deletions
|
@ -79,7 +79,7 @@ workflow:
|
||||||
# Default Docker image (unless otherwise defined)
|
# Default Docker image (unless otherwise defined)
|
||||||
image: debian:${DEB_VERSION}
|
image: debian:${DEB_VERSION}
|
||||||
variables:
|
variables:
|
||||||
DEB_VERSION: "bookworm"
|
DEB_VERSION: "testing"
|
||||||
# Common cloning procedure
|
# Common cloning procedure
|
||||||
GIT_DEPTH: "1"
|
GIT_DEPTH: "1"
|
||||||
GIT_SUBMODULE_STRATEGY: none
|
GIT_SUBMODULE_STRATEGY: none
|
||||||
|
@ -141,7 +141,6 @@ deps-debian:
|
||||||
entrypoint: [""]
|
entrypoint: [""]
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none
|
GIT_STRATEGY: none
|
||||||
UMFPACK: libumfpack5
|
|
||||||
PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
|
PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
|
||||||
script:
|
script:
|
||||||
- export container=docker
|
- export container=docker
|
||||||
|
@ -184,6 +183,7 @@ deps-debian:
|
||||||
libaa1-dev
|
libaa1-dev
|
||||||
libappstream-glib-dev
|
libappstream-glib-dev
|
||||||
libarchive-dev
|
libarchive-dev
|
||||||
|
libbacktrace-dev
|
||||||
libbz2-dev
|
libbz2-dev
|
||||||
libcfitsio-dev
|
libcfitsio-dev
|
||||||
libgexiv2-dev
|
libgexiv2-dev
|
||||||
|
@ -210,7 +210,7 @@ deps-debian:
|
||||||
libspiro-dev
|
libspiro-dev
|
||||||
libsuitesparse-dev
|
libsuitesparse-dev
|
||||||
libtiff-dev
|
libtiff-dev
|
||||||
$UMFPACK
|
libumfpack6
|
||||||
libunwind-dev
|
libunwind-dev
|
||||||
libwebp-dev
|
libwebp-dev
|
||||||
libwmf-dev
|
libwmf-dev
|
||||||
|
|
|
@ -345,8 +345,6 @@ if [ "$GIMP_UNSTABLE" ] || [ -z "$GIMP_RELEASE" ]; then
|
||||||
bund_usr "$UNIX_PREFIX" "lib/libEGL*"
|
bund_usr "$UNIX_PREFIX" "lib/libEGL*"
|
||||||
bund_usr "$UNIX_PREFIX" "lib/libGL*"
|
bund_usr "$UNIX_PREFIX" "lib/libGL*"
|
||||||
bund_usr "$UNIX_PREFIX" "lib/dri*"
|
bund_usr "$UNIX_PREFIX" "lib/dri*"
|
||||||
#TODO: remove this on Debian Trixie (which have Mesa 24.2)
|
|
||||||
conf_app LIBGL_DRIVERS_PATH "${LIB_DIR}/${LIB_SUBDIR}dri"
|
|
||||||
fi
|
fi
|
||||||
### Debug dialog
|
### Debug dialog
|
||||||
bund_usr "$GIMP_PREFIX" "bin/gimp-debug-tool*" --dest "libexec"
|
bund_usr "$GIMP_PREFIX" "bin/gimp-debug-tool*" --dest "libexec"
|
||||||
|
|
|
@ -9,11 +9,10 @@ developers maintaining GIMP for this platform will decide.
|
||||||
|
|
||||||
### GNU/Linux, *BSD…
|
### GNU/Linux, *BSD…
|
||||||
|
|
||||||
Until GIMP 3.0 release, Debian 12 "bookworm" stable will be our baseline target.
|
From GIMP 3.4 release, Debian 13 "trixie" stable is our baseline target.
|
||||||
I.e. that we can bump a minimum dependency version only if it is in Debian
|
I.e. that we can bump a minimum dependency version only if it is in Debian
|
||||||
bookworm.
|
bookworm.
|
||||||
|
|
||||||
After GIMP 3.0 release, we might get back to depend on Debian Testing.
|
|
||||||
|
|
||||||
### macOS
|
### macOS
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue