ulauncher: update to 5.15.7.

This commit is contained in:
oreo639 2024-06-20 22:56:40 -07:00
parent 62f6da150d
commit 78c7a7885d
2 changed files with 60 additions and 3 deletions

View File

@ -0,0 +1,57 @@
From 08b52d22df8054fd6b8cd8e61dec72d8ab6dc846 Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@fridaythe14th.com>
Date: Sat, 27 Apr 2024 14:13:36 +0200
Subject: [PATCH] fix: support gir1.2-webkit2-4.1 for ubuntu 24.04
---
debian/control | 2 +-
.../ui/windows/PreferencesUlauncherDialog.py | 4 ++--
ulauncher/utils/WebKit2.py | 15 +++++++++++++++
3 files changed, 18 insertions(+), 3 deletions(-)
create mode 100644 ulauncher/utils/WebKit2.py
diff --git a/ulauncher/ui/windows/PreferencesUlauncherDialog.py b/ulauncher/ui/windows/PreferencesUlauncherDialog.py
index 2fe19efaa..e4e304192 100644
--- a/ulauncher/ui/windows/PreferencesUlauncherDialog.py
+++ b/ulauncher/ui/windows/PreferencesUlauncherDialog.py
@@ -12,10 +12,9 @@
gi.require_version('Gio', '2.0')
gi.require_version('GLib', '2.0')
gi.require_version('Gtk', '3.0')
-gi.require_version('WebKit2', '4.0')
# pylint: disable=wrong-import-position,unused-argument
-from gi.repository import Gio, Gtk, WebKit2, GLib # type: ignore
+from gi.repository import Gio, Gtk, GLib # type: ignore
from ulauncher.api.shared.action.OpenAction import OpenAction
from ulauncher.ui.windows.HotkeyDialog import HotkeyDialog
@@ -39,6 +38,7 @@
from ulauncher.utils.Settings import Settings
from ulauncher.utils.Router import Router, get_url_params
from ulauncher.utils.AutostartPreference import AutostartPreference
+from ulauncher.utils.WebKit2 import WebKit2
from ulauncher.ui.AppIndicator import AppIndicator
from ulauncher.search.shortcuts.ShortcutsDb import ShortcutsDb
from ulauncher.config import get_data_file, get_options, get_version, EXTENSIONS_DIR
diff --git a/ulauncher/utils/WebKit2.py b/ulauncher/utils/WebKit2.py
new file mode 100644
index 000000000..70589eb63
--- /dev/null
+++ b/ulauncher/utils/WebKit2.py
@@ -0,0 +1,15 @@
+import gi
+
+# The package version refers to the "build environment". Not the actual Webkit version
+# 4.0 means it was built with GTK 3 and libsoup 2
+# 4.1 means it was built with GTK 3 and libsoup 3 (HTTP/2)
+# 5.0 means it was built with GTK 4 and libsoup 3 (incompatible w Ulauncher, and was only supported for a short period)
+# 6.0 means the same as 5.0, but the API has major changes, and the package name was renamed, dropping the "2"
+# https://blog.tingping.se/2021/06/07/http2-in-libsoup.html
+# https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190
+# https://bugs.webkit.org/show_bug.cgi?id=245296
+try:
+ gi.require_version('WebKit2', '4.1')
+except ValueError:
+ gi.require_version('WebKit2', '4.0')
+from gi.repository import WebKit2 # type: ignore[attr-defined] # noqa: F401

View File

@ -1,19 +1,19 @@
# Template file for 'ulauncher'
pkgname=ulauncher
version=5.15.3
version=5.15.7
revision=1
build_style=python3-module
hostmakedepends="python3-distutils-extra intltool python3-Levenshtein
python3-dbus python3-gobject python3-inotify python3-websocket-client
python3-xdg"
depends="libayatana-appindicator libkeybinder3 python3-Levenshtein python3-dbus
python3-gobject python3-inotify python3-websocket-client python3-xdg webkit2gtk"
python3-gobject python3-inotify python3-websocket-client python3-xdg libwebkit2gtk41"
short_desc="Linux application launcher with fuzzy search and extensions"
maintainer="Alberto Pau <me@albertopau.com>"
license="GPL-3.0-or-later"
homepage="https://ulauncher.io/"
distfiles="https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"
checksum=ba702273a19382f645149c0f111875eb8bdf0e2144d332c45238000d1f78c39c
checksum=6203b0dc6cb2fe8f2aa2b5809c0950ac06766539f23f73da80bb36424760efcf
pre_build() {
export DISPLAY=