From ee751690ce7c6b29b168e6262ab82015c4a70500 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 23 Jan 2022 12:07:20 +0100 Subject: [PATCH] gnu: gnome-builder: Fix build. * gnu/packages/patches/gnome-builder-update-libportal.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it here. * gnu/packages/gnome.scm (gnome-builder)[patches]: Use it here. [inputs, native-inputs]: Add python. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 6 +- .../gnome-builder-update-libportal.patch | 93 +++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnome-builder-update-libportal.patch diff --git a/gnu/local.mk b/gnu/local.mk index 114855269e..dceaa53145 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1182,6 +1182,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-boxes-add-guix-logo.patch \ + %D%/packages/patches/gnome-builder-update-libportal.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad7536c07c..e052bb2dee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12331,7 +12331,9 @@ (define-public gnome-builder name "-" version ".tar.xz")) (sha256 (base32 - "04p031i999dccbnlbysmr6f93x7dji7b559j6yhdsqbqgxb7ncan")))) + "04p031i999dccbnlbysmr6f93x7dji7b559j6yhdsqbqgxb7ncan")) + (patches + (search-patches "gnome-builder-update-libportal.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and compile schemas @@ -12379,6 +12381,7 @@ (define-public gnome-builder ("libportal" ,libportal) ("libsoup" ,libsoup-minimal-2) ("llvm" ,llvm) + ("python" ,python) ("python-pygobject" ,python-pygobject) ("sysprof" ,sysprof) ("template-glib" ,template-glib) @@ -12391,6 +12394,7 @@ (define-public gnome-builder ("glib:bin" ,glib "bin") ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) + ("python" ,python) ("vala" ,vala) ("xorg-server" ,xorg-server-for-tests))) (home-page "https://wiki.gnome.org/Apps/Builder") diff --git a/gnu/packages/patches/gnome-builder-update-libportal.patch b/gnu/packages/patches/gnome-builder-update-libportal.patch new file mode 100644 index 0000000000..1cf7f32132 --- /dev/null +++ b/gnu/packages/patches/gnome-builder-update-libportal.patch @@ -0,0 +1,93 @@ +From b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1 Mon Sep 17 00:00:00 2001 +From: Abderrahim Kitouni +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 +-#include ++#include + + #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 + + #include +-#include ++#include + + #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 +-#include ++#include + + struct _GbpOweWorkbenchAddin + { +-- +GitLab +