Date: Saturday, December 25, 2021 @ 02:01:52 Author: heftig Revision: 433056
41.3-2: libportal 0.5 Added: gnome-builder/trunk/libportal-0.5.diff Modified: gnome-builder/trunk/PKGBUILD Deleted: gnome-builder/trunk/screenshots.diff --------------------+ PKGBUILD | 13 ++++++++---- libportal-0.5.diff | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ screenshots.diff | 42 ----------------------------------------- 3 files changed, 61 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-25 02:01:37 UTC (rev 433055) +++ PKGBUILD 2021-12-25 02:01:52 UTC (rev 433056) @@ -3,7 +3,7 @@ pkgbase=gnome-builder pkgname=(gnome-builder gnome-builder-libide-docs) pkgver=41.3 -pkgrel=1 +pkgrel=2 pkgdesc="An IDE for writing GNOME-based software" url="https://wiki.gnome.org/Apps/Builder"; arch=(x86_64) @@ -11,14 +11,16 @@ depends=(gtksourceview4 devhelp libgit2-glib gjs python-gobject sysprof desktop-file-utils ctags libpeas vte3 vala autoconf-archive gspell libdazzle template-glib jsonrpc-glib python-sphinx webkit2gtk - glade python-lxml meson libportal cmark) + glade python-lxml meson libportal-gtk3 cmark) makedepends=(llvm gobject-introspection gi-docgen yelp-tools appstream-glib git mm-common python-sphinx_rtd_theme clang jedi-language-server flatpak-builder) checkdepends=(xorg-server-xvfb) _commit=21c097851240dc1242e9fbd819e7d9acf6e6af9c # tags/41.3^0 -source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit";) -sha256sums=('SKIP') +source=("git+https://gitlab.gnome.org/GNOME/gnome-builder.git#commit=$_commit"; + libportal-0.5.diff) +sha256sums=('SKIP' + '350dd0e5b8dc4d7ecdf3284e91983fe8d890ab453df6c5b218af8a6b6e7e7280') pkgver() { cd $pkgbase @@ -27,6 +29,9 @@ prepare() { cd $pkgbase + + # libportal 0.5 + git apply -3 ../libportal-0.5.diff } build() { Added: libportal-0.5.diff =================================================================== --- libportal-0.5.diff (rev 0) +++ libportal-0.5.diff 2021-12-25 02:01:52 UTC (rev 433056) @@ -0,0 +1,52 @@ +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 + { Deleted: screenshots.diff =================================================================== --- screenshots.diff 2021-12-25 02:01:37 UTC (rev 433055) +++ screenshots.diff 2021-12-25 02:01:52 UTC (rev 433056) @@ -1,42 +0,0 @@ -diff --git i/data/appdata/org.gnome.Builder.appdata.xml.in w/data/appdata/org.gnome.Builder.appdata.xml.in -index b63eedc47..17a844f46 100644 ---- i/data/appdata/org.gnome.Builder.appdata.xml.in -+++ w/data/appdata/org.gnome.Builder.appdata.xml.in -@@ -44,27 +44,31 @@ - <screenshots> - <screenshot type="default"> - <caption>Quickly access your projects</caption> -- <image width="2400" height="1350">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/01-greeter.png</image> -+ <image width="2104" height="1398">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/01-greeter.png</image> - </screenshot> - <screenshot type="default"> - <caption>Create new projects from a variety of templates</caption> -- <image width="2400" height="1350">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/02-template.png</image> -+ <image width="2104" height="1580">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/02-template.png</image> - </screenshot> - <screenshot type="default"> - <caption>Integration with Git to clone your projects</caption> -- <image width="2400" height="1350">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/03-clone.png</image> -+ <image width="2104" height="1398">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/03-clone.png</image> - </screenshot> - <screenshot type="default"> - <caption>The source code editor</caption> -- <image width="2400" height="1350">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/04-editor.png</image> -+ <image width="2976" height="1774">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/04-editor.png</image> - </screenshot> - <screenshot type="default"> - <caption>Fast global fuzzy search</caption> -- <image width="2400" height="1350">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/05-search.png</image> -+ <image width="1232" height="963">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/05-search.png</image> - </screenshot> - <screenshot type="default"> - <caption>Debug with the GNU debugger</caption> -- <image width="2400" height="1350">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/06-debugger.png</image> -+ <image width="2976" height="1774">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/06-debugger.png</image> -+ </screenshot> -+ <screenshot type="default"> -+ <caption>Use the minimap to see more of the file</caption> -+ <image width="2664" height="1638">https://gitlab.gnome.org/GNOME/gnome-builder/raw/master/data/appdata/07-minimap.png</image> - </screenshot> - </screenshots> - <launchable type="desktop-id">org.gnome.Builder.desktop</launchable>
