diff --git a/org.gimp.GIMP.json b/org.gimp.GIMP.json index 5453a9f1..a9245968 100644 --- a/org.gimp.GIMP.json +++ b/org.gimp.GIMP.json @@ -1,7 +1,7 @@ { "app-id": "org.gimp.GIMP", "runtime": "org.gnome.Platform", - "runtime-version": "46", + "runtime-version": "47", "sdk": "org.gnome.Sdk", "command": "gimp-2.10", "separate-locales": false, @@ -121,19 +121,13 @@ }, { "type": "patch", - "path": "shared-modules/gtk2/gtk2-use-adwaita-theme.patch" - }, - { - "type": "patch", - "path": "patches/gtk+-2.24-gimp-issue-2828-0001.patch" - }, - { - "type": "patch", - "path": "patches/gtk+-2.24-gimp-issue-2828-0002.patch" - }, - { - "type": "patch", - "path": "patches/gtk-2.24-bug795635.patch" + "paths": [ + "shared-modules/gtk2/gtk2-use-adwaita-theme.patch", + "shared-modules/gtk2/gtk2-gcc14.patch", + "patches/gtk+-2.24-gimp-issue-2828-0001.patch", + "patches/gtk+-2.24-gimp-issue-2828-0002.patch", + "patches/gtk-2.24-bug795635.patch" + ] } ] }, @@ -173,8 +167,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/ibus/ibus/releases/download/1.5.30/ibus-1.5.30.tar.gz", - "sha256": "05b84d4a45139face161596e5ade8e6c5da55cfaf6f194861da66516190f5b96", + "url": "https://github.com/ibus/ibus/releases/download/1.5.28/ibus-1.5.28.tar.gz", + "sha256": "6c9ff3a7576c3d61264f386030f47ee467eb7298c8104367002986e008765667", "x-checker-data": { "type": "anitya", "project-id": 1352, @@ -186,59 +180,6 @@ } ] }, - "shared-modules/libsoup/libsoup-2.4.json", - { - "name": "webkitgtk", - "config-opts": [ - "--with-gtk=2.0", - "--disable-webkit2", - "--disable-geolocation", - "--disable-video", - "--disable-spellcheck", - "--disable-credential-storage", - "--disable-web-audio" - ], - "build-options": { - "env": { - "PYTHON": "/usr/bin/python3" - }, - "cflags": "-O2 -g -pipe -Wno-expansion-to-defined -Wno-class-memaccess -fno-delete-null-pointer-checks -fpermissive -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_60", - "cflags-override": true, - "cxxflags": "-O2 -g -pipe -Wno-expansion-to-defined -Wno-class-memaccess -fno-delete-null-pointer-checks -fpermissive -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_60", - "cxxflags-override": true, - "arch": { - "aarch64": { - "cflags": "-O2 -g -pipe -DENABLE_YARR_JIT=0 -Wno-expansion-to-defined -Wno-class-memaccess -fno-delete-null-pointer-checks -fpermissive -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_60", - "cflags-override": true, - "cxxflags": "-O2 -g -pipe -DENABLE_YARR_JIT=0 -Wno-expansion-to-defined -Wno-class-memaccess -fno-delete-null-pointer-checks -fpermissive -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_60", - "cxxflags-override": true, - "config-opts": [ - "--disable-jit" - ] - } - } - }, - "cleanup": [ - "/share/doc", - "/bin" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz", - "sha256": "588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7" - }, - { - "type": "patch", - "paths": [ - "patches/webkitgtk-2.4.11.patch", - "patches/webkitgtk-fix.patch", - "patches/webkitgtk-41-fix.patch", - "patches/webkitgtk-ruby-fix.patch" - ] - } - ] - }, { "name": "python", "modules": [ diff --git a/shared-modules b/shared-modules index 5350d9e0..0529b121 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit 5350d9e0fbb53b9583655d1af217b1d9d839a39d +Subproject commit 0529b121864669aa14fac1c67b5684a4bc6542b8