From b0808c30ccb5f38b923a1de6887e4b57770e92e1 Mon Sep 17 00:00:00 2001 From: "Edward W. Koenig" Date: Tue, 24 Aug 2021 09:46:23 +0200 Subject: desktop/menulibre: Patch to avoid conflict with gtk+4. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- desktop/menulibre/fix_gtk4_conflict.patch | 24 ++++++++++++++++++++++++ desktop/menulibre/menulibre.SlackBuild | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 desktop/menulibre/fix_gtk4_conflict.patch diff --git a/desktop/menulibre/fix_gtk4_conflict.patch b/desktop/menulibre/fix_gtk4_conflict.patch new file mode 100644 index 000000000000..b28dca944959 --- /dev/null +++ b/desktop/menulibre/fix_gtk4_conflict.patch @@ -0,0 +1,24 @@ +diff -Naur menulibre-2.2.1.org/menulibre/MenulibreApplication.py menulibre-2.2.1/menulibre/MenulibreApplication.py +--- menulibre-2.2.1.org/menulibre/MenulibreApplication.py 2019-05-31 01:55:18.000000000 +0100 ++++ menulibre-2.2.1/menulibre/MenulibreApplication.py 2021-06-03 20:43:35.507256870 +0100 +@@ -26,6 +26,8 @@ + + from locale import gettext as _ + ++import gi ++gi.require_version("Gtk", "3.0") + from gi.repository import Gio, GLib, GObject, Gtk, Gdk, GdkPixbuf + + from . import MenulibreStackSwitcher, MenulibreIconSelection +diff -Naur menulibre-2.2.1.org/menulibre_lib/helpers.py menulibre-2.2.1/menulibre_lib/helpers.py +--- menulibre-2.2.1.org/menulibre_lib/helpers.py 2019-05-31 01:55:18.000000000 +0100 ++++ menulibre-2.2.1/menulibre_lib/helpers.py 2021-06-03 20:44:04.194017263 +0100 +@@ -18,6 +18,8 @@ + import logging + import os + ++import gi ++gi.require_version("Gtk", "3.0") + from gi.repository import Gtk + + from . menulibreconfig import get_data_file diff --git a/desktop/menulibre/menulibre.SlackBuild b/desktop/menulibre/menulibre.SlackBuild index 754f8428cbec..345868526c9b 100644 --- a/desktop/menulibre/menulibre.SlackBuild +++ b/desktop/menulibre/menulibre.SlackBuild @@ -80,6 +80,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/fix_gtk4_conflict.patch + python3 setup.py install --root=$PKG mv $PKG/usr/share/man $PKG/usr/man -- cgit v1.2.3