From bb317bfee9f01b8dc98ecd2fd6d1a29fa6aade3e Mon Sep 17 00:00:00 2001
From: mio <miyopan@e.email>
Date: Wed, 6 Nov 2024 07:07:26 +0000
Subject: [PATCH] community/font-manager: upgrade to 0.9.0
https://github.com/FontManager/font-manager/releases/tag/0.9.0
https://github.com/FontManager/font-manager/releases/tag/0.8.9
0.8.9 resolves compile errors with Vala that led to rebuild failure on a
3.21 builder.
The application identifier was changed in 0.9.0, so asset filenames in
`font_viewer()` were updated accordingly.
---
community/font-manager/APKBUILD | 21 +++++-----
community/font-manager/libsoup3.patch | 58 ---------------------------
2 files changed, 9 insertions(+), 70 deletions(-)
delete mode 100644 community/font-manager/libsoup3.patch
diff --git a/community/font-manager/APKBUILD b/community/font-manager/APKBUILD
index ad2997b9fa9d..60d081cc331d 100644
--- a/community/font-manager/APKBUILD
+++ b/community/font-manager/APKBUILD
@@ -2,8 +2,8 @@
# Maintainer: knuxify <knuxify@gmail.com>
pkgname=font-manager
_viewer_pkgname=font-viewer
-pkgver=0.8.8
-pkgrel=6
+pkgver=0.9.0
+pkgrel=0
pkgdesc="Simple font management application for GTK Desktop Environments"
url="https://fontmanager.github.io/"
arch="all"
@@ -13,11 +13,11 @@ makedepends="meson
freetype-dev
glib-dev
gobject-introspection-dev
- gtk+3.0-dev
+ gtk4.0-dev
itstool
json-glib-dev
libxml2-dev
- webkit2gtk-4.1-dev
+ webkit2gtk-6.0-dev
yelp-tools
vala"
# For file manager extentions
@@ -43,9 +43,7 @@ case "$CARCH" in
;;
esac
-source="https://github.com/FontManager/font-manager/releases/download/$pkgver/font-manager-$pkgver.tar.xz
- libsoup3.patch
- "
+source="https://github.com/FontManager/font-manager/releases/download/$pkgver/font-manager-$pkgver.tar.xz"
options="!check" # no test suite, see https://github.com/FontManager/font-manager/issues/238
build() {
@@ -74,14 +72,14 @@ common() {
font_viewer() {
pkgdesc="Full featured font file preview application for GTK+ Desktop Environments"
- local pkgid="org.gnome.FontViewer"
+ local pkgid="com.github.FontManager.FontViewer"
amove usr/libexec/font-manager
amove usr/share/applications/$pkgid.desktop
amove usr/share/dbus-1/services/$pkgid.service
amove usr/share/glib-*/schemas/$pkgid.gschema.xml
- amove usr/share/icons/hicolor/*/apps/$pkgid.png
- amove usr/share/metainfo/$pkgid.appdata.xml
+ amove usr/share/icons/hicolor/*/apps/$pkgid.svg
+ amove usr/share/metainfo/$pkgid.metainfo.xml
}
ext_nautilus() {
@@ -106,6 +104,5 @@ ext_thunar() {
}
sha512sums="
-75e85af8bbbac4f4f3e73371eb618e75afdd14ea1dc1eab7855db537356c4a9f89121554db2c7a7e2a2357a545a6c2ad69bebbde4ed588a6f9ec0bfe1cc67ad0 font-manager-0.8.8.tar.xz
-3d31661695ef31e2f86c613ca68a1740e133b8799579d71224df32d3302a1cd665eab099a4e3aad4e969074221e6c587f2b09dec2cdaf1cce013521b59282b8e libsoup3.patch
+d17eed9b0db726c7c8aadc9b2c1b253b25503ca3159e6e1a1e7f797d8a49fa01799a7001f35d2ebd0a88468fb02c764cffe9dcc8d4db0b479dd6dcde8c2528d9 font-manager-0.9.0.tar.xz
"
diff --git a/community/font-manager/libsoup3.patch b/community/font-manager/libsoup3.patch
deleted file mode 100644
index a71d45b20ac3..000000000000
--- a/community/font-manager/libsoup3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/meson.build b/meson.build
-index bd96b9b..49f7127 100644
---- a/meson.build
-+++ b/meson.build
-@@ -27,8 +27,8 @@ sqlite = dependency('sqlite3', version: '>= 3.8')
- xml = dependency('libxml-2.0', version: '>= 2.9')
-
- if get_option('webkit')
-- soup = dependency('libsoup-2.4', version: '>= 2.62')
-- webkit = dependency('webkit2gtk-4.0', version: '>= 2.24')
-+ soup = dependency('libsoup-3.0', version: '>= 2.62')
-+ webkit = dependency('webkit2gtk-4.1', version: '>= 2.24')
- add_global_arguments('-D', 'HAVE_WEBKIT', language: 'vala')
- endif
-
-diff --git a/src/font-manager/web/google/GoogleFonts.vala b/src/font-manager/web/google/GoogleFonts.vala
-index 6139e17..1430d99 100644
---- a/src/font-manager/web/google/GoogleFonts.vala
-+++ b/src/font-manager/web/google/GoogleFonts.vala
-@@ -156,10 +156,15 @@ namespace FontManager.GoogleFonts {
- foreach (var entry in order) {
- string filename = "gfc-%s.json".printf(entry);
- var message = new Soup.Message(GET, WEBFONTS.printf(GFC_API_KEY, entry));
-- if (session.send_message(message) == Soup.Status.OK) {
-+ GLib.Bytes? bytes = null;
-+ try {
-+ bytes = session.send_and_read(message, null);
-+ } catch (GLib.Error e) {
-+ warning("Failed to fetch webfont %s", filename);
-+ }
-+ if (message.get_status() == Soup.Status.OK && bytes != null) {
- string filepath = Path.build_filename(get_package_cache_directory(), filename);
- try {
-- Bytes bytes = message.response_body.flatten().get_as_bytes();
- File cache_file = File.new_for_path(filepath);
- if (cache_file.query_exists())
- cache_file.delete();
-diff --git a/src/font-manager/web/google/WebFont.vala b/src/font-manager/web/google/WebFont.vala
-index d4f1494..d2bd446 100644
---- a/src/font-manager/web/google/WebFont.vala
-+++ b/src/font-manager/web/google/WebFont.vala
-@@ -42,9 +42,14 @@ namespace FontManager.GoogleFonts {
- string filename = font.get_filename();
- string filepath = Path.build_filename(font_dir, filename);
- var message = new Soup.Message(GET, font.url);
-- if (session.send_message(message) == Soup.Status.OK) {
-+ GLib.Bytes? bytes = null;
-+ try {
-+ bytes = session.send_and_read(message, null);
-+ } catch (GLib.Error e) {
-+ warning("Failed to fetch webfont %s", filename);
-+ }
-+ if (message.get_status() == Soup.Status.OK && bytes != null) {
- try {
-- Bytes bytes = message.response_body.flatten().get_as_bytes();
- File font_file = File.new_for_path(filepath);
- if (font_file.query_exists())
- font_file.delete();
--
GitLab