me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gnome-builder: Update to 42.1.

Browse source 
* gnu/packages/gnome.scm (gnome-builder): Update to 42.1.
[source]: Remove patches field.
[configure-flags]: Remove -Dplugin_flatpak=false and
-Dplugin_update_manager=false.
[phases]{patch-meson}: Use search-input-file.
{fix-ninja}: Delete phase.
[inputs]: Ad flatpak, libhandy and libostree.
[propagated-inputs]: Replace gtksourceview with gtksourceview-4.
* gnu/packages/patches/gnome-builder-update-libportal.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
This commit is contained in:
Maxim Cournoyer 2022-09-11 01:12:07 -04:00
parent 715fb46817
commit b060857c8e
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 45 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1207,7 +1207,6 @@ dist_patch_DATA = \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \
%D%/packages/patches/gnome-builder-update-libportal.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \

98
gnu/packages/gnome.scm
View file

@ -12708,7 +12708,7 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(define-public gnome-builder (define-public gnome-builder
(package (package
(name "gnome-builder") (name "gnome-builder")
(version "41.2") (version "42.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -12716,20 +12716,12 @@ libraries. Applications do not need to be recompiled--or even restarted.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"04p031i999dccbnlbysmr6f93x7dji7b559j6yhdsqbqgxb7ncan")) "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax"))))
(patches
(search-patches "gnome-builder-update-libportal.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:glib-or-gtk? #t ;To wrap binaries and compile schemas #:glib-or-gtk? #t ;To wrap binaries and compile schemas
#:configure-flags #:configure-flags #~(list "-Dnetwork_tests=false")
#~(list "-Dnetwork_tests=false"
;; TODO: Enable all plugins...
;; Flatpak plugin wants libsoup 2
"-Dplugin_flatpak=false"
;; ... except this one.
"-Dplugin_update_manager=false")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-meson (add-after 'unpack 'patch-meson
@ -12738,47 +12730,47 @@ libraries. Applications do not need to be recompiled--or even restarted.")
(("gtk-update-icon-cache") "true") (("gtk-update-icon-cache") "true")
(("update-desktop-database") "true")) (("update-desktop-database") "true"))
(substitute* "src/libide/meson.build" (substitute* "src/libide/meson.build"
(("/usr/lib") (string-append (assoc-ref inputs (("/usr/lib")
"python-pygobject") (string-append #$(this-package-input "python-pygobject")
"/lib"))))) "/lib")))))
(add-after 'configure 'fix-ninja
(lambda _
;; #43296: meson(?) incorrectly assumes we want to link
;; this PIE against a static libselinux.
(substitute* "build.ninja"
(("libselinux\\.a") "libselinux.so"))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1")))))) (setenv "DISPLAY" ":1"))))))
(inputs (list cmark (inputs
clang (list cmark
devhelp-with-libsoup2 clang
glade3 devhelp-with-libsoup2
gspell flatpak
gtk+ glade3
json-glib gspell
jsonrpc-glib gtk+
libdazzle json-glib
libgit2-glib jsonrpc-glib
libpeas libdazzle
libportal libgit2-glib
libsoup-minimal-2 libhandy
llvm libpeas
python libportal
python-pygobject libsoup-minimal-2
sysprof-3.44 llvm
template-glib libostree
vte python
webkitgtk-with-libsoup2)) python-pygobject
(propagated-inputs (list gtksourceview)) ; needed for settings sysprof-3.44
(native-inputs (list desktop-file-utils ; for desktop-file-validate template-glib
`(,glib "bin") vte
gettext-minimal webkitgtk-with-libsoup2))
pkg-config (propagated-inputs
python ; for meson scripts (list gtksourceview-4)) ;needed for settings
vala (native-inputs
xorg-server-for-tests)) (list desktop-file-utils ;for desktop-file-validate
`(,glib "bin")
gettext-minimal
pkg-config
python ;for meson scripts
vala
xorg-server-for-tests))
(home-page "https://wiki.gnome.org/Apps/Builder") (home-page "https://wiki.gnome.org/Apps/Builder")
(synopsis "Toolsmith for GNOME-based applications") (synopsis "Toolsmith for GNOME-based applications")
(description (description
@ -12819,10 +12811,10 @@ profiler via Sysprof, debugging support, and more.")
(substitute* "meson_post_install.py" (substitute* "meson_post_install.py"
(("gtk-update-icon-cache") (which "true"))))) (("gtk-update-icon-cache") (which "true")))))
(add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(wrap-program (search-input-file outputs "bin/komikku") (wrap-program (search-input-file outputs "bin/komikku")
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(inputs (inputs
(list bash-minimal (list bash-minimal
gtk+ gtk+

93
gnu/packages/patches/gnome-builder-update-libportal.patch
View file

@ -1,93 +0,0 @@
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