From ff6b84fdc86950c63255595fae74993cd8821617 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:03:48 +0000 Subject: [PATCH 01/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 346e85eb32b51e851345f4a36d02973c6180608e Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 3 Apr 2024 00:06:39 +0300 Subject: [PATCH 02/16] =?UTF-8?q?=D1=81hore:=20Update=20to=205.15.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- ulauncher.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ca5ef2b..a8037f7 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ ulauncher /ulauncher_5.15.3.tar.gz /ulauncher_5.15.4.tar.gz /ulauncher_5.15.6.tar.gz +/ulauncher_5.15.7.tar.gz diff --git a/sources b/sources index dccb164..c9631e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ulauncher_5.15.6.tar.gz) = f8276df032446c371731c7e46b060250e59b5251434185238212aa0dcda672461314f113781b43c2126bd834b3207e76ab1f3e7e7132b319c751d0150625fe47 +SHA512 (ulauncher_5.15.7.tar.gz) = d438aac1a90a908a95ca3b0438de4d3599e61f6bfe603e2bdd93f60b441f09dac351e0e8f807acd203c0070f08301c90fe8c97224cde3200f11318e34f8eda8d diff --git a/ulauncher.spec b/ulauncher.spec index 3f58472..b9f77e0 100644 --- a/ulauncher.spec +++ b/ulauncher.spec @@ -1,5 +1,5 @@ Name: ulauncher -Version: 5.15.6 +Version: 5.15.7 Release: %{autorelease} Summary: Linux Application Launcher BuildArch: noarch From 6812410c517d21a733e4164c8b20538a6575aba2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 10:14:36 +0200 Subject: [PATCH 03/16] Rebuilt for Python 3.13 From 3892b89ae11dce9ef0a1edc2a8a0ab6e1af30f03 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Thu, 20 Jun 2024 21:15:21 +0300 Subject: [PATCH 04/16] build: Switch to webkit2gtk-4.1 rh#2293346 https://fedoraproject.org/wiki/Changes/Remove_webkit2gtk-4.0_API_Version Signed-off-by: Artem Polishchuk --- support-gir1.2-webkit2-4.1.patch | 70 ++++++++++++++++++++++++++++++++ ulauncher.spec | 6 +-- 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 support-gir1.2-webkit2-4.1.patch diff --git a/support-gir1.2-webkit2-4.1.patch b/support-gir1.2-webkit2-4.1.patch new file mode 100644 index 0000000..9689fdf --- /dev/null +++ b/support-gir1.2-webkit2-4.1.patch @@ -0,0 +1,70 @@ +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/debian/control b/debian/control +index 4f167e9df..a2529901c 100644 +--- a/debian/control ++++ b/debian/control +@@ -20,7 +20,7 @@ Depends: ${misc:Depends}, + libgtk-3-0 (>= 3.10), + gir1.2-gtk-3.0, + gir1.2-keybinder-3.0 (>= 0.3), +- gir1.2-webkit2-4.0, ++ gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0, + gir1.2-glib-2.0, + gir1.2-notify-0.7, + gir1.2-gdkpixbuf-2.0, +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 b9f77e0..91fe7a0 100644 --- a/ulauncher.spec +++ b/ulauncher.spec @@ -7,6 +7,8 @@ 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 @@ -20,14 +22,12 @@ BuildRequires: python3-Levenshtein BuildRequires: python3-pyxdg BuildRequires: python3-websocket-client BuildRequires: systemd-rpm-macros - BuildRequires: python3dist(requests) - BuildRequires: pkgconfig(gtk+-3.0) Requires: hicolor-icon-theme Requires: keybinder3 -Requires: webkitgtk4 +Requires: webkit2gtk4.1 Requires: python3-cairo Requires: python3-dbus Requires: python3-gobject From d3750d2c8a6d43b8664797e167ff0374bdb4b934 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Thu, 20 Jun 2024 21:21:17 +0300 Subject: [PATCH 05/16] build: Rebase webkit2gtk-4.1 patch Signed-off-by: Artem Polishchuk --- support-gir1.2-webkit2-4.1.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/support-gir1.2-webkit2-4.1.patch b/support-gir1.2-webkit2-4.1.patch index 9689fdf..e214560 100644 --- a/support-gir1.2-webkit2-4.1.patch +++ b/support-gir1.2-webkit2-4.1.patch @@ -10,19 +10,6 @@ Subject: [PATCH] fix: support gir1.2-webkit2-4.1 for ubuntu 24.04 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 ulauncher/utils/WebKit2.py -diff --git a/debian/control b/debian/control -index 4f167e9df..a2529901c 100644 ---- a/debian/control -+++ b/debian/control -@@ -20,7 +20,7 @@ Depends: ${misc:Depends}, - libgtk-3-0 (>= 3.10), - gir1.2-gtk-3.0, - gir1.2-keybinder-3.0 (>= 0.3), -- gir1.2-webkit2-4.0, -+ gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0, - gir1.2-glib-2.0, - gir1.2-notify-0.7, - gir1.2-gdkpixbuf-2.0, diff --git a/ulauncher/ui/windows/PreferencesUlauncherDialog.py b/ulauncher/ui/windows/PreferencesUlauncherDialog.py index 2fe19efaa..e4e304192 100644 --- a/ulauncher/ui/windows/PreferencesUlauncherDialog.py From 41cbdc88b209238bfe68541767af9df0cdbc5b49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:12:36 +0000 Subject: [PATCH 06/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From aae223cfed51d9b066dbf771c38e944220f6b80a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:42:04 +0000 Subject: [PATCH 07/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 04a9f8332f973a12a07ef0ea37fcf71dfff84258 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 13:12:51 +0200 Subject: [PATCH 08/16] Rebuilt for Python 3.14 From 584ebb4d82d323a78d4c36142b7d0c1d5025df50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:45:07 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From aa9ae665a677ab70b782d52fca4736a63536ee86 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:22 +0200 Subject: [PATCH 10/16] Rebuilt for Python 3.14.0rc2 bytecode From 84dbc154e8b74ffd221ced658efe411b808cc40d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:01:16 +0200 Subject: [PATCH 11/16] Rebuilt for Python 3.14.0rc3 bytecode From 5d7cf8a1f90307fbcd5c70469f44ce74457ba3a5 Mon Sep 17 00:00:00 2001 From: Troy Curtis Jr Date: Mon, 3 Nov 2025 21:53:53 -0500 Subject: [PATCH 12/16] Update to 5.15.15. --- .gitignore | 1 + sources | 2 +- support-gir1.2-webkit2-4.1.patch | 57 -------------------------------- ulauncher.spec | 6 ++-- 4 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 support-gir1.2-webkit2-4.1.patch 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..30f01fa 100644 --- a/ulauncher.spec +++ b/ulauncher.spec @@ -1,5 +1,5 @@ Name: ulauncher -Version: 5.15.7 +Version: 5.15.15 Release: %{autorelease} Summary: Linux Application Launcher BuildArch: noarch @@ -7,8 +7,6 @@ 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 From 26b3203336189fb0552f3a99fe72414056377b7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:34:26 +0000 Subject: [PATCH 13/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From f3b153a7e5b12cc25733c1a0c906a0adecbe73a7 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Thu, 22 Jan 2026 12:50:34 +0300 Subject: [PATCH 14/16] Update desc Signed-off-by: Artem Polishchuk --- ulauncher.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ulauncher.spec b/ulauncher.spec index 30f01fa..3bf59b2 100644 --- a/ulauncher.spec +++ b/ulauncher.spec @@ -1,7 +1,7 @@ Name: ulauncher 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 @@ -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 From a838c14721084e407a9c7cd2ea27ea8202cb3c51 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 20:00:51 +0200 Subject: [PATCH 15/16] Rebuilt for Python 3.15 From 420b9f8e9d14b39d2ccb313b9e91c97a5b8599f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:09:04 +0000 Subject: [PATCH 16/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild