From 468a52716caf6da45cfabf7eed63853575c53bad Mon Sep 17 00:00:00 2001 From: aliriza Date: Thu, 16 Mar 2023 07:49:39 +0000 Subject: [PATCH] lxpanel done --- dev/lang/duktape/ympbuild | 14 +++++++++++--- lxde/base/lxpanel/ympbuild | 14 +++++++++++++- lxde/base/lxsession/ympbuild | 18 ++++++++++-------- lxde/base/pcmanfm/ympbuild | 2 +- net/libs/libpsl/ympbuild | 16 +++++++++++----- sys/auth/polkit/polkit.groups | 1 + sys/auth/polkit/polkit.initd | 12 ++++++++++++ sys/auth/polkit/polkit.passwd | 1 + sys/auth/polkit/polkit.sysconf | 11 +++++++++++ sys/auth/polkit/ympbuild | 21 +++++++++++++++++---- 10 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 sys/auth/polkit/polkit.groups create mode 100644 sys/auth/polkit/polkit.initd create mode 100644 sys/auth/polkit/polkit.passwd create mode 100644 sys/auth/polkit/polkit.sysconf diff --git a/dev/lang/duktape/ympbuild b/dev/lang/duktape/ympbuild index 47ac58ef..0655da11 100644 --- a/dev/lang/duktape/ympbuild +++ b/dev/lang/duktape/ympbuild @@ -17,9 +17,17 @@ arch=('x86_64') cd $name-$version -_make() ( +prepare(){ + # tools/configure.py needs Python 2 + sed -i 's/^#undef DUK_USE_FASTINT$/#define DUK_USE_FASTINT/' src/duk_config.h + + # Add missing NEEDED on libm.so + sed -i 's/duktape\.c/& -lm/' Makefile.sharedlibrary +} + +_make(){ make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr "$@" -) +} build(){ _make @@ -27,6 +35,6 @@ build(){ package(){ _make DESTDIR="$DESTDIR" install - install -Dt "$DESTDIR/usr/share/licenses/$name" -m644 LICENSE.txt + install -Dt "$DESTDIR/usr/share/licenses/$name" -m644 LICENSE.txt } diff --git a/lxde/base/lxpanel/ympbuild b/lxde/base/lxpanel/ympbuild index b104cb5d..5f920bd1 100644 --- a/lxde/base/lxpanel/ympbuild +++ b/lxde/base/lxpanel/ympbuild @@ -17,10 +17,22 @@ arch=('x86_64') cd $name-debian-$version +prepare(){ + # Disable pager plugin as it breaks panel layout with GTK+ 3 + # https://sourceforge.net/p/lxde/bugs/773/ + sed -i '/pager.c/d' plugins/Makefile.am + sed -i '/STATIC_PAGER/d' src/private.h + sed -i 's/libwnck-3.0//' configure.ac + sed -i 's/background=1/background=0/' data/default/panels/panel.in +} + setup(){ autoreconf -fvi ./configure --prefix=/usr \ - --libdir=/usr/lib64/ --enable-gtk3 + --libdir=/usr/lib64/ \ + --enable-gtk3 \ + --disable-silent-rules \ + --with-plugins=all,-cpufreq } build(){ diff --git a/lxde/base/lxsession/ympbuild b/lxde/base/lxsession/ympbuild index 8283bfa4..91caff39 100644 --- a/lxde/base/lxsession/ympbuild +++ b/lxde/base/lxsession/ympbuild @@ -7,23 +7,25 @@ description='Lightweight X11 session manager' email='akarsu@protonmail.com' maintainer='akarsu' license=('GPL2') -source=("https://downloads.sourceforge.net/lxde/$name-$version.tar.xz") +source=("https://salsa.debian.org/lxde-team/lxsession/-/archive/debian/0.5.5-2/lxsession-debian-0.5.5-2.tar.gz") depends=(gtk3 polkit) makedepends=(intltool vala docbook-xsl) -md5sums=('e8380acef215ee7c99c067a2241c2c7b') +md5sums=('57c0a337a43c256d15962a07667107d3') group=(lxde.base) uses=() arch=('x86_64') -cd $name-$version -rm *.stamp +cd $name-debian-$version-2 + setup(){ autoreconf -fvi - ./configure --sysconfdir=/etc \ - --libexecdir=/usr/lib \ + ./configure --prefix=/usr\ + --sysconfdir=/etc \ + --libexecdir=/usr/libexec \ --enable-gtk3 \ - --prefix=/usr \ - --libdir=/usr/lib64/ + --enable-buildin-clipboard \ + --libdir=/usr/lib64/ \ + --enable-buildin-polkit } build(){ diff --git a/lxde/base/pcmanfm/ympbuild b/lxde/base/pcmanfm/ympbuild index 70b1e426..3bd6d6e4 100644 --- a/lxde/base/pcmanfm/ympbuild +++ b/lxde/base/pcmanfm/ympbuild @@ -8,7 +8,7 @@ email='bayramk@gmail.com' maintainer='bk' license=('GPLv3') source=("https://github.com/lxde/pcmanfm/archive/refs/tags/1.3.2.tar.gz") -depends=(lxmenu-data libfm) +depends=(lxmenu-data libfm menu-cache libkeybinder3) makedepends=() md5sums=('212a3ca12bc38dbd92c4b501b98d8074') group=(lxde.base) diff --git a/net/libs/libpsl/ympbuild b/net/libs/libpsl/ympbuild index 3752f296..4cc8af9b 100644 --- a/net/libs/libpsl/ympbuild +++ b/net/libs/libpsl/ympbuild @@ -9,24 +9,30 @@ maintainer='sulincix' license=('GPLv3') source=("https://github.com/rockdaboot/libpsl/releases/download/$version/libpsl-$version.tar.gz") depends=(libidn2) -makedepends=( ) +makedepends=(python) md5sums=('ad40b970dcb5117d559b62a1e0d8d827') arch=('x86_64') group=(net.libs) cd $name-$version +fprepare() { + rm -frv list +} + setup(){ - meson setup build --prefix=/usr \ + autoreconf -fiv + ./configure \ + --prefix=/usr \ --libdir=/usr/lib64 \ - --default-library=both + --enable-{builtin,runtime}=libidn2 } build(){ - ninja -C build + make $jobs } package(){ - ninja -C build install + make install $jobs } diff --git a/sys/auth/polkit/polkit.groups b/sys/auth/polkit/polkit.groups new file mode 100644 index 00000000..3c753abf --- /dev/null +++ b/sys/auth/polkit/polkit.groups @@ -0,0 +1 @@ +polkitd:x:102:polkitd diff --git a/sys/auth/polkit/polkit.initd b/sys/auth/polkit/polkit.initd new file mode 100644 index 00000000..30d23874 --- /dev/null +++ b/sys/auth/polkit/polkit.initd @@ -0,0 +1,12 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon + +name="Polkit System Daemon" +description="Provide System authentication via PolicyKit1 D-Bus service" + +command=/usr/lib/polkit-1/polkitd +command_args="${POLKIT_OPTS:---no-debug}" + +depend() { + need dbus +} diff --git a/sys/auth/polkit/polkit.passwd b/sys/auth/polkit/polkit.passwd new file mode 100644 index 00000000..7802cd3d --- /dev/null +++ b/sys/auth/polkit/polkit.passwd @@ -0,0 +1 @@ +polkitd:x:102:102:User for polkitd:/var/empty:/sbin/nologin diff --git a/sys/auth/polkit/polkit.sysconf b/sys/auth/polkit/polkit.sysconf new file mode 100644 index 00000000..0e0b1cf5 --- /dev/null +++ b/sys/auth/polkit/polkit.sysconf @@ -0,0 +1,11 @@ +#!/bin/bash +if [ ! -f /var/lib/ymp/sysconf/polkit/postinstall.done ] ; then + install -d /usr/share/polkit-1/rules.d + install -d /etc/polkit-1/rules.d + chown -R polkitd:polkitd /{etc,usr/share}/polkit-1/rules.d + chmod -R 700 /etc/polkit-1/rules.d + chmod -R 700 /usr/share/polkit-1/rules.d + chmod 4755 /usr/lib/polkit-1/polkit-agent-helper-1 + chmod 4755 /usr/bin/pkexec + date > /var/lib/ymp/sysconf/polkit/postinstall.done +fi diff --git a/sys/auth/polkit/ympbuild b/sys/auth/polkit/ympbuild index 87eeb0c9..0a08be55 100644 --- a/sys/auth/polkit/ympbuild +++ b/sys/auth/polkit/ympbuild @@ -7,10 +7,16 @@ description='Application development toolkit for controlling system-wide privile email='akarsu@protonmail.com' maintainer='akarsu' license=('GPLv3') -source=("https://gitlab.freedesktop.org/polkit/polkit/-/archive/$version/polkit-$version.tar.gz") +source=("https://gitlab.freedesktop.org/polkit/polkit/-/archive/$version/polkit-$version.tar.gz" + "polkit.groups" + "polkit.passwd" + "polkit.sysconf") depends=(duktape expat glib pam elogind) -makedepends=(git gobject-introspection gtk-doc meson) -md5sums=('bbe3e745fc5bc1a41f1b5044f09a0f26') +makedepends=(gobject-introspection gtk-doc meson) +md5sums=('bbe3e745fc5bc1a41f1b5044f09a0f26' + 'SKIP' + 'SKIP' + 'SKIP') group=(sys.auth) uses=() arch=('x86_64') @@ -19,7 +25,9 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ - --libdir=/usr/lib64/ + --libdir=/usr/lib64/ \ + -Dsession_tracking="libelogind" \ + -Dsystemdsystemunitdir=/garbage } build(){ @@ -28,5 +36,10 @@ build(){ package(){ ninja -C build install $jobs + rm -rf $DESTDIR/garbage + install -d $DESTDIR/etc/{passwd,group,sysconf}.d + install ../polkit.sysconf $DESTDIR/etc/sysconf.d/polkit + install ../polkit.groups $DESTDIR/etc/group.d/polkit + install ../polkit.passwd $DESTDIR/etc/passwd.d/polkit }