diff options
| -rw-r--r-- | community/epiphany/APKBUILD | 9 | ||||
| -rw-r--r-- | community/epiphany/libportal-0.5.patch | 88 | ||||
| -rw-r--r-- | community/epiphany/remove-incorrect-args.patch | 35 |
3 files changed, 129 insertions, 3 deletions
diff --git a/community/epiphany/APKBUILD b/community/epiphany/APKBUILD index bff6a87705..556dbfc4aa 100644 --- a/community/epiphany/APKBUILD +++ b/community/epiphany/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=epiphany pkgver=41.0 -pkgrel=0 +pkgrel=1 pkgdesc="A simple, clean, beautiful view of the web" url="https://wiki.gnome.org/Apps/Web" # s390x, mips64 and riscv64 blocked by rust -> libhandy1 @@ -16,8 +16,9 @@ makedepends="meson iso-codes-dev gtk+3.0-dev gsettings-desktop-schemas-dev checkdepends="appstream-glib desktop-file-utils xvfb-run ibus" options="!check" # Fail due to our webkitgtk patches! subpackages="$pkgname-lang $pkgname-doc $pkgname-dbg" -source="https://download.gnome.org/sources/epiphany/${pkgver%.*}/epiphany-$pkgver.tar.xz" - +source="https://download.gnome.org/sources/epiphany/${pkgver%.*}/epiphany-$pkgver.tar.xz + libportal-0.5.patch + remove-incorrect-args.patch" build() { abuild-meson . output meson compile ${JOBS:+-j ${JOBS}} -C output @@ -34,4 +35,6 @@ package() { sha512sums=" 3e3f8209238b0b7fb181c48899e815896a24aae5b318c2ca6a75ce334423290d006e138c63496a0bcd4f32846439426f46b84875b2306aabb5b87e53368f8118 epiphany-41.0.tar.xz +885ae045faa26e208f0f9971279ea31ec68b2b0b6f05dfb2c8965e3cdcd5cc97ed085cbab9718ad7d20d9918a84d61e901a81fb5f658bca74b5dafd9f4f193b4 libportal-0.5.patch +222ac6f568cd53549b4b2154db08ea4c1f6d1bded70b8e1ccf3009f4d955d0f32b5b981b2c7fc5976ad67951eeec62f2e219286d7fe5ab3a3edf881fbb3bb595 remove-incorrect-args.patch " diff --git a/community/epiphany/libportal-0.5.patch b/community/epiphany/libportal-0.5.patch new file mode 100644 index 0000000000..68e01d9c40 --- /dev/null +++ b/community/epiphany/libportal-0.5.patch @@ -0,0 +1,88 @@ +Patch-Source: https://gitlab.gnome.org/GNOME/epiphany/-/commit/84474398f6e59266b73170838219aa896729ce93.patch + +From 84474398f6e59266b73170838219aa896729ce93 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis <pgriffis@igalia.com> +Date: Thu, 23 Dec 2021 14:51:50 -0600 +Subject: [PATCH] Port to libportal 0.5 + +This was an API breaking release that requires minor changes. +--- + lib/ephy-flatpak-utils.c | 2 +- + meson.build | 2 +- + org.gnome.Epiphany.Canary.json.in | 7 +++++-- + org.gnome.Epiphany.json | 7 +++++-- + 4 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/lib/ephy-flatpak-utils.c b/lib/ephy-flatpak-utils.c +index 818af95..aef937f 100644 +--- a/lib/ephy-flatpak-utils.c ++++ b/lib/ephy-flatpak-utils.c +@@ -29,7 +29,7 @@ + #include <gio/gio.h> + #include <gio/gunixfdlist.h> + #if USE_LIBPORTAL +-#include <libportal/portal-gtk3.h> ++#include <libportal-gtk3/portal-gtk3.h> + #endif + #include <string.h> + #include <sys/stat.h> +diff --git a/meson.build b/meson.build +index 74eee8a..40dc740 100644 +--- a/meson.build ++++ b/meson.build +@@ -96,7 +96,7 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') + libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') + libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12') + nettle_dep = dependency('nettle', version: nettle_requirement) +-portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal')) ++portal_dep = dependency('libportal-gtk3', version: '>= 0.5', required: get_option('libportal')) + sqlite3_dep = dependency('sqlite3', version: '>= 3.22') + + if get_option('soup2').enabled() +diff --git a/org.gnome.Epiphany.Canary.json.in b/org.gnome.Epiphany.Canary.json.in +index 17d4755..f7ffa12 100644 +--- a/org.gnome.Epiphany.Canary.json.in ++++ b/org.gnome.Epiphany.Canary.json.in +@@ -106,12 +106,15 @@ + "name" : "libportal", + "buildsystem" : "meson", + "config-opts" : [ +- "-Dgtk_doc=false" ++ "-Dbackends=gtk3", ++ "-Dintrospection=false", ++ "-Ddocs=false" + ], + "sources" : [ + { + "type" : "git", +- "url" : "https://github.com/flatpak/libportal.git" ++ "url" : "https://github.com/flatpak/libportal.git", ++ "tag": "0.5" + } + ] + }, +diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json +index 77993c1..f45c1db 100644 +--- a/org.gnome.Epiphany.json ++++ b/org.gnome.Epiphany.json +@@ -103,12 +103,15 @@ + "name" : "libportal", + "buildsystem" : "meson", + "config-opts" : [ +- "-Dgtk_doc=false" ++ "-Dbackends=gtk3", ++ "-Dintrospection=false", ++ "-Ddocs=false" + ], + "sources" : [ + { + "type" : "git", +- "url" : "https://github.com/flatpak/libportal.git" ++ "url" : "https://github.com/flatpak/libportal.git", ++ "tag": "0.5" + } + ] + }, +-- +2.34.1 + diff --git a/community/epiphany/remove-incorrect-args.patch b/community/epiphany/remove-incorrect-args.patch new file mode 100644 index 0000000000..6fee19ee66 --- /dev/null +++ b/community/epiphany/remove-incorrect-args.patch @@ -0,0 +1,35 @@ +Patch-Source: https://gitlab.gnome.org/GNOME/nautilus/-/commit/42b0362e9844f4c5114b21464185620eaadcfcaa.patch + +From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001 +From: rvalue <i@rvalue.moe> +Date: Wed, 24 Nov 2021 04:52:42 +0000 +Subject: [PATCH] Remove incorrect args for i18n.merge_file + +Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 46df3fd80..eac6b8224 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -16,7 +16,6 @@ install_data( + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) + desktop = i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('org.gnome.Epiphany.desktop.in.in'), + output: 'org.gnome.Epiphany.desktop.in', +@@ -32,7 +31,6 @@ desktop = i18n.merge_file( + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Epiphany.appdata.xml.in.in'), + output: 'org.gnome.Epiphany.appdata.xml.in', +-- +GitLab + |