[arch-commits] Commit in gnome-builder/trunk (PKGBUILD libportal-0.5.diff)

[Jan Steffens]

    Date: Saturday, April 2, 2022 @ 23:45:01
  Author: heftig
Revision: 441372

42.0+r12+gfd803f606-1

Modified:
  gnome-builder/trunk/PKGBUILD
Deleted:
  gnome-builder/trunk/libportal-0.5.diff

--------------------+
 PKGBUILD           |   20 +++++++------------
 libportal-0.5.diff |   52 ---------------------------------------------------
 2 files changed, 8 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-02 23:44:35 UTC (rev 441371)
+++ PKGBUILD	2022-04-02 23:45:01 UTC (rev 441372)
@@ -2,35 +2,31 @@
 
 pkgbase=gnome-builder
 pkgname=(gnome-builder gnome-builder-libide-docs)
-pkgver=41.3
-pkgrel=5
+pkgver=42.0+r12+gfd803f606
+pkgrel=1
 pkgdesc="An IDE for writing GNOME-based software"
 url="https://wiki.gnome.org/Apps/Builder"
 arch=(x86_64)
 license=(GPL3)
 depends=(gtksourceview4 devhelp libgit2-glib gjs python-gobject sysprof
-         desktop-file-utils ctags libpeas vte3 vala autoconf-archive
+         desktop-file-utils ctags libpeas vte3 vala autoconf-archive libhandy
          gspell libdazzle template-glib jsonrpc-glib python-sphinx webkit2gtk
          glade python-lxml meson libportal-gtk3 cmark clang flatpak-builder)
 makedepends=(llvm gobject-introspection gi-docgen yelp-tools appstream-glib git
              mm-common python-sphinx_rtd_theme jedi-language-server)
 checkdepends=(xorg-server-xvfb)
-_commit=21c097851240dc1242e9fbd819e7d9acf6e6af9c  # tags/41.3^0
-source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit"
-        libportal-0.5.diff)
-sha256sums=('SKIP'
-            '350dd0e5b8dc4d7ecdf3284e91983fe8d890ab453df6c5b218af8a6b6e7e7280')
+options=(debug)
+_commit=fd803f606f6bc5ea7af5a3fdbf325a1f0165c212  # gnome-builder-42
+source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgbase
-  git describe --tags | sed 's/^GNOME_BUILDER_//;s/[^-]*-g/r&/;s/_/./g;s/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgbase
-
-  # libportal 0.5
-  git apply -3 ../libportal-0.5.diff
 }
 
 build() {

Deleted: libportal-0.5.diff
===================================================================
--- libportal-0.5.diff	2022-04-02 23:44:35 UTC (rev 441371)
+++ libportal-0.5.diff	2022-04-02 23:45:01 UTC (rev 441372)
@@ -1,52 +0,0 @@
-diff --git i/meson.build w/meson.build
-index 71e4be94c..a6257e535 100644
---- i/meson.build
-+++ w/meson.build
-@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.29.91')
- 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', version: '>= 0.5', required: false)
- libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0')
- libvte_dep = dependency('vte-2.91', version: '>= 0.40.2')
- libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false)
-diff --git i/src/gstyle/gstyle-color-panel.c w/src/gstyle/gstyle-color-panel.c
-index 15742a7be..a6295c168 100644
---- i/src/gstyle/gstyle-color-panel.c
-+++ w/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 i/src/plugins/devhelp/gbp-devhelp-page.c w/src/plugins/devhelp/gbp-devhelp-page.c
-index 5d5c52b0d..2ac788414 100644
---- i/src/plugins/devhelp/gbp-devhelp-page.c
-+++ w/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 i/src/plugins/open-with-external/gbp-owe-workbench-addin.c w/src/plugins/open-with-external/gbp-owe-workbench-addin.c
-index 51d2da844..816fe643f 100644
---- i/src/plugins/open-with-external/gbp-owe-workbench-addin.c
-+++ w/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
- {