joborun-pkg/jobextra
joborun-pkg
/
jobextra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upg limine openbox-patched vala

This commit is contained in:
joborun linux 2023-08-20 02:18:57 +03:00
parent 44df8d9bd8
commit c6695b46b5
10 changed files with 158 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
limine/PKGBUILD
View File

@ -10,7 +10,7 @@
# Eventually this made it to AUR then extra for Arch
pkgname=limine
pkgver=5.20230811.0
pkgver=5.20230819.0
pkgrel=01
pkgdesc="An advanced, portable, multiprotocol bootloader"
url="https://limine-bootloader.org/"
@ -58,10 +58,10 @@ arch=(x86_64)
license=('BSD')
sha256sums=(644b3725efb864176e176c2beae2c7e83cfe38b50b570b03ef9dde42279a0b7a # limine-5.20230811.0.tar.xz
sha256sums=(d81c3082f5cbd6bd19ab69ebe8ea96fe9f66833ee86e06728047000404a43b5e # limine-5.20230819.0.tar.xz
a70b1fd5981d8d7d024992a521fd78481a0a69f8311a768679fc732f5c03488a # limine.cfg
15df8e06872a6cb89dfad3f99ad2b255dd1a54576e4343c954975e2ea48f28ab # bg.jpg
c2897b54e8a54d81a61f929280f98b54786a506e5269fe474ebfac4c57c57a9f) # CONFIG.md
## 5e1e306c64dc9d0b10ee12a024691c3dbe1678fec0b20a99d0ed9e1fe586a4c0 limine-5.20230811.0-01-x86_64.pkg.tar.lz
## 80721a8b5f17936a1bc91e626cb916f309b4957fdc644c87a70cf45f0ee57388 limine-5.20230819.0-01-x86_64.pkg.tar.lz

4
limine/PKGBUILD-arch
View File

@ -2,7 +2,7 @@
# Contributor: Mintsuki <mintsuki@protonmail.com>
pkgname=limine
pkgver=5.20230811.0
pkgver=5.20230819.0
pkgrel=1
pkgdesc="An advanced, portable, multiprotocol bootloader"
arch=('x86_64')
@ -11,7 +11,7 @@ license=('BSD')
depends=('glibc')
makedepends=('nasm' 'mtools' 'llvm' 'lld' 'clang')
source=("https://github.com/limine-bootloader/limine/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz")
sha256sums=('644b3725efb864176e176c2beae2c7e83cfe38b50b570b03ef9dde42279a0b7a')
sha256sums=('d81c3082f5cbd6bd19ab69ebe8ea96fe9f66833ee86e06728047000404a43b5e')
build() {
cd "${pkgname}-${pkgver}"

2
nut-monitor/PKGBUILD
View File

@ -1,7 +1,7 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------

2
nut_exporter/PKGBUILD
View File

@ -1,7 +1,7 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcomm/$pkgname"
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------

50
openbox-patched/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch Normal file
View File

@ -0,0 +1,50 @@
From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001
From: pldubouilh <pldubouilh@gmail.com>
Date: Fri, 17 Mar 2023 18:23:47 +0100
Subject: [PATCH] Fix list traversal issue in client_calc_layer
The calls to client_calc_layer_internal can modify stacking_list, which
can cause us to follow dangling ->next pointers (either by the pointer
itself already being freed, or it pointing to a freed area). Avoid this
by copying the list first, the goal is to visit every client in the list
once so this should be fine.
---
openbox/client.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/openbox/client.c b/openbox/client.c
index 7168b2407..b8264587c 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self)
void client_calc_layer(ObClient *self)
{
GList *it;
+ /* the client_calc_layer_internal calls below modify stacking_list,
+ so we have to make a copy to iterate over */
+ GList *list = g_list_copy(stacking_list);
/* skip over stuff above fullscreen layer */
- for (it = stacking_list; it; it = g_list_next(it))
+ for (it = list; it; it = g_list_next(it))
if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
/* find the windows in the fullscreen layer, and mark them not-visited */
@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self)
client_calc_layer_internal(self);
/* skip over stuff above fullscreen layer */
- for (it = stacking_list; it; it = g_list_next(it))
+ for (it = list; it; it = g_list_next(it))
if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
/* now recalc any windows in the fullscreen layer which have not
@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self)
!WINDOW_AS_CLIENT(it->data)->visited)
client_calc_layer_internal(it->data);
}
+
+ g_list_free(it);
}
gboolean client_should_show(ObClient *self)

87
openbox-patched/PKGBUILD
View File

@ -2,38 +2,73 @@
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Contributor : Dylan Araps <dylan.araps@gmail.com>
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
# Contributor : Dylan Araps <dylan.araps@gmail.com>
pkgname=openbox-patched
_pkgname=openbox
pkgver=3.6.1
pkgrel=07
pkgdesc='Openbox with Rounded Corners patch and anything else deemed useful'
pkgrel=011
pkgdesc='Openbox with Rounded Corners patch and debian patches'
url='http://openbox.org'
arch=('x86_64')
install="${pkgname}.install"
makedepends=('automake' 'docbook2x' 'python-pyxdg' 'autoconf' 'gettext')
optdepends=('python-pyxdg: for the openbox-xdg-autostart script')
backup=('etc/xdg/openbox/menu.xml'
'etc/xdg/openbox/rc.xml'
'etc/xdg/openbox/autostart'
'etc/xdg/openbox/environment')
depends=('libxml2' 'libxinerama' 'libxrandr'
'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm' 'python-pyxdg')
groups=('lxde' 'lxde-gtk3')
'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm' 'python-pyxdg'
'libxi' 'startup-notification')
provides=('libobrender.so' $_pkgname)
conflicts=($_pkgname)
conflicts=($_pkgname $_pkgname-debian)
replaces=($_pkgname)
source=("http://openbox.org/dist/openbox/${_pkgname}-${pkgver}.tar.gz"
"http://openbox.org/dist/openbox/openbox-3.5.0-title-matching.patch"
"http://openbox.org/dist/openbox/openbox-3.5.0-which-2.20.patch"
"http://openbox.org/dist/openbox/openbox-3.6.2-rounded-corners.patch"
"http://openbox.org/dist/openbox/openbox-3.6.2-fix-out-of-bounds.patch"
"https://github.com/archlinux/svntogit-community/blob/packages/openbox/trunk/py3.patch")
# "https://github.com/archlinux/svntogit-community/blob/packages/openbox/trunk/py3.patch"
"http://http.debian.net/debian/pool/main/o/openbox/openbox_3.6.1-10.debian.tar.xz"
"https://github.com/Mikachu/openbox/commit/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch")
install="${pkgname}.install"
prepare() {
cd "${_pkgname}-${pkgver}"
local patches=(
01_rc.xml.patch
02_fix_freedesktop_compliance.patch
04_fix_xml_load_file.patch
# 05_openbox-3.5.0-title-matching.patch
# 06_openbox-3.5.0-which-2.20.patch
07_update_desktop.patch
08_autostart-fix.patch
704724_fix_refers-to-autostart.sh.patch
719620_fix_show_startup_notification.patch
754207_use-scrot.patch
808138_Replace-getgrent-with-getgroups.patch
d9a405e9.patch
fix-spelling-error-in-binary.patch
adapt-to-gsd-324.patch
843231.patch
09-disable-check-gnome-version.patch
887908.patch
917204_undecorated_maximized_no_border.patch
# python3.patch
Allow-256x256-window-icon-size-for-HiDPI-displays.patch
Add-class-hint-to-focus-cycle-popup.patch
Fix-collision-between-iterator-and-throw-away-argume.patch
# 974180.patch
)
for i in "${patches[@]}"; do
msg "Applying ${i} ..."
patch -p1 -i "../debian/patches/${i}"
done
patch -Np1 -i "${srcdir}/openbox-3.5.0-title-matching.patch" # OB#5277
patch -Np1 -i "${srcdir}/openbox-3.5.0-which-2.20.patch" # FS#11455
@ -43,19 +78,23 @@ prepare() {
# https://github.com/danakj/openbox/pull/26
patch -Np1 -i "${srcdir}/openbox-3.6.2-fix-out-of-bounds.patch"
patch -Np1 -i "${srcdir}/py3.patch"
# # py3.patch modifies configure.ac
# patch -Np1 -i "${srcdir}/py3.patch"
# https://bugs.archlinux.org/task/77853
# The patch is proposed on https://bugzilla.icculus.org/show_bug.cgi?id=6669
# and commited to a work branch in the upstream repo
patch -Np1 -i "$srcdir"/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch
# py3.patch modifies configure.ac
autoreconf -ifv
}
build() {
cd "${_pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--with-x \
--disable-startup-notification \
--enable-startup-notification \
--sysconfdir=/etc \
--libexecdir=/usr/lib/openbox
make
@ -64,20 +103,21 @@ build() {
package() {
cd "${_pkgname}-${pkgver}"
make DESTDIR="$pkgdir" install
# GNOME Panel is no longer available in the arch repositories
rm -r "${pkgdir}/usr/bin/"{gdm-control,gnome-panel-control,openbox-gnome-session} \
# GNOME Panel is no longer available in the arch repositories
rm -r "${pkgdir}/usr/bin/"{gdm-control,gnome-panel-control,openbox-gnome-session} \
"${pkgdir}/usr/share/gnome"{,-session} \
"${pkgdir}/usr/share/man/man1/openbox-gnome-session.1" \
"${pkgdir}/usr/share/xsessions/openbox-gnome.desktop"
#
# sed -i 's:startkde:/usr/bin/\0:' \
# "${pkgdir}/usr/share/xsessions/openbox-kde.desktop"
# The hell with kde and plasma telemetry backdoors
#
}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('GPL')
@ -86,5 +126,12 @@ sha256sums=(8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7 #
ce33bb6c3d543da091db2037e1f3084e5a0e752c9479584256d2f000f0da920d # openbox-3.5.0-which-2.20.patch
ac5617253dfc39e2fc204830ca19aa3fa48a0e00e46dd90a0057a2f1dd77cfbb # openbox-3.6.2-rounded-corners.patch
ec1f99bd7149e888c96b719b4192c413464815848bb05cfa8e88c7cb4214b9ac # openbox-3.6.2-fix-out-of-bounds.patch
4cd2708320ab3cdf4868bd66f20481dbad504d0e9aa43f13bca5c149b94a49cf) # py3.patch
# 4cd2708320ab3cdf4868bd66f20481dbad504d0e9aa43f13bca5c149b94a49cf # py3.patch
897cd12faf2c5a0c3b9b0db675b04bc1de084ca189b7797afac9ed50998c7ce4 # openbox_3.6.1-10.debian.tar.xz
a371d116483f37cd888bdeb1a5a1b594ddc9bf92c9c91478a1d5bff48a24b537) # 9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch
## 7276120922e47283ee3c0b7cdd51ea343ee027781d662161da159f68b0a093df openbox-patched-3.6.1-08-x86_64.pkg.tar.lz
## 0c5b28e361dbc06ce83c62fb0c6a5164cd464d89d88bda471137f2e35f1f0bcb openbox-patched-3.6.1-09-x86_64.pkg.tar.lz
## 58fb7f7ca994b91a1c762a85b7f3ad7b95a99a44fb370dcc9287c94a356fe61e openbox-patched-3.6.1-010-x86_64.pkg.tar.lz
## 25c6b510785b2dd632dc2cca22b27add3bd1f06dc7dc77310928cf2e160b48ee openbox-patched-3.6.1-011-x86_64.pkg.tar.lz

23
openbox-patched/PKGBUILD-arch
View File

@ -7,7 +7,7 @@
pkgname=openbox
pkgver=3.6.1
pkgrel=8
pkgrel=10
pkgdesc='Highly configurable and lightweight X11 window manager'
arch=('x86_64')
url='http://openbox.org'
@ -15,7 +15,7 @@ license=('GPL')
provides=(libobrender.so)
depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
'libxcursor' 'pango' 'imlib2' 'librsvg' 'libsm')
makedepends=('python')
makedepends=('python-xdg')
optdepends=('plasma-workspace: for the KDE/Openbox xsession'
'python-xdg: for the openbox-xdg-autostart script')
groups=('lxde' 'lxde-gtk3' 'lxqt')
@ -27,7 +27,8 @@ source=(http://openbox.org/dist/openbox/$pkgname-$pkgver.tar.gz{,.asc}
$pkgname-kde-paths.patch
py3.patch
debian-887908.patch
https://github.com/mati75/openbox-debian/raw/debian/3.6.1-8/debian/patches/917204_undecorated_maximized_no_border.patch)
https://github.com/mati75/openbox-debian/raw/debian/3.6.1-8/debian/patches/917204_undecorated_maximized_no_border.patch
https://github.com/Mikachu/openbox/commit/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch)
md5sums=('b72794996c6a3ad94634727b95f9d204'
'SKIP'
'0a11d7149da210a31ef88f8a9c717711'
@ -35,7 +36,17 @@ md5sums=('b72794996c6a3ad94634727b95f9d204'
'f7df0df8c1d2da279e48d0fdc984fb71'
'67ae9735c283637ef6d11b17a3f81953'
'4ff275746641e840605e9a74043079fe'
'bf629dfad2b4bef6330dd914922cae48')
'bf629dfad2b4bef6330dd914922cae48'
'783f40691cc84e6a9e401677e0e10d01')
sha256sums=('8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7'
'SKIP'
'adc0820671e6ec42ff1bb4cbb04c65e19cdf74c62bcef3a3b727adb208eb82c7'
'988acc655cf9a0fe4252c7e76d5ec2124a3f16c3ed26072fdcfd829ae9278c26'
'40b6feb8fd83da0c9073ffc3ee4c009b5b036d105199bcaf6aa03cb18bf0b7e0'
'4cd2708320ab3cdf4868bd66f20481dbad504d0e9aa43f13bca5c149b94a49cf'
'f13d0aa857ea0a4304d8529b58cdda22d74b827cac78b991f92289f341a61fd8'
'057761c75f9c3ccc799a2a3f453b729d950e6b78a271f5269d1b0f2b982d45c2'
'a371d116483f37cd888bdeb1a5a1b594ddc9bf92c9c91478a1d5bff48a24b537')
validpgpkeys=(4B71379A9D5263D112A85620A5A4E99C711D3B61)
prepare() {
@ -51,6 +62,10 @@ prepare() {
patch -Np1 -i "$srcdir"/debian-887908.patch
# https://bugs.archlinux.org/task/72023
patch -Np1 -i "$srcdir"/917204_undecorated_maximized_no_border.patch
# https://bugs.archlinux.org/task/77853
# The patch is proposed on https://bugzilla.icculus.org/show_bug.cgi?id=6669
# and commited to a work branch in the upstream repo
patch -Np1 -i "$srcdir"/9ed6fdd71890c5cc43747f105382d5677e5d37e7.patch
# py3.patch modifies configure.ac
autoreconf -ifv

13
openbox-patched/deps
View File

@ -5,8 +5,13 @@ pango
imlib2
librsvg
libsm
autoconf
automake
gettext
python-pyxdg
python
libxi
startup-notification
automake
autoconf
gettext
libxml2
docbook2x

7
vala/PKGBUILD
View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=vala
pkgver=0.56.11
pkgver=0.56.12
pkgrel=01
pkgdesc='Compiler for the GObject type system'
url='https://wiki.gnome.org/Projects/Vala'
@ -17,7 +17,7 @@ provides=(valadoc libvala{,doc}-${pkgver%.*}.so )
conflicts=(valadoc)
replaces=(valadoc)
#options=(debug) ## uncomment this to have the debug package produced
_commit=0a4a679270bdb413b4f7d3e759e129ec65597d29 # tags/0.56.11^0
_commit=2a0ae432b97f6594f859b6fb5b859565457388a7 # tags/0.56.12^0
source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
pkgver() {
@ -55,4 +55,5 @@ license=(LGPL)
sha256sums=('SKIP')
## fe5b21ecf1debc8a3314e80cf5b8c0f87e94b65b0f60ba590838431087c7a4fc vala-0.56.11-01-x86_64.pkg.tar.lz
## 852e275f8a53c82ddf27730309030b4e1e48a373ffbfc76ba6450ca8f4d88ac8 vala-0.56.12-01-x86_64.pkg.tar.lz

4
vala/PKGBUILD-arch
View File

@ -4,7 +4,7 @@
# Contributor: Timm Preetz <timm@preetz.us>
pkgname=vala
pkgver=0.56.11
pkgver=0.56.12
pkgrel=1
pkgdesc='Compiler for the GObject type system'
url='https://wiki.gnome.org/Projects/Vala'
@ -36,7 +36,7 @@ provides=(
)
conflicts=(valadoc)
replaces=(valadoc)
_commit=0a4a679270bdb413b4f7d3e759e129ec65597d29 # tags/0.56.11^0
_commit=2a0ae432b97f6594f859b6fb5b859565457388a7 # tags/0.56.12^0
source=("git+https://gitlab.gnome.org/GNOME/vala.git#commit=$_commit")
b2sums=('SKIP')