Update package version to 5.15.11

This commit is contained in:
2025-09-15 21:20:10 +03:00
parent 0c8e4e536d
commit 805da9aeda
4 changed files with 11 additions and 62 deletions
+9
View File
@@ -0,0 +1,9 @@
#!/bin/bash
# Github repository
REPO="ulauncher/ulauncher"
# Get tag name using Github Rest API
TAG_NAME=$(curl -s -L -H "X-GitHub-Api-Version: 2022-11-28" -H "Authorization: token ${GITHUB_API_TOKEN}" https://api.github.com/repos/"$REPO"/releases/latest | jq -r '.tag_name')
echo "$TAG_NAME"
+2 -2
View File
@@ -1,10 +1,10 @@
name: ulauncher name: ulauncher
description: Feature rich application Launcher for Linux description: Feature rich application Launcher for Linux
version: 5.15.7 version: 5.15.11
url: https://ulauncher.io/ url: https://ulauncher.io/
license: GPL3-or-later license: GPL3-or-later
architecture: any architecture: any
depends: ["gdk-pixbuf","gtk3","libkeybinder3","libnotify","python-pycairo","python-dbus","python-pygobject","python-levenshtein","python-pyinotify","python-pyxdg","python-websocket-client","webkitgtk"] depends: ["gdk-pixbuf","gtk3","libkeybinder3","libnotify","python-pycairo","python-dbus","python-pygobject","python-levenshtein","python-pyinotify","python-pyxdg","python-websocket-client","webkitgtk3"]
optional_depends: ["libayatana-appindicator"] optional_depends: ["libayatana-appindicator"]
make_depends: ["python-distutils-extra","python-setuptools"] make_depends: ["python-distutils-extra","python-setuptools"]
type: source type: source
-57
View File
@@ -1,57 +0,0 @@
From 08b52d22df8054fd6b8cd8e61dec72d8ab6dc846 Mon Sep 17 00:00:00 2001
From: Albin Larsson <[email protected]>
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
-3
View File
@@ -15,9 +15,6 @@ prepare() {
# The build function is executed in the source directory # The build function is executed in the source directory
# This function is used to compile the source code # This function is used to compile the source code
build() { build() {
# Patch for fixing webkit2gtk 4.1 compatability
patch -Np1 < "$BPM_WORKDIR"/libwebkit2gtk41.patch
python setup.py build python setup.py build
} }