aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2021-12-27 11:28:00 +0000
committerLeo <thinkabit.ukim@gmail.com>2021-12-29 11:32:06 +0000
commit5f6cf5a124e62becb007fff21e2d3f3613f054b8 (patch)
tree001856a63731b560fa62eb8741f163d0f67dee1c
parent768de23aeab1cc9c3a217a62c1466d774ff8a306 (diff)
downloadaports-5f6cf5a124e62becb007fff21e2d3f3613f054b8.tar.gz
aports-5f6cf5a124e62becb007fff21e2d3f3613f054b8.tar.bz2
aports-5f6cf5a124e62becb007fff21e2d3f3613f054b8.tar.xz
community/gnome-builder: upgrade to 41.3
backport patch to work with new libportal-gtk 0.5 backport patch for 32-bit rebuild against libportal rebuild against python3.10
-rw-r--r--community/gnome-builder/APKBUILD48
-rw-r--r--community/gnome-builder/fix-32bit-build.patch26
-rw-r--r--community/gnome-builder/fix-libportal-gtk3.patch93
3 files changed, 158 insertions, 9 deletions
diff --git a/community/gnome-builder/APKBUILD b/community/gnome-builder/APKBUILD
index 6b8cc986d1..55d4212d81 100644
--- a/community/gnome-builder/APKBUILD
+++ b/community/gnome-builder/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Rasmus Thomsen <oss@cogitri.dev>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gnome-builder
-pkgver=41.2
+pkgver=41.3
pkgrel=0
pkgdesc="Develop software for GNOME"
url="https://wiki.gnome.org/Apps/Builder"
@@ -9,16 +9,44 @@ url="https://wiki.gnome.org/Apps/Builder"
arch="all !s390x !riscv64"
license="GPL-3.0-or-later"
depends="flatpak-builder py3-lxml py3-gobject3"
-makedepends="meson libdazzle-dev glib-dev gtk+3.0-dev gtksourceview4-dev
- json-glib-dev jsonrpc-glib-dev pango-dev libpeas-dev webkit2gtk-dev
- libxml2-dev libgit2-glib-dev template-glib-dev llvm-dev gspell-dev
- enchant2-dev devhelp-dev glade-dev pcre2-dev gtkmm3-dev
- vte3-dev vala gobject-introspection-dev ctags clang-dev flatpak-dev
- libexecinfo-dev libportal-dev cmark-dev"
+makedepends="
+ meson
+ libdazzle-dev
+ glib-dev
+ gtk+3.0-dev
+ gtksourceview4-dev
+ json-glib-dev
+ jsonrpc-glib-dev
+ pango-dev
+ libpeas-dev
+ webkit2gtk-dev
+ libxml2-dev
+ libgit2-glib-dev
+ template-glib-dev
+ llvm-dev
+ gspell-dev
+ enchant2-dev
+ devhelp-dev
+ glade-dev
+ pcre2-dev
+ gtkmm3-dev
+ vte3-dev
+ vala
+ gobject-introspection-dev
+ ctags
+ clang-dev
+ flatpak-dev
+ libexecinfo-dev
+ libportal-dev
+ cmark-dev
+ "
checkdepends="appstream-glib desktop-file-utils xvfb-run"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.gnome.org/sources/gnome-builder/${pkgver%.*}/gnome-builder-$pkgver.tar.xz
+source="
+ https://download.gnome.org/sources/gnome-builder/${pkgver%.*}/gnome-builder-$pkgver.tar.xz
fix-musl.patch
+ fix-libportal-gtk3.patch
+ fix-32bit-build.patch
"
build() {
@@ -39,6 +67,8 @@ package() {
}
sha512sums="
-032d877865e72f8eb4124a1f89ab55fb60213cb64dc71c5e8d1967ba58e216eeb2cd6f7f26e2b29e5618a00e7d4fe0fac032630bb3c725fbef4a314f0e5709e5 gnome-builder-41.2.tar.xz
+26ea632666991eeba5c5e6291b7e898e123623622989d96fa5e44156d08f44fae27f8ec341f01cbff5275becfa67b4d3b83239705535b60e323e03cfc9eebfe8 gnome-builder-41.3.tar.xz
ef7f75d316558e59ecb07b4fc8ef92abc51d78d6983021588546fadb57f90d971561be1f2491a2750e61e07c6d6200f3c199dab3db1060a2217ccbdb2505239e fix-musl.patch
+24d6acf0378ba673ccc860e090affc1f5ef5f852289250e163892cfced6d33d93ffeaeec6ff584a36944c9b58f06213582a20be673253a777e03563c780e6b9b fix-libportal-gtk3.patch
+c668c08d94ebcff7e9c810c92d487c0a039d23fab6efaa2d2b2ebaebfd5167d3f9d9e8b12127a8961bf0e7cda73fa1e3b82633c6bb53ac0889417114e080ffef fix-32bit-build.patch
"
diff --git a/community/gnome-builder/fix-32bit-build.patch b/community/gnome-builder/fix-32bit-build.patch
new file mode 100644
index 0000000000..101c6492c8
--- /dev/null
+++ b/community/gnome-builder/fix-32bit-build.patch
@@ -0,0 +1,26 @@
+From fcf976d5fcfb81d14ea0ec9b9909bc9b8dc52a81 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Fri, 19 Nov 2021 08:27:28 -0600
+Subject: [PATCH] flatpak: attempt to fix build on i686
+
+There may be more problems, but this should fix the first build failure.
+---
+ src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
+index 0f2da7456..6e9d82732 100644
+--- a/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
++++ b/src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
+@@ -597,7 +597,7 @@ is_known_worker (GTask *task,
+ }
+
+ finish:
+- g_debug ("RuntimeIsKnown => (%d, %"G_GSIZE_FORMAT")", found, download_size);
++ g_debug ("RuntimeIsKnown => (%d, %"G_GINT64_FORMAT")", found, download_size);
+ ipc_flatpak_service_complete_runtime_is_known (g_task_get_source_object (task),
+ g_steal_pointer (&state->invocation),
+ found,
+--
+GitLab
+
diff --git a/community/gnome-builder/fix-libportal-gtk3.patch b/community/gnome-builder/fix-libportal-gtk3.patch
new file mode 100644
index 0000000000..1cf7f32132
--- /dev/null
+++ b/community/gnome-builder/fix-libportal-gtk3.patch
@@ -0,0 +1,93 @@
+From b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1 Mon Sep 17 00:00:00 2001
+From: Abderrahim Kitouni <akitouni@gnome.org>
+Date: Sat, 25 Dec 2021 16:25:43 +0100
+Subject: [PATCH] build: use libportal 0.5
+
+This partly reverts 2aea4bd7d0ced77a7d0778517b4505af5dea2dac
+---
+ build-aux/flatpak/org.gnome.Builder.json | 7 ++++---
+ meson.build | 2 +-
+ src/gstyle/gstyle-color-panel.c | 2 +-
+ src/plugins/devhelp/gbp-devhelp-page.c | 2 +-
+ src/plugins/open-with-external/gbp-owe-workbench-addin.c | 2 +-
+ 5 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
+index 02ac31ede..a32d29b92 100644
+--- a/build-aux/flatpak/org.gnome.Builder.json
++++ b/build-aux/flatpak/org.gnome.Builder.json
+@@ -601,15 +601,16 @@
+ "name" : "libportal",
+ "config-opts" : [
+ "--libdir=/app/lib",
+- "--buildtype=debugoptimized"
++ "--buildtype=debugoptimized",
++ "-Dbackends=gtk3"
+ ],
+ "buildsystem" : "meson",
+ "builddir" : true,
+ "sources" : [
+ {
+ "type" : "archive",
+- "url" : "https://github.com/flatpak/libportal/releases/download/0.4/libportal-0.4.tar.xz",
+- "sha256" : "3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28"
++ "url" : "https://github.com/flatpak/libportal/releases/download/0.5/libportal-0.5.tar.xz",
++ "sha256" : "d8c8cb18a34e5eeb26a39c94044c955995b01de0e139caac5e18c076cf821b3b"
+ }
+ ]
+ },
+diff --git a/meson.build b/meson.build
+index 01737034b..494e0d752 100644
+--- a/meson.build
++++ b/meson.build
+@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.41.0')
+ libm_dep = cc.find_library('m', required: false)
+ libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0')
+ libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
+-libportal_dep = dependency('libportal', version: '>= 0.3', required: false)
++libportal_dep = dependency('libportal-gtk3', required: false)
+ libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0')
+ libvte_dep = dependency('vte-2.91', version: '>= 0.65.0')
+ libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false)
+diff --git a/src/gstyle/gstyle-color-panel.c b/src/gstyle/gstyle-color-panel.c
+index 15742a7be..a6295c168 100644
+--- a/src/gstyle/gstyle-color-panel.c
++++ b/src/gstyle/gstyle-color-panel.c
+@@ -30,7 +30,7 @@
+ #include "gstyle-color.h"
+
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+
+ #define HSV_TO_SCALE_FACTOR (1.0 / 256.0)
+ #define CIELAB_L_TO_SCALE_FACTOR (100.0 / 256.0)
+diff --git a/src/plugins/devhelp/gbp-devhelp-page.c b/src/plugins/devhelp/gbp-devhelp-page.c
+index 5d5c52b0d..2ac788414 100644
+--- a/src/plugins/devhelp/gbp-devhelp-page.c
++++ b/src/plugins/devhelp/gbp-devhelp-page.c
+@@ -25,7 +25,7 @@
+ #include <webkit2/webkit2.h>
+
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+
+ #include "gbp-devhelp-page.h"
+ #include "gbp-devhelp-search.h"
+diff --git a/src/plugins/open-with-external/gbp-owe-workbench-addin.c b/src/plugins/open-with-external/gbp-owe-workbench-addin.c
+index 51d2da844..816fe643f 100644
+--- a/src/plugins/open-with-external/gbp-owe-workbench-addin.c
++++ b/src/plugins/open-with-external/gbp-owe-workbench-addin.c
+@@ -23,7 +23,7 @@
+ #include "gbp-owe-workbench-addin.h"
+
+ #include <libportal/portal.h>
+-#include <libportal/portal-gtk3.h>
++#include <libportal-gtk3/portal-gtk3.h>
+
+ struct _GbpOweWorkbenchAddin
+ {
+--
+GitLab
+