1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00

aports: remove aged packages from testing

This commit is contained in:
Alpine Infra 2023-11-07 21:55:21 +00:00
parent 8d013a1f64
commit a328a587a2
4230 changed files with 0 additions and 231782 deletions

View file

@ -1,12 +0,0 @@
#!/sbin/openrc-run
supervisor="supervise-daemon"
command="/usr/bin/3proxy"
CONFFILE=/etc/$SVCNAME/$SVCNAME.cfg
command_args="$CONFFILE"
command_user="$(id -u 3proxy):$(id -g 3proxy)"
required_files="$CONFFILE"
depend() {
need net
}

View file

@ -1,6 +0,0 @@
#!/bin/sh
addgroup -S 3proxy 2>/dev/null
adduser -S -D -h /var/log/3proxy -s /sbin/nologin -G 3proxy -g 3proxy 3proxy 2>/dev/null
exit 0

View file

@ -1,37 +0,0 @@
# Contributor: sillysausage <sillysausage@privatedemail.net>
# Maintainer:
pkgname=3proxy
pkgver=0.9.4
pkgrel=0
pkgdesc="Really tiny cross-platform proxy servers set"
url="https://3proxy.ru"
arch="all"
license="Apache-2.0 GPL-2.0-or-later LGPL-2.1-or-later"
pkgusers="3proxy"
pkggroups="3proxy"
options="!check" # No test suite
makedepends="linux-headers"
install="3proxy.pre-install"
subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/3proxy/3proxy/archive/$pkgver.tar.gz
$pkgname.initd
"
build() {
make -f Makefile.Linux prefix="/usr"
}
package() {
make -f Makefile.Linux DESTDIR="$pkgdir" prefix="/usr" install
install -Dm755 "$srcdir"/3proxy.initd "$pkgdir"/etc/init.d/3proxy
mv "$pkgdir"/usr/local/3proxy/libexec/*.so "$pkgdir"/usr/lib/
rm -rf "$pkgdir"/usr/local
chown -R 3proxy:3proxy "$pkgdir"/etc/3proxy
install -Dm644 copying "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
sha512sums="
d3316f6ee1217e580ce593a7bfd9d76672487a89862f247373b0acf3ea207887c758168e33b25db9fc974063deab0826c20d455cab2536d03eee49d8bddda6b5 3proxy-0.9.4.tar.gz
043fa5784623e29961ae92f5370598d420e55da6d04f6421b585ac050694982765d6b57ee0276a10738bc8ad0e49ddc4edf6ef288bb9c68e7da11b572066688e 3proxy.initd
"

View file

@ -1,64 +0,0 @@
# Contributor: Joshua Haase <hahj87@gmail.com>
# Maintainer: Joshua Haase <hahj87@gmail.com>
pkgname=9base
pkgver=6
pkgrel=1
pkgdesc="A port of various Plan 9 tools for Unix."
url="https://tools.suckless.org/9base/"
arch="all !armv7 !armhf !aarch64" # Needs arch specific config.mk
license="MIT"
makedepends="linux-headers"
subpackages="$pkgname-doc $pkgname-troff"
options="!check" # No test suite present
source="https://dl.suckless.org/tools/9base-$pkgver.tar.gz
config.mk.x86_64
config.mk.i686
config.mk.s390x
config.mk.ppc64le
config.mk.riscv64
dirread.patch
s390x.patch
riscv64.patch"
# Fix build with gcc >= 10, too many definitions affected.
export CFLAGS="$CFLAGS -fcommon"
prepare() {
default_prepare
cp "$srcdir/config.mk.$(uname -m)" "$builddir/config.mk"
}
build() {
make DESTDIR="$pkgdir" all
}
package() {
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
make DESTDIR="$pkgdir" install
}
doc() {
default_doc
mkdir -p "$subpkgdir/usr/lib/9base/share"
mv "$pkgdir/usr/lib/9base/share/man" "$subpkgdir/usr/lib/9base/share"
}
troff() {
cd "$pkgdir"
mkdir -p "$subpkgdir/usr/lib/9base/bin"
mv "$pkgdir/usr/lib/9base/bin/troff" "$subpkgdir/usr/lib/9base/bin/troff"
mkdir -p "$subpkgdir/usr/lib/9base/lib"
mv "$pkgdir/usr/lib/9base/lib/troff" "$subpkgdir/usr/lib/9base/lib/troff"
}
sha512sums="
38108a94118b56c6f3982e692beb1068c52f9aecd74447d6b552b77fae5e365eab72b4781bdf07d9696ac89d54371c1cae8cc0363de510b53988302acef50dba 9base-6.tar.gz
3a30955d59ad78c1bc4e2fbd0f511eb85624ed48b0aeceef436e3456f685690e064eb1f171a2080a34a0fcb40d874277a282864c720c9e612eca3ad848dec35e config.mk.x86_64
7a58d4762c5ec9a0191f2cce15b23b2e60ec9445c357dc2e3925a5b4d5dec1c5eed6fb3565be07a25616c0c2b0768c21737b2d35082deb17bfc7a7f5f0c0d2a6 config.mk.i686
61e67a22abf8f7d3dbfadda92cf0836e8726ae8225939318d0bf34dc05b47a12dd41de895f7b5df515ba5cd783dae368cce98706366cc28360a1987b4e7c652c config.mk.s390x
dd0f9ff55e103fd16f689f01e41769cf6bc6370201e790bf64236570cda2d0e6ef2954f1b5798feb4ebd65fc1a0563ce71c8a9b7fb05166a8ff28ac8be472dfe config.mk.ppc64le
d832d40601687068ac5c558db4e2d52cff25a0c7a04d0de0d2d4987015e60a0c3b9da8dc9f47e836ed2ee77fda991111a0a2039007d7803e85d6d62885d835c3 config.mk.riscv64
5b47647245366e786059a28747fe9a36fd87d9df2e1a7f68e9a41f4adb7ec96f230a9abe94acbe5f82d62f4f85b061ff7ab7356d32072dd9ef7f677379f456f5 dirread.patch
f1f05e2a6081f2a451256de9af669e1ff1e82b6603b376677825421c11bd6ef22a8ab0eb89c15b0589252bada71b58214b6306127bdd379952203105f14e49e9 s390x.patch
aec441bd768a969ff11774be6bf85413b61f45b9967f7720b7e8b5ef75ae6f834cf8f40177114c337c95e33f0b5a717685b54cd8a43b953cd2301616241abf33 riscv64.patch
"

View file

@ -1,24 +0,0 @@
# Customize to fit your system
# paths
PREFIX = /usr/lib/9base
MANPREFIX = ${PREFIX}/share/man
VERSION = 6
OBJTYPE = 386
#OBJTYPE = arm
#OBJTYPE = x86_64
# Linux/BSD
#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\""
LDFLAGS += -static
# Solaris
#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
#LDFLAGS = -dn
# compiler
AR = ar rc
CC = cc
YACC = ../yacc/9yacc

View file

@ -1,22 +0,0 @@
# Customize to fit your system
# paths
PREFIX = /usr/lib/9base
MANPREFIX = ${PREFIX}/share/man
VERSION = 6
OBJTYPE = power
# Linux/BSD
#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\""
LDFLAGS += -static
# Solaris
#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
#LDFLAGS = -dn
# compiler
AR = ar rc
CC = cc
YACC = ../yacc/9yacc

View file

@ -1,24 +0,0 @@
# Customize to fit your system
# paths
PREFIX = /usr/lib/9base
MANPREFIX = ${PREFIX}/share/man
VERSION = 6
#OBJTYPE = 386
#OBJTYPE = arm
OBJTYPE = riscv64
# Linux/BSD
#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\""
LDFLAGS += -static
# Solaris
#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
#LDFLAGS = -dn
# compiler
AR = ar rc
CC = cc
YACC = ../yacc/9yacc

View file

@ -1,22 +0,0 @@
# Customize to fit your system
# paths
PREFIX = /usr/lib/9base
MANPREFIX = ${PREFIX}/share/man
VERSION = 6
OBJTYPE = s390x
# Linux/BSD
#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\""
LDFLAGS += -static
# Solaris
#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
#LDFLAGS = -dn
# compiler
AR = ar rc
CC = cc
YACC = ../yacc/9yacc

View file

@ -1,24 +0,0 @@
# Customize to fit your system
# paths
PREFIX = /usr/lib/9base
MANPREFIX = ${PREFIX}/share/man
VERSION = 6
#OBJTYPE = 386
#OBJTYPE = arm
OBJTYPE = x86_64
# Linux/BSD
#CFLAGS += -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
CFLAGS += -c -I. -DPREFIX="\"${PREFIX}\""
LDFLAGS += -static
# Solaris
#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
#LDFLAGS = -dn
# compiler
AR = ar rc
CC = cc
YACC = ../yacc/9yacc

View file

@ -1,17 +0,0 @@
--- 9base-6/lib9/dirread.c
+++ 9base-6/lib9/dirread.c
@@ -10,13 +10,7 @@
static int
mygetdents(int fd, struct dirent *buf, int n)
{
- off_t off;
- int nn;
-
- /* This doesn't match the man page, but it works in Debian with a 2.2 kernel */
- off = p9seek(fd, 0, 1);
- nn = getdirentries(fd, (void*)buf, n, &off);
- return nn;
+ return getdents(fd, buf, n);
}
#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
static int

View file

@ -1,13 +0,0 @@
Taken from the posix-riscv64 subdirectory in the community/drawterm source.
diff -uNr 9base-6-orig/lib9/getcallerpc-riscv64.c 9base-6/lib9/getcallerpc-riscv64.c
--- 9base-6-orig/lib9/getcallerpc-riscv64.c 1970-01-01 01:00:00.000000000 +0100
+++ 9base-6/lib9/getcallerpc-riscv64.c 2021-07-04 16:39:04.452113924 +0200
@@ -0,0 +1,7 @@
+#include <lib9.h>
+
+ulong
+getcallerpc(void *x)
+{
+ return ((uintptr*)x)[-1];
+}

View file

@ -1,10 +0,0 @@
--- /dev/null
+++ 9base-6/lib9/getcallerpc-s390x.c
@@ -0,0 +1,7 @@
+#include <lib9.h>
+
+ulong
+getcallerpc(void *x)
+{
+ __builtin_return_address(0);
+}

View file

@ -1,31 +0,0 @@
# Contributor: Kay Thomas <kaythomas@pm.me>
# Maintainer: Kay Thomas <kaythomas@pm.me>
pkgname=a2jmidid
pkgver=9
pkgrel=3
pkgdesc="ALSA sequencer to JACK MIDI bridging"
url="https://github.com/jackaudio/a2jmidid"
arch="all"
license="GPL-2.0-or-later"
depends="py3-dbus"
makedepends="meson jack-dev alsa-lib-dev dbus-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/jackaudio/a2jmidid/archive/$pkgver.tar.gz
check-for-libc-backtrace.patch
riscv.patch"
options="!check" # No testsuite
build() {
abuild-meson . build
meson compile -C build
}
package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
sha512sums="
5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c a2jmidid-9.tar.gz
0639c8f2070a8af2872a073c255f0d4dca709363457c726fc0824a6574ca479a78a079a2f71dac18b2f0fa738a8f96ce261984a88687ad804f45a0aad81a869f check-for-libc-backtrace.patch
4664c339daf6e4342ff42ed884fe2b4e57c7ad08c86ac5b01ac928be35e6b143f9816736df9845a2c95855001249af7187aefdefc680176e9286c2e82064758a riscv.patch
"

View file

@ -1,34 +0,0 @@
Check if libc supports error backtracing from execinfo.h before attempting
to use it (musl does not support this).
--- a2jmidid-9/sigsegv.c
+++ a2jmidid-9/sigsegv.c
@@ -28,7 +28,9 @@
#include <signal.h>
#include <ucontext.h>
#include <dlfcn.h>
+#ifdef LIBC_HAS_BACKTRACE
#include <execinfo.h>
+#endif
#include <errno.h>
#ifndef NO_CPP_DEMANGLE
//#include <cxxabi.h>
@@ -148,12 +150,14 @@
bp = (void**)bp[0];
}
#else
- a2j_error("Stack trace (non-dedicated):");
- sz = backtrace(bt, 20);
- strings = backtrace_symbols(bt, sz);
+ #ifdef LIBC_HAS_BACKTRACE
+ a2j_error("Stack trace (non-dedicated):");
+ sz = backtrace(bt, 20);
+ strings = backtrace_symbols(bt, sz);
- for(i = 0; i < sz; ++i)
- a2j_error("%s", strings[i]);
+ for(i = 0; i < sz; ++i)
+ a2j_error("%s", strings[i]);
+ #endif
#endif
a2j_error("End of stack trace");
exit (-1);

View file

