diff options
| -rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch | 4 | ||||
| -rw-r--r-- | meta-gnome/recipes-gimp/gimp/gimp_3.0.6.bb (renamed from meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb) | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch index 721225c8b3..380e425f25 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-gimp-cross-compile-fix-for-bz2.patch | |||
| @@ -16,8 +16,8 @@ diff --git a/meson.build b/meson.build | |||
| 16 | index 4e48f8c64c..d5dce47015 100644 | 16 | index 4e48f8c64c..d5dce47015 100644 |
| 17 | --- a/meson.build | 17 | --- a/meson.build |
| 18 | +++ b/meson.build | 18 | +++ b/meson.build |
| 19 | @@ -765,7 +765,7 @@ zlib = dependency('zlib') | 19 | @@ -777,7 +777,7 @@ zlib = dependency('zlib') |
| 20 | MIMEtypes += 'image/x-psp' | 20 | zlib = dependency('zlib') |
| 21 | 21 | ||
| 22 | # Compiler-provided headers can't be found in crossroads environment | 22 | # Compiler-provided headers can't be found in crossroads environment |
| 23 | -if not meson.is_cross_build() | 23 | -if not meson.is_cross_build() |
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.0.6.bb index e2ad29eb98..9f38cdcd03 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.4.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_3.0.6.bb | |||
| @@ -5,7 +5,7 @@ LICENSE = "GPL-3.0-only" | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" |
| 6 | 6 | ||
| 7 | DEPENDS = " \ | 7 | DEPENDS = " \ |
| 8 | appstream-glib \ | 8 | appstream \ |
| 9 | atk \ | 9 | atk \ |
| 10 | babl \ | 10 | babl \ |
| 11 | bzip2 \ | 11 | bzip2 \ |
| @@ -56,13 +56,12 @@ GIDOCGEN_MESON_OPTION = "gi-docgen" | |||
| 56 | GIDOCGEN_MESON_ENABLE_FLAG = "enabled" | 56 | GIDOCGEN_MESON_ENABLE_FLAG = "enabled" |
| 57 | GIDOCGEN_MESON_DISABLE_FLAG = "disabled" | 57 | GIDOCGEN_MESON_DISABLE_FLAG = "disabled" |
| 58 | 58 | ||
| 59 | SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gimp.git;protocol=https;branch=master" | 59 | SRC_URI = "https://download.gimp.org/gimp/v3.0/${BP}.tar.xz" |
| 60 | SRC_URI += "file://0001-gimp-cross-compile-fix-for-bz2.patch" | 60 | SRC_URI += "file://0001-gimp-cross-compile-fix-for-bz2.patch" |
| 61 | SRC_URI += "file://0002-meson.build-reproducibility-fix.patch" | 61 | SRC_URI += "file://0002-meson.build-reproducibility-fix.patch" |
| 62 | SRC_URI += "file://0001-meson.build-dont-check-for-lgi.patch" | 62 | SRC_URI += "file://0001-meson.build-dont-check-for-lgi.patch" |
| 63 | SRC_URI += "file://0001-meson.build-require-iso-codes-native.patch" | 63 | SRC_URI += "file://0001-meson.build-require-iso-codes-native.patch" |
| 64 | SRCREV = "c1901c5be644ab8dcaf779b1f383bf5370bc90c6" | 64 | SRC_URI[sha256sum] = "246c225383c72ef9f0dc7703b7d707084bbf177bd2900e94ce466a62862e296b" |
| 65 | |||
| 66 | 65 | ||
| 67 | PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" | 66 | PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" |
| 68 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" | 67 | PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" |
