Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

splited kde/gnome pakcages and added some patches

Browse Source
This commit is contained in:
ayhanyalcinsoy
2022-04-27 15:09:04 +03:00
parent 13b44265c3
commit acb145c232
4 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/wm/openbox/actions.py
+1 -1
View File
@@ -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()))
x11/wm/openbox/files/debian-887908.patch
+31
View File
@@ -0,0 +1,31 @@
Description: Fix toggled hover and pressed images masks not loaded
Author: "E. Serradilla" <eserradi@gmx.com>
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);
}
}
x11/wm/openbox/files/openbox-kde-paths.patch
+22
View File
@@ -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
x11/wm/openbox/pspec.xml
+47 -8
View File
@@ -36,6 +36,8 @@
<Patch>openbox-3.5.2-gnome-session.patch</Patch>
<Patch>openbox-3.6.1-py3-xdg.patch</Patch>
<Patch>openbox-kde-paths.patch</Patch>
<Patch>debian-887908.patch</Patch>
<!-- <Patch>openbox-python3.patch</Patch> -->
</Patches>
</Source>
@@ -60,20 +62,24 @@
<Dependency>startup-notification</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/libexec</Path>
<Path fileType="executable">/usr/bin/obmenu-generator</Path>
<Path fileType="executable">/usr/bin/obxprop</Path>
<Path fileType="executable">/usr/bin/openbox</Path>
<Path fileType="executable">/usr/bin/openbox-session</Path>
<Path fileType="executable">/usr/lib/openbox</Path>
<Path fileType="config">/etc/xdg/openbox</Path>
<Path fileType="config">/etc/xdg/obmenu-generator</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="library">/usr/lib/libobrender*</Path>
<Path fileType="library">/usr/lib/libobt*</Path>
<Path fileType="data">/usr/share/openbox</Path>
<Path fileType="data">/usr/share/themes</Path>
<Path fileType="data">/usr/share/xsessions</Path>
<Path fileType="data">/usr/share/gnome</Path>
<Path fileType="data">/usr/share/gnome-session</Path>
<Path fileType="data">/usr/share/xsessions/openbox.desktop</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="man">/usr/share/man/man1/obxprop.1</Path>
<Path fileType="man">/usr/share/man/man1/openbox.1</Path>
<Path fileType="man">/usr/share/man/man1/openbox-session.1</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<AdditionalFiles>
@@ -83,10 +89,36 @@
<!-- <AdditionalFile owner="root" permission="0644" target="/etc/xdg/openbox/autostart">autostart</AdditionalFile> -->
<AdditionalFile owner="root" permission="0644" target="/usr/share/openbox/kedicik.png">kedicik.png</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/libexec/openbox-xdg-menu">xdg-menu</AdditionalFile>
<AdditionalFile owner="root" permission="0755" target="/usr/lib/openbox/openbox-xdg-menu">xdg-menu</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/xdg/openbox/terminals.menu">terminals.menu</AdditionalFile>
</AdditionalFiles>
</Package>
<Package>
<Name>openbox-kde</Name>
<Summary>The openbox-kde package contains the files needed for using openbox inside a
KDE session.</Summary>
<RuntimeDependencies>
<Dependency release="current">openbox</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin/openbox-kde-session</Path>
<Path fileType="data">/usr/share/xsessions/openbox-kde.desktop</Path>
<Path fileType="man">/usr/share/man/man1/openbox-kde-session.1</Path>
</Files>
</Package>
<Package>
<Name>openbox-gnome</Name>
<Summary>The openbox-gnome package contains the files needed for using openbox inside a
Gnome session.</Summary>
<RuntimeDependencies>
<Dependency release="current">openbox</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/gnome/wm-properties</Path>
</Files>
</Package>
<Package>
<Name>openbox-devel</Name>
@@ -107,6 +139,13 @@
</Package>
<History>
<Update release="5">
<Date>2022-04-27</Date>
<Version>3.6.1</Version>
<Comment>splited kde/gnome packages and added some patch</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2021-12-13</Date>
<Version>3.6.1</Version>