@ -1,12 +0,0 @@
diff -upr a2jmidid-9.orig/sigsegv.c a2jmidid-9/sigsegv.c
--- a2jmidid-9.orig/sigsegv.c 2021-07-11 11:43:22.326350510 +0200
+++ a2jmidid-9/sigsegv.c 2021-07-11 11:43:34.907756185 +0200
@@ -91,7 +91,7 @@ static void signal_segv(int signum, sigi
a2j_error("info.si_errno = %d", info->si_errno);
a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
a2j_error("info.si_addr = %p", info->si_addr);
-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv)
for(i = 0; i < NGREG; i++)
a2j_error("reg[%02d] = 0x" REGFORMAT, i,
#if defined(__powerpc__) && !defined(__powerpc64__)

View file

@ -1,74 +0,0 @@
# Contributor: Keith Toh <ktprograms@gmail.com>
# Maintainer: Sebastian Hudak <sebastian@sebsite.pw>
pkgname=ace-of-penguins
pkgver=1.4
pkgrel=2
pkgdesc="Collection of one-player games for X"
url="https://www.delorie.com/store/ace/"
arch="all"
license="GPL-2.0-or-later"
makedepends="libpng-dev libx11-dev libxpm-dev zlib-dev"
subpackages="$pkgname-doc"
# .desktop files were taken from ace-of-penguins AUR files, with slight
# modifications.
# https://aur.archlinux.org/packages/ace-of-penguins
source="https://www.delorie.com/store/ace/ace-$pkgver.tar.gz
ace.patch
fix-font.patch
canfield.desktop
freecell.desktop
golf.desktop
mastermind.desktop
merlin.desktop
minesweeper.desktop
pegged.desktop
penguins.desktop
solitaire.desktop
spider.desktop
taipei-editor.desktop
taipei.desktop
thornq.desktop
"
builddir="$srcdir/ace-$pkgver"
prepare() {
default_prepare
update_config_sub
update_config_guess
}
build() {
./configure --prefix=/usr
make
}
check() {
make check
}
package() {
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/lib/libcards.a
install -Dm644 docs/*.* -t "$pkgdir"/usr/share/doc/ace-of-penguins/
install -Dm644 "$srcdir"/*.desktop -t "$pkgdir"/usr/share/applications/
}
sha512sums="
cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc ace-1.4.tar.gz
6846662deda4c21a89ecaf55afe1580f82f67122f236618a94dcd584cd3a5a76d0429c9bd4ac808e29d04ae78ab9cf9417e274585f87af46a0a769af4917f509 ace.patch
b3cd34677326d4b9e47875698aa1bca6985231e1f0e14dc9acdb815c443f767f1199dbd8dd0c72a3aaa2eba62e35c3473a60acaab7c606d848c6cbdb854d3487 fix-font.patch
4ba6813cb57d2ed41ee8a582b4cc3026a9f69d4c78ee5a012cdcb3284efee0b3efb04917ad2bd9fb4846b7007cce4bfef7e5e9bd8e91c229b4ed31d077f4f10b canfield.desktop
3f0b3a55af0df885d23fcd73764e0548b7f7d0e25eb881ee1e24d108dd51a234e4140d37a6c616bc39dc2eb70aeeb0f370a1c0ef0ec3314ffb4a07ab89e0b005 freecell.desktop
d76332b739d938ed29ad30f41baaddff6efa70e674aa7354f60b342f828d470212bebacb2a02f6921b8740a616b97b97002455eb153555d7350ffab3ea7b670a golf.desktop
24adc08aa52625c25d6315160f45ce3ded0b733238c09aff1764c39f5e95229bff7da70757318048c703faf120a273127bc965ae462bb0b47460f5cf1a4607da mastermind.desktop
d235d731fc8d3e43537a0e16d61c62f032cb78ce341279af36c4bdd7e7f7101d12ffd04d767ecd51cc6b6e993b46694b09abebb45631cd16a175013f65dc6329 merlin.desktop
8015901cd23d17b19daa62cc2f2f9d377b9af37d5099b651e9ff0f07af07262b65ac81cb84a6d672f429a2bf0e69ab11f7376e90fcafe11dd977b58901152cf4 minesweeper.desktop
70f86cb3919c6f5627fcd86fef5812bdeb5370cc0eab47530912ef4c1a300865b204b5091ce1fc0bd51b857996a9fff795c1847c8d48daa8f80ddabd6a7c5521 pegged.desktop
a224aed5a4ffb26f84d892285559767da203542e8610d06a39562bb491458ffacba834191f7970cb5d868f302bfd242a3db8dcb4659c368081cf81e45179bd92 penguins.desktop
d51a8657471729a7fabd85a88aa90b6cb2598a078c9880bb945ada923eaa9340ba82a22d2f8a477fd84201a9282d1667c24d043989d8fd24a3d04a75c89e3ef2 solitaire.desktop
8a9fa45b275acccb78a52db218d424abc71af2f3aa1ae5f8a197a5685a48ed08a90b57225f563ae430211ebadb5f63217650fc2b5cff5a7b4e6abdb9757f6202 spider.desktop
8c5c81bd806b3a453c2480bf6a3cc83f532c99c9ee439a906ee1eccaf908380d83441ad538179ca9c9fa9f3fd6d5c0de1a97a09794ec5df470e6a1f8baf3c181 taipei-editor.desktop
7930c8af3def8f0d1ff9f8e0a2fcdc8d953eeb2699c4bf5dde794e862ddf616a9d86b202f1e7b9a8507b7e898721a62b3edafa59d9c27d0d4ce73fc89fcbb0f3 taipei.desktop
b8a84c7aa1fca593a604e936e9500939a92a3278252ebf86ad3d1b168ead4ec9e6319f37c81e74d8d577b4bae647ce2238dafb57550ca8d7fea66fc5d5aa5c7d thornq.desktop
"

View file

@ -1,76 +0,0 @@
Some patches have been taken from the ace-of-penguins AUR package.
https://aur.archlinux.org/cgit/aur.git/tree/ace14_fixes.patch?h=ace-of-penguins
diff -Naur ace-1.4/config.guess ace-1.4-alpine/config.guess
--- ace-1.4/config.guess 2012-03-24 18:00:49.000000000 +0000
+++ ace-1.4-alpine/config.guess 2021-12-19 21:36:35.650013257 +0000
@@ -882,6 +882,9 @@
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
fi
exit ;;
+ aarch64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
@@ -950,7 +953,7 @@
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
- ppc64:Linux:*:*)
+ ppc64*:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
diff -Naur ace-1.4/lib/Makefile.am ace-1.4-alpine/lib/Makefile.am
--- ace-1.4/lib/Makefile.am 2012-03-24 18:00:49.000000000 +0000
+++ ace-1.4-alpine/lib/Makefile.am 2021-12-19 21:36:12.876679139 +0000
@@ -6,7 +6,7 @@
CLEANFILES = images.c images.d
INCLUDES = $(X_CFLAGS) @PDA@
-AM_LDFLAGS = $(X_LIBS)
+AM_LDFLAGS = $(X_LIBS) -lpng -lz -lm
BUILD_CC = @BUILD_CC@
AR = @AR@
diff -Naur ace-1.4/lib/make-imglib.c ace-1.4-alpine/lib/make-imglib.c
--- ace-1.4/lib/make-imglib.c 2012-03-24 18:00:49.000000000 +0000
+++ ace-1.4-alpine/lib/make-imglib.c 2021-12-19 21:36:12.876679139 +0000
@@ -86,7 +86,7 @@
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
info_ptr = png_create_info_struct (png_ptr);
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf (png_ptr))) {
fclose (f);
continue;
}
diff -Naur ace-1.4/lib/xwin.c ace-1.4-alpine/lib/xwin.c
--- ace-1.4/lib/xwin.c 2012-03-24 18:00:49.000000000 +0000
+++ ace-1.4-alpine/lib/xwin.c 2021-12-19 21:36:12.876679139 +0000
@@ -55,7 +55,6 @@
{ "-visual", OPTION_INTEGER, &visual_id },
{ 0, 0, 0 }
};
-OptionDesc *xwin_options = xwin_options_list;
Display *display=0;
int screen=0;
@@ -841,13 +840,13 @@
png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
info_ptr = png_create_info_struct (png_ptr);
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf (png_ptr))) {
fprintf(stderr, "Invalid PNG image!\n");
return;
}
file_bytes = src->file_data;
- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader);
+ png_set_read_fn (png_ptr, &file_bytes, (png_rw_ptr)png_reader);
png_read_info (png_ptr, info_ptr);

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Canfield
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/canfield
Terminal=false
Categories=Game;BoardGame;

View file

@ -1,24 +0,0 @@
Without this patch, trying to open the help screen could make the program
segfault if the appropriate fonts weren't installed.
--- ace-1.4/lib/help.c 2022-02-17 03:11:56.410174316 +0000
+++ ace-1.4-alpine/lib/help.c 2022-02-17 03:46:31.476912695 +0000
@@ -179,7 +179,18 @@
for (i=0; i<17; i++)
{
if (!fonts[i])
+ {
fonts[i] = XLoadQueryFont(display, i & STYLE_TT ? "fixed" : "variable");
+ if (!fonts[i])
+ {
+ int count;
+ char **fontlist = XListFonts(display, "*", 1, &count);
+ if (count == 0)
+ abort();
+ fonts[i] = XLoadQueryFont(display, fontlist[0]);
+ XFreeFontNames(fontlist);
+ }
+ }
thin_space[i] = XTextWidth(fonts[i], " ", 1);
}
for (i=0; i<NTAGS; i++)

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Freecell
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/freecell
Terminal=false
Categories=Game;CardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Golf
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/golf
Terminal=false
Categories=Game;CardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Mastermind
GenericName=
Comment=Guess a secret combination of colors
Icon=
Exec=/usr/bin/mastermind
Terminal=false
Categories=Game;LogicGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Merlin
GenericName=
Comment=Classical puzzle
Icon=
Exec=/usr/bin/merlin
Terminal=false
Categories=Game;LogicGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Minesweeper
GenericName=
Comment=Find all hidden mines in a minefield
Icon=
Exec=/usr/bin/minesweeper
Terminal=false
Categories=Game;LogicGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Pegged
GenericName=
Comment=Classical board game
Icon=
Exec=/usr/bin/pegged
Terminal=false
Categories=Game;LogicGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Penguins
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/penguins
Terminal=false
Categories=Game;CardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Solitaire
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/solitaire
Terminal=false
Categories=Game;CardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Spider
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/spider
Terminal=false
Categories=Game;BoardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Taipei Editor
GenericName=
Comment=Editor for your own Taipei levels
Icon=
Exec=/usr/bin/taipedit
Terminal=false
Categories=Game;BoardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Taipei
GenericName=
Comment=Asian puzzle: remove pairs of equal stones
Icon=
Exec=/usr/bin/taipei
Terminal=false
Categories=Game;BoardGame;

View file

@ -1,9 +0,0 @@
[Desktop Entry]
Type=Application
Name=Thornq
GenericName=
Comment=Solitary card game
Icon=
Exec=/usr/bin/thornq
Terminal=false
Categories=Game;CardGame;

View file

@ -1,47 +0,0 @@
# Contributor: kpcyrd <git@rxv.cc>
# Maintainer: kpcyrd <git@rxv.cc>
pkgname=acmetool
pkgver=0.2.2
pkgrel=3
pkgdesc="An easy-to-use command line tool for automatically acquiring certificates from ACME servers (such as Let's Encrypt)"
url="https://github.com/hlandau/acmetool"
arch="all"
license="MIT"
makedepends="go libcap-dev"
subpackages="$pkgname-doc"
# no test suite available
options="!check net"
source="$pkgname-$pkgver.tar.gz::https://github.com/hlandau/acmetool/archive/v$pkgver.tar.gz
go.mod
go.sum
"
export GOPATH="$srcdir/go"
export GOCACHE="$srcdir/go-build"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
prepare() {
default_prepare
cp "$srcdir"/go.mod "$srcdir"/go.sum "$builddir"/
}
build() {
go build -v \
-ldflags "-X github.com/hlandau/acmetool/hooks.DefaultPath=/etc/acme/hooks" \
./cmd/acmetool/...
}
package() {
install -Dm 755 acmetool "$pkgdir/usr/bin/acmetool"
install -Dm644 README.md "$pkgdir/usr/share/doc/acmetool/README"
cp -a _doc/* "$pkgdir/usr/share/doc/$pkgname/"
}
sha512sums="
c24bebbf52664cfda0442db86f8437244322a709413fdd03a79294feac99045f0e06b4342a6186ae4aa400fb627e740f00eadf7522919d3faff4270badb38451 acmetool-0.2.2.tar.gz
5c3e8400b46fbfe00553698c200075367bd6d6e19d3aaddf8029c9a3e43ae0b9a19496175358d8439cd6edf0d1652d68ed1ae1980318bad8f04112f7ef009841 go.mod
e52269c2d78c8ca6e769ae918b369591e8965db0283e7c8c2f18531e4af36fd71589596d91dbf0f75fd5aeca36d95c522f28a4c8ae006a300a8ea9fc2e3eb305 go.sum
"

View file

@ -1,44 +0,0 @@
module github.com/hlandau/acmetool
go 1.16
require (
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
github.com/btcsuite/winsvc v1.0.0 // indirect
github.com/coreos/go-systemd v0.0.0-20180409111510-d1b7d058aa2a // indirect
github.com/erikdubbelboer/gspt v0.0.0-20171114050331-2cac68f23d57 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible
github.com/google/go-cmp v0.5.9 // indirect
github.com/hlandau/buildinfo v0.0.0-20161112115716-337a29b54997 // indirect
github.com/hlandau/dexlogconfig v0.0.0-20161112114350-244f29bd2608
github.com/hlandau/goutils v0.0.0-20160722130800-0cdb66aea5b8
github.com/hlandau/xlog v1.0.0
github.com/hlandauf/go-systemd v22.2.1-0.20210317225616-d4cbd5bfbd43+incompatible
github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548
github.com/mattn/go-runewidth v0.0.3 // indirect
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7
github.com/ogier/pflag v0.0.2-0.20160129220114-45c278ab3607 // indirect
github.com/peterhellberg/link v1.0.1-0.20180124233705-6d32b8d78d1e // indirect
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
github.com/stretchr/testify v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20180411161317-d6449816ce06 // indirect
golang.org/x/net v0.0.0-20180417003750-8d16fa6dc9a8
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/text v0.3.1-0.20180410181320-7922cc490dd5 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/cheggaaa/pb.v1 v1.0.22
gopkg.in/hlandau/acmeapi.v2 v2.0.2
gopkg.in/hlandau/configurable.v1 v1.0.1 // indirect
gopkg.in/hlandau/easyconfig.v1 v1.0.16
gopkg.in/hlandau/service.v2 v2.0.16
gopkg.in/hlandau/svcutils.v1 v1.0.10
gopkg.in/hlandauf/dbus.v5 v5.990.1 // indirect
gopkg.in/square/go-jose.v1 v1.1.1
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/tylerb/graceful.v1 v1.2.15
gopkg.in/yaml.v2 v2.2.1
)
replace golang.org/x/sys => golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c

View file

@ -1,85 +0,0 @@
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/btcsuite/winsvc v1.0.0 h1:J9B4L7e3oqhXOcm+2IuNApwzQec85lE+QaikUcCs+dk=
github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
github.com/coreos/go-systemd v0.0.0-20180409111510-d1b7d058aa2a h1:kJfKDOt1RNg9d0/s1KKRY0W3iJkfnURwhZo3BbaDIMY=
github.com/coreos/go-systemd v0.0.0-20180409111510-d1b7d058aa2a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/erikdubbelboer/gspt v0.0.0-20171114050331-2cac68f23d57 h1:3r+tV/4K76VpFxFiH7IjAB6S9dOx4k7NSkvy5M3guUY=
github.com/erikdubbelboer/gspt v0.0.0-20171114050331-2cac68f23d57/go.mod h1:v6o7m/E9bfvm79dE1iFiF+3T7zLBnrjYjkWMa1J+Hv0=
github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=
github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/hlandau/buildinfo v0.0.0-20161112115716-337a29b54997 h1:pSU4Sj7AD5qh+4V5FRlpiw3DpuNQ459c3j8h2F38q74=
github.com/hlandau/buildinfo v0.0.0-20161112115716-337a29b54997/go.mod h1:Oara+TmqGrvsLVEj5YkFe+PP9cSkp0kFD2PFQ5gjHok=
github.com/hlandau/dexlogconfig v0.0.0-20161112114350-244f29bd2608 h1:ouW4TuIFOsfgql1NgzTHGgW6esZ41RW5NZwHz3ALXn8=
github.com/hlandau/dexlogconfig v0.0.0-20161112114350-244f29bd2608/go.mod h1:JpXGCMr2CULPTjnwD8PL9A7YipEitrd+xSHTIK8orHU=
github.com/hlandau/goutils v0.0.0-20160722130800-0cdb66aea5b8 h1:9aNGW7btNlVqbcqAc2YVwjI0fhZFmoZHkC3+ZJyt1DM=
github.com/hlandau/goutils v0.0.0-20160722130800-0cdb66aea5b8/go.mod h1:pYz0KEJgONY133I+1Pkmn6MLptkdKyz3SHgGmpDWyFI=
github.com/hlandau/xlog v1.0.0 h1:tcFGp86iK+v6NwbyuG9wyLB77SBkvAJUjOkRJo3H8C0=
github.com/hlandau/xlog v1.0.0/go.mod h1:aZl5hrokGCtnAFcvft2givQmKZYVfHRvQJbjoqI2lm8=
github.com/hlandauf/go-systemd v22.2.1-0.20210317225616-d4cbd5bfbd43+incompatible h1:435zI8sPEgcr0HUwAczIY6cQQzJRJ+qlyj/tsDZzsww=
github.com/hlandauf/go-systemd v22.2.1-0.20210317225616-d4cbd5bfbd43+incompatible/go.mod h1:Tfuxf4cwByXRPnu6MRc3Wn66VjG+worH/9IhfvPnlZg=
github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548 h1:dYTbLf4m0a5u0KLmPfB6mgxbcV7588bOCx79hxa5Sr4=
github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548/go.mod h1:hGT6jSUVzF6no3QaDSMLGLEHtHSBSefs+MgcDWnmhmo=
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
github.com/ogier/pflag v0.0.2-0.20160129220114-45c278ab3607 h1:xZoOomu8/sOa+6Q469LrXeyq2YsmkhZo8wU6EzNWMDg=
github.com/ogier/pflag v0.0.2-0.20160129220114-45c278ab3607/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
github.com/peterhellberg/link v1.0.1-0.20180124233705-6d32b8d78d1e h1:UNCcSD9GJ5vTa9Nl0jlCFVuaSQc8H6wADKWAIMs0SXI=
github.com/peterhellberg/link v1.0.1-0.20180124233705-6d32b8d78d1e/go.mod h1:gtSlOT4jmkY8P47hbTc8PTgiDDWpdPbFYl75keYyBB8=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo=
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/crypto v0.0.0-20180411161317-d6449816ce06 h1:EOqG0JqGlLr+punVB69jvWCv/ErZKGlC7PMdyHfv+Bc=
golang.org/x/crypto v0.0.0-20180411161317-d6449816ce06/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20180417003750-8d16fa6dc9a8 h1:x78T1ffZeQiacNSxOb00nz8Y+6YRQ8Jc2nlHAgp3HZc=
golang.org/x/net v0.0.0-20180417003750-8d16fa6dc9a8/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.1-0.20180410181320-7922cc490dd5 h1:23hw054QGj0KDkhDTmeMTzaawNqHp/Q5B65f8TTG3vg=
golang.org/x/text v0.3.1-0.20180410181320-7922cc490dd5/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/cheggaaa/pb.v1 v1.0.22 h1:c9uUtBcJbskglPcslP+bFq43Y9mR+Hja6qPRW0bsOJ0=
gopkg.in/cheggaaa/pb.v1 v1.0.22/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
gopkg.in/hlandau/acmeapi.v2 v2.0.2 h1:S5jEi1/TiaPpfQ9Mwvhfi9NRDYZ+zA+UcRbysH4ygNM=
gopkg.in/hlandau/acmeapi.v2 v2.0.2/go.mod h1:aWwBqx5Cy/gAMFsLZOKe0T/ZUMvy2kmsIIAZFjBOtFc=
gopkg.in/hlandau/configurable.v1 v1.0.1 h1:rH8g/WXZu2b/eyLagvsqUf9q5mO66hfGHW5L4rm8ktk=
gopkg.in/hlandau/configurable.v1 v1.0.1/go.mod h1:rlyQpcii/QkMGudMSMoe3jjHAgqLZuqg0hQkiUcNfF8=
gopkg.in/hlandau/easyconfig.v1 v1.0.16 h1:ldFeTZmzPDiiFbyeV8eOMVLAqSCWI0rg8W3GK3Z9wH0=
gopkg.in/hlandau/easyconfig.v1 v1.0.16/go.mod h1:fljDHM+/VAXpyEN/45q6RFtcOFnUaF1Wgr6p4LLICoU=
gopkg.in/hlandau/service.v2 v2.0.16 h1:mmaXq+/O4vXTWEGHdVy+Cy5S7h2djyu8Rodm6qE3oV4=
gopkg.in/hlandau/service.v2 v2.0.16/go.mod h1:3f+96gui2lGv8llWOAUPi9+oI+TOBIyvlVHa1DUwliA=
gopkg.in/hlandau/svcutils.v1 v1.0.10 h1:eIasSJy56y3H3rJ0US4EJURTAfHXItiehMxZRRs7TrU=
gopkg.in/hlandau/svcutils.v1 v1.0.10/go.mod h1:aAoYFMVAq2ck6z8av+FBxzX/qX1ehmUIc5PgGBf+P3I=
gopkg.in/hlandauf/dbus.v5 v5.990.1 h1:5ei2lTlF906KJlYbA8xv0LJFSV9Jb0Lr4EWSlzXyo3U=
gopkg.in/hlandauf/dbus.v5 v5.990.1/go.mod h1:MofjUhKgyhZW5tf4SWxHvGcU4jKyvuHrsifrQNhNuvA=
gopkg.in/square/go-jose.v1 v1.1.1 h1:pA7KxQLcwADLRJ3lpUC+vIe4LCO8oRBMoq1HJoJhA3U=
gopkg.in/square/go-jose.v1 v1.1.1/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA=
gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/tylerb/graceful.v1 v1.2.15 h1:1JmOyhKqAyX3BgTXMI84LwT6FOJ4tP2N9e2kwTCM0nQ=
gopkg.in/tylerb/graceful.v1 v1.2.15/go.mod h1:yBhekWvR20ACXVObSSdD3u6S9DeSylanL2PAbAC/uJ8=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

View file

@ -1,28 +0,0 @@
# Contributor: omni <omni+alpine@hack.org>
# Maintainer: omni <omni+alpine@hack.org>
pkgname=adbtuifm
pkgver=0.5.8
pkgrel=7
pkgdesc="A TUI File Manager for Android Debug Bridge (ADB)"
url="https://github.com/darkhz/adbtuifm"
license="MIT"
arch="all"
makedepends="go"
options="!check" # no test files
source="$pkgname-$pkgver.tar.gz::https://github.com/darkhz/adbtuifm/archive/refs/tags/v$pkgver.tar.gz"
export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
build() {
go build -v .
}
package() {
install -Dm0755 "$pkgname" -t "$pkgdir"/usr/bin
}
sha512sums="
78db21a7414be6a230ca0fa51dfb06e52f773b50aa473df51341a5b1484a491016f87d567b7a05e0ea85b4437294f5c7a3e6ceb6b2ce1bf11f15cba822dbe770 adbtuifm-0.5.8.tar.gz
"

View file

@ -1,35 +0,0 @@
Author: Anjandev Momi <anjan@momi.ca>
URL: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=adjtimex
Summary: create directory on install and make mandir respect DESTDIR
----
diff -ruN adjtimex-debian-1.29-10.old/Makefile.in adjtimex-debian-1.29-10/Makefile.in
--- adjtimex-debian-1.29-10.old/Makefile.in 2018-07-25 17:02:11.000000000 +0000
+++ adjtimex-debian-1.29-10/Makefile.in 2019-01-01 02:58:05.867107891 +0000
@@ -8,7 +8,7 @@
prefix = @prefix@
man1dir=@mandir@/man1
exec_prefix = @exec_prefix@
-bindir=/sbin
+bindir=$(DESTDIR)/$(prefix)/bin
datadir = @datadir@
datarootdir = @datarootdir@
@@ -18,7 +18,7 @@
# Extension (not including `.') for the manual page filenames.
manext = 8
# Where to put the manual pages.
-mandir = $(prefix)/share/man/man$(manext)
+mandir = $(DESTDIR)/$(prefix)/share/man/man$(manext)
#### End of system configuration section. ####
@@ -42,7 +42,8 @@
$(CC) $(CFLAGS) -c mat.c
install: all
- $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex
+ $(INSTALL) -d -g root -m 755 -o root $(bindir)
+ $(INSTALL) -g root -m 755 -o root adjtimex $(bindir)/adjtimex
$(INSTALL) -d -g root -m 755 -o root $(mandir)
-$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \
$(mandir)/adjtimex.$(manext)

View file

@ -1,33 +0,0 @@
# Contributor: Anjandev Momi <anjan@momi.ca>
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=adjtimex
pkgver=1.29
pkgrel=0
pkgdesc="Allows configuration of kernel time variables"
url="https://github.com/rogers0/adjtimex"
options="!check" # No tests
arch="all"
subpackages="$pkgname-doc"
license="GPL-2.0-or-later"
source="http://ftp.debian.org/debian/pool/main/a/adjtimex/adjtimex_$pkgver.orig.tar.gz
10-Makefile.patch"
build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var
make
}
package() {
make PREFIX=/usr DESTDIR="$pkgdir" install
}
sha512sums="
5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649 adjtimex_1.29.orig.tar.gz
f75ede467d2b089306aa0bf08613c835d040f019eb74987869dd0495d2768db66f718a977fda6600238ba1a3582137d7035dfc900d10fd8531e5fbc091b53d93 10-Makefile.patch
"

View file

@ -1,38 +0,0 @@
# Contributor: Noel Kuntze <noel.kuntze@thermi.consulting>
# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
pkgname=adman
pkgver=0.9.0
pkgrel=2
pkgdesc="A tool for performing automated Active Directory management"
url="https://gitlab.com/JonathonReinhart/adman"
arch="noarch"
license="MIT"
depends="
python3
py3-pyldap
py3-dnspython
py3-smbc
py3-yaml
"
makedepends="py3-setuptools"
checkdepends="py3-pytest"
subpackages="$pkgname-pyc"
source="adman-$pkgver.tar.gz::https://gitlab.com/JonathonReinhart/adman/-/archive/v$pkgver/adman-v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-v$pkgver"
options="!check" # fail with py3.11 (or other depends?)
build() {
python3 setup.py build
}
check() {
PYTHONPATH=build/lib pytest -vv --color=yes
}
package() {
python3 setup.py install --skip-build --root="$pkgdir"
}
sha512sums="
52d741a27c1e6c5666fa9cb0136ac29ef9e5a3b042b611bc3a9b7ddf8d12c368d32761c52179020a69a1b0e5b30bff3101c01cc853629d70c5948e7d21967caf adman-0.9.0.tar.gz
"

View file

@ -1,29 +0,0 @@
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=admesh
pkgver=0.98.5
pkgrel=0
pkgdesc="A program for processing triangulated solid meshes"
url="https://github.com/admesh/admesh"
arch="all"
license="GPL-2.0-only"
makedepends="libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/admesh/admesh/releases/download/v$pkgver/admesh-$pkgver.tar.gz"
options="!check" # no unit tests
build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr
make
}
package() {
make DESTDIR="$pkgdir" install
}
sha512sums="
8d94966caf65ec09a143b0d9ed4a1dce1ccd6dc2281b6da02c620d6f31439c2ce4b6501bfca4392ed96727696df3a15c86890e4dd6fc995bc8cf9d130f25786a admesh-0.98.5.tar.gz
"

View file

@ -1,81 +0,0 @@
# Maintainer: Taner Tas <taner76@gmail.com>
pkgname=advancemame
pkgver=3.9
pkgrel=4
pkgdesc="A port of the MAME emulator for Arcade Monitors and TVs but also for LCDs and PC monitors"
url="http://www.advancemame.it"
# armhf: fails with clang
arch="all !armhf"
license="GPL-2.0-only"
makedepends="
alsa-lib-dev
clang
expat-dev
freetype-dev
linux-headers
sdl2-dev
slang-dev
zlib-dev
"
subpackages="$pkgname-doc $pkgname-data::noarch $pkgname-mess $pkgname-menu"
source="https://github.com/amadvance/advancemame/releases/download/v$pkgver/advancemame-$pkgver.tar.gz
fix-ppc64le-float128.patch
formatsec.patch
"
options="!check"
# Fix build with gcc 10
export CFLAGS="$CFLAGS -fcommon"
prepare() {
default_prepare
update_config_guess
update_config_sub
}
build() {
export CC=clang
export CXX=clang++
./configure \
--build=$CBUILD \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
--enable-fb \
--enable-sdl2
make
}
package() {
make bindir="$pkgdir/usr/bin/" \
datadir="$pkgdir/usr/share/" \
mandir="$pkgdir/usr/share/man/" \
pkgdocdir="$pkgdir/usr/share/doc/$pkgname/" \
install
}
data() {
pkgdesc="Distribution files for advancemame"
depends="$pkgname=$pkgver-r$pkgrel"
amove usr/share/advance/*
}
mess() {
pkgdesc="Advancemame port of MESS."
amove usr/bin/advmess
}
menu() {
pkgdesc="An emulator frontend with sound and animated previews of your games."
amove usr/bin/advmenu
}
sha512sums="
43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3 advancemame-3.9.tar.gz
d42a9b3c65c2d96be5287c7541eb1e911562b3f2aaf07c55c1849725592857716ce496405e3da2243edcbd4b7307226306533ddf66ef2e081b4c492412930d1b fix-ppc64le-float128.patch
461a76d3db95d9c894ec6937be18f2d1d7f193c2c06e14c4b3bb7cb860c7b2054f46fac636c8ebd9616d48a079b07f6cd2b1647ec0d706e26a473ac08d1ce504 formatsec.patch
"

View file

@ -1,24 +0,0 @@
--- a/advance/d2/d2.cc
+++ b/advance/d2/d2.cc
@@ -21,6 +21,9 @@
#include <string>
#include <iostream>
#include <sstream>
+#if defined(__PPC64__)
+#define __STRICT_ANSI__
+#endif
#include <cstdlib>
#include <cstdio>
--- a/advance/lib/portable.h
+++ b/advance/lib/portable.h
@@ -67,6 +67,9 @@
/* Include some standard headers */
#include <stdio.h>
+#if defined(__PPC64__)
+#define __STRICT_ANSI__
+#endif
#include <stdlib.h> /* On many systems (e.g., Darwin), `stdio.h' is a prerequisite. */
#include <stdarg.h>
#include <string.h>

View file

@ -1,13 +0,0 @@
diff --git a/advance/menu/emulator.cc b/advance/menu/emulator.cc
index cfa4300..3c3d5d6 100644
--- a/advance/menu/emulator.cc
+++ b/advance/menu/emulator.cc
@@ -2203,7 +2203,7 @@ bool advmess::run(const game& g, const game* bios, unsigned orientation, bool se
}
}
error += "\n";
- target_err(error.c_str());
+ target_err("%s", error.c_str());
}
for (int i = 0; i < argc; ++i)

