summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Edward W. Koenig2021-08-24 09:46:23 +0200
committer Willy Sudiarto Raharjo2021-08-25 07:11:45 +0200
commitb0808c30ccb5f38b923a1de6887e4b57770e92e1 (patch)
treee4fb9b02f34afb91c15fda82e7b22c92d369e2fe
parentc1ec0ea6a84dfc7c29e4f60b808bb8ad86a3aadd (diff)
downloadslackbuilds-b0808c30ccb5f38b923a1de6887e4b57770e92e1.tar.gz
desktop/menulibre: Patch to avoid conflict with gtk+4.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/menulibre/fix_gtk4_conflict.patch24
-rw-r--r--desktop/menulibre/menulibre.SlackBuild2
2 files changed, 26 insertions, 0 deletions
diff --git a/desktop/menulibre/fix_gtk4_conflict.patch b/desktop/menulibre/fix_gtk4_conflict.patch
new file mode 100644
index 0000000000..b28dca9449
--- /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 754f8428cb..345868526c 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