From 77e8a3d5f3ad74c438ce3c28d1ef589c3b4c3377 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Thu, 16 Apr 2026 22:56:44 +0200 Subject: Upgrade ettolkit 2.1.0 -> 2.2.0 and add i3lock-extended/PKGBUILD makepkg.conf sgsmirrorlist --- etoolkit/PKGBUILD | 14 ++-- i3lock-extended/PKGBUILD | 51 +++++++++++++++ makepkg.conf | 165 +++++++++++++++++++++++++++++++++++++++++++++++ sgsmirrorlist | 1 + 4 files changed, 222 insertions(+), 9 deletions(-) create mode 100644 i3lock-extended/PKGBUILD create mode 100644 makepkg.conf create mode 100644 sgsmirrorlist diff --git a/etoolkit/PKGBUILD b/etoolkit/PKGBUILD index e2aeac0..4194c70 100644 --- a/etoolkit/PKGBUILD +++ b/etoolkit/PKGBUILD @@ -1,23 +1,19 @@ # Maintainer: Simeon Simeonov pkgname=python-etoolkit -pkgver=2.1.0 +pkgver=2.2.0 pkgrel=1 arch=('any') -url="https://github.com/blackm0re/etoolkit" +url="https://codeberg.org/sgs/etoolkit" license=('GPL-3+') pkgdesc='A simple toolkit for setting environment variables in a flexible way' depends=('python' 'python-cryptography') makedepends=('python-build' 'python-installer') -source=(https://github.com/blackm0re/etoolkit/releases/download/${pkgver}/etoolkit-$pkgver.tar.gz{,.asc}) -b2sums=('fd0031acb84f53c524b7b7c5a4ac0ec421c74d6c9f5136719f9fce89c843c73d13a98d888d41891db75adc720ede945cbd40373e601cf9cb8e3ea78145ba4eab' 'fec3763023574f33d0d593d128b27d2584674f6525132f8f3664e9a10a0bd04cda3199d3ce716108b5a46cc0932545569ccaf8b4f1c33791340b15317ac402b7') -sha512sums=('43da4c1f14a2b5761ef21b961c6d4e72aa05d37b60c61ad80923eb764f6a84d5ee2d86f0ec8bf95e0b2b253b8c7bb21197bfd1ae58a1d97e5dbd14cc2ed36b16' 'd67fc0ddff3b54b9bb21f3a4cc1c5bbe8c25bb0d6e8c5f28b765edd3881a340ce75da654a11d0ca301962da570e1e89bc5697925b8f3f3312709d44629bbd941') +source=(https://codeberg.org/sgs/etoolkit/releases/download/${pkgver}/etoolkit-$pkgver.tar.gz{,.asc}) +b2sums=('136b95de598add017b3dc9932af948cde6941e129d2e3e648eed49f558b763a546b3e26fbc62e61994eab738d2cf575379331bea16e46079c061614b89aed798' '356072987f46736b7675112bdc66c4379923b9518850113ffb49914ee00a309e248b8aecd7b15e3f06f12c55e8243cdc25c22f588d543e3390503f68776a6f42') +sha512sums=('9f7a32faae0bed92ab0a7476b2056bc900d810254b21b913fd4b60db81c08b1a9392f3d52eb1d1c1fe72819b9fd23477d202004dad6617fa11d55a57272e195a' '5fb3f6db9c930801f614d44fbd38aa54b46d5fde94f1d140fac72220d69ef9ed526129ca4fed0ab1dc6729c0f9dde5c81749062c04f025c83132b310ea717673') validpgpkeys=('A6645797661E2F473DD3FF06BCE70555C3BB08F7') # Simeon Simeonov -# prepare() { -# cd "etoolkit-$pkgver" -# } - build() { cd "etoolkit-$pkgver" python -m build --wheel --no-isolation diff --git a/i3lock-extended/PKGBUILD b/i3lock-extended/PKGBUILD new file mode 100644 index 0000000..4553e89 --- /dev/null +++ b/i3lock-extended/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Simeon Simeonov + +pkgname=i3lock-extended +pkgver=3.2.15 +pkgrel=1 +pkgdesc='i3lock-extended - i3lock fork with additional functionality' +url='https://github.com/blackm0re/i3lock-extended' +arch=('x86_64') +license=('GPL-3+' 'BSD') +depends=( + 'cairo' 'libcairo.so' + 'glibc' + 'libev' 'libev.so' + 'libxcb' + 'libxkbcommon' 'libxkbcommon.so' + 'libxkbcommon-x11' 'libxkbcommon-x11.so' + 'pam' 'libpam.so' + 'xcb-util' + 'xcb-util-image' + 'xcb-util-xrm' +) +makedepends=( + 'meson' +) +options=('docs') +backup=('etc/pam.d/i3lock-extended') +source=(https://github.com/blackm0re/i3lock-extended/releases/download/${pkgver}/$pkgname-$pkgver.tar.xz{,.asc}) + +b2sums=('001917e98564cdae8834142acfbf6e5424c041f6a96eb8e55017d414eda6d6f70068305bef2213295da6577dd8f16a6a9ff322705f9f0c563d7471097c906c83' 'cbcc71c7c22cfe0d5af3db3e490d7d0d550409b3588cc4e5f526923ea542cffc1c4b85ffe4c89eb236d3f2651dd5c51a0e4c94f72b2848210880be4e003a776c') +sha512sums=('b1b4c15fb7c03fb3dce036d9bb7f41e4702a0de4f4f4820a7d1dbe36f3b62007469f4c6b9b942788da5e905adf94ea4c831844924d019f20b5b126eb3b82af2f' '651b29cbe355c132eeb20d58a2d8f915f56c3cdb9336304475a1136807b96f31acf56b208f386515eb93f6eda944ef4c69efb82f39a20604627e7cc988ee3f12') +validpgpkeys=('A6645797661E2F473DD3FF06BCE70555C3BB08F7') # Simeon Simeonov + +prepare() { + cd ${pkgname}-${pkgver} + + # Fix ticket FS#31544, sed line taken from gentoo + sed -i -e 's:login:system-auth:' pam/i3lock-extended +} + +build() { + arch-meson $pkgname-$pkgver build + meson compile -C build +} + +package() { + DESTDIR="$pkgdir" meson install -C build + + cd ${pkgname}-${pkgver} + install -Dm 644 i3lock-extended.1 -t "${pkgdir}/usr/share/man/man1" + install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/makepkg.conf b/makepkg.conf new file mode 100644 index 0000000..0aa61a5 --- /dev/null +++ b/makepkg.conf @@ -0,0 +1,165 @@ +#!/hint/bash +# shellcheck disable=2034 + +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' + 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/wget + +#-- The package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::breezy' + 'fossil::fossil' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="x86_64" +CHOST="x86_64-pc-linux-gnu" + +#-- Compiler and Linker Flags +#CPPFLAGS="" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection \ + -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" +LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ + -Wl,-z,pack-relative-relocs" +LTOFLAGS="-flto=auto" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" +#-- Debugging flags +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign) +# A negated environment option will do the opposite of the comments below. +# +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +#-- sign: Generate PGP signature file +# +BUILDENV=(!distcc color !ccache check sign) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" +# +#-- Specify a directory for package building. +#BUILDDIR=/tmp/makepkg + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- debug: Add debugging flags as specified in DEBUG_* variables +#-- lto: Add compile flags for building with link time optimization +#-- autodeps: Automatically add depends/provides +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto) + +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 +INTEGRITY_CHECK=(sha256) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) +#-- Directory to store source code in for debug packages +DBGSRCDIR="/usr/src/debug" +#-- Prefix and directories for library autodeps +LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +PKGDEST=/home/sgs/pkg/pkgdest +#-- Source cache: specify a fixed directory where source files will be cached +SRCDEST=/home/sgs/pkg/srcdest +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Log files: specify a fixed directory where all log files will be placed +LOGDEST=/home/sgs/pkg/logs +#-- Packager: name/email of the person or organization building packages +PACKAGER="Simeon Simeonov " +#-- Specify a key to use for package signing +GPGKEY="A6645797661E2F473DD3FF06BCE70555C3BB08F7" + +######################################################################### +# COMPRESSION DEFAULTS +######################################################################### +# +COMPRESSGZ=(gzip -c -f -n) +COMPRESSBZ2=(bzip2 -c -f) +COMPRESSXZ=(xz -c -z -) +COMPRESSZST=(zstd -c -T0 -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) +COMPRESSZ=(compress -c -f) +COMPRESSLZ4=(lz4 -q) +COMPRESSLZ=(lzip -c -f) + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +PKGEXT='.pkg.tar.zst' +SRCEXT='.src.tar.gz' + +######################################################################### +# OTHER +######################################################################### +# +#-- Command used to run pacman as root, instead of trying sudo and su +#PACMAN_AUTH=() +# vim: set ft=sh ts=2 sw=2 et: diff --git a/sgsmirrorlist b/sgsmirrorlist new file mode 100644 index 0000000..b100bd5 --- /dev/null +++ b/sgsmirrorlist @@ -0,0 +1 @@ +Server = https://pkg.pichove.org/archlinux/$repo/os/$arch -- cgit v1.3