View file

@ -1,276 +0,0 @@
Author: Patrycja Rosa <alpine@ptrcnull.me>
Date: Thu, 03 Feb 2022 05:06:47 +0100
replace throw with noexcept
throw has been deprecated in C++11 and removed in C++17
diff --git a/conf.cc b/conf.cc
index e9b596d..e537e00 100644
--- a/conf.cc
+++ b/conf.cc
@@ -28,7 +28,7 @@
using namespace std;
-static void expand_tree(const string& path, filepath_container& ds) throw (error)
+static void expand_tree(const string& path, filepath_container& ds) noexcept (false)
{
DIR* dir = opendir(path.c_str());
if (!dir)
diff --git a/file.cc b/file.cc
index 1e90348..36f3495 100644
--- a/file.cc
+++ b/file.cc
@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadonly)
/**
* Check if a file exists.
*/
-bool file_exists(const string& path) throw (error)
+bool file_exists(const string& path) noexcept (false)
{
struct stat s;
if (stat(path.c_str(), &s) != 0) {
@@ -114,7 +114,7 @@ bool file_exists(const string& path) throw (error)
/**
* Write a whole file.
*/
-void file_write(const string& path, const char* data, unsigned size) throw (error)
+void file_write(const string& path, const char* data, unsigned size) noexcept (false)
{
FILE* f = fopen(path.c_str(), "wb");
if (!f)
@@ -134,7 +134,7 @@ void file_write(const string& path, const char* data, unsigned size) throw (erro
/**
* Read a whole file.
*/
-void file_read(const string& path, char* data, unsigned size) throw (error)
+void file_read(const string& path, char* data, unsigned size) noexcept (false)
{
file_read(path, data, 0, size);
}
@@ -142,7 +142,7 @@ void file_read(const string& path, char* data, unsigned size) throw (error)
/**
* Read a whole file.
*/
-void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error)
+void file_read(const string& path, char* data, unsigned offset, unsigned size) noexcept (false)
{
FILE* f = fopen(path.c_str(), "rb");
if (!f)
@@ -166,7 +166,7 @@ void file_read(const string& path, char* data, unsigned offset, unsigned size) t
/**
* Get the time of a file.
*/
-time_t file_time(const string& path) throw (error)
+time_t file_time(const string& path) noexcept (false)
{
struct stat s;
if (stat(path.c_str(), &s)!=0)
@@ -178,7 +178,7 @@ time_t file_time(const string& path) throw (error)
/**
* Set the time of a file.
*/
-void file_utime(const string& path, time_t tod) throw (error)
+void file_utime(const string& path, time_t tod) noexcept (false)
{
struct utimbuf u;
@@ -192,7 +192,7 @@ void file_utime(const string& path, time_t tod) throw (error)
/**
* Get the size of a file.
*/
-unsigned file_size(const string& path) throw (error)
+unsigned file_size(const string& path) noexcept (false)
{
struct stat s;
if (stat(path.c_str(), &s)!=0)
@@ -204,7 +204,7 @@ unsigned file_size(const string& path) throw (error)
/**
* Get the crc of a file.
*/
-crc_t file_crc(const string& path) throw (error)
+crc_t file_crc(const string& path) noexcept (false)
{
unsigned size = file_size(path);
@@ -227,7 +227,7 @@ crc_t file_crc(const string& path) throw (error)
/**
* Copy a file.
*/
-void file_copy(const string& path1, const string& path2) throw (error)
+void file_copy(const string& path1, const string& path2) noexcept (false)
{
unsigned size;
@@ -249,7 +249,7 @@ void file_copy(const string& path1, const string& path2) throw (error)
/**
* Move a file.
*/
-void file_move(const string& path1, const string& path2) throw (error)
+void file_move(const string& path1, const string& path2) noexcept (false)
{
if (rename(path1.c_str(), path2.c_str())!=0
&& errno==EXDEV) {
@@ -271,7 +271,7 @@ void file_move(const string& path1, const string& path2) throw (error)
/**
* Remove a file.
*/
-void file_remove(const string& path1) throw (error)
+void file_remove(const string& path1) noexcept (false)
{
if (remove(path1.c_str())!=0) {
throw error() << "Failed remove of " << path1;
@@ -281,7 +281,7 @@ void file_remove(const string& path1) throw (error)
/**
* Rename a file.
*/
-void file_rename(const string& path1, const string& path2) throw (error)
+void file_rename(const string& path1, const string& path2) noexcept (false)
{
if (rename(path1.c_str(), path2.c_str())!=0) {
throw error() << "Failed rename of " << path1 << " to " << path2;
@@ -291,7 +291,7 @@ void file_rename(const string& path1, const string& path2) throw (error)
/**
* Randomize a name file.
*/
-string file_randomize(const string& path, int n) throw ()
+string file_randomize(const string& path, int n) noexcept (true)
{
ostringstream os;
@@ -307,7 +307,7 @@ string file_randomize(const string& path, int n) throw ()
return os.str();
}
-string file_temp(const string& path) throw ()
+string file_temp(const string& path) noexcept (true)
{
ostringstream os;
@@ -319,7 +319,7 @@ string file_temp(const string& path) throw ()
/**
* Get the directory from a path.
*/
-string file_dir(const string& path) throw ()
+string file_dir(const string& path) noexcept (true)
{
size_t pos = path.rfind('/');
if (pos == string::npos) {
@@ -332,7 +332,7 @@ string file_dir(const string& path) throw ()
/**
* Get the file name from a path.
*/
-string file_name(const string& path) throw ()
+string file_name(const string& path) noexcept (true)
{
size_t pos = path.rfind('/');
if (pos == string::npos) {
@@ -345,7 +345,7 @@ string file_name(const string& path) throw ()
/**
* Get the basepath (path without extension) from a path.
*/
-string file_basepath(const string& path) throw ()
+string file_basepath(const string& path) noexcept (true)
{
size_t dot = path.rfind('.');
if (dot == string::npos)
@@ -357,7 +357,7 @@ string file_basepath(const string& path) throw ()
/**
* Get the basename (name without extension) from a path.
*/
-string file_basename(const string& path) throw ()
+string file_basename(const string& path) noexcept (true)
{
string name = file_name(path);
size_t dot = name.rfind('.');
@@ -370,7 +370,7 @@ string file_basename(const string& path) throw ()
/**
* Get the extension from a path.
*/
-string file_ext(const string& path) throw ()
+string file_ext(const string& path) noexcept (true)
{
string name = file_name(path);
size_t dot = name.rfind('.');
@@ -383,7 +383,7 @@ string file_ext(const string& path) throw ()
/**
* Compare two path.
*/
-int file_compare(const string& path1, const string& path2) throw ()
+int file_compare(const string& path1, const string& path2) noexcept (true)
{
return strcasecmp(path1.c_str(), path2.c_str());
}
@@ -391,7 +391,7 @@ int file_compare(const string& path1, const string& path2) throw ()
/**
* Convert a path to the C format.
*/
-string file_adjust(const string& path) throw ()
+string file_adjust(const string& path) noexcept (true)
{
string r;
for(unsigned i=0;i<path.length();++i) {
@@ -409,7 +409,7 @@ string file_adjust(const string& path) throw ()
/**
* Make a drectory tree.
*/
-void file_mktree(const std::string& path) throw (error)
+void file_mktree(const std::string& path) noexcept (false)
{
string dir = file_dir(path);
string name = file_name(path);
diff --git a/file.h b/file.h
index 1b0cf85..b3843c0 100644
--- a/file.h
+++ b/file.h
@@ -67,28 +67,28 @@ typedef unsigned crc_t;
crc_t crc_compute(const char* data, unsigned len);
crc_t crc_compute(crc_t pred, const char* data, unsigned len);
-bool file_exists(const std::string& file) throw (error);
-void file_write(const std::string& path, const char* data, unsigned size) throw (error);
-void file_read(const std::string& path, char* data, unsigned size) throw (error);
-void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error);
-time_t file_time(const std::string& path) throw (error);
-void file_utime(const std::string& path, time_t tod) throw (error);
-unsigned file_size(const std::string& path) throw (error);
-crc_t file_crc(const std::string& path) throw (error);
-void file_copy(const std::string& path1, const std::string& path2) throw (error);
-void file_move(const std::string& path1, const std::string& path2) throw (error);
-void file_remove(const std::string& path1) throw (error);
-void file_mktree(const std::string& path1) throw (error);
+bool file_exists(const std::string& file) noexcept (false);
+void file_write(const std::string& path, const char* data, unsigned size) noexcept (false);
+void file_read(const std::string& path, char* data, unsigned size) noexcept (false);
+void file_read(const std::string& path, char* data, unsigned offset, unsigned size) noexcept (false);
+time_t file_time(const std::string& path) noexcept (false);
+void file_utime(const std::string& path, time_t tod) noexcept (false);
+unsigned file_size(const std::string& path) noexcept (false);
+crc_t file_crc(const std::string& path) noexcept (false);
+void file_copy(const std::string& path1, const std::string& path2) noexcept (false);
+void file_move(const std::string& path1, const std::string& path2) noexcept (false);
+void file_remove(const std::string& path1) noexcept (false);
+void file_mktree(const std::string& path1) noexcept (false);
-std::string file_temp(const std::string& path) throw ();
-std::string file_randomize(const std::string& path, int n) throw ();
-std::string file_name(const std::string& file) throw ();
-std::string file_dir(const std::string& file) throw ();
-std::string file_basename(const std::string& file) throw ();
-std::string file_basepath(const std::string& file) throw ();
-std::string file_ext(const std::string& file) throw ();
-int file_compare(const std::string& path1, const std::string& path2) throw ();
-std::string file_adjust(const std::string& path) throw ();
+std::string file_temp(const std::string& path) noexcept (true);
+std::string file_randomize(const std::string& path, int n) noexcept (true);
+std::string file_name(const std::string& file) noexcept (true);
+std::string file_dir(const std::string& file) noexcept (true);
+std::string file_basename(const std::string& file) noexcept (true);
+std::string file_basepath(const std::string& file) noexcept (true);
+std::string file_ext(const std::string& file) noexcept (true);
+int file_compare(const std::string& path1, const std::string& path2) noexcept (true);
+std::string file_adjust(const std::string& path) noexcept (true);
#endif

View file

@ -1,46 +0,0 @@
# Maintainer: Taner Tas <taner76@gmail.com>
pkgname=advancescan
pkgver=1.18
pkgrel=1
pkgdesc="Command line rom manager for AdvanceMAME and AdvanceMESS"
url="http://www.advancemame.it"
arch="all"
license="GPL"
makedepends="zlib-dev"
subpackages="$pkgname-doc"
source="https://github.com/amadvance/advancescan/releases/download/v$pkgver/advancescan-$pkgver.tar.gz
0001-cpp17-throw.patch
"
options="!check"
prepare() {
default_prepare
update_config_guess
update_config_sub
}
build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
make
}
package() {
make \
bindir="$pkgdir/usr/bin/" \
datadir="$pkgdir/usr/share/" \
mandir="$pkgdir/usr/share/man/" \
pkgdocdir="$pkgdir/usr/share/doc/advancescan/" \
install
}
sha512sums="
ad7529fb2dd625f8d5aa5f5d1cabfbeb5612b1da6e0952a451abd162a95aadf616b74b2bf5b6c4963188cea1267394f2ee84c3f47a323d345d285e9c63622889 advancescan-1.18.tar.gz
795b13bf7f11fdad59644de6cd03196ea05a87ba9c70b3fd89da0f6b2d202759dbecc70736603cb56aea0cd4cb33cb62fcf067c4ea8a061d45d7786c0881f6ef 0001-cpp17-throw.patch
"

View file

@ -1,25 +0,0 @@
# Contributor: KikooDX <kikoodx@paranoici.org>
# Maintainer: KikooDX <kikoodx@paranoici.org>
pkgname=afetch
pkgver=2.2.0
pkgrel=1
pkgdesc="Fast and simple system info written in C"
url="https://github.com/13-CF/afetch"
arch="all"
license="GPL-3.0-or-later"
subpackages="$pkgname-doc"
options="!check" # there is no test suite
source="$pkgname-$pkgver.tar.gz::https://github.com/13-CF/afetch/archive/refs/tags/V$pkgver.tar.gz"
build() {
make
}
package() {
make PREFIX=/usr DESTDIR="$pkgdir" install
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
sha512sums="
90503f197b454e2edd8d11db3246c57f975b962c639bddc73563c12c5bf63448c4de5b24c550459a3a75cbddb1812a2999363de347c9b970b8eb4d7cd305375c afetch-2.2.0.tar.gz
"

View file

@ -1,81 +0,0 @@
From efd33aad5e69f36ab343b1f28839a55db4538104 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 10:55:37 +0100
Subject: [PATCH 01/15] Fix non-terminating loop conditions when len=1
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
{
sx = (lp.x1 + sx) >> 1;
sy = (lp.y1 + sy) >> 1;
}
---
include/agg_renderer_outline_aa.h | 8 ++++----
include/agg_renderer_outline_image.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/agg_renderer_outline_aa.h b/include/agg_renderer_outline_aa.h
index ce25a2e..cb2aa00 100644
--- a/include/agg_renderer_outline_aa.h
+++ b/include/agg_renderer_outline_aa.h
@@ -1659,7 +1659,7 @@ namespace agg
}
else
{
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
{
sx = (lp.x1 + sx) >> 1;
sy = (lp.y1 + sy) >> 1;
@@ -1726,7 +1726,7 @@ namespace agg
}
else
{
- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
{
ex = (lp.x2 + ex) >> 1;
ey = (lp.y2 + ey) >> 1;
@@ -1798,7 +1798,7 @@ namespace agg
}
else
{
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
{
sx = (lp.x1 + sx) >> 1;
sy = (lp.y1 + sy) >> 1;
@@ -1811,7 +1811,7 @@ namespace agg
}
else
{
- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
{
ex = (lp.x2 + ex) >> 1;
ey = (lp.y2 + ey) >> 1;
diff --git a/include/agg_renderer_outline_image.h b/include/agg_renderer_outline_image.h
index fbfac10..66d2b9a 100644
--- a/include/agg_renderer_outline_image.h
+++ b/include/agg_renderer_outline_image.h
@@ -969,7 +969,7 @@ namespace agg
}
else
{
- while(abs(sx - lp.x1) + abs(sy - lp.y1) > lp2.len)
+ while(abs(sx - lp.x1) + abs(sy - lp.y1) > 1 + lp2.len)
{
sx = (lp.x1 + sx) >> 1;
sy = (lp.y1 + sy) >> 1;
@@ -982,7 +982,7 @@ namespace agg
}
else
{
- while(abs(ex - lp.x2) + abs(ey - lp.y2) > lp2.len)
+ while(abs(ex - lp.x2) + abs(ey - lp.y2) > 1 + lp2.len)
{
ex = (lp.x2 + ex) >> 1;
ey = (lp.y2 + ey) >> 1;
--
1.8.1.4

View file

@ -1,40 +0,0 @@
From e269fe9b62af6fe314cebe0ee7a6d6d1a4a84d1c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 11:03:26 +0100
Subject: [PATCH 02/15] Cure recursion by aborting if the co-ordinates are to
big to handle
---
include/agg_rasterizer_cells_aa.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/agg_rasterizer_cells_aa.h b/include/agg_rasterizer_cells_aa.h
index d3bb138..3a616d9 100644
--- a/include/agg_rasterizer_cells_aa.h
+++ b/include/agg_rasterizer_cells_aa.h
@@ -40,7 +40,8 @@
#define AGG_RASTERIZER_CELLS_AA_INCLUDED
#include <string.h>
-#include <math.h>
+#include <cstdlib>
+#include <limits>
#include "agg_math.h"
#include "agg_array.h"
@@ -333,6 +334,12 @@ namespace agg
{
int cx = (x1 + x2) >> 1;
int cy = (y1 + y2) >> 1;
+
+ // Bail if values are so large they are likely to wrap
+ if ((std::abs(x1) >= std::numeric_limits<int>::max()/2) || (std::abs(y1) >= std::numeric_limits<int>::max()/2) ||
+ (std::abs(x2) >= std::numeric_limits<int>::max()/2) || (std::abs(y2) >= std::numeric_limits<int>::max()/2))
+ return;
+
line(x1, y1, cx, cy);
line(cx, cy, x2, y2);
}
--
1.8.1.4

View file

@ -1,30 +0,0 @@
From 032d5342430f4c5dfbc34a2817d67386a14fd51b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 11:40:49 +0100
Subject: [PATCH 03/15] Get coordinates from previous vertex if last command is
path_cmd_end_poly
---
include/agg_path_storage.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/agg_path_storage.h b/include/agg_path_storage.h
index 7be7393..8922fc8 100644
--- a/include/agg_path_storage.h
+++ b/include/agg_path_storage.h
@@ -878,6 +878,12 @@ namespace agg
*x += x2;
*y += y2;
}
+ else if (!is_stop(m_vertices.last_command()) &&
+ is_vertex(m_vertices.prev_vertex(&x2, &y2)))
+ {
+ *x += x2;
+ *y += y2;
+ }
}
}
--
1.8.1.4

View file

@ -1,138 +0,0 @@
From b9c4b1c72b4ad6b24c37f402d3eec39ef393b0eb Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 14:17:43 +0100
Subject: [PATCH 04/15] Make rasterizer_outline_aa ignore close_polygon when
vertex count < 3
---
include/agg_rasterizer_outline_aa.h | 107 ++++++++++++++++++------------------
1 file changed, 52 insertions(+), 55 deletions(-)
diff --git a/include/agg_rasterizer_outline_aa.h b/include/agg_rasterizer_outline_aa.h
index 4d6dd57..24301d5 100644
--- a/include/agg_rasterizer_outline_aa.h
+++ b/include/agg_rasterizer_outline_aa.h
@@ -333,68 +333,65 @@ namespace agg
int y2;
int lprev;
- if(close_polygon)
+ if(close_polygon && (m_src_vertices.size() >= 3))
{
- if(m_src_vertices.size() >= 3)
+ dv.idx = 2;
+
+ v = &m_src_vertices[m_src_vertices.size() - 1];
+ x1 = v->x;
+ y1 = v->y;
+ lprev = v->len;
+
+ v = &m_src_vertices[0];
+ x2 = v->x;
+ y2 = v->y;
+ dv.lcurr = v->len;
+ line_parameters prev(x1, y1, x2, y2, lprev);
+
+ v = &m_src_vertices[1];
+ dv.x1 = v->x;
+ dv.y1 = v->y;
+ dv.lnext = v->len;
+ dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr);
+
+ v = &m_src_vertices[dv.idx];
+ dv.x2 = v->x;
+ dv.y2 = v->y;
+ dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
+
+ dv.xb1 = 0;
+ dv.yb1 = 0;
+ dv.xb2 = 0;
+ dv.yb2 = 0;
+
+ switch(m_line_join)
{
- dv.idx = 2;
-
- v = &m_src_vertices[m_src_vertices.size() - 1];
- x1 = v->x;
- y1 = v->y;
- lprev = v->len;
-
- v = &m_src_vertices[0];
- x2 = v->x;
- y2 = v->y;
- dv.lcurr = v->len;
- line_parameters prev(x1, y1, x2, y2, lprev);
-
- v = &m_src_vertices[1];
- dv.x1 = v->x;
- dv.y1 = v->y;
- dv.lnext = v->len;
- dv.curr = line_parameters(x2, y2, dv.x1, dv.y1, dv.lcurr);
-
- v = &m_src_vertices[dv.idx];
- dv.x2 = v->x;
- dv.y2 = v->y;
- dv.next = line_parameters(dv.x1, dv.y1, dv.x2, dv.y2, dv.lnext);
-
- dv.xb1 = 0;
- dv.yb1 = 0;
- dv.xb2 = 0;
- dv.yb2 = 0;
-
- switch(m_line_join)
- {
- case outline_no_join:
- dv.flags = 3;
- break;
+ case outline_no_join:
+ dv.flags = 3;
+ break;
- case outline_miter_join:
- case outline_round_join:
- dv.flags =
- (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) |
- ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1);
- break;
+ case outline_miter_join:
+ case outline_round_join:
+ dv.flags =
+ (prev.diagonal_quadrant() == dv.curr.diagonal_quadrant()) |
+ ((dv.curr.diagonal_quadrant() == dv.next.diagonal_quadrant()) << 1);
+ break;
- case outline_miter_accurate_join:
- dv.flags = 0;
- break;
- }
+ case outline_miter_accurate_join:
+ dv.flags = 0;
+ break;
+ }
- if((dv.flags & 1) == 0 && m_line_join != outline_round_join)
- {
- bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1);
- }
+ if((dv.flags & 1) == 0 && m_line_join != outline_round_join)
+ {
+ bisectrix(prev, dv.curr, &dv.xb1, &dv.yb1);
+ }
- if((dv.flags & 2) == 0 && m_line_join != outline_round_join)
- {
- bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
- }
- draw(dv, 0, m_src_vertices.size());
+ if((dv.flags & 2) == 0 && m_line_join != outline_round_join)
+ {
+ bisectrix(dv.curr, dv.next, &dv.xb2, &dv.yb2);
}
+ draw(dv, 0, m_src_vertices.size());
}
else
{
--
1.8.1.4

View file

@ -1,52 +0,0 @@
From b8c43fb0ba13af0cc2b1050f48f81d76d2fdf0c7 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 15:04:05 +0100
Subject: [PATCH 05/15] Remove VC++ 6 workaround
---
include/agg_renderer_scanline.h | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h
index c3bb6f0..c27ca60 100644
--- a/include/agg_renderer_scanline.h
+++ b/include/agg_renderer_scanline.h
@@ -79,34 +79,7 @@ namespace agg
sl.reset(ras.min_x(), ras.max_x());
while(ras.sweep_scanline(sl))
{
- //render_scanline_aa_solid(sl, ren, ren_color);
-
- // This code is equivalent to the above call (copy/paste).
- // It's just a "manual" optimization for old compilers,
- // like Microsoft Visual C++ v6.0
- //-------------------------------
- int y = sl.y();
- unsigned num_spans = sl.num_spans();
- typename Scanline::const_iterator span = sl.begin();
-
- for(;;)
- {
- int x = span->x;
- if(span->len > 0)
- {
- ren.blend_solid_hspan(x, y, (unsigned)span->len,
- ren_color,
- span->covers);
- }
- else
- {
- ren.blend_hline(x, y, (unsigned)(x - span->len - 1),
- ren_color,
- *(span->covers));
- }
- if(--num_spans == 0) break;
- ++span;
- }
+ render_scanline_aa_solid(sl, ren, ren_color);
}
}
}
--
1.8.1.4

View file

@ -1,85 +0,0 @@
From 9422570f4e099a834fc43619f7b2a7eb6b442e25 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 15:31:01 +0100
Subject: [PATCH 06/15] Implement grain-merge blending mode (GIMP)
---
include/agg_pixfmt_rgba.h | 42 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
index 79d10dc..f576ce4 100644
--- a/include/agg_pixfmt_rgba.h
+++ b/include/agg_pixfmt_rgba.h
@@ -1401,9 +1401,46 @@ namespace agg
}
};
+ //================================================comp_op_rgba_grain_merge
+ template <typename ColorT, typename Order> struct comp_op_rgba_grain_merge
+ {
+ typedef ColorT color_type;
+ typedef Order order_type;
+ typedef typename color_type::value_type value_type;
+ typedef typename color_type::calc_type calc_type;
+ typedef typename color_type::long_type long_type;
+ enum base_scale_e
+ {
+ base_shift = color_type::base_shift,
+ base_mask = color_type::base_mask
+ };
+ // E = I + M - 128
+ static AGG_INLINE void blend_pix(value_type* p,
+ unsigned sr, unsigned sg, unsigned sb,
+ unsigned sa, unsigned cover)
+ {
-
+ if(cover < 255)
+ {
+ sr = (sr * cover + 255) >> 8;
+ sg = (sg * cover + 255) >> 8;
+ sb = (sb * cover + 255) >> 8;
+ sa = (sa * cover + 255) >> 8;
+ }
+ if(sa)
+ {
+ calc_type da = p[Order::A];
+ int dr = sr + p[Order::R] - 128;
+ int dg = sg + p[Order::G] - 128;
+ int db = sb + p[Order::B] - 128;
+ p[Order::R] = (value_type)(dr < 0 ? 0 : (dr > 255 ? 255 : dr));
+ p[Order::G] = (value_type)(dg < 0 ? 0 : (dg > 255 ? 255 : dg));
+ p[Order::B] = (value_type)(db < 0 ? 0 : (db > 255 ? 255 : db));
+ p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift));
+ }
+ }
+ };
//======================================================comp_op_table_rgba
template<class ColorT, class Order> struct comp_op_table_rgba
@@ -1451,6 +1488,7 @@ namespace agg
comp_op_rgba_contrast <ColorT,Order>::blend_pix,
comp_op_rgba_invert <ColorT,Order>::blend_pix,
comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix,
+ comp_op_rgba_grain_merge<ColorT,Order>::blend_pix,
0
};
@@ -1486,6 +1524,7 @@ namespace agg
comp_op_contrast, //----comp_op_contrast
comp_op_invert, //----comp_op_invert
comp_op_invert_rgb, //----comp_op_invert_rgb
+ comp_op_grain_merge, //----comp_op_grain_merge
end_of_comp_op_e
};
@@ -2908,4 +2947,3 @@ namespace agg
}
#endif
-
--
1.8.1.4

View file

@ -1,85 +0,0 @@
From abd440342e166a90d08610bf5b31d2a8357eafbe Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 15:43:18 +0100
Subject: [PATCH 07/15] Implement grain-extract blending mode (GIMP)
---
include/agg_pixfmt_rgba.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
index f576ce4..42f0a05 100644
--- a/include/agg_pixfmt_rgba.h
+++ b/include/agg_pixfmt_rgba.h
@@ -1442,6 +1442,52 @@ namespace agg
}
};
+ //==============================================comp_op_rgba_grain_extract
+ template <typename ColorT, typename Order> struct comp_op_rgba_grain_extract
+ {
+ typedef ColorT color_type;
+ typedef Order order_type;
+ typedef typename color_type::value_type value_type;
+ typedef typename color_type::calc_type calc_type;
+ typedef typename color_type::long_type long_type;
+ enum base_scale_e
+ {
+ base_shift = color_type::base_shift,
+ base_mask = color_type::base_mask
+ };
+
+ // E = I - M + 128
+ static AGG_INLINE void blend_pix(value_type* p,
+ unsigned sr, unsigned sg, unsigned sb,
+ unsigned sa, unsigned cover)
+ {
+ calc_type da = (p[Order::A] * sa + 255) >> 8;
+
+ int dr = p[Order::R] - sr + 128;
+ int dg = p[Order::G] - sg + 128;
+ int db = p[Order::B] - sb + 128;
+
+ dr = dr < 0 ? 0 : (dr > 255 ? 255 : dr);
+ dg = dg < 0 ? 0 : (dg > 255 ? 255 : dg);
+ db = db < 0 ? 0 : (db > 255 ? 255 : db);
+
+ p[Order::A] = da;
+
+ if(da < 255)
+ {
+ p[Order::R] = (dr * da + 255) >> 8;
+ p[Order::G] = (dg * da + 255) >> 8;
+ p[Order::B] = (db * da + 255) >> 8;
+ }
+ else
+ {
+ p[Order::R] = dr;
+ p[Order::G] = dg;
+ p[Order::B] = db;
+ }
+ }
+ };
+
//======================================================comp_op_table_rgba
template<class ColorT, class Order> struct comp_op_table_rgba
{
@@ -1489,6 +1535,7 @@ namespace agg
comp_op_rgba_invert <ColorT,Order>::blend_pix,
comp_op_rgba_invert_rgb <ColorT,Order>::blend_pix,
comp_op_rgba_grain_merge<ColorT,Order>::blend_pix,
+ comp_op_rgba_grain_extract<ColorT,Order>::blend_pix,
0
};
@@ -1525,6 +1572,7 @@ namespace agg
comp_op_invert, //----comp_op_invert
comp_op_invert_rgb, //----comp_op_invert_rgb
comp_op_grain_merge, //----comp_op_grain_merge
+ comp_op_grain_extract, //----comp_op_grain_extract
end_of_comp_op_e
};
--
1.8.1.4

View file

@ -1,36 +0,0 @@
From 2688af280836b95908d3cfd6915510d55de673b8 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 16:15:01 +0100
Subject: [PATCH 08/15] Declare multiplication and division operators as const
---
include/agg_trans_affine.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/agg_trans_affine.h b/include/agg_trans_affine.h
index a662099..2f602a0 100644
--- a/include/agg_trans_affine.h
+++ b/include/agg_trans_affine.h
@@ -216,15 +216,15 @@ namespace agg
}
// Multiply the matrix by another one and return
- // the result in a separete matrix.
- trans_affine operator * (const trans_affine& m)
+ // the result in a separate matrix.
+ trans_affine operator * (const trans_affine& m) const
{
return trans_affine(*this).multiply(m);
}
// Multiply the matrix by inverse of another one
- // and return the result in a separete matrix.
- trans_affine operator / (const trans_affine& m)
+ // and return the result in a separate matrix.
+ trans_affine operator / (const trans_affine& m) const
{
return trans_affine(*this).multiply_inv(m);
}
--
1.8.1.4

View file

@ -1,37 +0,0 @@
From be9ed90897bc43b4547a3a1f8046827caaf13b4c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 16:15:36 +0100
Subject: [PATCH 09/15] Add a static identity transformation
---
include/agg_trans_affine.h | 1 +
src/agg_trans_affine.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/agg_trans_affine.h b/include/agg_trans_affine.h
index 2f602a0..67fe5ca 100644
--- a/include/agg_trans_affine.h
+++ b/include/agg_trans_affine.h
@@ -92,6 +92,7 @@ namespace agg
//----------------------------------------------------------------------
struct trans_affine
{
+ static const trans_affine identity;
double sx, shy, shx, sy, tx, ty;
//------------------------------------------ Construction
diff --git a/src/agg_trans_affine.cpp b/src/agg_trans_affine.cpp
index aca18c2..b3d9bc0 100644
--- a/src/agg_trans_affine.cpp
+++ b/src/agg_trans_affine.cpp
@@ -28,6 +28,7 @@
namespace agg
{
+ const trans_affine trans_affine::identity;
//------------------------------------------------------------------------
const trans_affine& trans_affine::parl_to_parl(const double* src,
--
1.8.1.4

View file

@ -1,193 +0,0 @@
From 749c8cd11e9e6f81e93ae5ce19258431722b6bdf Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 16:43:25 +0100
Subject: [PATCH 10/15] Add renderer_scanline_aa_alpha
---
include/agg_pixfmt_rgba.h | 24 +++++++++++++-
include/agg_renderer_base.h | 28 ++++++++++++++++
include/agg_renderer_scanline.h | 71 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 122 insertions(+), 1 deletion(-)
diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
index 42f0a05..6c4bc37 100644
--- a/include/agg_pixfmt_rgba.h
+++ b/include/agg_pixfmt_rgba.h
@@ -2247,7 +2247,6 @@ namespace agg
}
-
//--------------------------------------------------------------------
void blend_color_vspan(int x, int y,
unsigned len,
@@ -2751,6 +2750,29 @@ namespace agg
}
//--------------------------------------------------------------------
+ void blend_color_hspan_alpha(int x, int y, unsigned len,
+ const color_type* colors,
+ value_type alpha,
+ const int8u* covers,
+ int8u cover)
+ {
+ value_type* p = (value_type*)m_rbuf->row_ptr(x, y, len) + (x << 2);
+ do
+ {
+ blender_type::blend_pix(m_comp_op,
+ p,
+ (colors->r * alpha + 255) >> 8,
+ (colors->g * alpha + 255) >> 8,
+ (colors->b * alpha + 255) >> 8,
+ (colors->a * alpha + 255) >> 8,
+ covers ? *covers++ : cover);
+ p += 4;
+ ++colors;
+ }
+ while(--len);
+ }
+
+ //--------------------------------------------------------------------
void blend_color_vspan(int x, int y, unsigned len,
const color_type* colors,
const int8u* covers,
diff --git a/include/agg_renderer_base.h b/include/agg_renderer_base.h
index 1808944..25f07c3 100644
--- a/include/agg_renderer_base.h
+++ b/include/agg_renderer_base.h
@@ -37,6 +37,7 @@ namespace agg
public:
typedef PixelFormat pixfmt_type;
typedef typename pixfmt_type::color_type color_type;
+ typedef typename pixfmt_type::color_type::value_type value_type;
typedef typename pixfmt_type::row_data row_data;
//--------------------------------------------------------------------
@@ -383,6 +384,33 @@ namespace agg
}
//--------------------------------------------------------------------
+ void blend_color_hspan_alpha(int x, int y, int len,
+ const color_type* colors,
+ value_type alpha,
+ const cover_type* covers,
+ cover_type cover = agg::cover_full)
+ {
+ if(y > ymax()) return;
+ if(y < ymin()) return;
+
+ if(x < xmin())
+ {
+ int d = xmin() - x;
+ len -= d;
+ if(len <= 0) return;
+ if(covers) covers += d;
+ colors += d;
+ x = xmin();
+ }
+ if(x + len > xmax())
+ {
+ len = xmax() - x + 1;
+ if(len <= 0) return;
+ }
+ m_ren->blend_color_hspan_alpha(x, y, len, colors, alpha, covers, cover);
+ }
+
+ //--------------------------------------------------------------------
void blend_color_vspan(int x, int y, int len,
const color_type* colors,
const cover_type* covers,
diff --git a/include/agg_renderer_scanline.h b/include/agg_renderer_scanline.h
index c27ca60..4fcb557 100644
--- a/include/agg_renderer_scanline.h
+++ b/include/agg_renderer_scanline.h
@@ -156,6 +156,35 @@ namespace agg
}
}
+ //================================================render_scanline_aa_alpha
+ template<class Scanline, class BaseRenderer,
+ class SpanAllocator, class SpanGenerator>
+ void render_scanline_aa_alpha(const Scanline& sl, BaseRenderer& ren,
+ SpanAllocator& alloc, SpanGenerator& span_gen,
+ unsigned alpha)
+ {
+ int y = sl.y();
+
+ unsigned num_spans = sl.num_spans();
+ typename Scanline::const_iterator span = sl.begin();
+ for(;;)
+ {
+ int x = span->x;
+ int len = span->len;
+ const typename Scanline::cover_type* covers = span->covers;
+
+ if(len < 0) len = -len;
+ typename BaseRenderer::color_type* colors = alloc.allocate(len);
+ span_gen.generate(colors, x, y, len);
+ ren.blend_color_hspan_alpha(x, y, len, colors, alpha,
+ (span->len < 0) ? 0 : covers, *covers);
+
+ if(--num_spans == 0) break;
+ ++span;
+ }
+ }
+
+
//=====================================================render_scanlines_aa
template<class Rasterizer, class Scanline, class BaseRenderer,
class SpanAllocator, class SpanGenerator>
@@ -216,8 +245,50 @@ namespace agg
};
+ //==============================================renderer_scanline_aa_alpha
+ template<class BaseRenderer, class SpanAllocator, class SpanGenerator>
+ class renderer_scanline_aa_alpha
+ {
+ public:
+ typedef BaseRenderer base_ren_type;
+ typedef SpanAllocator alloc_type;
+ typedef SpanGenerator span_gen_type;
+ //--------------------------------------------------------------------
+ renderer_scanline_aa_alpha() : m_ren(0), m_alloc(0), m_span_gen(0), m_alpha(1.0) {}
+ renderer_scanline_aa_alpha(base_ren_type& ren,
+ alloc_type& alloc,
+ span_gen_type& span_gen,
+ unsigned alpha) :
+ m_ren(&ren),
+ m_alloc(&alloc),
+ m_span_gen(&span_gen),
+ m_alpha(alpha)
+ {}
+ void attach(base_ren_type& ren,
+ alloc_type& alloc,
+ span_gen_type& span_gen)
+ {
+ m_ren = &ren;
+ m_alloc = &alloc;
+ m_span_gen = &span_gen;
+ }
+ //--------------------------------------------------------------------
+ void prepare() { m_span_gen->prepare(); }
+
+ //--------------------------------------------------------------------
+ template<class Scanline> void render(const Scanline& sl)
+ {
+ render_scanline_aa_alpha(sl, *m_ren, *m_alloc, *m_span_gen, m_alpha);
+ }
+
+ private:
+ base_ren_type* m_ren;
+ alloc_type* m_alloc;
+ span_gen_type* m_span_gen;
+ unsigned m_alpha;
+ };
//===============================================render_scanline_bin_solid
--
1.8.1.4

View file

@ -1,58 +0,0 @@
From 0ec68d7f5695403eccac75025ba7f6f7ecf1814e Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 19 May 2013 16:49:08 +0100
Subject: [PATCH 11/15] Avoid division by zero in color-burn mode
FIXME: re-work using latest math from http://www.w3.org/TR/SVGCompositing/
---
include/agg_pixfmt_rgba.h | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
index 6c4bc37..5d6b511 100644
--- a/include/agg_pixfmt_rgba.h
+++ b/include/agg_pixfmt_rgba.h
@@ -1027,6 +1027,21 @@ namespace agg
// Dca' = Sa.(Sca.Da + Dca.Sa - Sa.Da)/Sca + Sca.(1 - Da) + Dca.(1 - Sa)
//
// Da' = Sa + Da - Sa.Da
+
+
+ // http://www.w3.org/TR/SVGCompositing/
+ // if Sca == 0 and Dca == Da
+ // Dca' = Sa × Da + Sca × (1 - Da) + Dca × (1 - Sa)
+ // = Sa × Da + Dca × (1 - Sa)
+ // = Da = Dca
+ // otherwise if Sca == 0
+ // Dca' = Sca × (1 - Da) + Dca × (1 - Sa)
+ // = Dca × (1 - Sa)
+ // otherwise if Sca > 0
+ // Dca' = Sa × Da - Sa × Da × min(1, (1 - Dca/Da) × Sa/Sca) + Sca × (1 - Da) + Dca × (1 - Sa)
+ // = Sa × Da × (1 - min(1, (1 - Dca/Da) × Sa/Sca)) + Sca × (1 - Da) + Dca × (1 - Sa)
+
+ // sa * da * (255 - std::min(255, (255 - p[0]/da)*(sa/(sc*sa)) +
static AGG_INLINE void blend_pix(value_type* p,
unsigned sr, unsigned sg, unsigned sb,
unsigned sa, unsigned cover)
@@ -1056,15 +1071,15 @@ namespace agg
p[Order::R] = (value_type)(((srda + drsa <= sada) ?
sr * d1a + dr * s1a :
- sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask) >> base_shift);
+ (sr > 0 ? sa * (srda + drsa - sada) / sr + sr * d1a + dr * s1a + base_mask : 0)) >> base_shift);
p[Order::G] = (value_type)(((sgda + dgsa <= sada) ?
sg * d1a + dg * s1a :
- sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask) >> base_shift);
+ (sg > 0 ? sa * (sgda + dgsa - sada) / sg + sg * d1a + dg * s1a + base_mask : 0)) >> base_shift);
p[Order::B] = (value_type)(((sbda + dbsa <= sada) ?
sb * d1a + db * s1a :
- sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask) >> base_shift);
+ (sb > 0 ? sa * (sbda + dbsa - sada) / sb + sb * d1a + db * s1a + base_mask : 0)) >> base_shift);
p[Order::A] = (value_type)(sa + da - ((sa * da + base_mask) >> base_shift));
}
--
1.8.1.4

View file

@ -1,26 +0,0 @@
From bf0e0b71360cfbc690a29f4abe15d7b9b61b8479 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Jun 2013 12:11:54 +0100
Subject: [PATCH 12/15] Avoid pixel artifacts when compositing
Change src_over alpha to avoid pixel artifacts by reordering computations.
---
include/agg_pixfmt_rgba.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/agg_pixfmt_rgba.h b/include/agg_pixfmt_rgba.h
index 5d6b511..bb255cd 100644
--- a/include/agg_pixfmt_rgba.h
+++ b/include/agg_pixfmt_rgba.h
@@ -346,7 +346,7 @@ namespace agg
p[Order::R] = (value_type)(sr + ((p[Order::R] * s1a + base_mask) >> base_shift));
p[Order::G] = (value_type)(sg + ((p[Order::G] * s1a + base_mask) >> base_shift));
p[Order::B] = (value_type)(sb + ((p[Order::B] * s1a + base_mask) >> base_shift));
- p[Order::A] = (value_type)(sa + p[Order::A] - ((sa * p[Order::A] + base_mask) >> base_shift));
+ p[Order::A] = (value_type)(sa + ((p[Order::A] * s1a + base_mask) >> base_shift));
}
};
--
1.8.1.4

View file

@ -1,93 +0,0 @@
From 6f1ab5f4b470bcf4e7e72aac6e2f7f6ee3e7b424 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Jun 2013 12:16:42 +0100
Subject: [PATCH 13/15] Modify agg conv classes to allow access to the original
geometry type
---
include/agg_conv_adaptor_vcgen.h | 2 ++
include/agg_conv_adaptor_vpgen.h | 1 +
include/agg_conv_clip_polygon.h | 1 +
include/agg_conv_clip_polyline.h | 1 +
include/agg_conv_smooth_poly1.h | 2 ++
5 files changed, 7 insertions(+)
diff --git a/include/agg_conv_adaptor_vcgen.h b/include/agg_conv_adaptor_vcgen.h
index 7bd9b07..fef4579 100644
--- a/include/agg_conv_adaptor_vcgen.h
+++ b/include/agg_conv_adaptor_vcgen.h
@@ -38,6 +38,7 @@ namespace agg
void rewind(unsigned) {}
unsigned vertex(double*, double*) { return path_cmd_stop; }
+ unsigned type() const { return 0; }
};
@@ -73,6 +74,7 @@ namespace agg
}
unsigned vertex(double* x, double* y);
+ unsigned type() const { return m_source->type(); }
private:
// Prohibit copying
diff --git a/include/agg_conv_adaptor_vpgen.h b/include/agg_conv_adaptor_vpgen.h
index dca9415..a39102d 100644
--- a/include/agg_conv_adaptor_vpgen.h
+++ b/include/agg_conv_adaptor_vpgen.h
@@ -42,6 +42,7 @@ namespace agg
void rewind(unsigned path_id);
unsigned vertex(double* x, double* y);
+ unsigned type() const { return m_source->type(); }
private:
conv_adaptor_vpgen(const conv_adaptor_vpgen<VertexSource, VPGen>&);
diff --git a/include/agg_conv_clip_polygon.h b/include/agg_conv_clip_polygon.h
index 3c34590..e417a7d 100644
--- a/include/agg_conv_clip_polygon.h
+++ b/include/agg_conv_clip_polygon.h
@@ -60,6 +60,7 @@ namespace agg
double y1() const { return base_type::vpgen().y1(); }
double x2() const { return base_type::vpgen().x2(); }
double y2() const { return base_type::vpgen().y2(); }
+ unsigned type() const { return base_type::type(); }
private:
conv_clip_polygon(const conv_clip_polygon<VertexSource>&);
diff --git a/include/agg_conv_clip_polyline.h b/include/agg_conv_clip_polyline.h
index d45067f..0de4b57 100644
--- a/include/agg_conv_clip_polyline.h
+++ b/include/agg_conv_clip_polyline.h
@@ -60,6 +60,7 @@ namespace agg
double y1() const { return base_type::vpgen().y1(); }
double x2() const { return base_type::vpgen().x2(); }
double y2() const { return base_type::vpgen().y2(); }
+ unsigned type() const { return base_type::type(); }
private:
conv_clip_polyline(const conv_clip_polyline<VertexSource>&);
diff --git a/include/agg_conv_smooth_poly1.h b/include/agg_conv_smooth_poly1.h
index 15f7f8d..0956c4e 100644
--- a/include/agg_conv_smooth_poly1.h
+++ b/include/agg_conv_smooth_poly1.h
@@ -48,6 +48,7 @@ namespace agg
void smooth_value(double v) { base_type::generator().smooth_value(v); }
double smooth_value() const { return base_type::generator().smooth_value(); }
+ unsigned type() const { return base_type::type(); }
private:
conv_smooth_poly1(const conv_smooth_poly1<VertexSource>&);
@@ -70,6 +71,7 @@ namespace agg
void smooth_value(double v) { m_smooth.generator().smooth_value(v); }
double smooth_value() const { return m_smooth.generator().smooth_value(); }
+ unsigned type() const { return m_smooth.type(); }
private:
conv_smooth_poly1_curve(const conv_smooth_poly1_curve<VertexSource>&);
--
1.8.1.4

View file

@ -1,30 +0,0 @@
From 6433a64f4cd41e88499386b0b7c7ae05d30683b8 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Jun 2013 12:33:32 +0100
Subject: [PATCH 14/15] Avoid potential zero division resulting in nan in
agg::gamma_linear
---
include/agg_gamma_functions.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/agg_gamma_functions.h b/include/agg_gamma_functions.h
index fa38a45..beb0c04 100644
--- a/include/agg_gamma_functions.h
+++ b/include/agg_gamma_functions.h
@@ -94,7 +94,11 @@ namespace agg
{
if(x < m_start) return 0.0;
if(x > m_end) return 1.0;
- return (x - m_start) / (m_end - m_start);
+ double delta = m_end - m_start;
+ // avoid nan from potential zero division
+ // https://github.com/mapnik/mapnik/issues/761
+ if (delta <= 0.0) return 0.0;
+ return (x - m_start) / delta;
}
private:
--
1.8.1.4

View file

@ -1,24 +0,0 @@
From ca818d4dcd428c5560fc3c341fbaf427a7485e32 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Jun 2013 12:34:37 +0100
Subject: [PATCH 15/15] Ensure first value in the gamma table is always zero
---
include/agg_gamma_functions.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/agg_gamma_functions.h b/include/agg_gamma_functions.h
index beb0c04..b8eda52 100644
--- a/include/agg_gamma_functions.h
+++ b/include/agg_gamma_functions.h
@@ -49,6 +49,7 @@ namespace agg
double operator() (double x) const
{
+ if (x == 0.0) return 0.0;
return pow(x, m_gamma);
}
--
1.8.1.4

View file

@ -1,75 +0,0 @@
# Contributor: Bradley J Chambers <brad.chambers@gmail.com>
# Maintainer: Bradley J Chambers <brad.chambers@gmail.com>
pkgname=agg
pkgver=2.5
pkgrel=3
pkgdesc="Anti-Grain Geometry (AGG) is a general purpose graphical toolkit written completely in standard and platform independent C++."
options="!check" # No testsuite
url="https://src.fedoraproject.org/rpms/agg"
arch="all"
license="GPL-2.0-or-later"
makedepends="autoconf automake libtool sdl12-compat-dev freetype-dev"
subpackages="$pkgname-dev"
source="https://sources.archlinux.org/other/community/agg/$pkgname-free-$pkgver.tar.gz
agg-2.4-depends.patch
agg-2.5-pkgconfig.patch
agg-2.5-autotools.patch
0001-Fix-non-terminating-loop-conditions-when-len-1.patch
0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
0003-Get-coordinates-from-previous-vertex-if-last-command.patch
0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
0005-Remove-VC-6-workaround.patch
0006-Implement-grain-merge-blending-mode-GIMP.patch
0007-Implement-grain-extract-blending-mode-GIMP.patch
0008-Declare-multiplication-and-division-operators-as-con.patch
0009-Add-a-static-identity-transformation.patch
0010-Add-renderer_scanline_aa_alpha.patch
0011-Avoid-division-by-zero-in-color-burn-mode.patch
0012-Avoid-pixel-artifacts-when-compositing.patch
0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
bad-const.patch
"
prepare() {
default_prepare
aclocal
autoheader
autoconf
libtoolize -f
automake --foreign --add-missing --ignore-deps
}
build() {
./configure \
--prefix=/usr \
--disable-static \
--disable-examples
make
}
package() {
make DESTDIR="$pkgdir" install
}
sha512sums="f0a9bcc150eeddcf3bc3728ded1bbcfda5b2a2c935653a336ab14bb194fda5505bdc715f1c94f7e51583ac13f4149932f7d083c077556e279500f0cf467ded63 agg-free-2.5.tar.gz
22b15f495c313417e05431516239bd04889d26b05c559b4905f0ad0aac3b8e4053a6bdc19e1c8e0c192f3b65c200cf5e3074db15011e01e4deaa4c13070418ef agg-2.4-depends.patch
113ac9deb4d0992ef4bdaeb1654f5c1ab199d3865b525c573926b73b2351e9c551f2a7b77082f87fd78bcdab3036621b72bba9502028c35b28dc8f18acf11f53 agg-2.5-pkgconfig.patch
20ec96fe509a8139e6e81f44751ded96c8ac6dcad99c0ad18ef236d682c48840b62c15ace8ab8adb4ef22f08671d956d6cc399dc806c7a55227e5eb4f04b86fe agg-2.5-autotools.patch
6fa06ff3b97efde6d83ee3bb7a2cea81ed5e095f284f2517a65d182b591a629ce09b3eaeefc9ff80d093d6245a802fd76a261b812a357a16085c8062738caf4d 0001-Fix-non-terminating-loop-conditions-when-len-1.patch
40369584513c2bb86d89670b78c3d7489af5ff6a7c837faea0b52a8ed224bd458deb7bb47027c72557d9a849abb8ae1d8f3cd0dfb6bb0e13128954eb5558bc6d 0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
fa9ae4f9e3169da8d60939e2d53c04833e4d955535b72067b95d4a1c74ac543bd67596d2da2c587abaeb4ce2ac905ec2bbd2c808dc8c90b0826486390e937e64 0003-Get-coordinates-from-previous-vertex-if-last-command.patch
72b82c8729e16afa11ea11e47c44dee3962b95e655c8129c2c9a9caa176ad88a85d5cb356b5092dfc4432d1d52f9678f28abdbe5c0a7a011b0df53581258d758 0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
36ad8f23396df65c3f040fef40447fde4e9a00a578f5599ea44e441626d1ce2bb2023d0dd1a6cda513624d9bf34d2cbef4bcf37cd2d97e5f66b3d9eea51e7c67 0005-Remove-VC-6-workaround.patch
9e0df7f67f1c6f91f9b257cc568117773f0534253743f7a8bdb79765503b02bec4575be28f61f03dcfe715de182b94e76ff27f7f9c7d8d29927b30500dad5947 0006-Implement-grain-merge-blending-mode-GIMP.patch
40044f1cb0b684c6d57454264d3af084c61195fee4be4d1a966f32c3940051536f17b99b47f02f4b4f1f47c571be6989fded986e5f66d3918415a8907274da44 0007-Implement-grain-extract-blending-mode-GIMP.patch
f816897fce1367fc44e3c95f3463de7b582d9895e4b5a910366a96c6c18befdd6ed5aea3b03c75382b345f1739028f27e19ce4c0367aacaf34c737d8a2887781 0008-Declare-multiplication-and-division-operators-as-con.patch
0f86f4af17338a4ddbd24a788ad46481050cb308a50cd28b6fd15a26434fd8b844656498391f5546a953ae5eefd29fadc4e62ef493971c02386bcf3ca9d92e7e 0009-Add-a-static-identity-transformation.patch
7b0a1d9d9c7995e0c103df3ac1b68924b693066ee416aba79999acf93f7534729597cfe89e2d5668fd40325cb462b68de8a9ad7478f7da54127a431ea51a9e46 0010-Add-renderer_scanline_aa_alpha.patch
41ed5524289ba6d59686a284c6ff37f0f71c215306592b54d51439011a9ba9e040ad2758353b642156b0af7e4869ad504d0aa165d357d7c722f756ffd147c4d9 0011-Avoid-division-by-zero-in-color-burn-mode.patch
495403338eeb106c561a917265fe99652691f9d7bae11132720bad0e64ae6cadf68e0495744db1c33ace9d2fc06a62c7e79b97699dda250388291d067993b5e4 0012-Avoid-pixel-artifacts-when-compositing.patch
85eff63dabcc9f357933db7ffe9d9f87bd652de475859b80205e2661d6158842b6848caf52917c6401063f86a53f668a0ee311f31b17999474043943273304ca 0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
4dcb65e3e1561e43d7a1250529830f23b8d0a928a927dde60fe7cfe8fe89c69e535ef6e79a884311ede4396530f9e4c2de3e6188ed7ce860b74a55d580400c5b 0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
f67185083382823d1e00bee5065943be467b4ad2b5b155efe4cdb472142276e9215545bce62bacbeefc2f69142463726fbcbcfee82ac4b6db72d9fe645a29777 0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
a0305f1baeffb0356306704658f16608acb23f86978b1a6ad8990198d4a9be3d4f4a50d4d7e84bec4feec151ee84403c86a7a735e37b4638bf4cc528210d78ed bad-const.patch"

View file

@ -1,48 +0,0 @@
--- agg-2.4.orig/font_freetype/Makefile.am 2005-10-18 11:45:40.000000000 +0100
+++ agg-2.4/font_freetype/Makefile.am 2006-07-10 15:11:55.000000000 +0100
@@ -4,8 +4,9 @@
agginclude_HEADERS = agg_font_freetype.h
lib_LTLIBRARIES = libaggfontfreetype.la
-libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @FREETYPE_LIBS@
+libaggfontfreetype_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
libaggfontfreetype_la_SOURCES = agg_font_freetype.cpp
libaggfontfreetype_la_CXXFLAGS = -I$(top_srcdir)/include @FREETYPE_CFLAGS@
+libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
endif
--- agg-2.4.orig/src/platform/sdl/Makefile.am 2005-10-17 23:49:35.000000000 +0100
+++ agg-2.4/src/platform/sdl/Makefile.am 2006-07-10 15:11:55.000000000 +0100
@@ -5,6 +5,6 @@
libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
libaggplatformsdl_la_CXXFLAGS = -I$(top_srcdir)/include @SDL_CFLAGS@
-libaggplatformsdl_la_LIBADD = @SDL_LIBS@
+libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
endif
--- agg-2.5.orig/configure.in 2006-10-09 05:06:36.000000000 +0100
+++ agg-2.5/configure.in 2007-01-07 14:07:39.000000000 +0000
@@ -122,7 +122,8 @@
fi
AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
+test -n "$x_libraries" && X_LDFLAGS="-L$x_libraries"
+AC_SUBST(X_LDFLAGS)
dnl ###############################################
dnl Settung up library version
--- agg-2.5.orig/src/platform/X11/Makefile.am 2006-12-11 00:59:45.000000000 +0000
+++ agg-2.5/src/platform/X11/Makefile.am 2007-01-07 14:07:39.000000000 +0000
@@ -1,8 +1,8 @@
if ENABLE_X11
lib_LTLIBRARIES = libaggplatformX11.la
-libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ -L@x_libraries@
+libaggplatformX11_la_LDFLAGS = -version-info @AGG_LIB_VERSION@ @X_LDFLAGS@
libaggplatformX11_la_SOURCES = agg_platform_support.cpp
libaggplatformX11_la_CXXFLAGS = -I$(top_srcdir)/include -I@x_includes@
-libaggplatformX11_la_LIBADD = -lX11
+libaggplatformX11_la_LIBADD = ../../libagg.la -lX11
endif

View file

@ -1,11 +0,0 @@
--- a/configure.in~ 2013-02-22 09:30:00.000000000 -0600
+++ b/configure.in 2013-02-22 09:30:49.030777571 -0600
@@ -8,7 +8,7 @@
AC_PROG_CC
AC_PROG_CXX
AC_ISC_POSIX
-AM_C_PROTOTYPES
+#AM_C_PROTOTYPES
if test "x$U" != "x"; then
AC_MSG_ERROR(Compiler not ANSI compliant)
fi

View file

@ -1,10 +0,0 @@
--- agg-2.5/libagg.pc.in.orig 2007-01-07 13:58:28.000000000 +0000
+++ agg-2.5/libagg.pc.in 2007-01-07 14:02:40.000000000 +0000
@@ -6,5 +6,6 @@
Name: libagg
Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
Version: @VERSION@
-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
+Requires.private: freetype2
+Libs: -L${libdir} -lagg
Cflags: -I${includedir}

View file

@ -1,12 +0,0 @@
diff -u -r agg-2.5/include/agg_renderer_outline_aa.h agg-2.5-const/include/agg_renderer_outline_aa.h
--- agg-2.5/include/agg_renderer_outline_aa.h 2006-10-09 06:07:08.000000000 +0200
+++ agg-2.5-const/include/agg_renderer_outline_aa.h 2018-06-16 23:09:16.500057814 +0200
@@ -1375,7 +1375,7 @@
//---------------------------------------------------------------------
void profile(const line_profile_aa& prof) { m_profile = &prof; }
const line_profile_aa& profile() const { return *m_profile; }
- line_profile_aa& profile() { return *m_profile; }
+ line_profile_aa& profile() { return *const_cast<line_profile_aa*>(m_profile); }
//---------------------------------------------------------------------
int subpixel_width() const { return m_profile->subpixel_width(); }

View file

@ -1,32 +0,0 @@
# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
pkgname=air
pkgver=1.49.0
pkgrel=0
pkgdesc="Live reload for Go apps"
url="https://github.com/cosmtrek/air"
arch="all"
license="GPL-3.0-or-later"
makedepends="go"
source="$pkgname-$pkgver.tar.gz::https://github.com/cosmtrek/air/archive/refs/tags/v$pkgver.tar.gz"
options="!check" # failed to build; outdated, broken tests
export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
build() {
mkdir -v build
local goldflags="
-X main.airVersion=$pkgver
-X main.goVersion=$(go env GOVERSION | sed 's/^go//')
"
go build -v -o build -ldflags "$goldflags" .
}
package() {
install -Dm755 build/$pkgname -t "$pkgdir"/usr/bin
}
sha512sums="
ce0404dae1c6ff491d2d5e9ee8c2085e6bcb06fd9125477b0a0e6db243f32797d96fcce438fc7bd1d1c0794c590070669e41bff9f4a667f9ebaf1c1ef404541b air-1.49.0.tar.gz
"

View file

@ -1,48 +0,0 @@
# Contributor: Kay Thomas <kaythomas@pm.me>
# Maintainer: Kay Thomas <kaythomas@pm.me>
pkgname=airsonic-advanced
_sha=1397446f979b1cdea283eec89ce4f0eae7d63450
pkgver=11.0.0_git20230217
pkgrel=0
pkgdesc="Modern implementation of the Airsonic fork with several key performance and feature enhancements"
url="https://github.com/airsonic-advanced/airsonic-advanced"
# inconsistent test and build failures on other arches
arch="x86_64"
license="GPL-3.0-or-later"
depends="openjdk11"
makedepends="maven"
subpackages="$pkgname-openrc"
pkgusers="airsonic-advanced"
pkggroups="airsonic-advanced"
install="$pkgname.pre-install"
source="$pkgname-$pkgver.tar.gz::https://github.com/airsonic-advanced/airsonic-advanced/archive/$_sha.tar.gz
maven.patch
airsonic-advanced.initd
"
builddir="$srcdir/$pkgname-$_sha"
build() {
mvn clean package -DskipTests
}
check() {
mvn test
}
package() {
install -dm755 -o airsonic-advanced -g airsonic-advanced \
"$pkgdir"/var/airsonic
install -m755 -o airsonic-advanced -g airsonic-advanced \
"$builddir"/airsonic-main/target/airsonic.war \
"$pkgdir"/var/airsonic/airsonic.war
install -Dm755 "$srcdir"/$pkgname.initd \
"$pkgdir"/etc/init.d/$pkgname
}
sha512sums="
f415620bdbed9fb3874afbf30d9362e68b1e9e8e90dbbed4ca3206b643cad97ca0558e64ec5b4440382f0ec908c3325e321ea3631c38ff9a2109163c8f0cfe0b airsonic-advanced-11.0.0_git20230217.tar.gz
6cb52fee19815fcdf2596e55d97d3e750321b1df7a4fec36fc9bc2a57d4be979a3905a42d3aa9dbeb2bf0d4f56edbf344f13551219b8e4d2ca583abd4bb5c8f9 maven.patch
ca87e6a7199950e6ac52aeb076a03f831d60ee9d4ceed47366bbd78443765d205796d895ebb244051d8033e5b2e9ccd648d20434039c854b8b50e766cc5cd10d airsonic-advanced.initd
"

View file

@ -1,14 +0,0 @@
#!/sbin/openrc-run
supervisor=supervise-daemon
name="airsonic-advanced"
command="/usr/lib/jvm/java-11-openjdk/jre/bin/java"
command_args="-jar airsonic.war"
command_user="airsonic-advanced:airsonic-advanced"
directory="/var/airsonic"
pidfile="/run/airsonic-advanced.pid"
depend() {
need net localmount
after firewall
}

View file

@ -1,6 +0,0 @@
#!/bin/sh
addgroup -S airsonic-advanced 2>/dev/null
adduser -S -D -H -s /sbin/nologin -G airsonic-advanced -g airsonic-advanced airsonic-advanced 2>/dev/null
exit 0

View file

@ -1,8 +0,0 @@
fixes maven 3.9 breaking change
https://maven.apache.org/docs/3.9.0/release-notes.html#potentially-breaking-core-changes
--- airsonic-advanced-1397446f979b1cdea283eec89ce4f0eae7d63450/.mvn/maven.config
+++ airsonic-advanced-1397446f979b1cdea283eec89ce4f0eae7d63450/.mvn/maven.config
@@ -1 +1,2 @@
---settings ./.mvn/settings.xml
+--settings
+./.mvn/settings.xml

View file

@ -1,36 +0,0 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=alpine-lift
pkgver=0.2.0
pkgrel=13
pkgdesc="Basic cloud-init-like for Alpine Linux"
url="https://github.com/bjwschaap/alpine-lift"
license="MIT"
arch="all"
makedepends="go"
options="!check" #no golint avail
source="$pkgname-$pkgver.tar.gz::https://github.com/bjwschaap/alpine-lift/archive/refs/tags/v$pkgver.tar.gz
makefile.patch
"
export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
build() {
export CGO_CPPFLAGS="$CPPFLAGS"
export CGO_CFLAGS="$CFLAGS"
export CGO_CXXFLAGS="$CXXFLAGS"
export CGO_LDFLAGS="$LDFLAGS"
export GOFLAGS="$GOFLAGS -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
make localbuild
}
package() {
install -m755 -D bin/lift \
"$pkgdir"/usr/bin/lift
}
sha512sums="
d7e457b4f1147390e1d0932786a23c1339d9099eebfc3ac43ebda5866614b2a29a06345b2ffc822da32c3598efd9adb757d472dbf7fd24c6da8179b63b5dcd6f alpine-lift-0.2.0.tar.gz
6285b8a839b5c6ad0f4e7208903060cbbf289a5cc1661d5618f8e9d0d2a7ed0c35d5160992246eef303de66e90416f6f44787ceb918bbcf398248831e5e778ae makefile.patch
"

View file

@ -1,13 +0,0 @@
diff --git a/Makefile b/Makefile
index 0e66003..3269166 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ upxbuild:
${DOCKERRUN} ash -c "apk add --no-cache git upx libc-dev gcc && GO111MODULE=on go mod download && ${GOBUILD} -o bin/${BINNAME} github.com/bjwschaap/alpine-lift/cmd/lift && ${UPX}"
localbuild:
- ${GOBUILD} -v -race -o bin/${BINNAME} github.com/bjwschaap/alpine-lift/cmd/lift
+ ${GOBUILD} -v -o bin/${BINNAME} github.com/bjwschaap/alpine-lift/cmd/lift
upx:
${UPX}

View file

@ -1,45 +0,0 @@
# Contributor: Patrycja Rosa <alpine@ptrcnull.me>
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=alps
pkgver=0_git20230807
pkgrel=1
_commit=652ea9c7885a6c508d3c69c37b7c65e5bbe4fe77
pkgdesc="Simple and extensible webmail"
url="https://sr.ht/~migadu/alps/"
arch="all"
license="MIT"
makedepends="go"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
source="$pkgname-$_commit.tar.gz::https://git.sr.ht/~migadu/alps/archive/$_commit.tar.gz
fix-statics-dir.patch
alps.confd
alps.initd
"
builddir="$srcdir/alps-$_commit"
options="!check net" # no tests in upstream
build() {
go build -o alps ./cmd/alps
}
package() {
install -Dm755 alps "$pkgdir"/usr/bin/alps
install -dm755 "$pkgdir"/var/lib/alps
cp -r themes "$pkgdir"/var/lib/alps
for asset in plugins/*/public/*.html plugins/*/public/**/*; do
install -Dm644 "$asset" "$pkgdir"/var/lib/alps/"$asset"
done
install -Dm755 "$srcdir"/alps.initd "$pkgdir"/etc/init.d/alps
install -Dm644 "$srcdir"/alps.confd "$pkgdir"/etc/conf.d/alps
}
sha512sums="
17161088b6cd50d07e24deb90b54e17a54f0e634f9101aec1565cf16a1960ee9a086004d76052c3385fe93e4f71aa4335f4d1656523ae59dcdb8d899fccd3e07 alps-652ea9c7885a6c508d3c69c37b7c65e5bbe4fe77.tar.gz
789b4cae9b2c4acb5b05288c4f9858de1b5cfda87bc96c40505e9447ec9ad39fdabbd5af0c65007c51a5f3a425602ea7a81d3f6c62894dddf6790fe26793755c fix-statics-dir.patch
61c1b05851ae05fbf51cb8eb060c5677de7145a07dac3a194a3f7513b2ff3bf5f3792a749d1a2eef09fc6378f2fbf2021cc49dffe652f51230120c40a7062b6c alps.confd
6e109577d662ce61d2b753e5b82237827646f10d0af02b10b3f184a10bb747c3c8303e7d20a5cc2b7c31ac4a6f3aef62290c068868e647c9b1ce711dfb6e025a alps.initd
"

View file

@ -1,11 +0,0 @@
# Configuration for /etc/init.d/alps
# space-separated list of imap/smtp servers
servers="imap://localhost"
theme="alps"
listen_address=":1323"
command_user="alps:alps"
# comment this out for old style service management
supervisor=supervise-daemon

View file

@ -1,23 +0,0 @@
#!/sbin/openrc-run
name="alps webmail server"
command="/usr/bin/alps"
command_args="${listen_address:+-addr $listen_address} ${theme:+-theme $theme} $servers"
: ${command_user:="alps:alps"}
command_background=yes
directory="/var/lib/alps"
pidfile="/run/alps.pid"
output_log="/var/log/alps.log"
error_log="/var/log/alps.log"
depend() {
need net
after firewall
}
start_pre() {
checkpath -d -m 755 -o "$command_user" /var/lib/alps
checkpath -f -m 644 -o "$command_user" /var/log/alps.log
}

View file

@ -1,6 +0,0 @@
#!/bin/sh
addgroup -S alps
adduser -S -D -H -h /var/lib/alps -s /sbin/nologin -G alps -g alps alps
exit 0

View file

@ -1,26 +0,0 @@
diff --git a/cmd/alps/main.go b/cmd/alps/main.go
index 5a00957..f537177 100644
--- a/cmd/alps/main.go
+++ b/cmd/alps/main.go
@@ -23,7 +23,7 @@ import (
_ "git.sr.ht/~migadu/alps/plugins/viewtext"
)
-var themesPath = "./themes"
+var themesPath = "/var/lib/alps/themes"
func main() {
var (
diff --git a/plugin.go b/plugin.go
index e634f02..43b8164 100644
--- a/plugin.go
+++ b/plugin.go
@@ -7,7 +7,7 @@ import (
)
// PluginDir is the path to the plugins directory.
-const PluginDir = "plugins"
+const PluginDir = "/var/lib/alps/plugins"
// Plugin extends alps with additional functionality.
type Plugin interface {

View file

@ -1,20 +0,0 @@
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=alsa-ucm-conf-asahi
pkgver=4
pkgrel=0
pkgdesc="ALSA Use Case Manager configuration for Apple silicon devices"
url="https://asahilinux.org/"
arch="aarch64"
license="BSD-3-Clause"
depends="alsa-ucm-conf>=1.2.7.2"
source="$pkgname-$pkgver.tar.gz::https://github.com/AsahiLinux/alsa-ucm-conf-asahi/archive/refs/tags/v$pkgver.tar.gz"
package() {
install -vdm 755 "$pkgdir/usr/share/alsa/ucm2/conf.d"
cp -av ucm2/conf.d/macaudio "$pkgdir/usr/share/alsa/ucm2/conf.d/"
}
sha512sums="
1dc88c2681e5d1a1238a5d4076512f72900d699be3614ef7c341e1842ad15e2dea988b80e55780e70f2e08ab3556580be72771d0839c541c6f5d0adb444ec25a alsa-ucm-conf-asahi-4.tar.gz
"

View file

@ -1,39 +0,0 @@
# Contributor: Alexander Kulak <sa-dev@rainbow.by>
# Maintainer: Alexander Kulak <sa-dev@rainbow.by>
pkgname=alttab
pkgver=1.7.1
pkgrel=0
pkgdesc="X11 window switcher designed for minimalistic window managers"
url="https://github.com/sagb/alttab"
options="!check"
arch="all"
license="GPL-3.0-or-later"
makedepends="autoconf automake libx11-dev libxft-dev musl-fts-dev libxrender-dev libxrandr-dev
libpng-dev uthash-dev libxpm-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/sagb/alttab/archive/v$pkgver.tar.gz
"
prepare() {
default_prepare
./bootstrap.sh
}
build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var
make
}
package() {
make DESTDIR="$pkgdir" install
}
sha512sums="
d9f6c1d00be21e975521ebc39e800f00522f0d898512a7e3a406ae859890c553a1ae312a0947701085831aa5e62b5b9db859ae84af4b3e8f3370462634a5ab97 alttab-1.7.1.tar.gz
"

View file

@ -1,36 +0,0 @@
# Contributor: Anjandev Momi <anjan@momi.ca>
# Maintainer: Anjandev Momi <anjan@momi.ca>
pkgname=amdgpu-fan
pkgver=0.1.0
pkgrel=2
pkgdesc="Fan controller for AMD graphics cards running the amdgpu driver on Linux"
url="https://github.com/zzkW35/amdgpu-fan"
arch="noarch"
license="GPL-2.0-or-later"
depends="python3 py3-yaml py3-numpy"
makedepends="py3-setuptools"
checkdepends="py3-pytest"
subpackages="$pkgname-pyc"
source="$pkgname-$pkgver.tar.gz::https://github.com/zzkW35/amdgpu-fan/archive/refs/tags/$pkgver.tar.gz"
prepare() {
default_prepare
sed -i "s/PROJECTVERSION/$pkgver/g" setup.py
}
build() {
python3 setup.py build
}
check() {
PYTHONPATH="$PWD/build/lib" pytest
}
package() {
python3 setup.py install --skip-build --root="$pkgdir"
}
sha512sums="
b21d8e413d44a263fdbef37fff11a496fe5e46a1f4d1e7ade161dde36750cf0dc02dfd2ccaebc455dac5aa023150101a65a255a38e6d9b70a6bba39da8f26378 amdgpu-fan-0.1.0.tar.gz
"

View file

@ -1,27 +0,0 @@
# Contributor: TBK <alpine@jjtc.eu>
# Maintainer: TBK <alpine@jjtc.eu>
pkgname=amiitool
pkgver=2
_pkgver=r2
pkgrel=1
pkgdesc="Reverse-engineered amiibo cryptography"
url="https://github.com/socram8888/amiitool"
arch="all"
license="MIT"
options="!check" # No test suite
makedepends="git mbedtls-dev" # git is used to pull head version
source="$pkgname-$_pkgver.tar.gz::https://github.com/socram8888/amiitool/archive/$_pkgver.tar.gz
fix-mbedtls_include.patch
"
builddir="$srcdir/$pkgname-$_pkgver"
build() {
make prefix=/usr
}
package() {
make prefix=/usr DESTDIR="$pkgdir" install
}
sha512sums="28087a022a88ca604f610dff6f49f19f4c273d7787401a3e1dd998243ba4ca3628adb58bf9ea20e8e6c77cc021bedfeda8b632e0a50efe752eec543f20ef33d6 amiitool-r2.tar.gz
50bc13ff736c65b05b402e3dc1c3e61242271e9d311f5a60169263e2dd6ca5765dee6b1cde963e3a76980deaf29ee1e65991b9028f9c58c3a6402d959015993e fix-mbedtls_include.patch"

View file

@ -1,56 +0,0 @@
+++ a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
bindir = $(exec_prefix)/bin
# mbed TLS libraries
-MBEDTLS_DIR = $(PWD)/mbedtls
+MBEDTLS_DIR = /usr/include/
MBEDTLS_CONFIG = $(PWD)/configs/mbedtls.h
MBEDTLS_CFLAGS = -DMBEDTLS_CONFIG_FILE='\"$(MBEDTLS_CONFIG)\"' $(CFLAGS)
@@ -39,7 +39,7 @@
# Default target: compile all programs
all: $(BINS)
-%: %.o $(LIBSOBJ) $(STATICLIBS)
+%: %.o $(LIBSOBJ)
$(CC) $(ALL_CFLAGS) $(LIBSOBJ) $< -o $@ $(LDFLAGS)
%.o: %.c $(HEADERS)
--- a/configs/mbedtls.h
+++ b/configs/mbedtls.h
@@ -24,6 +24,6 @@
#define MBEDTLS_HAVE_ASM
#define MBEDTLS_PLATFORM_C
-#include "mbedtls/check_config.h"
+#include <mbedtls/check_config.h>
#endif
--- a/amiibo.c
+++ b/amiibo.c
@@ -7,8 +7,8 @@
#include "nfc3d/amiibo.h"
#include "util.h"
-#include "mbedtls/md.h"
-#include "mbedtls/aes.h"
+#include <mbedtls/md.h>
+#include <mbedtls/aes.h>
#include <errno.h>
#include "portable_endian.h"
--- a/include/nfc3d/drbg.h
+++ b/include/nfc3d/drbg.h
@@ -10,7 +10,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "mbedtls/md.h"
+#include <mbedtls/md.h>
#define NFC3D_DRBG_MAX_SEED_SIZE 480 /* Hardcoded max size in 3DS NFC module */
#define NFC3D_DRBG_OUTPUT_SIZE 32 /* Every iteration generates 32 bytes */

View file

@ -1,44 +0,0 @@
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
# This package is in search of a new maintainer
pkgname=ampy
_pkgname=adafruit-ampy
pkgver=1.1.0
pkgrel=3
pkgdesc="Utility to interact with a MicroPython board over a serial connection"
url="https://github.com/scientifichackers/ampy"
arch="noarch"
license="MIT"
depends="
py3-click
py3-dotenv
py3-pyserial
python3
"
makedepends="py3-setuptools"
subpackages="$pkgname-doc $pkgname-pyc"
source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
prepare() {
default_prepare
touch CONTRIBUTING.md
}
build() {
python3 setup.py build
}
check() {
python3 setup.py check
}
package() {
python3 setup.py install --skip-build --root="$pkgdir"
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
install -m644 README.md "$pkgdir"/usr/share/doc/$pkgname/
}
sha512sums="
b06a1007cda17d29c6441c2b8c7d5f7e40e41783e87334791254654d6a6157768af7a4c5b348f8b64620b47a4d86cd86d45bdb02be18c7a146deab74c4935645 adafruit-ampy-1.1.0.tar.gz
"

View file

@ -1,66 +0,0 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=amule
_pkgname=aMule
pkgver=2.3.3
pkgrel=12
pkgdesc="eMule-like client for the eD2k and Kademlia networks"
url="https://www.amule.org/"
arch="all !x86" # crypto++
license="GPL-2.0-or-later"
makedepends="
bison
boost-dev
crypto++-dev
gd-dev
geoip-dev
libsm-dev
libupnp-dev
wxwidgets-dev
"
options="!check" # unexpected end of file
subpackages="$pkgname-lang $pkgname-doc"
source="$_pkgname-$pkgver.tar.xz::https://downloads.sourceforge.net/project/amule/aMule/$pkgver/aMule-$pkgver.tar.xz
fix-gcc11-include.patch
"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
export CFLAGS="$CFLAGS -flto=auto -DNDEBUG"
export CXXFLAGS="$CXXFLAGS -flto=auto -DNDEBUG"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--mandir=/usr/share/man \
--disable-debug \
--enable-alc \
--enable-alcc \
--enable-amule-daemon \
--enable-amule-gui \
--enable-amulecmd \
--enable-ccache \
--enable-geoip \
--enable-optimize \
--enable-upnp \
--enable-webserver \
--enable-fileview \
--with-boost
make
}
check() {
make check
}
package() {
make DESTDIR="$pkgdir" install
}
sha512sums="
a5a80c5ddd1e107d92070c1d8e232c2762c4c54791abc067c739eef7c690062ed164dd7733808f80c762719261162aeb3d602308964dda2670a0bb059d87b74e aMule-2.3.3.tar.xz
ce5e35ad33a188358dc311df06a2357dba52b5905f345dcba0fb44337ee1a1314579e918cb4e0cc60818a39d5c4678321262e9d6b1e17fe800fda55a5def1976 fix-gcc11-include.patch
"

View file

@ -1,10 +0,0 @@
--- a/src/libs/common/MuleDebug.cpp
+++ b/src/libs/common/MuleDebug.cpp
@@ -24,6 +24,7 @@
//
#include <cstdlib> // Needed for std::abort()
+#include <exception>
#include "config.h" // Needed for HAVE_CXXABI and HAVE_EXECINFO

View file

@ -1,61 +0,0 @@
diff --git a/src/muuli_wdr.cpp b/src/muuli_wdr.cpp
index 44f0eb6..64dbade 100644
--- a/src/muuli_wdr.cpp
+++ b/src/muuli_wdr.cpp
@@ -181,10 +181,10 @@ wxSizer *searchDlg( wxWindow *parent, bool call_fit, bool set_sizer )
wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
wxStaticText *item4 = new wxStaticText( parent, -1, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 );
- item3->Add( item4, 0, wxALIGN_CENTER|wxALL, 5 );
+ item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, IDC_SEARCHNAME, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
- item3->Add( item5, 1, wxALIGN_CENTER|wxALL, 5 );
+ item3->Add( item5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxFlexGridSizer *item6 = new wxFlexGridSizer( 1, 0, 0, 0 );
@@ -212,7 +212,7 @@ wxSizer *searchDlg( wxWindow *parent, bool call_fit, bool set_sizer )
wxCheckBox *item12 = new wxCheckBox( parent, IDC_FILTERCHECK, _("Filtering"), wxDefaultPosition, wxDefaultSize, 0 );
item6->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
- item3->Add( item6, 0, wxALIGN_CENTER, 0 );
+ item3->Add( item6, 0, wxALIGN_CENTER_VERTICAL, 0 );
item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
@@ -925,17 +925,17 @@ wxSizer *downloadDlg( wxWindow *parent, bool call_fit, bool set_sizer )
item0->Add( item2, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
wxGauge *item3 = new wxGauge( parent, ID_HTTPDOWNLOADPROGRESS, 100, wxDefaultPosition, wxSize(-1,10), wxGA_SMOOTH|wxGA_PROGRESSBAR );
- item0->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ item0->Add( item3, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
wxStaticText *item4 = new wxStaticText( parent, IDC_DOWNLOADSIZE, _("Unknown size"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
- item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
wxStaticLine *item5 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
- item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
wxButton *item6 = new wxButton( parent, ID_HTTPCANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
item6->SetDefault();
- item0->Add( item6, 0, wxALIGN_CENTER|wxALL, 5 );
+ item0->Add( item6, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
if (set_sizer)
{
diff --git a/src/utils/wxCas/src/wxcasprefs.cpp b/src/utils/wxCas/src/wxcasprefs.cpp
index d87aad3..c36ac64 100644
--- a/src/utils/wxCas/src/wxcasprefs.cpp
+++ b/src/utils/wxCas/src/wxcasprefs.cpp
@@ -88,7 +88,7 @@ WxCasPrefs::WxCasPrefs ( wxWindow * parent ) : wxDialog ( parent, -1,
WxCasCte::DEFAULT_REFRESH_RATE ) );
m_refreshStaticText =
new wxStaticText ( this, -1, _( "Refresh rate interval in seconds" ), wxDefaultPosition,
- wxDefaultSize, wxALIGN_CENTRE );
+ wxDefaultSize, wxALIGN_CENTER );
m_refreshSBoxSizer->Add ( m_refreshSpinButton, 0, wxALL | wxALIGN_CENTER, 5 );
m_refreshSBoxSizer->Add ( m_refreshStaticText, 1, wxALL | wxALIGN_CENTER, 5 );

View file

@ -1,28 +0,0 @@
# Contributor: Waweic <waweic@activ.ism.rocks>
# Maintainer: Waweic <waweic@activ.ism.rocks>
pkgname=anarch
pkgver=1.0
pkgrel=1
pkgdesc="Extremely small 90s style doom clone"
url="https://gitlab.com/drummyfish/anarch"
arch="all"
license="CC0-1.0"
makedepends="sdl2-dev"
subpackages="$pkgname-doc"
source="https://gitlab.com/drummyfish/anarch/-/archive/$pkgver/anarch-$pkgver.tar.gz"
options="!check" # No tests in source
build() {
cc -O3 -o anarch main_sdl.c -lSDL2
}
package() {
install -Dm755 anarch -t "$pkgdir"/usr/bin/
for file in README.md IDEAS.txt; do
install -Dm644 $file -t "$pkgdir"/usr/share/doc/$pkgname/
done
}
sha512sums="
f9d3335401a0cfd03ab253e4545675c41ba5d1c552eed3d6932ab6aa2b27d90817a844b5fb0f1199b7e4bc7a6319cc6a5ea0c1014bd1e2ae637c2eef4f4c1fda anarch-1.0.tar.gz
"

View file

@ -1,50 +0,0 @@
# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
pkgname=android-apkeep
pkgver=0.15.0
pkgrel=1
pkgdesc="A command-line tool for downloading Android APK files from various sources"
url="https://github.com/EFForg/apkeep"
# ppc64le, riscv64, s390x: ring crate
arch="all !ppc64le !riscv64 !s390x"
license="MIT"
makedepends="
bzip2-dev
cargo
cargo-auditable
openssl-dev
zstd-dev
"
source="https://github.com/EFForg/apkeep/archive/refs/tags/$pkgver/apkeep-$pkgver.tar.gz"
options="!check" # no tests
builddir="$srcdir/apkeep-$pkgver"
prepare() {
default_prepare
cargo fetch --target="$CTARGET" --locked
# Rust target triple.
local target=$(rustc -vV | sed -n 's/host: //p')
# Build against system-provided libs
mkdir -p .cargo
cat >> .cargo/config.toml <<-EOF
[target.$target]
bzip2 = { rustc-link-lib = ["bz2"] }
zstd = { rustc-link-lib = ["zstd"] }
EOF
}
build() {
cargo auditable build --frozen --release
}
package() {
install -Dm755 target/release/apkeep "$pkgdir"/usr/bin/apkeep
}
sha512sums="
ffc089896a0d223cdbb8534f7e77a86cbc899d3c8200d416f88fdce143e5583403322484b45aa238f27beb5f125f0152d3e6ff678a59f4adba54c4d6d5c6b42a apkeep-0.15.0.tar.gz
"

View file

@ -1,25 +0,0 @@
# Contributor: Patrycja Rosa <alpine@ptrcnull.me>
# Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
pkgname=android-apktool
pkgver=2.9.0
pkgrel=0
pkgdesc="Tool for reverse engineering Android apk files"
url="https://ibotpeaches.github.io/Apktool/"
arch="all !x86 !armhf !armv7 !riscv64"
# disabled due to openjdk11 limitations
license="Apache-2.0"
depends="openjdk11-jre-headless"
source="https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_$pkgver.jar
apktool"
options="!check"
# no tests available
package() {
install -Dm644 "$srcdir"/apktool_$pkgver.jar "$pkgdir"/usr/share/apktool/apktool.jar
install -Dm755 "$srcdir"/apktool "$pkgdir"/usr/bin/apktool
}
sha512sums="
9b08c60d8f39210da8693ac934eb5f4b36d243b8d03acf9c00e6dc6feda27dde1c1e4db7d4e3a20a4e3ef89088745f2fde0ccc4d4c43e8120649672bcfdaa434 apktool_2.9.0.jar
8cb0d693996fe5a3df2f49120336962bc4d36ad6540744b6bc53dd1c03cc2b34e339f3749804abd9c054510b7093da77b18e77e886795c4f6b2206c64ea0247e apktool
"

View file

@ -1,3 +0,0 @@
#!/bin/sh
/usr/lib/jvm/java-11-openjdk/bin/java -jar /usr/share/apktool/apktool.jar "$@"

View file

@ -1,46 +0,0 @@
# Contributor: Michał Polański <michal@polanski.me>
# Maintainer: Michał Polański <michal@polanski.me>
pkgname=android-file-transfer
pkgver=4.2
pkgrel=0
pkgdesc="Android MTP client with minimalistic UI"
url="https://whoozle.github.io/android-file-transfer-linux/"
license="LGPL-2.1-only"
arch="all"
makedepends="
cmake
file-dev
fuse-dev
linux-headers
openssl-dev
qt5-qtbase-dev
qt5-qttools-dev
readline-dev
samurai
taglib-dev
zlib-dev
"
subpackages="$pkgname-cli $pkgname-libs $pkgname-dev"
source="https://github.com/whoozle/android-file-transfer-linux/archive/v$pkgver/android-file-transfer-$pkgver.tar.gz"
builddir="$srcdir/android-file-transfer-linux-$pkgver"
options="!check" # no test suite
cli() {
amove usr/bin/aft-mtp-*
}
build() {
cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=MinSizeRel \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIB=ON
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 android-file-transfer-4.2.tar.gz
"

View file

@ -1,60 +0,0 @@
# Contributor: Elly Fong-Jones <elly@elly.town>
# Maintainer: Elly Fong-Jones <elly@elly.town>
pkgname=angband
pkgver=4.2.4
pkgrel=0
pkgdesc="Roguelike computer role playing game"
url="https://rephial.org"
arch="all"
# License: GPL-2.0-only for the actual code, but the tile sets (which this build
# includes) have different licenses. See docs/copying.rst in the source tree for
# full details.
license="GPL-2.0-only AND custom"
makedepends="ncurses-dev sdl2-dev sdl2_image-dev sdl2_mixer-dev sdl2_ttf-dev"
checkdepends="perl"
source="https://github.com/angband/angband/releases/download/$pkgver/Angband-$pkgver.tar.gz"
builddir="$srcdir/Angband-$pkgver"
# Angband has a unit test suite, but it requires the game to be installed
# to run: https://github.com/angband/angband/issues/5517
options="!check"
prepare() {
default_prepare
# angband ships some obsolete autoconf intermediates that choke on musl
update_config_sub
}
build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--bindir=/usr/bin \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
--enable-curses \
--disable-x11 \
--enable-sdl2 \
--disable-sdl \
--disable-test \
--disable-stats
make
}
check() {
make tests
# Note: there are also a handful of integration tests, but they don't
# have a separate build target and instead compile extra code into
# the production binary. We don't want the extra code size, so they
# aren't run here.
}
package() {
make DESTDIR="$pkgdir" install
}
sha512sums="
41a36a0be570ccef62da826a9a53fa20d82c7adf8e862389ed92340a20a0426d21433c507c25a56ef63809aa2023d54d3689072168a87c7f2b3109caa848ada3 Angband-4.2.4.tar.gz
"

View file

@ -1,34 +0,0 @@
# Contributor: Aleks Bunin <alpinelinux@compuix.com>
# Maintainer: Aleks Bunin <alpinelinux@compuix.com>
pkgname=antibody
pkgver=6.1.1
pkgrel=18
pkgdesc="The fastest zsh shell plugin manager."
url="https://github.com/getantibody/antibody"
license="MIT"
arch="all"
depends="git zsh"
makedepends="go"
source="$pkgname-$pkgver.tar.gz::https://github.com/getantibody/antibody/archive/v$pkgver.tar.gz"
options="!check" # uses removed github api
export GOFLAGS="$GOFLAGS -modcacherw"
export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}"
export GOTMPDIR="${GOTMPDIR:-"$srcdir"}"
export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}"
build() {
go build -o antibody -ldflags "-X main.version=$pkgver" -trimpath
}
check() {
go test -v -cover ./...
}
package() {
install -sD -m 755 antibody "$pkgdir"/usr/bin/antibody
}
sha512sums="
0a436227d195b1e68be03d62d0f7fab0f10c4434df10e047468809a6dcf330623c54ddf4e52c459d7b816a3be977e62c6aba58408881f9a45583456e37614b04 antibody-6.1.1.tar.gz
"

View file

@ -1,39 +0,0 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=apache-mod-auth-gssapi
pkgver=1.6.5
pkgrel=1
pkgdesc="GSSAPI authentication for Apache"
url="https://github.com/gssapi/mod_auth_gssapi"
arch="all"
license="MIT"
depends="apache2"
makedepends="apache2-dev krb5-dev openssl-dev>3
automake autoconf m4 libtool flex bison"
options="!check" # some packages missing from Alpine, see: https://github.com/gssapi/mod_auth_gssapi/ on "Tests" paragraph
source="$pkgname-$pkgver.zip::https://github.com/gssapi/mod_auth_gssapi/archive/v$pkgver.zip
mod-auth-gssapi.conf"
builddir="$srcdir"/mod_auth_gssapi-$pkgver
prepare() {
autoreconf -fi
}
build() {
./configure \
--prefix=/usr \
--enable-static=no
make
}
package() {
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/etc/apache2/conf.d
install -D -m644 ../../mod-auth-gssapi.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-gssapi.conf
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
sha512sums="
356f2b0287bc8d3a976f1c5251654362b6489f0cda177fe43811fa873b8bccd6de6b5cb111dc8c13b40d3235ee4200aeac0bfa49ae8f3575b96292a65f647e51 apache-mod-auth-gssapi-1.6.5.zip
45658d5446f18315de1a66b682a0669d15b0782e46e649b7d5c4bea2e1c9735909ee1b4d36e9eaa0e54bac68773bb68610d4a0bf68a9eccb368d569489246dfa mod-auth-gssapi.conf
"

View file

@ -1,19 +0,0 @@
LoadModule auth_gssapi_module modules/mod_auth_gssapi.so
## example, see mod_auth_gssapi README for more options
#<Directory "/var/www/private">
# AuthType GSSAPI
# AuthName "GSSAPI Single Sign On Login"
# GssapiCredStore keytab:/etc/apache2/krb5.keytab
# Require valid-user
# GssapiBasicAuth On
# GssapiAllowedMech krb5
# GssapiNegotiateOnce On
# GssapiLocalName On
# GssapiUseSessions On
# GssapiDelegCcacheDir /run/httpd/clientcaches
# GssapiPublishErrors On
# GssapiAcceptorName HTTP@{HOSTNAME}
## See http://www.jfcarter.net/~jimc/documents/bugfix/41-auth-kerb.html for details
#</Directory>

View file

@ -1,57 +0,0 @@
# Maintainer: Takumi Takahashi <takumiiinn@gmail.com>
pkgname=apache-mod-auth-openidc
_pkgname=mod_auth_openidc
pkgver=2.4.14.4
pkgrel=0
pkgdesc="OpenID Connect Relying Party implementation for Apache HTTP Server 2.x"
url="https://www.mod-auth-openidc.org"
arch="all !s390x" # tests fails on s390x from cjose
license="Apache-2.0"
depends="apache2"
makedepends="
apache2-dev
cjose-dev
curl-dev
hiredis-dev
jansson-dev
jq-dev
musl-dev
oniguruma-dev
openssl-dev
pcre2-dev
"
subpackages="$pkgname-doc $pkgname-static"
source="https://github.com/zmartzone/mod_auth_openidc/releases/download/v$pkgver/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir"/$_pkgname-$pkgver
build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--with-jq=/usr
make
}
check() {
make test
}
package() {
mkdir -p "$pkgdir"/usr/lib/apache2
/usr/share/apache2/build/instdso.sh SH_LIBTOOL='/usr/share/build-1/libtool' mod_auth_openidc.la "$pkgdir"/usr/lib/apache2
/usr/share/build-1/libtool --mode=install install mod_auth_openidc.la "$pkgdir"/usr/lib/apache2
mkdir -p "$pkgdir"/etc/apache2/conf.d
cat <<- __EOF__ > "$pkgdir"/etc/apache2/conf.d/mod-auth-openidc.conf
LoadModule auth_openidc_module modules/mod_auth_openidc.so
__EOF__
cat auth_openidc.conf >> "$pkgdir"/etc/apache2/conf.d/mod-auth-openidc.conf
install -Dm644 README.md "$pkgdir"/usr/share/doc/"$pkgname"/README.md
}
sha512sums="
b7d61f15d48292f2a567653632f7d9df8b6cb54303d4de0c333c8122a32df8749e508a0abd5259ac7ca15da5b244eec1e1d21f62140720ddb1705ec289551984 mod_auth_openidc-2.4.14.4.tar.gz
"

View file

@ -1,35 +0,0 @@
# Contributor: Nathan Rennie-Waldock <nathan.renniewaldock@gmail.com>
# Maintainer: Nathan Rennie-Waldock <nathan.renniewaldock@gmail.com>
pkgname=apache2-mod-authnz-external
_realname=mod_authnz_external
pkgver=3.3.3
pkgrel=0
pkgdesc="Apache module for external authentication"
url="https://github.com/phokz/mod-auth-external/"
arch="all"
license="Apache-2.0"
options="!check" # No automated tests
depends="apache2"
makedepends="apache2-dev"
subpackages="$pkgname-doc"
source="https://github.com/phokz/mod-auth-external/archive/mod_authnz_external-$pkgver.tar.gz
$pkgname.apache2.conf"
builddir="$srcdir/mod-auth-external-$_realname-$pkgver"
build() {
make
}
package() {
install -Dm755 ".libs/$_realname.so" "$pkgdir/usr/lib/apache2/$_realname.so"
install -Dm644 "$srcdir/$pkgname.apache2.conf" \
"$pkgdir/etc/apache2/conf.d/authnz-external-module.conf"
local f
for f in AUTHENTICATORS README; do
install -Dm644 "$f" \
"$pkgdir/usr/share/doc/$pkgname/$f"
done
}
sha512sums="65b643870dcfc5cdc0343bc606ff74697473617ce9f6fe27cae40ae1b2dca904bb71b6ec8347c6b5c5e3819785432798f6e78820cdf66fd17b245371a41322d2 mod_authnz_external-3.3.3.tar.gz
aad10cd570ae77b24a658898f1edb0ee08501e98ef76b68efd101037f53b7de123aecc87e535957b401925c665f952b381c4d4bf874c946ba0caeb979b222c35 apache2-mod-authnz-external.apache2.conf"

View file

@ -1 +0,0 @@
LoadModule authnz_external_module modules/mod_authnz_external.so

View file

@ -1,53 +0,0 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Matt Smith <mcs@darkregion.net>
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=apache2-mod-perl
_pkgreal=mod_perl
pkgver=2.0.13
pkgrel=0
pkgdesc="Perl Module for Apache2"
url="https://perl.apache.org/"
arch="all"
license="Apache-2.0"
depends="apache2"
depends_dev="$pkgname"
makedepends="apache2-dev perl-dev perl-linux-pid apr-dev apr-util-dev"
options="!check" # fails to start test server
subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev"
source="https://archive.apache.org/dist/perl/$_pkgreal-$pkgver.tar.gz
$pkgname.conf"
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
perl Makefile.PL \
INSTALLDIRS=vendor \
MP_APXS=/usr/bin/apxs
make
}
check() {
make test
}
package() {
make DESTDIR="$pkgdir" install
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
install -Dm644 "$srcdir"/$pkgname.conf \
"$pkgdir"/etc/apache2/conf.d/$_pkgreal.conf
}
dev() {
default_dev
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
mkdir -p "$subpkgdir"/usr/lib/perl5/vendor_perl/auto/Apache2
mv "$pkgdir"/usr/lib/perl5/vendor_perl/auto/Apache2/Build \
"$pkgdir"/usr/lib/perl5/vendor_perl/auto/Apache2/typemap \
"$subpkgdir"/usr/lib/perl5/vendor_perl/auto/Apache2
}
sha512sums="
453c789743487e2d1167d005f21ef9780f36488db8830103e4ea0a0656f685bf5ec423cd1baa68ee30efc75d9e2b845c9656458203b9f48de81a315a91d587c9 mod_perl-2.0.13.tar.gz
15a430ce597e370997a08d6aa1b5e55d4fa723ecac031fe39906c8cc767b90d5bf63e3026dfaa8b10ae8b09a17832f4f07cb8b2fdcd6c9ef427edfaf4e8a48b0 apache2-mod-perl.conf
"

View file

@ -1,8 +0,0 @@
LoadModule perl_module modules/mod_perl.so
<Location /cgi-bin>
AddHandler perl-script .pl
PerlResponseHandler ModPerl::Registry
PerlOptions +ParseHeaders
Options +ExecCGI
</Location>

Some files were not shown because too many files have changed in this diff Show more