diff --git a/.gitignore b/.gitignore index a8037f7..64d0660 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ ulauncher /ulauncher_5.15.4.tar.gz /ulauncher_5.15.6.tar.gz /ulauncher_5.15.7.tar.gz +/ulauncher_5.15.15.tar.gz diff --git a/sources b/sources index c9631e2..99f9a13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ulauncher_5.15.7.tar.gz) = d438aac1a90a908a95ca3b0438de4d3599e61f6bfe603e2bdd93f60b441f09dac351e0e8f807acd203c0070f08301c90fe8c97224cde3200f11318e34f8eda8d +SHA512 (ulauncher_5.15.15.tar.gz) = f29579b85c79cafcea3af5ef03b144c0e9ad14ecba5a77f16ac779b9798b8c0f8ba0bd964a68d3341b377f4eff5fdea11e637d1d14d21dea86936448de5aea31 diff --git a/support-gir1.2-webkit2-4.1.patch b/support-gir1.2-webkit2-4.1.patch deleted file mode 100644 index e214560..0000000 --- a/support-gir1.2-webkit2-4.1.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 08b52d22df8054fd6b8cd8e61dec72d8ab6dc846 Mon Sep 17 00:00:00 2001 -From: Albin Larsson -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 diff --git a/ulauncher.spec b/ulauncher.spec index 91fe7a0..3bf59b2 100644 --- a/ulauncher.spec +++ b/ulauncher.spec @@ -1,14 +1,12 @@ Name: ulauncher -Version: 5.15.7 +Version: 5.15.15 Release: %{autorelease} -Summary: Linux Application Launcher +Summary: Feature rich application Launcher for Linux BuildArch: noarch License: GPL-3.0-or-later URL: https://github.com/Ulauncher/Ulauncher Source0: %{url}/releases/download/%{version}/%{name}_%{version}.tar.gz -# https://bugzilla.redhat.com/show_bug.cgi?id=2293346 -Patch: https://github.com/Ulauncher/Ulauncher/commit/08b52d2.patch#/support-gir1.2-webkit2-4.1.patch BuildRequires: desktop-file-utils BuildRequires: intltool @@ -16,6 +14,8 @@ BuildRequires: keybinder3-devel BuildRequires: python3-dbus BuildRequires: python3-devel >= 3.6 BuildRequires: python3-distutils-extra +# Need to call out setuptools since distutils-extra uses it, but doesn't list it as a requirement +BuildRequires: python3-setuptools BuildRequires: python3-gobject-devel >= 3.30 BuildRequires: python3-inotify BuildRequires: python3-Levenshtein @@ -24,7 +24,6 @@ BuildRequires: python3-websocket-client BuildRequires: systemd-rpm-macros BuildRequires: python3dist(requests) BuildRequires: pkgconfig(gtk+-3.0) - Requires: hicolor-icon-theme Requires: keybinder3 Requires: webkit2gtk4.1 @@ -36,12 +35,12 @@ Requires: python3-Levenshtein Requires: python3-pyxdg Requires: python3-websocket-client Requires: wmctrl - Recommends: libappindicator-gtk3 %description -Ulauncher is a fast application launcher for Linux. It's is written in Python, -using GTK+. +Ulauncher is a fast application launcher for Linux. It's written in Python using +GTK+, and features: App Search (fuzzy matching), Calculator, Extensions, +Shortcuts, File browser mode and Custom Color Themes. %prep