diff options
Diffstat (limited to 'system')
-rw-r--r-- | system/lxqt-admin/README | 3 | ||||
-rw-r--r-- | system/lxqt-admin/bash-shell-default.patch | 16 | ||||
-rw-r--r-- | system/lxqt-admin/code-improvements.patch | 77 | ||||
-rw-r--r-- | system/lxqt-admin/doinst.sh | 3 | ||||
-rw-r--r-- | system/lxqt-admin/lxqt-admin.SlackBuild | 112 | ||||
-rw-r--r-- | system/lxqt-admin/lxqt-admin.info | 10 | ||||
-rw-r--r-- | system/lxqt-admin/slack-desc | 19 |
7 files changed, 240 insertions, 0 deletions
diff --git a/system/lxqt-admin/README b/system/lxqt-admin/README new file mode 100644 index 0000000000..d206a1419b --- /dev/null +++ b/system/lxqt-admin/README @@ -0,0 +1,3 @@ +lxqt-admin provides two GUI tools (Time and date configuration, user +and group settings) to adjust settings of the operating system LXQt +is running on. diff --git a/system/lxqt-admin/bash-shell-default.patch b/system/lxqt-admin/bash-shell-default.patch new file mode 100644 index 0000000000..618b3d7153 --- /dev/null +++ b/system/lxqt-admin/bash-shell-default.patch @@ -0,0 +1,16 @@ +--- a/lxqt-admin-user/usermanager.cpp ++++ b/lxqt-admin-user/usermanager.cpp +@@ -436,7 +436,12 @@ + QByteArray line = file.readLine().trimmed(); + if(line.isEmpty() || line.startsWith('#')) + continue; +- mAvailableShells.append(QString::fromLocal8Bit(line)); ++ QString shell = QString::fromLocal8Bit(line); ++ if (shell.endsWith(QLatin1String("/bash")) ) { ++ mAvailableShells.prepend(shell); ++ } else { ++ mAvailableShells.append(shell); ++ } + } + file.close(); + } diff --git a/system/lxqt-admin/code-improvements.patch b/system/lxqt-admin/code-improvements.patch new file mode 100644 index 0000000000..138d35ed00 --- /dev/null +++ b/system/lxqt-admin/code-improvements.patch @@ -0,0 +1,77 @@ +--- a/lxqt-admin-time/fbsdtimedatectl.cpp ++++ b/lxqt-admin-time/fbsdtimedatectl.cpp +@@ -46,11 +46,12 @@ + QString FBSDTimeDateCtl::timeZone() const + { + QFile tzFile(QSL("/var/db/zoneinfo")); +- if (!tzFile.open(QFile::ReadOnly | QFile::Text)) return QSL("Unknown"); +- QTextStream in(&tzFile); +- QString lastTZone = in.readLine(); +- return lastTZone; ++ if (!tzFile.open(QFile::ReadOnly | QFile::Text)) ++ return QSL("Unknown"); + ++ QTextStream in(&tzFile); ++ QString lastTZone = in.readLine(); ++ return lastTZone; + } + + bool FBSDTimeDateCtl::setTimeZone(QString timeZone, QString& /*errorMessage*/) +@@ -76,8 +77,7 @@ + process.waitForFinished(-1); + QString t = QString::fromLatin1(process.readAllStandardOutput()); + QStringList o = t.split(QSL("\n")); +- for (QStringList::iterator it = o.begin(); +- it != o.end(); ++it) { ++ for (QStringList::iterator it = o.begin(); it != o.end(); ++it) { + QString current = *it; + if(!current.startsWith(QSL("#")) && current.contains(QSL("ntpd_enable"),Qt::CaseInsensitive) && current.contains(QSL("yes"),Qt::CaseInsensitive)) { + return true; +--- a/lxqt-admin-time/nosdtimedatectl.cpp ++++ b/lxqt-admin-time/nosdtimedatectl.cpp +@@ -46,10 +46,12 @@ + QString NOSDTimeDateCtl::timeZone() const + { + QFile tzFile(QSL("/etc/timezone")); +- if (!tzFile.open(QFile::ReadOnly | QFile::Text)) return QSL("Unknown"); +- QTextStream in(&tzFile); +- QString lastTZone = in.readLine(); +- return lastTZone; ++ if (!tzFile.open(QFile::ReadOnly | QFile::Text)) ++ return QSL("Unknown"); ++ ++ QTextStream in(&tzFile); ++ QString lastTZone = in.readLine(); ++ return lastTZone; + } + + bool NOSDTimeDateCtl::setTimeZone(QString timeZone, QString& /*errorMessage*/) +@@ -99,18 +101,19 @@ + { + QFile tzFile(QSL("/etc/sysconfig/clock")); + if (!tzFile.open(QFile::ReadOnly | QFile::Text)) +- return false; ++ return false; ++ + QTextStream in(&tzFile); + QString all = in.readAll(); + QStringList sl = all.split(QSL("\n")); +- for (QStringList::iterator it = sl.begin(); it != sl.end(); it++) { +- QString current = *it; +- if(current.startsWith(QSL("#"))) +- continue; +- if(current.startsWith(QSL("UTC=1")) || current.startsWith(QSL("UTC=true"))) +- return false; +- if(current.startsWith(QSL("UTC=0")) || current.startsWith(QSL("UTC=false"))) +- return true; ++ for (QStringList::iterator it = sl.begin(); it != sl.end(); ++it) { ++ QString current = *it; ++ if(current.startsWith(QSL("#"))) ++ continue; ++ if(current.startsWith(QSL("UTC=1")) || current.startsWith(QSL("UTC=true"))) ++ return false; ++ if(current.startsWith(QSL("UTC=0")) || current.startsWith(QSL("UTC=false"))) ++ return true; + } + return false; + } diff --git a/system/lxqt-admin/doinst.sh b/system/lxqt-admin/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/system/lxqt-admin/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/system/lxqt-admin/lxqt-admin.SlackBuild b/system/lxqt-admin/lxqt-admin.SlackBuild new file mode 100644 index 0000000000..033f31c2cd --- /dev/null +++ b/system/lxqt-admin/lxqt-admin.SlackBuild @@ -0,0 +1,112 @@ +#!/bin/bash + +# Slackware build script for lxqt-admin + +# Copyright 2024 Isaac Yu <isaacyu@protonmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=lxqt-admin +VERSION=${VERSION:-1.3.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Set bash shell default if available +# See https://github.com/lxqt/lxqt-admin/pull/280 +patch -p1 < $CWD/bash-shell-default.patch + +# Various code improvements +# See https://github.com/lxqt/lxqt-admin/pull/284 +patch -p1 < $CWD/code-improvements.patch + +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +sed -i '/^Categories/s,LXQt;,X-&,' $PKG/usr/share/applications/*desktop + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/lxqt-admin/lxqt-admin.info b/system/lxqt-admin/lxqt-admin.info new file mode 100644 index 0000000000..38a4d767d7 --- /dev/null +++ b/system/lxqt-admin/lxqt-admin.info @@ -0,0 +1,10 @@ +PRGNAM="lxqt-admin" +VERSION="1.3.0" +HOMEPAGE="https://github.com/lxqt/lxqt-admin" +DOWNLOAD="https://github.com/lxqt/lxqt-admin/releases/download/1.3.0/lxqt-admin-1.3.0.tar.xz" +MD5SUM="fb094c9722abe442e562394a71b7381c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="liblxqt" +MAINTAINER="Isaac Yu" +EMAIL="isaacyu@protonmail.com" diff --git a/system/lxqt-admin/slack-desc b/system/lxqt-admin/slack-desc new file mode 100644 index 0000000000..0d916d9ae7 --- /dev/null +++ b/system/lxqt-admin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +lxqt-admin: lxqt-admin (LXQt system administration tool) +lxqt-admin: +lxqt-admin: lxqt-admin provides two GUI tools (time and date configuration, user +lxqt-admin: and group settings) to adjust settings of the operating system LXQt +lxqt-admin: is running on. +lxqt-admin: +lxqt-admin: +lxqt-admin: +lxqt-admin: +lxqt-admin: +lxqt-admin: |