From acb145c23257c066178ebdeff679e81d2892900b Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Wed, 27 Apr 2022 15:09:04 +0300 Subject: [PATCH] splited kde/gnome pakcages and added some patches --- x11/wm/openbox/actions.py | 2 +- x11/wm/openbox/files/debian-887908.patch | 31 +++++++++++ x11/wm/openbox/files/openbox-kde-paths.patch | 22 ++++++++ x11/wm/openbox/pspec.xml | 55 +++++++++++++++++--- 4 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 x11/wm/openbox/files/debian-887908.patch create mode 100644 x11/wm/openbox/files/openbox-kde-paths.patch diff --git a/x11/wm/openbox/actions.py b/x11/wm/openbox/actions.py index b78db8f33f..2eea00f2eb 100644 --- a/x11/wm/openbox/actions.py +++ b/x11/wm/openbox/actions.py @@ -19,7 +19,7 @@ def setup(): --with-x \ --enable-nls \ --sysconfdir=/etc \ - --libexecdir=/usr/libexec \ + --libexecdir=/usr/lib/openbox \ --enable-startup-notification \ --docdir=/%s/%s" % (get.docDIR(), get.srcNAME())) diff --git a/x11/wm/openbox/files/debian-887908.patch b/x11/wm/openbox/files/debian-887908.patch new file mode 100644 index 0000000000..2c8794ed7f --- /dev/null +++ b/x11/wm/openbox/files/debian-887908.patch @@ -0,0 +1,31 @@ +Description: Fix toggled hover and pressed images masks not loaded +Author: "E. Serradilla" +Debian-Bugs: https://bugs.debian.org/887908 + +--- a/obrender/theme.c ++++ b/obrender/theme.c +@@ -1494,8 +1494,10 @@ static void read_button_styles(XrmDataba + READ_BUTTON_MASK_COPY(disabled, btn->unpressed_mask); + READ_BUTTON_MASK_COPY(hover, btn->unpressed_mask); + if (toggled_mask) { +- READ_BUTTON_MASK_COPY(pressed_toggled, btn->unpressed_toggled_mask); +- READ_BUTTON_MASK_COPY(hover_toggled, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_pressed.xbm", btnname); ++ READ_MASK_COPY(name, btn->pressed_toggled_mask, btn->unpressed_toggled_mask); ++ g_snprintf(name, 128, "%s_toggled_hover.xbm", btnname); ++ READ_MASK_COPY(name, btn->hover_toggled_mask, btn->unpressed_toggled_mask); + } + + #define READ_BUTTON_APPEARANCE(typedots, type, fallback) \ +@@ -1532,8 +1534,8 @@ static void read_button_styles(XrmDataba + READ_BUTTON_APPEARANCE("disabled", disabled, 0); + READ_BUTTON_APPEARANCE("hover", hover, 0); + if (toggled_mask) { +- READ_BUTTON_APPEARANCE("unpressed.toggled", unpressed_toggled, 1); +- READ_BUTTON_APPEARANCE("pressed.toggled", pressed_toggled, 0); +- READ_BUTTON_APPEARANCE("hover.toggled", hover_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.unpressed", unpressed_toggled, 1); ++ READ_BUTTON_APPEARANCE("toggled.pressed", pressed_toggled, 0); ++ READ_BUTTON_APPEARANCE("toggled.hover", hover_toggled, 0); + } + } diff --git a/x11/wm/openbox/files/openbox-kde-paths.patch b/x11/wm/openbox/files/openbox-kde-paths.patch new file mode 100644 index 0000000000..249af1f96f --- /dev/null +++ b/x11/wm/openbox/files/openbox-kde-paths.patch @@ -0,0 +1,22 @@ +diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in +index 35722796..ee91c16f 100644 +--- a/data/xsession/openbox-kde-session.in ++++ b/data/xsession/openbox-kde-session.in +@@ -17,4 +17,4 @@ xprop -root -remove _NET_NUMBER_OF_DESKTOPS \ + + # Run KDE with Openbox as its window manager + export KDEWM="@bindir@/openbox" +-exec startkde "$@" ++exec /usr/bin/startplasma-x11 "$@" +diff --git a/data/xsession/openbox-kde.desktop.in b/data/xsession/openbox-kde.desktop.in +index bc78a97c..a9bcc219 100644 +--- a/data/xsession/openbox-kde.desktop.in ++++ b/data/xsession/openbox-kde.desktop.in +@@ -2,6 +2,6 @@ + Name=KDE/Openbox + Comment=Use the Openbox window manager inside of the K Desktop Environment + Exec=@bindir@/openbox-kde-session +-TryExec=startkde ++TryExec=/usr/bin/startplasma-x11 + Icon=openbox + Type=Application diff --git a/x11/wm/openbox/pspec.xml b/x11/wm/openbox/pspec.xml index f39025b078..0682b59454 100644 --- a/x11/wm/openbox/pspec.xml +++ b/x11/wm/openbox/pspec.xml @@ -36,6 +36,8 @@ openbox-3.5.2-gnome-session.patch openbox-3.6.1-py3-xdg.patch + openbox-kde-paths.patch + debian-887908.patch @@ -60,20 +62,24 @@ startup-notification - /usr/bin - /usr/libexec + /usr/bin/obmenu-generator + /usr/bin/obxprop + /usr/bin/openbox + /usr/bin/openbox-session + /usr/lib/openbox /etc/xdg/openbox /etc/xdg/obmenu-generator - /usr/lib + /usr/lib/libobrender* + /usr/lib/libobt* /usr/share/openbox /usr/share/themes - /usr/share/xsessions - /usr/share/gnome - /usr/share/gnome-session + /usr/share/xsessions/openbox.desktop /usr/share/applications /usr/share/pixmaps /usr/share/locale - /usr/share/man + /usr/share/man/man1/obxprop.1 + /usr/share/man/man1/openbox.1 + /usr/share/man/man1/openbox-session.1 /usr/share/doc @@ -83,10 +89,36 @@ kedicik.png - xdg-menu + xdg-menu terminals.menu + + + openbox-kde + The openbox-kde package contains the files needed for using openbox inside a +KDE session. + + openbox + + + /usr/bin/openbox-kde-session + /usr/share/xsessions/openbox-kde.desktop + /usr/share/man/man1/openbox-kde-session.1 + + + + + openbox-gnome + The openbox-gnome package contains the files needed for using openbox inside a +Gnome session. + + openbox + + + /usr/share/gnome/wm-properties + + openbox-devel @@ -107,6 +139,13 @@ + + 2022-04-27 + 3.6.1 + splited kde/gnome packages and added some patch + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2021-12-13 3.6.1