Bump packages and add a few other ones

This commit is contained in:
Alex D. 2020-12-06 00:29:04 +00:00
parent d086782d49
commit 143c6571d6
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
16 changed files with 345 additions and 77 deletions

4
.gitignore vendored
View File

@ -1,2 +1,4 @@
repo/
*/*/src/
src/
pkg/
.rootbld-repositories

View File

@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Mutt with miscellaneous fixes and feature patches"
url="https://neomutt.org/"
arch="all"
options="!check" # Readline randomly fails and permissions test might not be cleaned up
options="chmod-clean" # Tests include 0000 permission reads, required for proper cleanup
license="GPL-2.0-or-later"
makedepends="cyrus-sasl-dev gdbm-dev gettext-dev gpgme-dev libidn-dev
ncurses-dev openssl-dev notmuch-dev bsd-compat-headers libxslt tcl

View File

@ -1,53 +1,51 @@
# Contributor: Leo <thinkabit.ukim@gmail.com>
# Contributor: Alex Denes <caskd@redxen.eu>
# Maintainer:
pkgname=telegram-desktop
pkgver=2.4.3
pkgver=2.4.9
pkgrel=0
pkgdesc="Telegram Desktop messaging app"
options="!check" # Requires Catch2 to be packaged.
url="https://desktop.telegram.org/"
arch="all !s390x !mips !mips64" # Need support on lib_base
arch="all !x86 !s390x !mips !mips64" # x86: textrels in tg_owt, rest: Need support on lib_base
license="GPL-3.0-or-later WITH OpenSSL"
depends="qt5-qtimageformats ttf-opensans"
makedepends="
alsa-lib-dev
cmake
samurai
zlib-dev
opus-dev
enchant2-dev
ffmpeg-dev
gtk+3.0-dev
hunspell-dev
libjpeg-turbo-dev
libdbusmenu-glib-dev
libdbusmenu-qt-dev
libexecinfo-dev
libexif-dev
libva-dev
libvdpau-dev
ffmpeg-dev
portaudio-dev
libxkbcommon-dev
lz4-dev
minizip-dev
openal-soft-dev
openssl-dev
libxkbcommon-dev
libxkbcommon-static
opus-dev
portaudio-dev
pulseaudio-dev
python3
qtchooser
qt5-qtbase-dev
qt5-qtwayland-dev
libexif-dev
xz-dev
minizip-dev
alsa-lib-dev
libexecinfo-dev
lz4-dev
qtchooser
pulseaudio-dev
libdbusmenu-glib-dev
xxhash-dev
enchant2-dev
range-v3-dev
python3
libdbusmenu-qt-dev
tl-expected
tg_owt-dev
hunspell-dev
gtk+3.0-dev
tl-expected
xxhash-dev
xz-dev
zlib-dev
"
source="
https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz
small-sizes.patch
remove-glibc.patch
small-sizes.patch
"
builddir="$srcdir/tdesktop-$pkgver-full"
@ -61,13 +59,16 @@ build() {
-DCMAKE_BUILD_TYPE=None \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
-DDESKTOP_APP_DISABLE_SPELLCHECK=OFF \
-DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \
-DDESKTOP_APP_LOTTIE_USE_CACHE=ON \
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
-DDESKTOP_APP_USE_PACKAGED=ON \
-DTDESKTOP_API_ID=17349 \
-DTDESKTOP_API_HASH=344583e45741c457fe1862106095a5eb \
-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-DTDESKTOP_LAUNCHER_BASENAME=telegram-desktop \
-DDESKTOP_APP_USE_PACKAGED_GSL=OFF \
-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
$CMAKE_CROSSOPTS .
make -C build
@ -77,6 +78,6 @@ package() {
DESTDIR="$pkgdir" make -C build install
}
sha512sums="066a04ee4ba0c28ea8c6f7b4badcbc814cfc131508ca08a34b6365a8c79106a579efffb4e9dd1a7856cad39505dc864cc8e8e417b8a4e06e8fd0d15752d44ac2 tdesktop-2.4.3-full.tar.gz
3d1b8e6f870fc780f9ae8bc6a67eb676a5c5f686dc79e84cd6d64cb3cfafb1be626d0cc3960ffc67cecca21568764a0137c7303a89045fa59f91ba4eb5d8caed small-sizes.patch
b6e16c02f7dafa5e00c9b2ce16df18ccd57d380877d009596261f2e1f631cb0f38088a0d8c48d8e321559cacea64ff9e79fe2d7719382d45e27a339888dc2823 remove-glibc.patch"
sha512sums="532858e98e1ec5a000fd63e336862b3e4b853cd47b299ad7239e65f5311bc578f0ffe18a47d7c2502b3e83fb799f88d00cf6f3d87d586a969b078c298bd47c25 tdesktop-2.4.9-full.tar.gz
b276001d1616cb5dbacbcd18510d0bd4b9d9f7b7a895b05fb6329866f5bdb7b69f536f7d7914436c8ea975c4f7951a2bb3efd9209c38df115b1d85e0ed099b04 remove-glibc.patch
3d1b8e6f870fc780f9ae8bc6a67eb676a5c5f686dc79e84cd6d64cb3cfafb1be626d0cc3960ffc67cecca21568764a0137c7303a89045fa59f91ba4eb5d8caed small-sizes.patch"

View File

@ -1,51 +1,39 @@
Upstream: Unsuitable (requires re-work into something that doesn't break libc)
Reason: This is Glibc specific and treating Linux == glibc is harmful
diff --git a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
index ea9ab61..bbef601 100644
index cff7136..ced69bd 100644
--- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
@@ -13,7 +13,6 @@
#include <QtCore/QVersionNumber>
@@ -12,11 +12,6 @@
#include <QtCore/QDate>
#include <QtGui/QGuiApplication>
-#include <gnu/libc-version.h>
-// this file is used on both Linux & BSD
-#ifdef Q_OS_LINUX
-#include <gnu/libc-version.h>
-#endif // Q_OS_LINUX
-
namespace Platform {
namespace {
@@ -84,8 +74,7 @@ QString SystemVersionPretty() {
return "Linux "
+ (list.isEmpty() ? QString() : list[0] + ' ')
+ (IsWayland() ? "Wayland " : "X11 ")
- + "glibc "
- + GetGlibCVersion();
+ + "musl";
@@ -124,21 +119,13 @@ QString AutoUpdateKey() {
QString GetLibcName() {
#ifdef Q_OS_LINUX
- return "glibc";
+ return "musl";
#endif // Q_OS_LINUX
return QString();
}
QString SystemCountry() {
@@ -103,10 +92,6 @@ QString SystemLanguage() {
QDate WhenSystemBecomesOutdated() {
if (IsLinux32Bit()) {
return QDate(2020, 9, 1);
- } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) {
- if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) {
- return QDate(2020, 9, 1); // Older than Ubuntu 16.04.
- }
}
return QDate();
}
@@ -129,14 +114,6 @@ QString AutoUpdateKey() {
}
}
-QString GetGlibCVersion() {
QString GetLibcVersion() {
-#ifdef Q_OS_LINUX
- static const auto result = [&] {
- const auto version = QString::fromLatin1(gnu_get_libc_version());
- return QVersionNumber::fromString(version).isNull() ? QString() : version;
- }();
- return result;
-}
-#endif // Q_OS_LINUX
-
bool IsWayland() {
return QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive);
return QString();
}

View File

@ -4,8 +4,8 @@
# Contributor: Alex Denes <caskd@redxen.eu>
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=youtube-dlc
pkgver=2020.10.31
pkgrel=1
pkgver=2020.11.10
pkgrel=0
pkgdesc="Command-line program to download videos from YouTube"
url="https://youtube-dl.org/"
arch="noarch"
@ -37,7 +37,7 @@ check() {
package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
ln -sr "$pkgdir"/usr/bin/youtube-dlc "$pkgdir"/usr/bin/youtube-dl
ln -s youtube-dlc "$pkgdir"/usr/bin/youtube-dl
}
sha512sums="35963a4dd44b6d8a1e3a3b8cfe001f66356b10bace3b312ec66d7f6e8539ae0739b6da6ac154923d74d640884b93cb703332870dd378763a68ad5abb6421fba5 yt-dlc-2020.10.31.tar.gz"
sha512sums="5b732c421861ca5913fc712aa41a8dea428061b85d5fc6ea4c557d0c37b5a734eeec5490cd19bbe1c43ef48bba211969008c82677f9ff44fabfb08762b2ae185 yt-dlc-2020.11.10.tar.gz"

View File

@ -0,0 +1,19 @@
diff --git a/abuild.in b/abuild.in
index d600e92..923c60f 100644
--- a/abuild.in
+++ b/abuild.in
@@ -458,7 +458,13 @@ initdcheck() {
local i line
for i in $source; do
case $i in
- *.initd) line=$(head -n 1 "$srcdir"/$i);;
+ *.initd)
+ if is_remote "$i"; then
+ line=$(head -n 1 "$srcdir"/"$(filename_from_uri $i)")
+ else
+ line=$(head -n 1 "$srcdir"/$i)
+ fi
+ ;;
*) continue ;;
esac

View File

@ -0,0 +1,51 @@
diff --git a/abuild.in b/abuild.in
index d600e92..74b3ae5 100644
--- a/abuild.in
+++ b/abuild.in
@@ -27,7 +27,6 @@ fi
: ${ADDGROUP:="abuild-addgroup"}
: ${CC:="gcc"}
: ${CXX:="g++"}
-
apk_opt_wait="--wait 30"
umask 022
@@ -2200,15 +2199,17 @@ builddeps() {
[ -n "$nodeps" ] && return 0
msg "Analyzing dependencies..."
- case "$BOOTSTRAP" in
- no*) BUILD_BASE="";;
- *) if cross_creating || cross_compiling; then
- BUILD_BASE="build-base-$CTARGET_ARCH"
- else
- BUILD_BASE="build-base"
- fi
- esac
- calcdeps "$BUILD_BASE"
+ if ! options_has "!buildbase"; then
+ case "$BOOTSTRAP" in
+ no*) BUILD_BASE="";;
+ *) if cross_creating || cross_compiling; then
+ BUILD_BASE="build-base-$CTARGET_ARCH"
+ else
+ BUILD_BASE="build-base"
+ fi
+ esac
+ calcdeps "$BUILD_BASE"
+ fi
# find which deps are missing
local mbd mhd missing
@@ -2337,9 +2338,10 @@ rootbld() {
echo "$REPODEST/$repo"
) < "$repo_template" > "$BUILD_ROOT/etc/apk/repositories"
+ options_has "!buildbase" || builddeps="$builddeps build-base"
calcdeps
$SUDO_APK add --initdb --root "$BUILD_ROOT" --update \
- abuild alpine-base build-base git $hostdeps $builddeps \
+ abuild alpine-base git $hostdeps $builddeps \
${USE_CCACHE:+ccache}
local bwrap_opts=""

View File

@ -0,0 +1,89 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=abuild
pkgver=3.7.0_rc1
_ver=${pkgver%_git*}
pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
license="GPL-2.0-only"
depends="fakeroot scanelf openssl apk-tools>=2.0.7-r1 libc-utils
attr tar pkgconf patch lzip"
if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends curl"
fi
makedepends_build="pkgconfig"
makedepends_host="openssl-dev zlib-dev"
makedepends="$makedepends_host $makedepends_build"
checkdepends="bats"
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="
apkbuild-cpan:cpan:noarch
apkbuild-gem-resolver:gems:noarch
apkbuild-pypi:pypi:noarch
abuild-rootbld:_rootbld:noarch
$pkgname-doc
"
options="suid"
pkggroups="abuild"
source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz
0001-fix-initd-checks.patch
0002-buildbase-opt.patch
"
builddir="$srcdir"/abuild-$pkgver
prepare() {
default_prepare
sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
}
build() {
make VERSION="$pkgver-r$pkgrel"
}
check() {
make check
}
package() {
make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir"
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
}
cpan() {
pkgdesc="Script to generate perl APKBUILD from CPAN"
depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny
perl-lwp-protocol-https"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
}
gems() {
pkgdesc="APKBUILD dependency resolver for RubyGems"
depends="ruby ruby-augeas"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/
}
pypi() {
pkgdesc="Script to generate python3 APKBUILD from PYPI"
depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/apkbuild-pypi "$subpkgdir"/usr/bin/
}
_rootbld() {
pkgdesc="Build packages in chroot"
depends="abuild bubblewrap gettext git"
mkdir -p "$subpkgdir"
}
sha512sums="ff0b7fd5e65b41185c0ec452703ecbcd73d409de75ffa14677ea9ed77919bc70347d53e42c6a3c6b569e260d2fb8bde495b151d9cf42adb097fe6b0764362248 abuild-3.7.0_rc1.tar.xz
e19ce813d78a71621534f00745ce77050efe622954bf813bc251d892b8927c0ba08c5c8e77ffb18a8d647d2638698d94cf8fdb60a929c0713458f9b3e06ea3cf 0001-fix-initd-checks.patch
60f184f3251e245eebe2c5ef35ad2d82132ca4b45eb1ae72de1f0b505541bb064fd736c9ac5e51f89beff243d3aabf4619f28459666a27fe6f8b554220d7615c 0002-buildbase-opt.patch"

View File

@ -0,0 +1,5 @@
#!/bin/sh
addgroup -S abuild 2>/dev/null
exit 0

View File

@ -0,0 +1 @@
abuild.pre-install

View File

@ -0,0 +1,24 @@
# Contributor: Alex Denes <caskd@redxen.eu>
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=uircd-openrc
pkgver=1
pkgrel=0
pkgdesc="uIRCd service files"
url="https://git.redxen.eu/RedXen"
arch="noarch"
license="none"
depends="openrc"
options="!check"
source="
initd
confd
"
builddir="$srcdir"
package() {
install -Dm755 initd "$pkgdir"/etc/init.d/uircd
install -Dm644 confd "$pkgdir"/etc/conf.d/uircd
}
sha512sums="ac39df79bc4a10a09146a9dbd1532ce86f90533e8db47dd57cab454878150c2966c1e47160cb1dcbfaef23a461923d1686818a9ef8751507911e2682b2d2c2c2 initd
af5f1348e304849dab9287b1094bf1514923933e87d49b497a0bbe2c6e1c2fa82692a15536d9c57dfb027e34927befa096879f12a1d712c26198ce1eb4851632 confd"

19
openrc/uircd-openrc/confd Normal file
View File

@ -0,0 +1,19 @@
command_user=caskd
error_log="/home/${command_user}/IRC/daemon.log"
uircd_verbosity=3
uircd_quitmsg="Now on the move."
uircd_logpath="/home/${command_user}/IRC"
uircd_connections="
caskd@localhost/7203,#testingrounds,#idletown,#programming
caskd@41.157.98.109/9006,#general,#programming
caskd@localhost/7205,#pinephone,#pine64
caskd@localhost/7206,#alpine-linux,#C
caskd@mbrserver.com,#general
caskd@irc.quakenet.org,#xonotic
caskd@localhost/7208
caskd@localhost/7204,#unix
caskd@localhost/7207,#alpine-linux,#pleroma
caskd@localhost/7201,#cyberpunk,#cyberia,#2f30,#radio
caskd@localhost/7209,#lokinet
caskd@localhost/7202,#hackint,#nerdberg,#freifunk
"

30
openrc/uircd-openrc/initd Executable file
View File

@ -0,0 +1,30 @@
#!/sbin/openrc-run
description="microIRC daemon"
supervisor=supervise-daemon
command="/usr/local/bin/uircd"
command_args=""
pidfile="/run/${RC_SVCNAME}.pid"
command_background=true
uircd_logpath="${uircd_logpath:-/home/${command_user}/IRC}"
depend() {
need networking
want stunnel.irc
}
optional_arg() {
if [ -n "$2" ]; then
command_args="$command_args $1 '$2'"
fi
}
start_pre() {
optional_arg "-V" "$uircd_verbosity"
checkpath --directory --owner $command_user "$uircd_logpath"
command_args="$command_args -l '$uircd_logpath'"
optional_arg "-m" "$uircd_quitmsg"
for i in $uircd_connections; do
command_args="$command_args -c '$i'"
done
}

View File

@ -3,15 +3,15 @@
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=dwm-desktop
pkgver=6.2
pkgrel=2
pkgrel=3
provides="dwm"
_commit="6239eee0399a803a3d31ec0a021546abe2776892"
_commit="44f4282c13c2a6af54f204c9c71896f6e214ed74"
pkgdesc="dwm - dynamic window manager (with caskd's patches)"
url="https://dwm.suckless.org"
arch="all"
options="!check"
license="MIT/X"
depends="dmenu st misc-scripts imagemagick pulsemixer neomutt nnn xdg-utils"
depends="dmenu st misc-scripts imagemagick pulsemixer nnn xdg-utils"
makedepends="libxft-dev libx11-dev libxinerama-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver-$_commit.tar.gz::https://git.redxen.eu/caskd/dwm/archive/$_commit.tar.gz"
@ -36,4 +36,4 @@ package() {
-C "$builddir" install
}
sha512sums="8a95d8a93a5150f657e8607c1abe094d6e7b09c23e5086c79141d18a5f32b381e20e74a05250697baa7fadef732200f19308bc8d9dcb10f863259adbe0c0838e dwm-desktop-6.2-6239eee0399a803a3d31ec0a021546abe2776892.tar.gz"
sha512sums="c0327f6270aa77c16ed053bbc1ae3f466d74158fbf31f7f59964828187ac4972464a5c1972a55f0fdadebf73f1032d28ac6c99a3dffe38be75e1e9a10e92eccf dwm-desktop-6.2-44f4282c13c2a6af54f204c9c71896f6e214ed74.tar.gz"

View File

@ -0,0 +1,39 @@
# Contributor: Gaber Ayoubi <gaber.ayoubi@gmail.com>
# Contributor: Alex Denes <caskd@redxen.eu>
# Maintainer: Alex Denes <caskd@redxen.eu>
pkgname=dwm-mobile
pkgver=6.2
pkgrel=0
provides="dwm"
_commit="b2dff3f769efb7947350e0b7f93bf3eef202044d"
pkgdesc="dwm - dynamic window manager (with caskd's patches)"
url="https://dwm.suckless.org"
arch="all"
options="!check"
license="MIT/X"
depends="dmenu st misc-scripts imagemagick pulsemixer nnn xdg-utils"
makedepends="libxft-dev libx11-dev libxinerama-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver-$_commit.tar.gz::https://git.redxen.eu/caskd/dwm/archive/$_commit.tar.gz"
builddir="$srcdir/dwm"
prepare() {
default_prepare
sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \
-e '/LDFLAGS/{s/=/+=/}' \
"$builddir"/config.mk
}
build() {
make X11INC=/usr/include/X11 \
X11LIB=/usr/lib/X11 \
FREETYPEINC=/usr/include/freetype2 \
-C "$builddir"
}
package() {
make PREFIX=/usr DESTDIR="$pkgdir" \
-C "$builddir" install
}
sha512sums="dfedd0f0e36acb6d4a1e492d1938ccb3af936331f874fb346cd8dc8bc9360c3928b720542303e0e5c093a1576100934eaf5d922af5903e1afce295a57c07c7b3 dwm-mobile-6.2-b2dff3f769efb7947350e0b7f93bf3eef202044d.tar.gz"

View File

@ -4,7 +4,7 @@ pkgname=svkbd-patched
pkgver=0.2.1
pkgrel=0
provides="svkbd"
_commit="9aa38c23d233ae3ea2726b25b70f8f15cd5366ae"
_commit="a8ea266a79cb2414f06598205db8b229c474ac8f"
pkgdesc="Simple virtual keyboard for X, ships with an international mobile-optimised layout"
url="https://tools.suckless.org/x/svkbd/"
arch="all"
@ -23,4 +23,4 @@ package() {
make PREFIX=/usr DESTDIR="$pkgdir" install
}
sha512sums="176dac99974a368d729916d26a2bd607c166fcee1304e18aab51d34d00cb9eb177111d80255bed362037fff0286cd3624d6fd5e95b306cb020c3907be84121d3 svkbd-patched-0.2.1-9aa38c23d233ae3ea2726b25b70f8f15cd5366ae.tar.gz"
sha512sums="e70d57d2a4a87de1482c6cc3e5dbe903ed3f00d8095f5dfb77f38736a89cf84b972a0dba1039a9f4663a55c071da8e4f904ea48964745ec8c49c57656c84eb90 svkbd-patched-0.2.1-a8ea266a79cb2414f06598205db8b229c474ac8f.tar.gz"