diff options
354 files changed, 3647 insertions, 2743 deletions
diff --git a/user/mkfontdir/APKBUILD b/legacy/mkfontdir/APKBUILD index 45629cd20..45629cd20 100644 --- a/user/mkfontdir/APKBUILD +++ b/legacy/mkfontdir/APKBUILD diff --git a/user/mkfontdir/mkfontdir.trigger b/legacy/mkfontdir/mkfontdir.trigger index 3024d71f1..3024d71f1 100644 --- a/user/mkfontdir/mkfontdir.trigger +++ b/legacy/mkfontdir/mkfontdir.trigger diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD index 0109fab0e..cdfb867e2 100644 --- a/system/bc/APKBUILD +++ b/system/bc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bc -pkgver=1.2.3 +pkgver=1.2.6 pkgrel=0 pkgdesc="An arbitrary precision numeric processing language (calculator)" url="https://github.com/gavinhoward/bc" @@ -9,7 +9,7 @@ arch="all" license="BSD-2-Clause" depends="" makedepends="" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-doc" source="https://github.com/gavinhoward/bc/releases/download/${pkgver/_/-}/bc-${pkgver/_/-}.tar.xz" builddir="$srcdir"/$pkgname-${pkgver/_/-} @@ -26,4 +26,4 @@ package() { make install } -sha512sums="5277177a0627b00d8022f37060f6496312ae0f25e41521b5d7276c0e177f1ee7605f148b0bdee1f526fbc5d00e36a2c1ecbf4f808978e6f55e2745f327bd3bdd bc-1.2.3.tar.xz" +sha512sums="c8ff2ac542413bf594a00ea9a8a9e4cd24e48081839a4e11546a08551a73b4f460391edf7f3aa3f5143db5c4e7bc1448ff7cd1104599cfa2fb44fba79c5b24fc bc-1.2.6.tar.xz" diff --git a/system/gcc/0016-invalid-tls-model.patch b/system/gcc/0016-invalid-tls-model.patch new file mode 100644 index 000000000..d3b2b8ea0 --- /dev/null +++ b/system/gcc/0016-invalid-tls-model.patch @@ -0,0 +1,51 @@ +--- gcc-7.3.0/libgomp/configure.tgt.orig 2018-09-25 13:44:16.654561098 -0400 ++++ gcc-7.3.0/libgomp/configure.tgt 2018-09-25 13:44:50.452688100 -0400 +@@ -10,23 +10,6 @@ + # XCFLAGS Add extra compile flags to use. + # XLDFLAGS Add extra link flags to use. + +-# Optimize TLS usage by avoiding the overhead of dynamic allocation. +-if test $gcc_cv_have_tls = yes ; then +- case "${target}" in +- +- *-*-k*bsd*-gnu*) +- ;; +- +- *-*-linux* | *-*-gnu*) +- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec" +- ;; +- +- *-*-rtems*) +- XCFLAGS="${XCFLAGS} -ftls-model=local-exec" +- ;; +- esac +-fi +- + # Since we require POSIX threads, assume a POSIX system by default. + config_path="posix" + +--- gcc-7.3.0/libitm/configure.tgt.orig 2018-09-25 13:47:31.019296903 -0400 ++++ gcc-7.3.0/libitm/configure.tgt 2018-09-25 13:47:37.676322335 -0400 +@@ -27,22 +27,6 @@ + # XCFLAGS Add extra compile flags to use. + # XLDFLAGS Add extra link flags to use. + +-# Optimize TLS usage by avoiding the overhead of dynamic allocation. +-if test "$gcc_cv_have_tls" = yes ; then +- case "${target}" in +- +- # For x86, we use slots in the TCB head for most of our TLS. +- # The setup of those slots in beginTransaction can afford to +- # use the global-dynamic model. +- i[456]86-*-linux* | x86_64-*-linux*) +- ;; +- +- *-*-linux*) +- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec" +- ;; +- esac +-fi +- + # Map the target cpu to an ARCH sub-directory. At the same time, + # work out any special compilation flags as necessary. + case "${target_cpu}" in diff --git a/system/gcc/338-gccgo-syscall.patch b/system/gcc/338-gccgo-syscall.patch new file mode 100644 index 000000000..a4ecb5b6b --- /dev/null +++ b/system/gcc/338-gccgo-syscall.patch @@ -0,0 +1,115 @@ +diff -Naur gcc-8.3.0-orig/libgo/go/runtime/stubs.go gcc-8.3.0/libgo/go/runtime/stubs.go +--- gcc-8.3.0-orig/libgo/go/runtime/stubs.go 2019-04-25 03:03:52.311215191 +0000 ++++ gcc-8.3.0/libgo/go/runtime/stubs.go 2019-04-25 03:03:27.973824045 +0000 +@@ -284,8 +284,7 @@ + // For gccgo this is in the C code. + func osyield() + +-// For gccgo this can be called directly. +-//extern syscall ++//extern __go_syscall6 + func syscall(trap uintptr, a1, a2, a3, a4, a5, a6 uintptr) uintptr + + // For gccgo, to communicate from the C code to the Go code. +diff -Naur gcc-8.3.0-orig/libgo/go/syscall/syscall_unix.go gcc-8.3.0/libgo/go/syscall/syscall_unix.go +--- gcc-8.3.0-orig/libgo/go/syscall/syscall_unix.go 2019-04-25 03:04:55.064488337 +0000 ++++ gcc-8.3.0/libgo/go/syscall/syscall_unix.go 2019-04-25 03:08:23.612133013 +0000 +@@ -19,11 +19,8 @@ + Stderr = 2 + ) + +-//extern syscall +-func c_syscall32(trap int32, a1, a2, a3, a4, a5, a6 int32) int32 +- +-//extern syscall +-func c_syscall64(trap int64, a1, a2, a3, a4, a5, a6 int64) int64 ++//extern __go_syscall6 ++func syscall6(trap uintptr, a1, a2, a3, a4, a5, a6 uintptr) uintptr + + const ( + darwin64Bit = runtime.GOOS == "darwin" && sizeofPtr == 8 +@@ -38,14 +35,7 @@ + func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { + Entersyscall() + SetErrno(0) +- var r uintptr +- if unsafe.Sizeof(r) == 4 { +- r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0) +- r = uintptr(r1) +- } else { +- r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), 0, 0, 0) +- r = uintptr(r1) +- } ++ r := syscall6(trap, a1, a2, a3, 0, 0, 0) + err = GetErrno() + Exitsyscall() + return r, 0, err +@@ -54,47 +44,22 @@ + func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) { + Entersyscall() + SetErrno(0) +- var r uintptr +- if unsafe.Sizeof(r) == 4 { +- r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), +- int32(a4), int32(a5), int32(a6)) +- r = uintptr(r1) +- } else { +- r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), +- int64(a4), int64(a5), int64(a6)) +- r = uintptr(r1) +- } ++ r := syscall6(trap, a1, a2, a3, a4, a5, a6) + err = GetErrno() + Exitsyscall() + return r, 0, err + } + + func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err Errno) { +- var r uintptr + SetErrno(0) +- if unsafe.Sizeof(r) == 4 { +- r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), 0, 0, 0) +- r = uintptr(r1) +- } else { +- r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), 0, 0, 0) +- r = uintptr(r1) +- } ++ r := syscall6(trap, a1, a2, a3, 0, 0, 0) + err = GetErrno() + return r, 0, err + } + + func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err Errno) { +- var r uintptr + SetErrno(0) +- if unsafe.Sizeof(r) == 4 { +- r1 := c_syscall32(int32(trap), int32(a1), int32(a2), int32(a3), +- int32(a4), int32(a5), int32(a6)) +- r = uintptr(r1) +- } else { +- r1 := c_syscall64(int64(trap), int64(a1), int64(a2), int64(a3), +- int64(a4), int64(a5), int64(a6)) +- r = uintptr(r1) +- } ++ r := syscall6(trap, a1, a2, a3, a4, a5, a6) + err = GetErrno() + return r, 0, err + } +diff -Naur gcc-8.3.0-orig/libgo/runtime/go-varargs.c gcc-8.3.0/libgo/runtime/go-varargs.c +--- gcc-8.3.0-orig/libgo/runtime/go-varargs.c 2015-11-06 19:15:45.000000000 +0000 ++++ gcc-8.3.0/libgo/runtime/go-varargs.c 2019-04-25 03:14:11.404851275 +0000 +@@ -89,3 +89,14 @@ + } + + #endif ++ ++// __go_syscall6 is called by both the runtime and syscall packages. ++// We use uintptr_t to make sure that the types match, since the Go ++// and C "int" types are not the same. ++ ++uintptr_t ++__go_syscall6(uintptr_t flag, uintptr_t a1, uintptr_t a2, uintptr_t a3, ++ uintptr_t a4, uintptr_t a5, uintptr_t a6) ++{ ++ return syscall (flag, a1, a2, a3, a4, a5, a6); ++} diff --git a/system/gcc/339-gccgo-errstr.patch b/system/gcc/339-gccgo-errstr.patch new file mode 100644 index 000000000..f78d18aa4 --- /dev/null +++ b/system/gcc/339-gccgo-errstr.patch @@ -0,0 +1,45 @@ +--- gcc-8.3.0/libgo/go/syscall/errstr_linux.go 2016-08-06 00:36:33.000000000 +0000 ++++ /dev/null 2019-04-08 15:05:18.560000000 +0000 +@@ -1,31 +0,0 @@ +-// errstr_linux.go -- GNU/Linux specific error strings. +- +-// Copyright 2010 The Go Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style +-// license that can be found in the LICENSE file. +- +-// We use this rather than errstr.go because on GNU/Linux sterror_r +-// returns a pointer to the error message, and may not use buf at all. +- +-package syscall +- +-import "unsafe" +- +-//sysnb strerror_r(errnum int, b []byte) (errstr *byte) +-//strerror_r(errnum _C_int, b *byte, len Size_t) *byte +- +-func Errstr(errnum int) string { +- a := make([]byte, 128) +- p := strerror_r(errnum, a) +- b := (*[1000]byte)(unsafe.Pointer(p)) +- i := 0 +- for b[i] != 0 { +- i++ +- } +- // Lowercase first letter: Bad -> bad, but STREAM -> STREAM. +- if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' { +- c := b[0] + 'a' - 'A' +- return string(c) + string(b[1:i]) +- } +- return string(b[:i]) +-} +--- gcc-8.3.0/libgo/go/syscall/errstr.go.old 2016-08-06 00:36:33.000000000 +0000 ++++ gcc-8.3.0/libgo/go/syscall/errstr.go 2019-04-25 05:41:27.915806277 +0000 +@@ -4,8 +4,6 @@ + // Use of this source code is governed by a BSD-style + // license that can be found in the LICENSE file. + +-// +build !linux +- + package syscall + + //sysnb strerror_r(errnum int, buf []byte) (err Errno) diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD index 9132db501..2ab149205 100644 --- a/system/gcc/APKBUILD +++ b/system/gcc/APKBUILD @@ -145,6 +145,7 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz 0010-ldbl128-config.patch 0011-m68k.patch 0012-static-pie.patch + 0016-invalid-tls-model.patch 002_all_default-relro.patch 005_all_default-as-needed.patch @@ -173,6 +174,8 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz 335-gccgo-signal-ppc32.patch 336-gccgo-mmap64.patch 337-gccgo-signal-sig34.patch + 338-gccgo-syscall.patch + 339-gccgo-errstr.patch add-classic_table-support.patch disable-multiarch-ppc32.patch @@ -540,6 +543,7 @@ b8207c1be82b20fdad2596bb0a60469db52257456d0925bacf48b44899f4c6ece93c501347e1ffe9 66085c5555e6b91b6874d1782d5a1dc0ab1792889f9400f48cde9483f82b51b9e3a5de1efbba21a19fc5e664334f2188d0c2bc988d42335efa26118b3c85cc7f 0010-ldbl128-config.patch cd3ba928121e8578ba9f73215e4d81ee3ebbab33e00b04cdfd62b46d21f9536297ae12dc021aad6e56f3b28d9d544727331bbe6db1e3438d7b9545b2c3250906 0011-m68k.patch 45d5bc11a89e5af77503ca06eec52d6d84e6fea0be021aaee1bcc39f8dd3c7b4baa4200cfa2b0688faa0f207d005db89c029eff32f362207aa3d2365b2f2363e 0012-static-pie.patch +dfedf48829cff22ee836ece743de20ad467b40e86c8f4034326a4c32df35b10affd69d6b9ab3382df2871a99ad0c2e99d4342183b59f9bca7f15112eed58ec8d 0016-invalid-tls-model.patch 625c02e03c2f1db04da12cc6a086ec85790a031a13df36486243fd9569cd17f7c8ebeec91ac16cc1f87c3ec1ffe4c421153e98a9aeb5eea35943a6f015d81f50 002_all_default-relro.patch 02b725b220e540077efef741e9d457f9e004fe53ae642a138e214875d076a60f7c2f27de0ed9a4225db2030fc9c3d2c5b0414c895b9eec0f5f48fad70e2fb029 005_all_default-as-needed.patch 622fdbcbbf2feb86bd839af627ec3613c6d2c77b14d37d31165b19f73f45b3663a203efff5d224f194edb15eb62d3d5885e32f85d1b584f071e580fea4e12664 011_all_default-warn-format-security.patch @@ -563,6 +567,8 @@ ab7a19d2702d232c9c1242fbdf9bd782e195d94104c0278e3b9ce435060a169094525ca53b615b3a e755072a3c71ada6cde354dd258fae029919e1116048068368d38411ca28a6ad8856702498d6667b0dcbb1d09fcb3fd66669aa79739a5e574a9cd490bd92ce90 335-gccgo-signal-ppc32.patch de0cc0f9356c9ee5ea7b0f954441b59115f4a8f8f63573d0c17b6537e6f37641cf137531b496fc192d38035c2c4ba8175d36cbd7da15cbfcf8dc18c049c0f111 336-gccgo-mmap64.patch c2916948b028e1e990e1953875b884561c0f8dd105c1ec03073795df9a47ec2c627cbc95ca0ec98ab9177bf2b7c8458bf3fd09f780fa6c301995846f6317e366 337-gccgo-signal-sig34.patch +0bdf592ec8444c6e253f1a7626b4e618b2e18e6d0b5a4548f90903f9de80a7cf3ea536750c2743f436a05faa1e7b65e52a391da9732dce51c4b00e23853e5365 338-gccgo-syscall.patch +b32d496a3a04c2357200b75dbf7f667fb57bf5af4f0c68926bc58f6600e4f23caa48aad2eaf073f1408168cacf27e8f11a6062c65bf5bb67458eedef698871d4 339-gccgo-errstr.patch 1860593584f629d24d5b6db14b0a3412e9f93449b663aaa4981301a0923db0159314905e694f27366fbfef72dce06636ab6df86862b7e9e9564847e03bee82c1 add-classic_table-support.patch db8c4ab3eae7c01943a61e9e3e20af45d4f6d196184eee5b94068b212900ccdeecaf4fb4145983226954f64e7c989fcd13e0b506176d2b3e781c2e9dc8b5a5a8 disable-multiarch-ppc32.patch 67a75a94fdba69de96b98dbc2978a50cb197857c464b81f7c956176da7066b3be937e40cb15e0870fc1e7382d662c5101bcd18cf457fc4112de41802042b51c4 gcc-5.4.0-locale.patch diff --git a/system/help2man/APKBUILD b/system/help2man/APKBUILD index f3c238fc6..e4464b8cf 100644 --- a/system/help2man/APKBUILD +++ b/system/help2man/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=help2man -pkgver=1.47.8 +pkgver=1.47.10 pkgrel=0 pkgdesc="Create simple man pages from --help output" url="https://www.gnu.org/software/help2man" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6 help2man-1.47.8.tar.xz" +sha512sums="071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff help2man-1.47.10.tar.xz" diff --git a/system/libcap/APKBUILD b/system/libcap/APKBUILD index 517b30609..335d4bcc4 100644 --- a/system/libcap/APKBUILD +++ b/system/libcap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=libcap -pkgver=2.26 +pkgver=2.27 pkgrel=0 pkgdesc="POSIX 1003.1e capabilities" arch="all" @@ -26,4 +26,4 @@ package() { make lib=/lib prefix=/usr RAISE_SETFCAP=no DESTDIR="$pkgdir" install } -sha512sums="1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0 libcap-2.26.tar.xz" +sha512sums="e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6 libcap-2.27.tar.xz" diff --git a/system/libedit/APKBUILD b/system/libedit/APKBUILD index e63964751..d9dc2003b 100644 --- a/system/libedit/APKBUILD +++ b/system/libedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libedit -pkgver=20181209.3.1 +pkgver=20190324.3.1 _realver=${pkgver/.3.1/-3.1} pkgrel=0 pkgdesc="Library providing line editing, history, and tokenisation functions" @@ -41,5 +41,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7673fb5612149a0d3508a103ac6f92041704911b27fffa084624f835fa6ac55b17c43b6e622ff9eac6ca06368e80ede14d93ec75afb5a368651734b8bfe045d2 libedit-20181209-3.1.tar.gz +sha512sums="240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3 libedit-20190324-3.1.tar.gz b9cfb07733d14339cfb053b5c4249b74486268005474f65f377e412e5cccbe29d3ce55663a9795db0b682155084cca5a9424de348c7defdc8698dea042c2a674 tinfo.patch" diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index f962068cf..62b7b421e 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libgpg-error -pkgver=1.35 +pkgver=1.36 pkgrel=0 pkgdesc="GnuPG runtime library" url="https://www.gnupg.org" @@ -36,4 +36,4 @@ lisp() { mv "$pkgdir"/usr/share "$subpkgdir"/usr/share/ } -sha512sums="9b1983f18f44f51b89a034c15b27415f710c21ead12dd63821aa489fb4c6d4b649a658ce1d5e1f3424cee483d3243be151b8fe32a24642af4531ded508aa4ac7 libgpg-error-1.35.tar.bz2" +sha512sums="6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346 libgpg-error-1.36.tar.bz2" diff --git a/system/libucontext/APKBUILD b/system/libucontext/APKBUILD index 05950ae27..30d179102 100644 --- a/system/libucontext/APKBUILD +++ b/system/libucontext/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libucontext pkgver=0.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="ucontext function implementations" url="https://git.dereferenced.org/kaniini/libucontext/" arch="all" @@ -10,6 +10,7 @@ depends="" subpackages="$pkgname-dev" source="https://distfiles.dereferenced.org/libucontext/libucontext-$pkgver.tar.xz powerpc.patch + static.patch " case "$CTARGET_ARCH" in @@ -35,4 +36,5 @@ package() { } sha512sums="9e0694c09f159de714b655f6a4201a05c8d1871ee7376bb6bf824206b45475cfbd8269ca1caa75b9c322624d9f77d3fc3f938228a4bdd267a5ddceb57ca5c1ab libucontext-0.1.3.tar.xz -22627fc66e57f64c24a8fb0d6e64fda8abfc4f72cc7a9b3d4f06cdb2b406adacd3d1b7eaa0321133959557ed4ee6856bdf5aee764f3b90981ec5b41cc1e5cd91 powerpc.patch" +22627fc66e57f64c24a8fb0d6e64fda8abfc4f72cc7a9b3d4f06cdb2b406adacd3d1b7eaa0321133959557ed4ee6856bdf5aee764f3b90981ec5b41cc1e5cd91 powerpc.patch +d63cf70c5226508f76dd1483a607e6e54417e062b7b77f3e70c7be244aff9cb81d19458b7f208bdf70c550aaa4da728eb91d9c280c461f64e6836c9d409f9aeb static.patch" diff --git a/system/libucontext/static.patch b/system/libucontext/static.patch new file mode 100644 index 000000000..a51e55f64 --- /dev/null +++ b/system/libucontext/static.patch @@ -0,0 +1,76 @@ +From 9cc1a2c0e62c75dc7afd20d5e337953f44693b70 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20Iva=C8=99cu?= <givascu@bitdefender.com> +Date: Tue, 9 Apr 2019 16:07:39 +0300 +Subject: [PATCH] Build static library too + +--- + Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d6ff1b0..d81153c 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,10 +8,14 @@ LIBUCONTEXT_S_SRC = $(wildcard arch/${ARCH}/*.S) + LIBUCONTEXT_OBJ = ${LIBUCONTEXT_C_SRC:.c=.o} ${LIBUCONTEXT_S_SRC:.S=.o} + LIBUCONTEXT_SOVERSION = 0 + LIBUCONTEXT_NAME = libucontext.so ++LIBUCONTEXT_STATIC_NAME = libucontext.a + LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} + LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} + +-all: ${LIBUCONTEXT_SONAME} ++all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} ++ ++${LIBUCONTEXT_STATIC_NAME}: ${LIBUCONTEXT_OBJ} ++ $(AR) rcs ${LIBUCONTEXT_STATIC_NAME} ${LIBUCONTEXT_OBJ} + + ${LIBUCONTEXT_NAME}: ${LIBUCONTEXT_OBJ} + $(CC) -o ${LIBUCONTEXT_NAME} -Wl,-soname,${LIBUCONTEXT_SONAME} \ +From 2e15b383272fafbbb92882990b8f339e2c6888d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gabriel=20Iva=C8=99cu?= <givascu@bitdefender.com> +Date: Fri, 12 Apr 2019 10:48:24 +0300 +Subject: [PATCH] Makefile: Handle static library at clean/install + +--- + .gitignore | 1 + + Makefile | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/.gitignore b/.gitignore +index 4fb95ca..d2e350f 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -34,5 +34,6 @@ Makefile.in + + *.o + test_libucontext ++libucontext.a + libucontext.so + libucontext.so.* +diff --git a/Makefile b/Makefile +index d81153c..8a605fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,6 +11,7 @@ LIBUCONTEXT_NAME = libucontext.so + LIBUCONTEXT_STATIC_NAME = libucontext.a + LIBUCONTEXT_SONAME = libucontext.so.${LIBUCONTEXT_SOVERSION} + LIBUCONTEXT_PATH = /lib/${LIBUCONTEXT_SONAME} ++LIBUCONTEXT_STATIC_PATH = /lib/${LIBUCONTEXT_STATIC_NAME} + + all: ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} + +@@ -31,10 +32,12 @@ ${LIBUCONTEXT_SONAME}: ${LIBUCONTEXT_NAME} + $(CC) -fPIC -DPIC ${CFLAGS} ${CPPFLAGS} -c -o $@ $< + + clean: +- rm -f ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_OBJ} test_libucontext ++ rm -f ${LIBUCONTEXT_NAME} ${LIBUCONTEXT_SONAME} ${LIBUCONTEXT_STATIC_NAME} \ ++ ${LIBUCONTEXT_OBJ} test_libucontext + + install: all + install -D -m755 ${LIBUCONTEXT_NAME} ${DESTDIR}/${LIBUCONTEXT_PATH} ++ install -D -m664 ${LIBUCONTEXT_STATIC_NAME} ${DESTDIR}/${LIBUCONTEXT_STATIC_PATH} + ln -sf ${LIBUCONTEXT_SONAME} ${DESTDIR}/lib/${LIBUCONTEXT_NAME} + + check: test_libucontext ${LIBUCONTEXT_SONAME} diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD index 5499a5537..09ab2d5c3 100644 --- a/system/ncurses/APKBUILD +++ b/system/ncurses/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ncurses -pkgver=6.1_p20190302 -_ver=${pkgver%_p*}-${pkgver#*_p} +pkgver=6.1.20190413 +_ver=${pkgver%.*}-${pkgver#*.*.} pkgrel=0 pkgdesc="Console display library" url="https://invisible-island.net/ncurses/ncurses.html" @@ -106,4 +106,4 @@ static() { mv "$pkgdir"/lib/*.a "$subpkgdir"/lib/ } -sha512sums="97598052792ecdc0d7d392ca7ea2596c5eb497dc674f89ad5202350433796f83efca9d7462c7235f6afb71cd56c1e13fc3fa80b19ede61094371e12b2bcfe734 ncurses-6.1-20190302.tgz" +sha512sums="04efbfccda38bf1dbe01b7343c58ae702c626f53ef672d2fe6eb5a71cd29eee56b0981841610ea83f26ac283e0a8829ebd09304a6ed439041ab590e517874e9c ncurses-6.1-20190413.tgz" diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index cd3dd5ab2..d1c8d6100 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.42.1 +pkgver=3.43 _ver=${pkgver//./_} pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -141,7 +141,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265 nss-3.42.1.tar.gz +sha512sums="e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5 nss-3.43.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD index eb2d468a9..0c0f36a10 100644 --- a/system/pcre/APKBUILD +++ b/system/pcre/APKBUILD @@ -1,20 +1,17 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pcre -pkgver=8.42 -pkgrel=1 +pkgver=8.43 +pkgrel=0 pkgdesc="Perl-compatible regular expression library" url="http://pcre.sourceforge.net" arch="all" license="BSD-3-Clause" depends= makedepends="" -checkdepends="paxmark" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcrecpp libpcre16 libpcre32" -source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2 - ppc64-elfv2-fix.patch - " +source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2" # secfixes: # 8.40-r2: @@ -22,10 +19,7 @@ source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgv # 7.8-r0: # - CVE-2017-11164 -builddir="$srcdir/$pkgname-$pkgver" - build() { - cd "$builddir" local _enable_jit="--enable-jit" [ "$CARCH" = "s390x" ] && _enable_jit="" ./configure \ @@ -46,19 +40,10 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } check() { - cd "$builddir" - - # paxmark tests requiring JIT - for fn in pcre_jit_test pcretest; do - ./$fn &>/dev/null < /dev/null || true - [ -x .libs/lt-$fn ] && paxmark -m .libs/lt-$fn - done - # skip locale specific tests sed -i -e 's/do3=yes//g' RunTest @@ -89,5 +74,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d pcre-8.42.tar.bz2 -61f06b2fb1d1d0d512056da4b8eb4905948b45a26ee177b0bcc6d25a75ffbdaff29c4b52ec461a7287b4f47ae20dbec31382188934e855c960f5877c31948a4b ppc64-elfv2-fix.patch" +sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 pcre-8.43.tar.bz2" diff --git a/system/pcre/ppc64-elfv2-fix.patch b/system/pcre/ppc64-elfv2-fix.patch deleted file mode 100644 index 040f93ee9..000000000 --- a/system/pcre/ppc64-elfv2-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur pcre-8.42-original/sljit/sljitConfigInternal.h pcre-8.42/sljit/sljitConfigInternal.h ---- pcre-8.42-original/sljit/sljitConfigInternal.h 2018-03-13 16:15:23.000000000 +0000 -+++ pcre-8.42/sljit/sljitConfigInternal.h 2018-09-13 01:16:46.640000000 +0000 -@@ -530,7 +530,7 @@ - #endif /* !SLJIT_FUNC */ - - #ifndef SLJIT_INDIRECT_CALL --#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)) \ -+#if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && ((defined _CALL_ELF && _CALL_ELF == 1) || (!defined _CALL_ELF))) \ - || ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && defined _AIX) - /* It seems certain ppc compilers use an indirect addressing for functions - which makes things complicated. */ -diff -Naur pcre-8.42-original/sljit/sljitNativePPC_common.c pcre-8.42/sljit/sljitNativePPC_common.c ---- pcre-8.42-original/sljit/sljitNativePPC_common.c 2018-01-08 10:25:56.000000000 +0000 -+++ pcre-8.42/sljit/sljitNativePPC_common.c 2018-09-13 01:21:00.360000000 +0000 -@@ -42,7 +42,8 @@ - #include <sys/cache.h> - #endif - --#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN) -+#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN) \ -+ || (defined _CALL_ELF && _CALL_ELF == 2) - #define SLJIT_PASS_ENTRY_ADDR_TO_CALL 1 - #endif - diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD index 6a13e68e3..72b5d4bb7 100644 --- a/system/perl-module-build/APKBUILD +++ b/system/perl-module-build/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-build _pkgreal=Module-Build -pkgver=0.4224 +pkgver=0.4229 pkgrel=0 pkgdesc="Build and install Perl modules" url="https://metacpan.org/release/Module-Build" @@ -41,4 +41,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c08e84c542a882aa16a682a81cbb7a4860774a3f6a0ec2e720ba9e9bcea76dab331999fee86bf8b92edc08560d7cef4a7c2dfa4e626ab9b22da965e715af531f Module-Build-0.4224.tar.gz" +sha512sums="51e0d73cecf450062121c3223b1a4c6f8a8c260fc2345d1c1a5e13ddcbd2b7bc2578411ac254420e27720b9e00a8efc9a9daa3159e9cba5338a188734b35c738 Module-Build-0.4229.tar.gz" diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD index 777af1613..0ccefb0b9 100644 --- a/system/pkgconf/APKBUILD +++ b/system/pkgconf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pkgconf -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=0 pkgdesc="Toolkit for maintaining development package metadata" url="https://git.dereferenced.org/pkgconf/pkgconf/" @@ -10,9 +10,7 @@ replaces="pkgconfig" provides="pkgconfig=1" subpackages="$pkgname-doc $pkgname-dev" checkdepends="kyua atf" -source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz - personality.patch - " +source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz" build() { ./configure \ @@ -47,5 +45,4 @@ dev() { mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/ } -sha512sums="eddb9354b3e0a4b91eb49c7b81ed4cbeb92b96b1931f25185b37fa66f25604315f0e1cc8cf13a415508b5a07c1b0d85ddb39a988648787b968083ddc82e73fda pkgconf-1.6.0.tar.xz -94d7749fa5d751f9207c9f6168dcce52bbe6108e9440721a640b6bc3492867c3fce5231d779a780a611009f1c1ad65bc9db8e81452c059f7b34b97314b38844a personality.patch" +sha512sums="d7314da008ca90858be2ad2599a1bc017da465ef3eae5ab8f18893539ffd557fff3316ae2f2ecf97d34550de6f7a3a3ab3f82ec5eb45e4f0a239b89fe3877835 pkgconf-1.6.1.tar.xz" diff --git a/system/pkgconf/personality.patch b/system/pkgconf/personality.patch deleted file mode 100644 index e7ff9ad9a..000000000 --- a/system/pkgconf/personality.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d926e75b345a6948e4e976828d3331cd7f0db660 Mon Sep 17 00:00:00 2001 -From: Emil Renner Berthing <esmil@mailme.dk> -Date: Wed, 6 Mar 2019 16:03:32 +0100 -Subject: [PATCH] main: fix personalities when argv[0] contains path - ---- - cli/main.c | 31 ++++++++++++++++++++----------- - 1 file changed, 20 insertions(+), 11 deletions(-) - -diff --git a/cli/main.c b/cli/main.c -index b52cc85..caa2525 100644 ---- a/cli/main.c -+++ b/cli/main.c -@@ -740,21 +740,30 @@ dump_personality(const pkgconf_cross_personality_t *p) - static pkgconf_cross_personality_t * - deduce_personality(char *argv[]) - { -- char *workbuf = strdup(argv[0]), *i; -- pkgconf_cross_personality_t *out = pkgconf_cross_personality_default(), *deduced; -+ const char *argv0 = argv[0]; -+ char *i, *prefix; -+ pkgconf_cross_personality_t *out; -+ -+ i = strrchr(argv0, '/'); -+ if (i != NULL) -+ argv0 = i + 1; -+ -+#if defined(_WIN32) || defined(_WIN64) -+ i = strrchr(argv0, '\\'); -+ if (i != NULL) -+ argv0 = i + 1; -+#endif - -- i = strstr(workbuf, "-pkg"); -+ i = strstr(argv0, "-pkg"); - if (i == NULL) -- goto finish; -- -- *i = 0; -+ return pkgconf_cross_personality_default(); - -- deduced = pkgconf_cross_personality_find(workbuf); -- if (deduced != NULL) -- out = deduced; -+ prefix = strndup(argv0, i - argv0); -+ out = pkgconf_cross_personality_find(prefix); -+ free(prefix); -+ if (out == NULL) -+ return pkgconf_cross_personality_default(); - --finish: -- free(workbuf); - return out; - } - diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD index cd09dac9c..4e518876e 100644 --- a/system/tzdata/APKBUILD +++ b/system/tzdata/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tzdata -pkgver=2018i -_tzcodever=2018i +pkgver=2019a +_tzcodever=2019a _ptzver=0.5 pkgrel=0 pkgdesc="Time zone data" @@ -54,7 +54,7 @@ package() { "$pkgdir"/usr/bin/posixtz } -sha512sums="1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d tzcode2018i.tar.gz -6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a tzdata2018i.tar.gz +sha512sums="7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5 tzcode2019a.tar.gz +d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa tzdata2019a.tar.gz 68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd posixtz-0.5.tar.xz f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467 0001-posixtz-fix-up-lseek.patch" diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD index 182e27176..f12fb48dc 100644 --- a/system/util-linux/APKBUILD +++ b/system/util-linux/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=util-linux -pkgver=2.33.1 +pkgver=2.33.2 case $pkgver in *.*.*) _v=${pkgver%.*};; @@ -100,5 +100,5 @@ libfdisk() { mv "$pkgdir"/lib/libfdisk.so.* "$subpkgdir"/lib/ } -sha512sums="94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2 util-linux-2.33.1.tar.xz +sha512sums="ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749 util-linux-2.33.2.tar.xz 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index a6d0bbaac..c89fb7bf7 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.1073 +pkgver=8.1.1177 pkgrel=0 pkgdesc="advanced text editor" url="https://www.vim.org" @@ -81,6 +81,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="74d13063853677aaff795925414baa293819ccd20e3deb7013c134b42434e8abd14db1645116b20081f80bcb3dfd9a1e0c6b210ed9af62a4cf19c183025c9779 vim-8.1.1073.tar.gz +sha512sums="b90d3f6b6727ea97a1e41154855c45f80a2e94a8e3cf1b912ec6812494c2658d66ba4bc796f5a9e7713544ecdd2f813512e4497293d0e362ae9281695dcee52f vim-8.1.1177.tar.gz 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD index f6e0dfd63..7542e1305 100644 --- a/system/yaml/APKBUILD +++ b/system/yaml/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=yaml -pkgver=0.2.1 -pkgrel=1 +pkgver=0.2.2 +pkgrel=0 pkgdesc="YAML 1.1 parser and emitter written in C" url="https://pyyaml.org/wiki/LibYAML" arch="all" @@ -10,12 +10,9 @@ license="MIT" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz - fix-emitter-$pkgver.patch - skip-trailing-doc-term-$pkgver.patch" +source="https://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,15 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235 yaml-0.2.1.tar.gz -ad35c3b893cfeb33fab748b39b06ad0c54215941f68d0df591b8e4e4edc3b67f27ea3206321b7621c0e9e6faf749255fd80209da017c77a91d8de68eec54fd2b fix-emitter-0.2.1.patch -715ad72a4a74b19fdf03b8be96b9e5c3801bab5475eeee4c98b109eabcf86e193d5884ad6466b6765ccc2174ebaedade25e43fff711d9522fb8f370bcea5eef4 skip-trailing-doc-term-0.2.1.patch" +sha512sums="13d2197135946204323dbfccafa0ac7b3d05437e920545a56f46811fd7319c01419a58083090ce85fccd4d6901a620ceb9f1190078cc0830bc0ce769bb024f51 yaml-0.2.2.tar.gz" diff --git a/system/yaml/fix-emitter-0.2.1.patch b/system/yaml/fix-emitter-0.2.1.patch deleted file mode 100644 index f3614e349..000000000 --- a/system/yaml/fix-emitter-0.2.1.patch +++ /dev/null @@ -1,35 +0,0 @@ -Contributor Note: This patch will be part of v0.2.2 which hasn't been -formally released as of 2018-11-20. It should be removed once this -package is version bumped. - -From e5ebb70a01cc0fbd9e519050d51d704f58c2a33d Mon Sep 17 00:00:00 2001 -From: James Clarke <jrtc27@jrtc27.com> -Date: Thu, 29 Jun 2017 02:26:09 +0100 -Subject: [PATCH 2/2] Skip trailing document terminator at the end of the - stream - ---- - src/emitter.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/emitter.c b/src/emitter.c -index c593a7d..1502590 100644 ---- a/src/emitter.c -+++ b/src/emitter.c -@@ -649,14 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter, - - else if (event->type == YAML_STREAM_END_EVENT) - { -- if (emitter->open_ended) -- { -- if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0)) -- return 0; -- if (!yaml_emitter_write_indent(emitter)) -- return 0; -- } -- - if (!yaml_emitter_flush(emitter)) - return 0; - --- -2.13.2 diff --git a/system/yaml/skip-trailing-doc-term-0.2.1.patch b/system/yaml/skip-trailing-doc-term-0.2.1.patch deleted file mode 100644 index 7e10cd9ea..000000000 --- a/system/yaml/skip-trailing-doc-term-0.2.1.patch +++ /dev/null @@ -1,30 +0,0 @@ -Contributor Note: As with fix-emitter-0.2.1.patch, this patch should -not be necessary when v0.2.2 is released. - -From 7c2e6f47e1b12ca3dfa9ea2f6c65e9bd8a02e8c8 Mon Sep 17 00:00:00 2001 -From: James Clarke <jrtc27@jrtc27.com> -Date: Thu, 29 Jun 2017 02:24:53 +0100 -Subject: [PATCH 1/2] Revert "This code is not needed and breaks tests" - -This reverts commit 56400d976a1999156b1abfd674c3122843980260. ---- - src/emitter.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/emitter.c b/src/emitter.c -index a5b7ff8..c593a7d 100644 ---- a/src/emitter.c -+++ b/src/emitter.c -@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter, - - emitter->whitespace = 0; - emitter->indention = 0; -+ if (emitter->root_context) -+ { -+ emitter->open_ended = 1; -+ } - - return 1; - } --- -2.13.2 diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index 4dfd623df..657eebdec 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d20ac4ce1a9ed5737d6e29f92f86c081cbdded829055d4d077832bdeadd00afa736ee4c6c99a8d7de242d6d8b5165368f6ca05cc9c623a9533b2cf3deedb33a9 analitza-18.12.3.tar.xz" +sha512sums="c8436f74b1ee9d0a5e6384e48e4aa693485636e05fc9d60b217bdcaf4cacb5c29ceaa3d7f53f3d281fe5088340af5736a485d5dc0b6db8f5cfc0889d5e8ab55d analitza-19.04.0.tar.xz" diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 1c2cd87e4..50918822d 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0dc232b004134c048bb516aa43e478545b4052fba9321a6166a3bb4e05638288802f578cea51340c8416257f10e1bcbd55740a8945ae5f95cee6864f107d633f ark-18.12.3.tar.xz" +sha512sums="7bcc2a98706644fc0a30bd04f40becea240c245f8fd8af941f893f4a1fe11c8e8f5ce6a9303f8172fed30db953110ce7cb7c4e50132f0392cd92ae9d02390bb5 ark-19.04.0.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index f68438764..c175aea77 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cab931686929a73a3fea25a6718818514a0216b096431f972cfc494e7df754a701a8d4c61874d6914bf8331c0b944b2053a5003bf7bf01901bf2fe79cdf7eba8 artikulate-18.12.3.tar.xz" +sha512sums="99ece4a46b52180a37b8812788a5caa2c43a4e20eaeba73f115622b14e7bc64bb39a8d44f794fa342628c3739c9fcda9e81de60f326e1778c7e4f5e3b8196faf artikulate-19.04.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 38feb8b0a..edd3dd5f3 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.32.0 +pkgver=2.32.1 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -13,9 +13,7 @@ depends_dev="libxtst-dev" makedepends="$depends_dev dbus-dev glib-dev intltool gobject-introspection-dev dbus meson ninja" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz - stupid-meson-fix.patch - " +source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz" build() { cd "$builddir" @@ -33,5 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="4c77b4e0d37b559d20e6521107e8f7e03e91392414dc7ffdceb558667f3a7a6137af6895f3a8cd97dc3e85715d7875812d658dcc84277a63a10276992bde2fa6 at-spi2-core-2.32.0.tar.xz -628b40c26d50d35ac898eab547c7c66d481e9ab239e0de4e98f5a8d90ef189960ac8c20312c88e8036c40ef1a1bb90559d5e621157b46f75d185d6b1be550877 stupid-meson-fix.patch" +sha512sums="cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca at-spi2-core-2.32.1.tar.xz" diff --git a/user/at-spi2-core/stupid-meson-fix.patch b/user/at-spi2-core/stupid-meson-fix.patch deleted file mode 100644 index 461871706..000000000 --- a/user/at-spi2-core/stupid-meson-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- at-spi2-core-2.32.0/atspi/meson.build.old 2019-03-12 02:54:43.000000000 +0000 -+++ at-spi2-core-2.32.0/atspi/meson.build 2019-03-23 22:15:47.910000000 +0000 -@@ -57,7 +57,7 @@ - - atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') - --install_headers(atspi_headers, subdir: atspi_includedir) -+install_headers(atspi_headers, install_dir: atspi_includedir) - - atspi_enums = gnome.mkenums('atspi-enum-types', - sources: [ 'atspi-constants.h', 'atspi-types.h' ], diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD index f30e3c168..fbeae9677 100644 --- a/user/baloo-widgets/APKBUILD +++ b/user/baloo-widgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo-widgets -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Widgets that utilise the Baloo desktop indexing engine" url="https://www.KDE.org/" @@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev baloo-dev kio-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kfilemetadata-dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz + frameworks.patch + " build() { cd "$builddir" @@ -41,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="40b62fd9fb204ba60f0f5d8550e33506907de11b8cc6a222071402ed4eef83d3171df6eef1be31c501dfc4b7271a05f79def095aec6d83c705dcbc52760966dc baloo-widgets-18.12.3.tar.xz" +sha512sums="031f36224fdc10c09d48b4d8c426c716516e8dc51e23bf91535eb904c4ae71f22aa3fe0774ecc120de9f3636cb76b949836d4e54ee96fa3e8225bf8e2a903195 baloo-widgets-19.04.0.tar.xz +b8de7699919edb1ecc64aa733b8a937fc0c1b06e3e03fc5f2ea1d78ca190a0bdbf4b6011c57de464ad657103981aa337f3a04953da3a02b6c161f47eda5d7372 frameworks.patch" diff --git a/user/baloo-widgets/frameworks.patch b/user/baloo-widgets/frameworks.patch new file mode 100644 index 000000000..002445bde --- /dev/null +++ b/user/baloo-widgets/frameworks.patch @@ -0,0 +1,11 @@ +--- baloo-widgets-19.04.0/CMakeLists.txt.old 2019-04-12 00:13:39.000000000 +0000 ++++ baloo-widgets-19.04.0/CMakeLists.txt 2019-04-19 07:30:31.523838076 +0000 +@@ -8,7 +8,7 @@ + project(baloo-widgets VERSION ${KDE_APPLICATIONS_VERSION}) + + set(QT_MIN_VERSION "5.8.0") +-set(KF5_MIN_VERSION "5.56.0") ++set(KF5_MIN_VERSION "5.54.0") + + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH}) diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 5c4f4e35a..ba105ab30 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="605d4015b122419c512f614bf2b27c23f5219dc2ef48a7cf86beb0aa0333872058b0cdb04c98799bd4780909cbfc9544e13ace22b809457bd362b3c4555c1d89 blinken-18.12.3.tar.xz" +sha512sums="0463141b16b118eae60c02a8f31fe5493050cf79e731fde154dc9ad1c5b7efe35d21719092ac130192171dfc5b91d033a89ad0adf98e0db87eba945fa3ba242a blinken-19.04.0.tar.xz" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index b5e6658e0..777e11fc5 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bomber -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7292e5449e4a6444730f771aeb7ab9c2290fda12c213edfae190593f30cae5c4b2d6b0622d9fceaebb474f38cb12396961326af34435e26c1feda64e5153a881 bomber-18.12.3.tar.xz" +sha512sums="8a29636e66683fb353b798b5804eafef192bf73d23beb8364db3d7f5f241d5350fa1402d3f0e7d27e9dddff777627bdfb98c6a866f0d2248768eed4490ae223f bomber-19.04.0.tar.xz" diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index 8e747d9ef..fa0a6b435 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bovo -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="077221d1a510e587fe8d90cb8f026dee78fcd88f831c26ad098c62db0bd2788bac30864247762f5221c7b3b3a55f772aa33e861fe0e9f91aacb3cd03f07a8fdd bovo-18.12.3.tar.xz" +sha512sums="4389e25fae039a4158474edf875d967710cec3f072142f40458c668a95cdb9aaba6ec9da3a7257a8ba8852736ca541fd7bf7f703ee3c32f9a308cabb4d7873cf bovo-19.04.0.tar.xz" diff --git a/user/bugzilla/APKBUILD b/user/bugzilla/APKBUILD index 897142939..5e0f6f31d 100644 --- a/user/bugzilla/APKBUILD +++ b/user/bugzilla/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bugzilla -pkgver=5.0.4 +pkgver=5.0.6 pkgrel=0 pkgdesc="Bug tracking software from Mozilla" url="https://www.bugzilla.org/" @@ -40,4 +40,4 @@ package() { mv bugzilla-$pkgver "$pkgdir"/usr/share/webapps/ } -sha512sums="508fdc5ab599f007f848a583907c726a876d4f3bc6d4e71d93c1efe82072f67309d229f5ba213443ad90a5f11e6e97e691fb11515ef2db71e36587e72fc849a8 bugzilla-5.0.4.tar.gz" +sha512sums="8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de bugzilla-5.0.6.tar.gz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index dbebd6089..b0a6eb763 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="196d47adef9cb35c1816efa0a88dcf904ac7b91176bde779f84c40315732bbc1196c21dff4a6c363cbf6fc4785aaa512590638a965c79c50574b264a4d7beccf cantor-18.12.3.tar.xz" +sha512sums="affed3d29e6af9a98ea60400c8ab3d8835d60f47f960d1453c6173ebe2eab0146b625269d66380e2ffd4c5a1bf7326b56750a0d4acb2aeed1627be8c6d0818e2 cantor-19.04.0.tar.xz" diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index 09f3359c8..a916e2915 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=checkbashisms -pkgver=2.18.6 +pkgver=2.19.4 pkgrel=0 pkgdesc="Check shell scripts for POSIX compliance" url="https://tracker.debian.org/pkg/devscripts" @@ -20,12 +20,10 @@ prepare() { } check() { - cd "$builddir" ./test/test_checkbashisms } package() { - cd "$builddir" install -Dm755 "scripts/$pkgname.pl" "$pkgdir/usr/bin/$pkgname" install -Dm644 "scripts/$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1" } @@ -40,4 +38,4 @@ bashcomp() { "$subpkgdir/usr/share/bash-completion/completions/$pkgname" } -sha512sums="6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014 devscripts_2.18.6.tar.xz" +sha512sums="43d9484dbbff6f48cf8e2cbcf50a5ee752796db881ec6ca2d1b038c938d7d3fe6d45d0f88d5f62a7bf5889366618fa85c8c0089869e6d6a39f6a87e8f1b5c97c devscripts_2.19.4.tar.xz" diff --git a/user/chrpath/APKBUILD b/user/chrpath/APKBUILD index 869a8bfdd..9eed07b26 100644 --- a/user/chrpath/APKBUILD +++ b/user/chrpath/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Dead Upstream <nobody@deprecated.invalid> +# Maintainer: pkgname=chrpath pkgver=0.16 pkgrel=2 diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD index f5987a037..436e0d909 100644 --- a/user/cifs-utils/APKBUILD +++ b/user/cifs-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=cifs-utils -pkgver=6.8 +pkgver=6.9 pkgrel=0 pkgdesc="CIFS filesystem user-space tools" url="https://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -17,7 +17,6 @@ source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 xattr_size_max.patch" build() { - cd "$builddir" # --enable-cifsidmap and --enable-cifsacl require libwbclient (samba) autoreconf -i @@ -35,19 +34,15 @@ build() { } check() { - cd "$builddir" - make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install # Allow unprivileged mount chmod u+s "$pkgdir"/sbin/mount.cifs } -sha512sums="54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 cifs-utils-6.8.tar.bz2 +sha512sums="b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a cifs-utils-6.9.tar.bz2 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch" diff --git a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch index f12adf513..6fdb58542 100644 --- a/user/clang/0001-Add-support-for-Ad-lie-Linux.patch +++ b/user/clang/0001-Add-support-for-Ad-lie-Linux.patch @@ -24,8 +24,8 @@ index 7b34a09256..7a3774a4f1 100644 AlpineLinux, ArchLinux, DebianLenny, -@@ -118,6 +119,10 @@ public: - return DistroVal >= UbuntuHardy && DistroVal <= UbuntuCosmic; +@@ -120,6 +121,10 @@ public: + return DistroVal >= UbuntuHardy && DistroVal <= UbuntuDisco; } + bool IsAdelieLinux() const { @@ -39,7 +39,7 @@ diff --git a/lib/Driver/Distro.cpp b/lib/Driver/Distro.cpp index 2c4d44faf8..7ef35ab379 100644 --- a/lib/Driver/Distro.cpp +++ b/lib/Driver/Distro.cpp -@@ -130,6 +130,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { +@@ -132,6 +132,9 @@ static Distro::DistroType DetectDistro(vfs::FileSystem &VFS) { if (VFS.exists("/etc/exherbo-release")) return Distro::Exherbo; @@ -49,30 +49,34 @@ index 2c4d44faf8..7ef35ab379 100644 if (VFS.exists("/etc/alpine-release")) return Distro::AlpineLinux; -diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp -index 2a87cb077c..85bcd8ed47 100644 ---- a/lib/Driver/ToolChains/Linux.cpp -+++ b/lib/Driver/ToolChains/Linux.cpp -@@ -234,7 +234,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) +-- +2.18.0 + +--- cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp.old 2018-11-29 18:52:22.000000000 +0000 ++++ cfe-8.0.0.src/lib/Driver/ToolChains/Linux.cpp 2019-04-23 23:49:37.786181838 +0000 +@@ -236,13 +236,13 @@ + + Distro Distro(D.getVFS()); + +- if (Distro.IsAlpineLinux() || Triple.isAndroid()) { ++ if (Distro.IsAdelieLinux() || Distro.IsAlpineLinux() || Triple.isAndroid()) { + ExtraOpts.push_back("-z"); ExtraOpts.push_back("now"); } -- if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux()) { -+ if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || -+ Distro.IsAdelieLinux()) { + if (Distro.IsOpenSUSE() || Distro.IsUbuntu() || Distro.IsAlpineLinux() || +- Triple.isAndroid()) { ++ Distro.IsAdelieLinux() || Triple.isAndroid()) { ExtraOpts.push_back("-z"); ExtraOpts.push_back("relro"); } -@@ -268,7 +269,8 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - // Hexagon linker/loader does not support .gnu.hash - if (!IsMips && !IsAndroid && !IsHexagon) { +@@ -285,7 +285,8 @@ + if (!IsMips && !IsHexagon) { if (Distro.IsRedhat() || Distro.IsOpenSUSE() || Distro.IsAlpineLinux() || -- (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick)) -+ Distro.IsAdelieLinux() || -+ (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick)) + (Distro.IsUbuntu() && Distro >= Distro::UbuntuMaverick) || +- (IsAndroid && !Triple.isAndroidVersionLT(23))) ++ (IsAndroid && !Triple.isAndroidVersionLT(23)) || ++ Distro.IsAdelieLinux()) ExtraOpts.push_back("--hash-style=gnu"); - if (Distro.IsDebian() || Distro.IsOpenSUSE() || Distro == Distro::UbuntuLucid || --- -2.18.0 - + if (Distro.IsDebian() || Distro.IsOpenSUSE() || diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index a56e16368..78db7102c 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=clang # Note: Update together with llvm. -pkgver=7.0.1 +pkgver=8.0.0 pkgrel=0 _llvmver=${pkgver%%.*} pkgdesc="A C language family front-end for LLVM" @@ -12,7 +12,8 @@ url="https://llvm.org/" license="NCSA" depends_dev="$pkgname=$pkgver-r$pkgrel" makedepends="cmake isl-dev libedit-dev libexecinfo-dev libxml2-dev libxml2-utils - llvm-dev>=$_llvmver llvm-static>=$_llvmver llvm-test-utils>=$_llvmver" + llvm-dev>=$_llvmver llvm-static>=$_llvmver llvm-test-utils>=$_llvmver + z3 z3-dev" subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-analyzer::noarch" source="https://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz @@ -27,6 +28,7 @@ build() { mkdir -p "$builddir"/build cd "$builddir"/build + CMAKE_PREFIX_PATH=/usr/lib/llvm$_llvmver/lib/cmake \ cmake .. -Wno-dev \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -103,8 +105,8 @@ analyzer() { mv usr/share/scan-* "$subpkgdir"/usr/share/ } -sha512sums="df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194 cfe-7.0.1.src.tar.xz -44aa152d50822a9e1a223b9e07e150ffa830c55deb4c4ca29e6218a0103eb263a00b41fd1ca84390e65fa08005901a0a0f88cf529bff8764220e99d06adef5fc 0001-Add-support-for-Ad-lie-Linux.patch +sha512sums="98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3 cfe-8.0.0.src.tar.xz +c3218a1622f53bb6bef65f844e32e1b048a1ed7d5aa444a7592f9b8e8543d41438a0ac032674adb2c1bf0ef8c6fbd6880c34f8c8e778a8fd31bb542968a3547e 0001-Add-support-for-Ad-lie-Linux.patch 9485fe4fd6182df543735ed8f4ce618693d0faeafa86d3f9574a6c7abf50978e2d56e0a94be3ed94d515cc937c388d66ceff1bbc9bb120d371b6d3e95340da00 0008-Fix-ClangConfig-cmake-LLVM-path.patch 8a596e7369b5791e7e9c3278320aa5bac30d91f27d9a0df335ea862c359623869353d12145c3b64730f721600522f3acc5abe706428091482e0209e4ff308175 use-llvm-lit.patch 9dad6dfb0097f79939b743dbe7ed20274c463d9c41f061a957841c60070247a4760b676465652e2e844fc75aab9a5b7f9f4dd7632f2ff5dd5b0a335fcbd29312 secure-plt.patch" diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index 98205aecb..7ebfd4e0d 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters -pkgver=1.21.6 +pkgver=1.22.5 pkgrel=0 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +36,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install # the pdf.utf-8 symlink isn't quite good enough cd "$pkgdir"/usr/share/cups/charsets && \ @@ -62,4 +59,4 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a cups-filters-1.21.6.tar.xz" +sha512sums="ed33e6d6f090c00f0f0d1d012d3b394bfaa1f81feeb5b0b7ead1dffa2399f0165ce916a99c3bf28aca7f279bffba5b6575feff700130cabfcd46eb4c904d5c59 cups-filters-1.22.5.tar.xz" diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index 2a7ec1437..1ef7a8908 100644 --- a/user/dolphin/APKBUILD +++ b/user/dolphin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dolphin -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" @@ -16,7 +16,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev baloo-widgets-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz + frameworks.patch + " build() { cd "$builddir" @@ -44,4 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="369592af52053550eb482fecfbb54fda3d65db75b0bcf000f88c32d4e709e056f8f5399427674b3aac0bcea438fe8fa24bdbb08109373e0c44e495d9c772da1f dolphin-18.12.3.tar.xz" +sha512sums="6a70c2f4cb76c6d088aeb9e74963cf9da514cf66abc2f8607ea9f191888f0f0b2440c3f4e9585028a45a07b5334ed40f555d85ea0e22e31e42bd0e655e2420d7 dolphin-19.04.0.tar.xz +4ec4b440f5ed52439152fb6132448e674f8e357413ef1eae339cfefb602a82909bceba85f5f517b51a985e3101d6be42b25bee6a4dd338a190d995deef57c708 frameworks.patch" diff --git a/user/dolphin/frameworks.patch b/user/dolphin/frameworks.patch new file mode 100644 index 000000000..3fc7130bb --- /dev/null +++ b/user/dolphin/frameworks.patch @@ -0,0 +1,11 @@ +--- dolphin-19.04.0/CMakeLists.txt.old 2019-04-12 00:02:11.000000000 +0000 ++++ dolphin-19.04.0/CMakeLists.txt 2019-04-18 20:17:53.396872289 +0000 +@@ -8,7 +8,7 @@ + project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) + + set(QT_MIN_VERSION "5.8.0") +-set(KF5_MIN_VERSION "5.56.0") ++set(KF5_MIN_VERSION "5.54.0") + + # ECM setup + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 59c394962..bb93d1c7d 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1173ca6bc1fa65161e35add94f08681de211000b571456edb41015d72f9e4a0ae2e5b1d323dcd3e599f35f54e24ce7714771e89d53c8c9a135a1641cf91e862a dragon-18.12.3.tar.xz" +sha512sums="0783ba20c4e65c4b5db942f2d63f7ea0a42cc4cc4d42f3f0d60ad9e5029cb970515f307516174a05776baed719dcb98beffe0a8c952a5e7e1d39218ec31c4ebe dragon-19.04.0.tar.xz" diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD index 8d4823e3d..e24ad4d76 100644 --- a/user/ethtool/APKBUILD +++ b/user/ethtool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=ethtool -pkgver=4.18 +pkgver=5.0 pkgrel=0 pkgdesc="Utility for controlling network drivers and hardware" url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/" @@ -12,7 +12,6 @@ subpackages="$pkgname-doc" source="https://www.kernel.org/pub/software/network/ethtool/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e77f9967be4634955640d9dccbc539455d333bcbad61326617dffea32cfd13a72a7dda4087caf6fff41b49c9ce476435cc1310e131705d0ad402685e10b4fb0e ethtool-4.18.tar.xz" +sha512sums="9ff6433466585e38dd0dbb99ed06430cd885f26ef4e11f6b95c024ed7511c376f8d86ff53c298cb8e811193500514737ce21eb0cd925bede0373799eb3a990b6 ethtool-5.0.tar.xz" diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 12c8c21c6..7cf8693fe 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -3,7 +3,7 @@ pkgname=exiv2 pkgver=0.26 pkgrel=2 pkgdesc="Exif, IPTC and XMP metadata library and tools" -url="http://www.exiv2.org" +url="https://www.exiv2.org/" arch="all" options="!check" # No test suite. license="GPL-2.0+" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index fdab8f0bd..dada6f23a 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg -pkgver=4.1.1 +pkgver=4.1.3 pkgrel=0 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" @@ -100,5 +100,5 @@ libs() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ } -sha512sums="fe72680f1e4ca0b226199d1407803e1de11f00f5a88a23251182172cda4a7369cf1826c4ef86230bf60b0f9ff0d69382da5eeec26574a31eacd9935cf4eeb86f ffmpeg-4.1.1.tar.xz +sha512sums="0a540a0c5395f42c6079bc26d1b3baca453995693da7de21da469ce40b3a548bea14ff46a72c6f4c32256333855f9b86207cb8bf1d0dda33a17ddca54970daa3 ffmpeg-4.1.3.tar.xz 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch" diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD index 74d46e589..e36f4621a 100644 --- a/user/ffmpegthumbs/APKBUILD +++ b/user/ffmpegthumbs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpegthumbs -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE video thumbnail system using FFmpeg" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="50d15d72b4181bea11895d8fc79a898d11c21c2f5c8b5d37e046f2d03f8b4b09047d3558c763c272e6e854693797b1f7f4a093981bdaefa2f405ec5d4f66dec0 ffmpegthumbs-18.12.3.tar.xz" +sha512sums="7e5865eaf55952aefe05418e9ca0a00afdde82ded06e08e0d1b95279939a2304efb2c320a0b9959fa558fe44ee02a922ab10caf821d489da982b7cc6ac5c4b6d ffmpegthumbs-19.04.0.tar.xz" diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD index ba8814388..c0f490ea0 100644 --- a/user/free42/APKBUILD +++ b/user/free42/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=free42 pkgver=2.0.22 -pkgrel=1 +pkgrel=2 pkgdesc="Scientific programmable calculator" -url="http://thomasokken.com/free42/" +url="https://thomasokken.com/free42/" arch="all" options="!check" # No test suite. license="GPL-2.0-only AND Public-Domain" @@ -15,11 +15,12 @@ source="https://distfiles.adelielinux.org/source/free42-nologo-$pkgver.tgz free42.desktop libx11.patch patch.patch + unsigned-char.patch " -builddir="$srcdir/free42-nologo-$pkgver/gtk" +builddir="$srcdir/free42-nologo-$pkgver" build() { - cd "$builddir" + cd "$builddir"/gtk local SAVE_CFLAGS SAVE_CFLAGS=$CFLAGS unset CFLAGS @@ -29,13 +30,13 @@ build() { } package() { - cd "$builddir" - install -D -m755 free42dec "$pkgdir"/usr/bin/free42dec + install -D -m755 gtk/free42dec "$pkgdir"/usr/bin/free42dec install -D -m644 "$srcdir"/free42.desktop \ "$pkgdir"/usr/share/applications/free42.desktop } sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop -f8434fd1c20f0dd40de5773615eaf798329870231f7ce66785a1bc8e208fa0a64919f48ac3eea5ab9ceb818570ae93f61b0e81baec4261bbdfbf04237108ab6a libx11.patch -7b48609bff5466d81f42ed65405cd09e98fa675c087837b22caebab2b97420a34d1156399c3b18608bcae42896c12aa63a6f87515f5677587dfff6ed135dc760 patch.patch" +470eb88936c65a053860af94955bf979973bad48c4b1f593598818f8ff0c39c4869613a05ad0e82b7a3fc6ce19fa7b8642a38e726d4a48e3fe63a9cbac8a45d6 libx11.patch +33afc0d0deb88143b3ec0a09fd2ba3de14d6ad269c9ecff55c9e89348d7bf76e2bbf880e0eef9a2c71eedb1da9136051a471d4aaaf9aa5acd4e992964a69692b patch.patch +2e2e6c5a00de96f2ca1c61a0039a945bf0416c889b9131abf89c6eca4d8816ff0144c32634ac7c7b112fc1bd8cd6d816f22f2aed31bde59b96a79b9588235a02 unsigned-char.patch" diff --git a/user/free42/libx11.patch b/user/free42/libx11.patch index 54c4c6cc0..aa07ba2d1 100644 --- a/user/free42/libx11.patch +++ b/user/free42/libx11.patch @@ -1,5 +1,5 @@ ---- gtk/Makefile.old 2019-01-13 14:52:39.000000000 +0000 -+++ gtk/Makefile 2019-01-17 01:38:40.500000000 +0000 +--- free42/gtk/Makefile.old 2019-01-13 14:52:39.000000000 +0000 ++++ free42/gtk/Makefile 2019-01-17 01:38:40.500000000 +0000 @@ -35,7 +35,7 @@ -D_WCHAR_T_DEFINED diff --git a/user/free42/patch.patch b/user/free42/patch.patch index e84b3f7b8..f79bb6c8e 100644 --- a/user/free42/patch.patch +++ b/user/free42/patch.patch @@ -1,5 +1,5 @@ ---- gtk/intel-lib-linux.patch.old 2019-01-13 14:52:39.000000000 +0000 -+++ gtk/intel-lib-linux.patch 2019-01-17 01:27:01.470000000 +0000 +--- free42/gtk/intel-lib-linux.patch.old 2019-01-13 14:52:39.000000000 +0000 ++++ free42/gtk/intel-lib-linux.patch 2019-01-17 01:27:01.470000000 +0000 @@ -1668,3 +1668,62 @@ }
@@ -63,8 +63,8 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) ---- gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 -+++ gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 +--- free42/gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 ++++ free42/gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 @@ -1727,3 +1727,14 @@ else __TMP := $(strip $(subst /, ,$(firstword $(CC)))) diff --git a/user/free42/unsigned-char.patch b/user/free42/unsigned-char.patch new file mode 100644 index 000000000..af3f47ef5 --- /dev/null +++ b/user/free42/unsigned-char.patch @@ -0,0 +1,15 @@ +This only breaks on platforms where 'char' is signed. + +(currently, pmmx and x86_64) + +--- free42/common/core_display.cc.old 2019-01-13 14:52:39.000000000 +0000 ++++ free42/common/core_display.cc 2019-04-17 23:01:56.398695993 +0000 +@@ -43,7 +43,7 @@ + #endif + + +-static char bigchars[130][5] = ++static unsigned char bigchars[130][5] = + { + { 0x08, 0x08, 0x2a, 0x08, 0x08 }, + { 0x22, 0x14, 0x08, 0x14, 0x22 }, diff --git a/user/fuse/APKBUILD b/user/fuse/APKBUILD index 92840ed41..690b69d51 100644 --- a/user/fuse/APKBUILD +++ b/user/fuse/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=fuse -pkgver=2.9.8 -pkgrel=2 +pkgver=2.9.9 +pkgrel=0 pkgdesc="Linux Filesystem in Userspace (legacy version)" url="https://github.com/libfuse/libfuse" arch="all" @@ -20,7 +20,6 @@ source="https://github.com/libfuse/libfuse/releases/download/$pkgname-$pkgver/$p # - CVE-2018-10906 build() { - cd "$builddir" UDEV_RULES_PATH='/lib/udev/rules.d' ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -36,10 +35,9 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d } -sha512sums="0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad fuse-2.9.8.tar.gz +sha512sums="3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 fuse-2.9.9.tar.gz 5672ceb35acabb4bd97b6efc30614f22def62882fe198e2a8598a074d45b6b5337c082a5e09b5e399b6e5212dc1fbde9071c2a5051534c32091444c350b9c657 fix-realpath.patch" diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD index dc049071d..31ef0032c 100644 --- a/user/fuse3/APKBUILD +++ b/user/fuse3/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=fuse3 _pkgname=fuse -pkgver=3.2.6 +pkgver=3.5.0 pkgrel=0 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface" url="https://github.com/libfuse/libfuse" @@ -25,7 +25,6 @@ builddir="$srcdir/$_pkgname-$pkgver" # - CVE-2018-10906 build() { - cd "$builddir" meson \ --prefix=/usr \ --sysconfdir=/etc \ @@ -42,7 +41,6 @@ check() { } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d @@ -72,6 +70,6 @@ openrc() { install_if="openrc fuse-common=$pkgver-r$pkgrel" } -sha512sums="3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8 fuse-3.2.6.tar.xz +sha512sums="953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27 fuse-3.5.0.tar.xz 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index 40c86ad5c..83ee6af4a 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.60.0.1 -_ver=2.60 +pkgver=2.60.1 +_ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" url="https://www.gnome.org/" @@ -12,7 +12,8 @@ depends="ca-certificates" makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool libgcrypt-dev libproxy-dev meson ninja p11-kit-dev" subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" +source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz + glib-networking-2.60-new-gnutls-cert-error-fix.patch" prepare() { cd "$builddir" @@ -37,4 +38,5 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="98a34a14cdbbcb4a9496bce807e7720dd9e103adbacd5dc44439d5fcaf02eef12c0385df95767d7603587331b84c7ad4a677f47b00583a46f15a022572a3690f glib-networking-2.60.0.1.tar.xz" +sha512sums="a40a7e9678076db1a469f0d8ffdcb0c6658ef96ff1d9637299fbb07985f4c42bae3f1415f8df15242718420d20eb90de93253a00d1f6a347110b3f8a74bcc717 glib-networking-2.60.1.tar.xz +b9d3d744aec5337553e228ff1ee0616b1d79d1766ef9d87e644706a154f8e6151b15651b73a7073482e5cbe20b54ac78bd34f7ad77ebf0d34c42d969b4315241 glib-networking-2.60-new-gnutls-cert-error-fix.patch" diff --git a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch new file mode 100644 index 000000000..ab04dae3e --- /dev/null +++ b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch @@ -0,0 +1,31 @@ +From 1ce6b40da8ecbf997c5522a592a122e805aa81c4 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@igalia.com> +Date: Wed, 3 Apr 2019 18:00:55 -0500 +Subject: [PATCH] gnutls: Handle new GNUTLS_E_CERTIFICATE_REQUIRED + +This new error in GnuTLS 3.6.7 should correspond to +G_TLS_ERROR_CERTIFICATE_REQUIRED. This fixes our client auth tests when +run with GnuTLS 3.6.7. + +Fixes #70 +--- + tls/gnutls/gtlsconnection-gnutls.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c +index 27bbbcd..774d668 100644 +--- a/tls/gnutls/gtlsconnection-gnutls.c ++++ b/tls/gnutls/gtlsconnection-gnutls.c +@@ -1062,7 +1062,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, + else + return 0; + } +- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) ++ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND ++#ifdef GNUTLS_E_CERTIFICATE_REQUIRED ++ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */ ++#endif ++ ) + { + g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED, + _("TLS connection peer did not send a certificate")); diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 1e97e0eb5..841a87d05 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.60.0 +pkgver=1.60.1 pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" @@ -46,4 +46,4 @@ dev() { replaces="gobject-introspection" } -sha512sums="858cf12b1a606be4ec884444ef0c9f05aaaf75d4f547dde489c4eef35d125a66d3d1b7c3cd879bae0f01bc0fb75dd3473a1e1bc9f66241f32ac27b0a35a06901 gobject-introspection-1.60.0.tar.xz" +sha512sums="01adbeffee08ff6487f11a303fd7a59a99c36714dce21be9bbae7fd2bf8f080665e830bc3a47566140a6081dc74f6c2f8d8232286759b761f70493545a9d90ea gobject-introspection-1.60.1.tar.xz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index f2504c535..132b8bad0 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=granatier -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af4a4201cede2d01a848b6d6c889f6019eb9298373f4e3c4faa2d9d514a8127a5b910bb701ecaada7559a91c887cca1a895c2e18cdd47c02b2569d781f5574c3 granatier-18.12.3.tar.xz" +sha512sums="e5f7de6eb6fdac6cbf174ab1e4b52e3e748fb83a76458ae136041ed20f0a82218026b0adf8266b855bf57756962cf16938d5a38c3a5a4c1d4747b861588082f6 granatier-19.04.0.tar.xz" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 0504053e6..57cbe384b 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.7 +pkgver=3.24.8 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -53,4 +53,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5 gtk+-3.24.7.tar.xz" +sha512sums="a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5 gtk+-3.24.8.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index a31e6eee5..fdb3bb987 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.1073 +pkgver=8.1.1177 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="74d13063853677aaff795925414baa293819ccd20e3deb7013c134b42434e8abd14db1645116b20081f80bcb3dfd9a1e0c6b210ed9af62a4cf19c183025c9779 vim-8.1.1073.tar.gz" +sha512sums="b90d3f6b6727ea97a1e41154855c45f80a2e94a8e3cf1b912ec6812494c2658d66ba4bc796f5a9e7713544ecdd2f813512e4497293d0e362ae9281695dcee52f vim-8.1.1177.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index a190e69d8..3bf7c09aa 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4105ef3529170e7c92cbbdca4bfb31f0fa4220979ce808f86d23aac0a2fdd9f59d927f87a7909e2d1641defd97bd31e1142075f30d526c7d1b29e8afe314fd51 gwenview-18.12.3.tar.xz" +sha512sums="bacc6e5e1702b7653c31164d57440944ecab13331b02babd6a45a3e4637b5f13cc8347d2073cf99be1811d61f666529495afac0131307696c504dc9f82dbb9e4 gwenview-19.04.0.tar.xz" diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD index de3af464c..8dace78cd 100644 --- a/user/http-parser/APKBUILD +++ b/user/http-parser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=http-parser -pkgver=2.9.0 +pkgver=2.9.2 pkgrel=0 pkgdesc="Library for parsing HTTP messages in C" url=" " @@ -14,18 +14,15 @@ subpackages="$pkgname-dev" source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz" build() { - cd "$builddir" make } check() { - cd "$builddir" true # tested as part of build. } package() { - cd "$builddir" make PREFIX=/usr DESTDIR="$pkgdir" install } -sha512sums="40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e http-parser-2.9.0.tar.gz" +sha512sums="fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023 http-parser-2.9.2.tar.gz" diff --git a/user/hwids/APKBUILD b/user/hwids/APKBUILD index 92d161907..1fcbe079d 100644 --- a/user/hwids/APKBUILD +++ b/user/hwids/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=hwids -pkgver=20180917 +pkgver=20190316 pkgrel=0 pkgdesc="Hardware identification databases" url="https://github.com/gentoo/hwids/" @@ -67,4 +67,4 @@ udev() { mv "$pkgdir"/etc "$subpkgdir"/ } -sha512sums="9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9 hwids-20180917.tar.gz" +sha512sums="6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e hwids-20190316.tar.gz" diff --git a/user/i3lock/APKBUILD b/user/i3lock/APKBUILD index 8080867c7..7d04a82af 100644 --- a/user/i3lock/APKBUILD +++ b/user/i3lock/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr> # Maintainer: Max Rees <maxcrees@me.com> pkgname=i3lock -pkgver=2.11 +pkgver=2.11.1 pkgrel=0 pkgdesc="Simple X11 screen locker" url="https://i3wm.org/i3lock/" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc" source="$url/$pkgname-$pkgver.tar.bz2" prepare() { - cd "$builddir" default_prepare # At present, this has no functional difference. # But when we start developing our PAM stack into something more @@ -24,8 +23,6 @@ prepare() { } build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,8 +35,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="c00741a66fdb5477a4b7e993d173f98fe95f0254fa74c50f83ddf8078a477d26a9fab126fbe31b509df2dbd35ed5ec64b95475621b8babf6f6c0f6db38160c8a i3lock-2.11.tar.bz2" +sha512sums="8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c i3lock-2.11.1.tar.bz2" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 864337eb2..00f6b907d 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.39 +pkgver=7.0.8.40 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="545c0e919f58e5d29b0a92b1db8dc32eb8f4aa828c6e8bc8f9bec5ada3468b79c8fbbb57350772f1a87a46f29bbd94af33272f7f8bb0ab720837844d15d7a43b ImageMagick-7.0.8-39.tar.xz" +sha512sums="09defd7bedfc18ff5ef8e404e2f1189cbcd97f087b05fc925cfd6e90b416e97aea691542a1eca6841b99c24dbeaf10d2437a74d8d380dfc5f70a1eb54ae61982 ImageMagick-7.0.8-40.tar.xz" diff --git a/user/iso-codes/APKBUILD b/user/iso-codes/APKBUILD index 599845de4..9fc122b61 100644 --- a/user/iso-codes/APKBUILD +++ b/user/iso-codes/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=iso-codes -pkgver=4.1 +pkgver=4.2 pkgrel=0 pkgdesc="Lists of country, language, and currency names" url=" " @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" pkgconfigdir=/usr/lib/pkgconfig install } -sha512sums="cf02be0cfc43a1fb28334ccae552cac9a7dee70ca3969b6263eca4bd7fee8ddcc437bd23d290643ba2cd7e99b207661d7330daaf452dc59cde36fdd5919b5616 iso-codes-4.1.tar.xz" +sha512sums="1ee8505d2fb6da03d82ebe665ad963e6652ac0337a1cde16a0d6f4c04003f52330735dd7ab20131999e8c562eca09ac18edf8c4aadd7cb8bcfbe0f350a8b6987 iso-codes-4.2.tar.xz" diff --git a/user/itstool/APKBUILD b/user/itstool/APKBUILD index 7fdfc40cc..7936887b7 100644 --- a/user/itstool/APKBUILD +++ b/user/itstool/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=itstool -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=0 pkgdesc="ITS-based XML translation tool" url="http://itstool.org/" @@ -38,5 +38,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67c55b83e43b5a4626a6633305b2e48a06a5defdf7725e78b00409edea213d166cb3d870a58eb402c48968bddd7c1778d9852acfa0ddebdd363f34ac13f32aa7 itstool-2.0.5.tar.bz2 +sha512sums="51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7 itstool-2.0.6.tar.bz2 eb426e7cc9f151154f47b93ef46d6fcfb5fa0982be3bf78863ebf5ea009a89de252a6c63dfb090d76003c47107ebb5d1ac2a7d1ef7db08defe19e32f996dbdbd fix-segfault.patch" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 44206a02c..e318b6f49 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d509892380dfc1be029debdfa6d924c996a92772cf4fd3c9bf3bfa943621d0f62a13c204867b86210f1a1a6c4895d02c8dd922176f87129dad8ce61a45b8496e juk-18.12.3.tar.xz" +sha512sums="449e20ac1237b0f4da162c71df45ad06b38b38d160525c8b68970b6957e8643f28311d31adab85a2a853234205cd73dba7f621750113aac1d8cdc80de5f84611 juk-19.04.0.tar.xz" diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD index 1e8c0e67a..039bd9dd8 100644 --- a/user/kaffeine/APKBUILD +++ b/user/kaffeine/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kaffeine -pkgver=2.0.15 +pkgver=2.0.16-2 pkgrel=0 pkgdesc="Media player with a focus on Digital TV (DVB)" url="https://www.kde.org/applications/multimedia/kaffeine/" @@ -13,6 +13,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev kxmlgui-dev solid-dev kdbusaddons-dev vlc-dev libxscrnsaver-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kaffeine/kaffeine-$pkgver.tar.xz" +builddir="$srcdir/kaffeine-$pkgver" +pkgver=2.0.16.2 build() { cd "$builddir" @@ -40,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d kaffeine-2.0.15.tar.xz" +sha512sums="1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21 kaffeine-2.0.16-2.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index f89a60f69..4344269e1 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e2c4dad9fc7c7ef0af2b4f6173376db9e68df7df92094efccfd9e6d4edd1bc376352d00717d29351613bbdd52a8cdb45113ae243d4092aa2f8199a010e3f336f kalgebra-18.12.3.tar.xz" +sha512sums="b313493803a39a090c28b860f64a891a6afde90027a761861a298d878283ff764ecad626c31c42af7ba58682299cb8df5ae86c4fdb2316c4ff4b0e7ad1054337 kalgebra-19.04.0.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 64f1a21b1..5e52f32cc 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a03c477fc535784ed6d8007373bc172a01fb72148282858cdb4d2560daa2c31bd3daf068e5ecaa28564888573cb14997840d26bbd922a1fe0c1cf3e77e17f711 kalzium-18.12.3.tar.xz" +sha512sums="6bbd18df09680b0eaf80aeff683aa40219e7b6bea9f60de4364e0f3abc3d894164cbac09b37e42479b1f08fcb2acd9ad3ed9b8a5eaa2cad5b861b837b7605625 kalzium-19.04.0.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index c0c734773..8795bad4b 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="75e9465a6621f04f32a7ac2868fd1a8b9133c0957d75608a960919252613b01fd27369fc17543ac08bff333351719986d69738773696be1f69cd330a1aa303a7 kanagram-18.12.3.tar.xz" +sha512sums="4b4593cd68836c4fcb14b1d0f1d7ff226daf56305ab9523bb0f3fd3f246f56df97e3cdaf83795ed18acafa8e3ca5688d787928cdd6e6726ddadd3f75693bb301 kanagram-19.04.0.tar.xz" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index ef2120b43..c2172bfe9 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapman -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="512743caa897c4e2e4d3f78bc5e85a500b3bc5c810dc8ea8a28508e81a02ef230fe7dda8b9abf01b8e15c90e8172a80655951473414fda959bb1eb079bf0f210 kapman-18.12.3.tar.xz" +sha512sums="0d4219f868eae03e082d7fef9a84fa59951b52bbc1cbfdf4cdcbc1716e448e56723669fb2415319d8f07cf3cfb0429f144960b99e5268e010772cd0af230af32 kapman-19.04.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 0fd90e6f3..f141e07ec 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -92,4 +92,4 @@ kwrite_lang() { done } -sha512sums="2f067628d29b7f807e13d2faa2c6727a8028e273c61b4923d6a6eaeb4d74dbf0f0e83edf492821b228ccbe99a985cf712cfd75b9d6ea8d16af9b1ff7ec8ac00d kate-18.12.3.tar.xz" +sha512sums="4dc3cd8ee18ba994f7000b647644d7735659de52de66b3adc65d5f2283056961a7d4d3228d66f4de52b80e4c012a243ed5c95fe00066e6ad5eb8a4569f2d22d9 kate-19.04.0.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index a96cb5759..de64024dc 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=katomic -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d47313b345c4b4dbe95dacf61a8435239da38a4acd4491ae7910f4fb70c8d2d5cdc85f5932bf86871c3af1da6fa99fdc703bd75b92ffdb6a9780a09a6e3c3055 katomic-18.12.3.tar.xz" +sha512sums="cc71f51db90edccd1876d1ba7f5c64ede5a68b602fcf315f90535746161fb00175149933a47b6471fd2dc0fb37091577bb86d548c4cf22cf8e07e9916f96f384 katomic-19.04.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 38b727182..76ecbaed5 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblackbox -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="888d5c00b3f05b4d26c8f898b85d73210ad01260c20f049f9da29fac9f7bc83e1ca9940ca489119313b976ec764b89dbd5acac3fa1f78c6a28205b1c3fc858e5 kblackbox-18.12.3.tar.xz" +sha512sums="4433b75658496dc661916a472ec9d4da02d59927e12f5fffa78bd22af8b60d51d127ffdc39cc2ee77998112562df1f99856e321097885c55befed9c09bc0ffd7 kblackbox-19.04.0.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index 4ec273c96..7b4624c91 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblocks -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bdefc1f640bbff779e2681a66733d1ba783239984849a4c6c8af9584155388723ad82abe1577989475ee6d91e8c51e39a565e443b55429da12299fdea33422fb kblocks-18.12.3.tar.xz" +sha512sums="727104bdf7624f58ea18fe24915f4bda8dd6497349dbcefd7beb3ef83a923b02e477bfff5a4c2615e67e53df5c0300a83f731d72e8eb7458376ab7755a4806a4 kblocks-19.04.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index c2c4fc9c3..d0391ac3e 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbounce -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b41a63edcf4d4f36b756929df55ddc17b5d345ad58cca8df251226de0ce43503f19726e9ffc5491374919f83d4767b3b753fb248958396e82163f7ab96e83536 kbounce-18.12.3.tar.xz" +sha512sums="8763fda324fa8a464273b1281490599db952c3a413dba9a47564e0aa43f241b4770d705d60af0c1dee42e88d30b2ae608eaa4800242d09ed70648e0202502782 kbounce-19.04.0.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 6f1392c57..a53f997ed 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbreakout -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5e0e2763ab4e8a5ce8eab78bbfd8e267e5efdf8151fd0e66d6cfdb174aed402a4ce5c02b3fcf2614c07f5726ff34fe6d636c238c4711302fc148c19af8f901d3 kbreakout-18.12.3.tar.xz" +sha512sums="a737eeb426f4a042ae2fde1f59824a966037f53021887eb25ea9727e1cace31cd0c8ae649c42a1d10f060bbcd30c0f71cf49960e7ff09284c34de854c96e34e8 kbreakout-19.04.0.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 0d841c20a..0515b1969 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="91375dcebf526b861103573a293a722aa1ce960bedfd2b3ac1ddc606395b84e1c65e1f7532b24789e1c5dc60f0a05e6c73eb26094bfc3810a8898c1ba10c7b56 kbruch-18.12.3.tar.xz" +sha512sums="cd7e3cf6ff9f3a3bf88370cb0b562cc212c255259129f94ff5a1b7fac3df18a7fa0831914430a42772b4f51cd2d022fb91df5278939a33e752daa63e7b5de7cd kbruch-19.04.0.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index b61847991..cc72cdf0f 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c22a442fad73921e098c66cefbffc999990b2082ad400dce195efea77bbfc6f2741f24ca0ee38d5eac7664663081d28cccf33f5c6e8c6e1fadaf67c9dc7e65bc kcachegrind-18.12.3.tar.xz" +sha512sums="ed0f1115f8d3cd4a8acc9c87a0d78e1d4ec2f3bb6701a8a00a759549f8a3d59912e1e4a0fa1c943a04957d5bc7ff6f4bc1dae492aece2e1027d56ec248c28643 kcachegrind-19.04.0.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index 0433fd73b..6166baa25 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalc -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="be4d7fd59f3ce6c63426a4aad4a388e4123397ab06c44441213754ec6e935217859c5960cfaf76ed0537400f51c35a74a6413a6c2bbe3466d045ea6ccd7ea45f kcalc-18.12.3.tar.xz" +sha512sums="ff33b7d7055ed957fa3092fdb3f85069eb10c5594a6e952d96bd7a3eb9480d4e4a1234c1ef8b0a0e3ab2bed4e56f4970954d60ccd30b1ddbea6904f1ab65132c kcalc-19.04.0.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index dcaab53ea..bb475c212 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcharselect -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eea89de5285ffb1afa744e7482423721026dd1c8ad0ce32720f2c8fecf105505e94b035f12b19d69e518fc27656257fbd5d1e3e578a5b1047f4d361bb4d77e7f kcharselect-18.12.3.tar.xz" +sha512sums="44f22ee2a0f9a1b0fb5b277fda467ec05612ca51b874ab233cde46e6acd6c3bcef3f3e48f0e648e7687c23ce6975d43b160d7274d86c176ab1a018ad05d21d90 kcharselect-19.04.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index 136d2a814..703731ea1 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27e6cc50cdb04f502746a17cf463751173f8f8e057ae1d3d31ae6cb5b10e29123649da755a65f9f7d505d99f585f47905de7a5d3b4f914c7fc84b41d58b7be6a kcolorchooser-18.12.3.tar.xz" +sha512sums="e78923102c7d1b737de03108ffd74324cd5e653cd760c11b9f34bb41daccb2867f4bd64d8a2cc80363ddd359a79d2c5e93991fa943d8fb651b6a40c0c991b82d kcolorchooser-19.04.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index e492802ff..558358620 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets pkgver=5.54.0 -pkgrel=0 +pkgrel=1 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" arch="all" @@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev kauth-dev kcodecs-dev kconfig-dev kguiaddons-dev ki18n-dev kwidgetsaddons-dev kdoctools-dev" makedepends="$depends_dev cmake extra-cmake-modules doxygen qt5-qttools-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfigwidgets-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kconfigwidgets-$pkgver.tar.xz + languagename.patch + " build() { cd "$builddir" @@ -42,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73 kconfigwidgets-5.54.0.tar.xz" +sha512sums="c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73 kconfigwidgets-5.54.0.tar.xz +3b1abbd9b5cef4400a8a962cef4f8a3614f49700fdf9df25e709a8105d9e59429102aa94b8a47fa35e7dcb9d39ba5bbfd8485743fa6f64155bef3aa1afb4bb9e languagename.patch" diff --git a/user/kconfigwidgets/languagename.patch b/user/kconfigwidgets/languagename.patch new file mode 100644 index 000000000..d3eb89f54 --- /dev/null +++ b/user/kconfigwidgets/languagename.patch @@ -0,0 +1,716 @@ +From 91077def022a999ce46c91347f1167626266f460 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Mon, 7 Jan 2019 11:42:28 +0100 +Subject: Add KLanguageName + +Summary: KLanguageName is a helper namespace that returns the name of a given language code. + +Reviewers: apol + +Reviewed By: apol + +Subscribers: hein, kde-frameworks-devel, sitter, markg, apol + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D10446 +--- + autotests/CMakeLists.txt | 27 ++++++ + .../kf5_entry_data.cmake/locale/ca/kf5_entry.cmake | 98 ++++++++++++++++++++++ + .../kf5_entry_data.cmake/locale/de/kf5_entry.cmake | 98 ++++++++++++++++++++++ + .../locale/en_US/kf5_entry.cmake | 44 ++++++++++ + autotests/kf5_entry_data.cmake/locale/es/.keep | 0 + .../kf5_entry_data.cmake/locale/fr/kf5_entry.cmake | 2 + + .../kf5_entry_data.cmake/locale/pt/kf5_entry.cmake | 98 ++++++++++++++++++++++ + autotests/klanguagenametest.cpp | 92 ++++++++++++++++++++ + src/CMakeLists.txt | 2 + + src/klanguagename.cpp | 67 +++++++++++++++ + src/klanguagename.h | 63 ++++++++++++++ + 11 files changed, 591 insertions(+) + create mode 100644 autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake + create mode 100644 autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake + create mode 100644 autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake + create mode 100644 autotests/kf5_entry_data.cmake/locale/es/.keep + create mode 100644 autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake + create mode 100644 autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake + create mode 100644 autotests/klanguagenametest.cpp + create mode 100644 src/klanguagename.cpp + create mode 100644 src/klanguagename.h + +diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt +index 1917ecb..37caaf9 100644 +--- a/autotests/CMakeLists.txt ++++ b/autotests/CMakeLists.txt +@@ -9,5 +9,32 @@ set(kconfigdialog_unittest_SRCS kconfigdialog_unittest.cpp) + kconfig_add_kcfg_files(kconfigdialog_unittest_SRCS GENERATE_MOC signaltest.kcfgc) + ecm_add_test(${kconfigdialog_unittest_SRCS} TEST_NAME "kconfigdialog_unittest" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) + ++set(lang_entries ++ ca ++ de ++ en_US ++ es # must not have file! ++ fr ++ pt ++) ++ ++# scripty would mangle all *.desktop files, since that'd have potential of ++# breaking the test we'll need to bypass scripty by not having our files called ++# .desktop! ++# Do note that we pop these into CMAKE_LIBRARY_OUTPUT_DIRECTORY so QFINDTESTDATA ++# is able to find the fixtures in the bin dir as KDECMakeSettings sets a special ++# output dir. ++foreach(lang ${lang_entries}) ++ set(src_dir "${CMAKE_CURRENT_SOURCE_DIR}/kf5_entry_data.cmake/locale/${lang}") ++ set(src_file "${src_dir}/kf5_entry.cmake") ++ set(bin_dir "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/kf5_entry_data/locale/${lang}") ++ set(bin_file "${bin_dir}/kf5_entry.desktop") ++ file(MAKE_DIRECTORY ${bin_dir}) ++ if(EXISTS ${src_file}) # not all languages have entries ++ configure_file(${src_file} ${bin_file} COPYONLY) ++ endif() ++endforeach() ++ ++ecm_add_test(klanguagenametest.cpp LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) + + ecm_add_test(krecentfilesactiontest.cpp TEST_NAME "krecentfilesaction_test" LINK_LIBRARIES Qt5::Test KF5::ConfigWidgets) +diff --git a/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake +new file mode 100644 +index 0000000..a81564c +--- /dev/null ++++ b/autotests/kf5_entry_data.cmake/locale/ca/kf5_entry.cmake +@@ -0,0 +1,98 @@ ++[KCM Locale] ++Name=Catalan ++Name[af]=Katelaans ++Name[ar]=الكاتالانيّة ++Name[as]=কাটালান ++Name[be]=Каталонская ++Name[be@latin]=Katalanskaja ++Name[bg]=Каталонски ++Name[bn]=ক্যাটালান ++Name[bn_IN]=ক্যাটালান ++Name[br]=Katalaneg ++Name[bs]=katalonski ++Name[ca]=Català ++Name[ca@valencia]=Català ++Name[cs]=Katalánský ++Name[csb]=Katalońsczi ++Name[cy]=Catalaneg ++Name[da]=Catalansk ++Name[de]=Katalanisch ++Name[el]=Καταλανικά ++Name[en_GB]=Catalan ++Name[eo]=Kataluna ++Name[es]=Catalán ++Name[et]=Katalaani ++Name[eu]=Katalaniera ++Name[fa]=کاتالان ++Name[fi]=Katalaani ++Name[fr]=Catalan ++Name[fy]=Katalaansk ++Name[ga]=Catalóinis ++Name[gd]=Catalanais ++Name[gl]=Catalán ++Name[gu]=કેટેલાન ++Name[he]=קטלונית ++Name[hi]=केटेलन ++Name[hne]=केटेलन ++Name[hr]=Katalonski ++Name[hsb]=Katalansce ++Name[hu]=Katalán ++Name[ia]=Catalan ++Name[id]=Catalan ++Name[is]=Katalónska ++Name[it]=Catalano ++Name[ja]=カタロニア語 ++Name[kk]=Каталанша ++Name[km]=កាតាឡាន ++Name[kn]=ಕ್ಯಾಟಲಾನ್ ++Name[ko]=카탈루냐어 ++Name[ku]=Katalan ++Name[lb]=Katalanesch ++Name[lt]=Katalonų ++Name[lv]=Kataloņu ++Name[mai]=केटालान ++Name[mk]=Каталонски ++Name[ml]=കറ്റാലന് ++Name[mr]=केटेलन ++Name[ms]=Catalan ++Name[nb]=Katalansk ++Name[nds]=Katalaansch ++Name[ne]=कातालान ++Name[nl]=Catalaans ++Name[nn]=Katalansk ++Name[oc]=Catalan ++Name[or]=କେଟାଲାନ ++Name[pa]=ਕਾਟਾਲਾਨ ++Name[pl]=Kataloński ++Name[ps]=کېټېلېن ++Name[pt]=Catalão ++Name[pt_BR]=Catalão ++Name[ro]=Catalană ++Name[ru]=Каталонский ++Name[se]=Katalánagiella ++Name[si]=කැටලන් ++Name[sk]=Katalánčina ++Name[sl]=Katalonščina ++Name[sq]=Katalanisht ++Name[sr]=каталонски ++Name[sr@ijekavian]=каталонски ++Name[sr@ijekavianlatin]=katalonski ++Name[sr@latin]=katalonski ++Name[sv]=Katalanska ++Name[ta]=கெடலான் ++Name[te]=కెటలన్ ++Name[tg]=Каталанӣ ++Name[th]=ภาษาคาตาลัน ++Name[tr]=Katalanca ++Name[tt]=Каталон ++Name[ug]=كاتالانچە ++Name[uk]=Каталанська ++Name[uz]=Katalancha ++Name[uz@cyrillic]=Каталанча ++Name[vi]=Catalan ++Name[wa]=Catalan ++Name[xh]=Catalan ++Name[x-test]=xxCatalanxx ++Name[zh_CN]=加泰罗尼亚语 ++Name[zh_HK]=加泰隆尼亞語 ++Name[zh_TW]=加泰羅尼亞語 +diff --git a/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake +new file mode 100644 +index 0000000..e8146cb +--- /dev/null ++++ b/autotests/kf5_entry_data.cmake/locale/de/kf5_entry.cmake +@@ -0,0 +1,98 @@ ++[KCM Locale] ++Name=German ++Name[af]=Duits ++Name[ar]=الألمانيّة ++Name[as]=জাৰ্মান ++Name[be]=Нямецкая ++Name[be@latin]=Niamieckaja ++Name[bg]=Немски ++Name[bn]=জার্মান ++Name[bn_IN]=জার্মান ++Name[br]=Alamaneg ++Name[bs]=njemački ++Name[ca]=Alemany ++Name[ca@valencia]=Alemany ++Name[cs]=Německý ++Name[csb]=Miemiecczi ++Name[cy]=Almaeneg ++Name[da]=Tysk ++Name[de]=Deutsch ++Name[el]=Γερμανικά ++Name[en_GB]=German ++Name[eo]=Germana ++Name[es]=Alemán ++Name[et]=Saksa ++Name[eu]=Alemana ++Name[fa]=آلمانی ++Name[fi]=Saksa ++Name[fr]=Allemand ++Name[fy]=Dútsk ++Name[ga]=Gearmáinis ++Name[gd]=Gearmailtis ++Name[gl]=Alemán ++Name[gu]=જર્મન ++Name[he]=גרמנית ++Name[hi]=जर्मन ++Name[hne]=जर्मन ++Name[hr]=Njemački ++Name[hsb]=Němsce ++Name[hu]=Német ++Name[ia]=Germano ++Name[id]=Jerman ++Name[is]=Þýska ++Name[it]=Tedesco ++Name[ja]=ドイツ語 ++Name[kk]=Немісше ++Name[km]=អាល្លឺម៉ង់ ++Name[kn]=ಜರ್ಮನ್ ++Name[ko]=독일어 ++Name[ku]=Almanî ++Name[lb]=Däitsch ++Name[lt]=Vokiečių ++Name[lv]=Vācu ++Name[mai]=जर्मन ++Name[mk]=Германски ++Name[ml]=ജര്മ്മന് ++Name[mr]=जर्मन ++Name[ms]=Jerman ++Name[nb]=Tysk ++Name[nds]=Hoochdüütsch ++Name[ne]=जर्मनी ++Name[nl]=Duits ++Name[nn]=Tysk ++Name[oc]=Aleman ++Name[or]=ଜର୍ମାନ ++Name[pa]=ਜਰਮਨ ++Name[pl]=Niemiecki ++Name[ps]=جرمني ++Name[pt]=Alemão ++Name[pt_BR]=Alemão ++Name[ro]=Germană ++Name[ru]=Немецкий ++Name[se]=Duiskkagiella ++Name[si]=ජර්මානු ++Name[sk]=Nemčina ++Name[sl]=Nemščina ++Name[sq]=Gjermanisht ++Name[sr]=немачки ++Name[sr@ijekavian]=њемачки ++Name[sr@ijekavianlatin]=njemački ++Name[sr@latin]=nemački ++Name[sv]=Tyska ++Name[ta]=ஜெர்மன் ++Name[te]=జెర్మన్ ++Name[tg]=Олмонӣ ++Name[th]=ภาษาเยอรมัน ++Name[tr]=Almanca ++Name[tt]=Алман ++Name[ug]=گېرمانچە ++Name[uk]=Німецька ++Name[uz]=Olmoncha ++Name[uz@cyrillic]=Олмонча ++Name[vi]=Đức ++Name[wa]=Almand ++Name[xh]=German ++Name[x-test]=xxGermanxx ++Name[zh_CN]=德语 ++Name[zh_HK]=德語 ++Name[zh_TW]=德語 +diff --git a/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake +new file mode 100644 +index 0000000..6033ad4 +--- /dev/null ++++ b/autotests/kf5_entry_data.cmake/locale/en_US/kf5_entry.cmake +@@ -0,0 +1,44 @@ ++[KCM Locale] ++Name=US English ++Name[ar]=الإنجليزية الأمريكية ++Name[bs]=Američki engleski ++Name[ca]=Anglès US ++Name[ca@valencia]=Anglés US ++Name[cs]=US Angličtina ++Name[da]=US Engelsk ++Name[de]=US-Englisch ++Name[el]=US English ++Name[en_GB]=US English ++Name[es]=Inglés de EE. UU. ++Name[et]=USA inglise ++Name[eu]=AEBtako ingelesa ++Name[fi]=Amerikanenglanti ++Name[fr]=Anglais (États-Unis) ++Name[gd]=Beurla (SA) ++Name[gl]=Inglés americano ++Name[he]=אנגלית ארה"ב ++Name[hu]=Angol (amerikai) ++Name[ia]=Anglese de S.U.A. ++Name[id]=Inggris US ++Name[it]=Inglese US ++Name[ko]=미국 영어 ++Name[lt]=JAV anglų ++Name[nb]=Engelsk (USA) ++Name[nl]=VS Engels ++Name[nn]=Engelsk (USA) ++Name[pl]=Angielski amerykański ++Name[pt]=Inglês dos EUA ++Name[pt_BR]=Inglês dos EUA ++Name[ru]=Английский (США) ++Name[sk]=Americká angličtina ++Name[sl]=ameriško angleško ++Name[sr]=амерички енглески ++Name[sr@ijekavian]=амерички енглески ++Name[sr@ijekavianlatin]=američki engleski ++Name[sr@latin]=američki engleski ++Name[sv]=Amerikansk engelska ++Name[tr]=ABD İngilizcesi ++Name[uk]=Англійська (США) ++Name[x-test]=xxUS Englishxx ++Name[zh_CN]=美国英语 ++Name[zh_TW]=美式英文 +diff --git a/autotests/kf5_entry_data.cmake/locale/es/.keep b/autotests/kf5_entry_data.cmake/locale/es/.keep +new file mode 100644 +index 0000000..e69de29 +diff --git a/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake +new file mode 100644 +index 0000000..4f248b9 +--- /dev/null ++++ b/autotests/kf5_entry_data.cmake/locale/fr/kf5_entry.cmake +@@ -0,0 +1,2 @@ ++[KCM Locale] ++Name=French +diff --git a/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake b/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake +new file mode 100644 +index 0000000..6e555d0 +--- /dev/null ++++ b/autotests/kf5_entry_data.cmake/locale/pt/kf5_entry.cmake +@@ -0,0 +1,98 @@ ++[KCM Locale] ++Name=Portuguese ++Name[af]=Portugese ++Name[ar]=البرتغاليّة ++Name[as]=প'ৰ্টুগিছ্ ++Name[be]=Партугальская ++Name[be@latin]=Partuhalskaja ++Name[bg]=Португалски ++Name[bn]=পর্তুগীজ ++Name[bn_IN]=পোর্তুগিজ ++Name[br]=Portugaleg ++Name[bs]=portugalski ++Name[ca]=Portuguès ++Name[ca@valencia]=Portugués ++Name[cs]=Portugalský ++Name[csb]=Pòrtugalsczi ++Name[cy]=Portiwgaleg ++Name[da]=Portugisisk ++Name[de]=Portugiesisch ++Name[el]=Πορτογαλικά ++Name[en_GB]=Portuguese ++Name[eo]=Portugala ++Name[es]=Portugués ++Name[et]=Portugali ++Name[eu]=Portugesa ++Name[fa]=پرتغالی ++Name[fi]=Portugali ++Name[fr]=Portugais ++Name[fy]=Portugeesk ++Name[ga]=Portaingéilis ++Name[gd]=Portagailis ++Name[gl]=Portugués ++Name[gu]=પોર્ટુગીઝ ++Name[he]=פורטוגזית ++Name[hi]=पुर्तगाली ++Name[hne]=पुर्तगाली ++Name[hr]=Portugalski ++Name[hsb]=Portugalsce ++Name[hu]=Portugál ++Name[ia]=Portugese ++Name[id]=Portugis ++Name[is]=Portúgalska ++Name[it]=Portoghese ++Name[ja]=ポルトガル語 ++Name[kk]=Португалша ++Name[km]=ព័រទុយហ្គាល់ ++Name[kn]=ಪೋರ್ಚುಗೀಸ್ ++Name[ko]=포르투갈어 ++Name[ku]=Portûgalî ++Name[lb]=Portugisesch ++Name[lt]=Portugalų ++Name[lv]=Portugāļu ++Name[mai]=पुर्तगाली ++Name[mk]=Португалски ++Name[ml]=പോര്ച്ചുഗീസ് ++Name[mr]=पोर्तुगीज ++Name[ms]=Portugis ++Name[nb]=Portugisisk ++Name[nds]=Portugeesch ++Name[ne]=पोर्तुगाली ++Name[nl]=Portugees ++Name[nn]=Portugisisk ++Name[oc]=Portugués ++Name[or]=ପର୍ତ୍ତୁଗିଜ ++Name[pa]=ਪੁਰਤਗਾਲੀ ++Name[pl]=Portugalski ++Name[ps]=پورټګيز ++Name[pt]=Português ++Name[pt_BR]=Português ++Name[ro]=Portugheză ++Name[ru]=Португальский ++Name[se]=Portugálagiella ++Name[si]=පෘතුගීසි ++Name[sk]=Portugalčina ++Name[sl]=Portugalščina ++Name[sq]=Portugalisht ++Name[sr]=португалски ++Name[sr@ijekavian]=португалски ++Name[sr@ijekavianlatin]=portugalski ++Name[sr@latin]=portugalski ++Name[sv]=Portugisiska ++Name[ta]=போர்த்துக்கீசிய ++Name[te]=పొర్ట్యుగీస్ ++Name[tg]=Португалӣ ++Name[th]=ภาษาโปรตุเกส ++Name[tr]=Portekizce ++Name[tt]=Португал ++Name[ug]=پورتۇگالچە ++Name[uk]=Португальська ++Name[uz]=Portugalcha ++Name[uz@cyrillic]=Португалча ++Name[vi]=Bồ Đào Nha ++Name[wa]=Portuguès ++Name[xh]=Portuguese ++Name[x-test]=xxPortuguesexx ++Name[zh_CN]=葡萄牙语 ++Name[zh_HK]=葡萄牙語 ++Name[zh_TW]=葡萄牙語 +diff --git a/autotests/klanguagenametest.cpp b/autotests/klanguagenametest.cpp +new file mode 100644 +index 0000000..bb2b3d9 +--- /dev/null ++++ b/autotests/klanguagenametest.cpp +@@ -0,0 +1,96 @@ ++/* ++ Copyright (c) 2018 Harald Sitter <sitter@kde.org> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) version 3, or any ++ later version accepted by the membership of KDE e.V. (or its ++ successor approved by the membership of KDE e.V.), which shall ++ act as a proxy defined in Section 6 of version 3 of the license. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library. If not, see <http://www.gnu.org/licenses/>. ++*/ ++ ++#include <QObject> ++#include <QtTest> ++ ++#include "klanguagename.h" ++ ++static void setEnvironment() ++{ ++ qputenv("LANG", "C.UTF-8"); ++ qputenv("LANGUAGE", "en"); ++ qputenv("XDG_DATA_DIRS", qUtf8Printable(QFINDTESTDATA("kf5_entry_data"))); ++ // There is a distinct chance of the envionrment setup being to late and ++ // causing flakey results based on the execution env. ++ // Make sure we definitely default to english. ++ QLocale::setDefault(QLocale::English); ++ ++ // NOTE ++ // - fr has no translations ++ // - es has no kf5_entry at all ++ // - other languages under testing are complete ++} ++ ++class KLanguageNameTest : public QObject ++{ ++ Q_OBJECT ++ ++private Q_SLOTS: ++ void testNameForCode() ++ { ++ // This is somewhat wrong, it should not say US. ++ QCOMPARE(KLanguageName::nameForCode("en"), QString("US English")); ++ ++ QCOMPARE(KLanguageName::nameForCode("de"), QString("German")); ++ QCOMPARE(KLanguageName::nameForCode("pt"), QString("Portuguese")); ++ QCOMPARE(KLanguageName::nameForCode("ca"), QString("Catalan")); ++ } ++ ++ void testNameForCodeInLocale() ++ { ++ // This is somewhat wrong, it should not say US. ++ QCOMPARE(KLanguageName::nameForCodeInLocale("en", "de"), QString("US-Englisch")); ++ ++ QCOMPARE(KLanguageName::nameForCodeInLocale("de", "de"), QString("Deutsch")); ++ QCOMPARE(KLanguageName::nameForCodeInLocale("pt", "de"), QString("Portugiesisch")); ++ QCOMPARE(KLanguageName::nameForCodeInLocale("ca", "de"), QString("Katalanisch")); ++ } ++ ++ void testNoTranslation() ++ { ++ // This has an entry file but no translation => QLocale. ++ QCOMPARE(KLanguageName::nameForCode("fr"), QString("French")); ++ QCOMPARE(KLanguageName::nameForCodeInLocale("fr", "de"), QString("French")); ++ // When in the same language, use the native name. ++ QCOMPARE(KLanguageName::nameForCodeInLocale("fr", "fr"), QString("français")); ++ } ++ ++ void testNoEntry() ++ { ++ // This has no entry file => QLocale. ++ QCOMPARE(KLanguageName::nameForCode("es"), QString("Spanish")); ++ QCOMPARE(KLanguageName::nameForCodeInLocale("es", "de"), QString("Spanish")); ++ // When in the same language, use the native name. ++ QCOMPARE(KLanguageName::nameForCodeInLocale("es", "es"), QString("español de España")); ++ } ++ ++ void testNoString() ++ { ++ // Qt doesn't have za support, we have no test fixture, so no string. ++ QCOMPARE(KLanguageName::nameForCode("za"), QString()); ++ } ++}; ++ ++Q_COREAPP_STARTUP_FUNCTION(setEnvironment) ++ ++QTEST_GUILESS_MAIN(KLanguageNameTest) ++ ++#include "klanguagenametest.moc" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a35cf3c..09fe50b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,6 +8,7 @@ set(kconfigwidgets_SRCS + kcmodule.cpp + khelpclient.cpp + klanguagebutton.cpp ++ klanguagename.cpp + kpastetextaction.cpp + krecentfilesaction.cpp + kstandardaction.cpp +@@ -52,6 +53,7 @@ ecm_generate_headers(KConfigWidgets_HEADERS + KCModule + KHelpClient + KLanguageButton ++ KLanguageName + KPasteTextAction + KRecentFilesAction + KViewStateMaintainer +diff --git a/src/klanguagename.cpp b/src/klanguagename.cpp +new file mode 100644 +index 0000000..6e1a519 +--- /dev/null ++++ b/src/klanguagename.cpp +@@ -0,0 +1,67 @@ ++/* ++ * Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org> ++ * (c) 2007 David Jarvie <software@astrojar.org.uk> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public License ++ * along with this library; see the file COPYING.LIB. If not, write to ++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ */ ++ ++#include "klanguagename.h" ++#include "kconfigwidgets_debug.h" ++ ++#include <kconfig.h> ++#include <kconfiggroup.h> ++ ++QString KLanguageName::nameForCode(const QString &code) ++{ ++ const QStringList parts = QLocale().name().split(QChar('_')); ++ return nameForCodeInLocale(code, parts.at(0)); ++} ++ ++QString KLanguageName::nameForCodeInLocale(const QString &code, const QString &outputCode) ++{ ++ const QString realCode = code == QStringLiteral("en") ? QStringLiteral("en_US") : code; ++ const QString realOutputCode = outputCode == QStringLiteral("en") ? QStringLiteral("en_US") : outputCode; ++ ++ const QString entryFile = ++ QStandardPaths::locate(QStandardPaths::GenericDataLocation, ++ QStringLiteral("locale") + QLatin1Char('/') + realCode + QStringLiteral("/kf5_entry.desktop")); ++ if (!entryFile.isEmpty()) { ++ KConfig entry(entryFile, KConfig::SimpleConfig); ++ entry.setLocale(realOutputCode); ++ const KConfigGroup group(&entry, "KCM Locale"); ++ const QString name = group.readEntry("Name"); ++ ++ // KConfig doesn't have a way to say it didn't find the entry in ++ // realOutputCode and returned the english version so we check for the ++ // english version, if it's equal to the "non-english" version we'll use ++ // otherwise we defer to QLocale. ++ entry.setLocale("en_US"); ++ const QString englishName = group.readEntry("Name"); ++ if (name != englishName || realOutputCode == QStringLiteral("en_US")) { ++ return name; ++ } ++ } ++ ++ const QLocale locale(realCode); ++ if (locale != QLocale::c()) { ++ if (realCode == realOutputCode) { ++ return locale.nativeLanguageName(); ++ } ++ return QLocale::languageToString(locale.language()); ++ } ++ ++ return QString(); ++} +diff --git a/src/klanguagename.h b/src/klanguagename.h +new file mode 100644 +index 0000000..51dc6dd +--- /dev/null ++++ b/src/klanguagename.h +@@ -0,0 +1,63 @@ ++/* ++ * Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org> ++ * (c) 2001 Martijn Klingens <klingens@kde.org> ++ * (c) 2007 David Jarvie <software@astrojar.org.uk> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public License ++ * along with this library; see the file COPYING.LIB. If not, write to ++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef KLANGUAGENAME_H ++#define KLANGUAGENAME_H ++ ++#include "kconfigwidgets_export.h" ++ ++class QString; ++ ++/** ++ * @class KLanguageName klanguagename.h KLanguageName ++ * ++ * KLanguageName is a helper namespace that returns the name of a given language code. ++ * ++ * @since 5.55 ++ * ++ */ ++namespace KLanguageName ++{ ++ /** ++ * Returns the name of the given language code in the current locale. ++ * ++ * If it can't be found in the current locale it returns the name in English. ++ * ++ * It it can't be found in English either it returns an empty QString. ++ * ++ * @param code code (ISO 639-1) of the language whose name is wanted. ++ */ ++ KCONFIGWIDGETS_EXPORT QString nameForCode(const QString &code); ++ ++ /** ++ * Returns the name of the given language code in the other given locale code. ++ * ++ * If it can't be found in the given locale it returns the name in English. ++ * ++ * It it can't be found in English either it returns an empty QString. ++ * ++ * @param code code (ISO 639-1) of the language whose name is wanted. ++ * @param outputLocale code (ISO 639-1) of the language in which we want the name in. ++ */ ++ KCONFIGWIDGETS_EXPORT QString nameForCodeInLocale(const QString &code, const QString &outputLocale); ++} ++ ++#endif +-- +cgit v1.1 + diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index af3f78ab5..c0b27cc8c 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 221120015..af1dbc524 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 95112536d..ce02896ba 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index bb36aeb40..b0243b827 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 2507670a3..0cdea4ab0 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index 24e00fd7d..4664b2b9c 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-utilities -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD index f3504d35f..492eb3313 100644 --- a/user/kdegraphics-thumbnailers/APKBUILD +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdegraphics-thumbnailers -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE thumbnailing sofware" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4e353f782d0f5acb3a6755f2868585b37c7527c5678b06f964ab78e902bcef97adfe882171690a029f3fca8c1b1805f0b89ee8fa71140b5ef8344d042bb6e109 kdegraphics-thumbnailers-18.12.3.tar.xz" +sha512sums="a41e9bab2ced645855aefcba5a8c9b73b9405941ca5059edcf830c96eca2cd9eb167ce4c6f9cf53e378e6b784d6bcbe6a7065d6f1b3deebcc4e660c9452aa4e5 kdegraphics-thumbnailers-19.04.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index ecdcfc4a3..25c92d9ad 100644 --- a/user/kdenlive/APKBUILD +++ b/user/kdenlive/APKBUILD @@ -1,11 +1,15 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdenlive -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" arch="all" +options="!check" # keyframetest.cpp seems to be broken: + # it claims the KeyframeModel cannot be constructed, + # and then abort(3)s with an assertion in QAbstractItemModel + # I believe the fakeit/Mock code is subtly broken somewhere. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev @@ -13,7 +17,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev - kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev" + kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev + kdeclarative-dev qt5-qtmultimedia-dev rttr-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz" @@ -43,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a05a48d7b2b958cc34fc1fd673af519861a0275f28d5b6774280e1b5eff009fa90a920d888466b70d2b07aecb3129892b6762d75d93106051c51c7a440fbfdc kdenlive-18.12.3.tar.xz" +sha512sums="4b3d203fcbcc83130f68f27d960b2d0b77b312edbb8654fa2df4d44d66ac0273389463f153012e72da09988559168e86b5b0a9a13ad0857969a561c76e5ac5e0 kdenlive-19.04.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index c9555acb1..93c075bb6 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdf -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6e604d18715dd5b743d63fe01528bfd347528f140638eed1900ae76a88911b2a2aea359e2603a17e82e7990a63c47789eb3b5839affb3a449547d9c89352444e kdf-18.12.3.tar.xz" +sha512sums="fbb72fa7d4ed54975e823b86ff9167bd43fc2211b558199a606debe8a53ac6c486ad9b68c3a46e75c7ea0efcd6045af58a456376e9d34ad20b189a536e8584a8 kdf-19.04.0.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index fc791cbeb..e5e79f1c4 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiamond -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8e11aa4af8fc3c856ab9a45def63491d0c5f14c5d33c93c19be73281873b3b84c20839733e92a9f146c288d908104dae776e8983ce1ee6560042d4c4633d9e78 kdiamond-18.12.3.tar.xz" +sha512sums="2e49c9776c2f44cea9c91926efe4f2e0c77c8fcc0c34ff93cd9fdc99f48d9b38b198fe8f8d705b1bd0a0d936b7391387b1f1ed324b9f7d823d35bff4d5412619 kdiamond-19.04.0.tar.xz" diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD index 14d9235fc..67159dc98 100644 --- a/user/keepassxc/APKBUILD +++ b/user/keepassxc/APKBUILD @@ -1,22 +1,22 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=keepassxc -pkgver=2.3.4 +pkgver=2.4.1 pkgrel=0 pkgdesc="A community revival of the KeePassX password manager" url="https://keepassxc.org" arch="all" license="(GPL-2.0-only OR GPL-3.0-only) AND MIT AND BSD-4-Clause AND ISC AND (LGPL-2.1-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND CC0-1.0 AND Public-Domain AND LGPL-2.1+ AND LGPL-3.0+" depends="hicolor-icon-theme" -makedepends="cmake xz qt5-qtbase-dev qt5-qttools-dev libgcrypt-dev - zlib-dev libxi-dev libxtst-dev qt5-qtx11extras-dev argon2-dev" +makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev + libxi-dev libxtst-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev + qt5-qtx11extras-dev xz zlib-dev" subpackages="$pkgname-doc" source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" prepare() { - cd "$builddir" - mkdir build default_prepare + mkdir build } build() { @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8 keepassxc-2.3.4-src.tar.xz" +sha512sums="4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502 keepassxc-2.4.1-src.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 744378ad7..2dea1fd5f 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata pkgver=5.54.0 -pkgrel=0 +pkgrel=1 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" arch="all" @@ -11,9 +11,11 @@ depends="catdoc" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz qt5-qtmultimedia-dev qt5-qttools-dev exiv2-dev karchive-dev ki18n-dev - poppler-qt5-dev taglib-dev" + poppler-qt5-dev taglib-dev kcoreaddons-dev ffmpeg-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz" +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz + add-formatting-fn.patch + " build() { cd "$builddir" @@ -42,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz" +sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz +f6d8b9fe9353fdf380d073b8a7dfa4dd8c822a64c1a978dbe8ce13d0f8327d3af5d314be41f9cecc32afb19896711452289b78e09b6fffb010d8c89843ebc4e0 add-formatting-fn.patch" diff --git a/user/kfilemetadata/add-formatting-fn.patch b/user/kfilemetadata/add-formatting-fn.patch new file mode 100644 index 000000000..5c3a1db91 --- /dev/null +++ b/user/kfilemetadata/add-formatting-fn.patch @@ -0,0 +1,479 @@ +From 4bedfd6609c6efe5dc327d305feac8985d4658e3 Mon Sep 17 00:00:00 2001 +From: Alexander Stippich <a.stippich@gmx.net> +Date: Sat, 9 Feb 2019 17:41:46 +0100 +Subject: Add string formatting function to property info + +Summary: +Adds the ability to format the metadata value +for displaying purposes individually for each +property. Currently, users of KFileMetaData +must implement their own custom formatting +functions. +All custom formatting functions from +Baloo-Widgets and Dolphin are copied into +KFileMetaData. This can be extended later. + +This adds a dependency on KCoreAddons to +KFileMetaData. + +FEATURE: 398581 + +Test Plan: tests pass + +Reviewers: broulik, bruns, mgallien, #frameworks + +Reviewed By: bruns + +Subscribers: ngraham, kde-frameworks-devel, #baloo + +Tags: #frameworks, #baloo + +Differential Revision: https://phabricator.kde.org/D17245 +--- + CMakeLists.txt | 5 +++ + autotests/propertyinfotest.cpp | 29 ++++++++++++++ + autotests/propertyinfotest.h | 1 + + src/CMakeLists.txt | 2 + + src/formatstrings.cpp | 86 ++++++++++++++++++++++++++++++++++++++++++ + src/formatstrings_p.h | 50 ++++++++++++++++++++++++ + src/propertyinfo.cpp | 27 +++++++++++++ + src/propertyinfo.h | 7 ++++ + 8 files changed, 207 insertions(+) + create mode 100644 src/formatstrings.cpp + create mode 100644 src/formatstrings_p.h + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa481a9..7ef0a40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,6 +40,11 @@ set_package_properties(KF5Archive PROPERTIES DESCRIPTION "KDE Frameworks 5: Arch + URL "https://download.kde.org/stable/frameworks/" TYPE OPTIONAL + PURPOSE "Archive is needed to build ODF and OOXML 2007 extractors") + ++find_package(KF5 ${KF5_DEP_VERSION} COMPONENTS CoreAddons) ++set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDE Frameworks 5: Core Addons Framework" ++ URL "https://download.kde.org/stable/frameworks/" TYPE REQUIRED ++ PURPOSE "Needed for the formatting of properties for display purposes") ++ + find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS I18n) + + find_package(Poppler 0.12.1 COMPONENTS Qt5) +diff --git a/autotests/propertyinfotest.cpp b/autotests/propertyinfotest.cpp +index ae8b1b8..e203dcd 100644 +--- a/autotests/propertyinfotest.cpp ++++ b/autotests/propertyinfotest.cpp +@@ -45,4 +45,33 @@ void PropertyInfoTest::testNameIdMapping() + } + } + ++void PropertyInfoTest::testFormatAsDisplayString() ++{ ++ auto emptyProperty = PropertyInfo::fromName(QStringLiteral("no valid property name")); ++ QCOMPARE(emptyProperty.formatAsDisplayString(QVariant("empty")), QStringLiteral("empty")); ++ ++ PropertyInfo year(Property::DiscNumber); ++ QCOMPARE(year.formatAsDisplayString(QVariant(2018)), QStringLiteral("2018")); ++ ++ QStringList artistList = {"Artist1", "Artist2"}; ++ PropertyInfo artist(Property::Artist); ++ QCOMPARE(artist.formatAsDisplayString(QVariant(artistList)), QStringLiteral("Artist1, Artist2")); ++ ++ QStringList authorList = {"Author1"}; ++ PropertyInfo author(Property::Author); ++ QCOMPARE(artist.formatAsDisplayString(QVariant(authorList)), QStringLiteral("Author1")); ++ ++ PropertyInfo duration(Property::Duration); ++ QCOMPARE(duration.formatAsDisplayString(QVariant(1800)), QStringLiteral("0:30:00")); ++ ++ PropertyInfo sampleRate(Property::SampleRate); ++ QCOMPARE(sampleRate.formatAsDisplayString(QVariant(44100)), QString(QLocale().toString(44.1) + QStringLiteral(" kHz"))); ++ ++ PropertyInfo bitRate(Property::BitRate); ++ QCOMPARE(bitRate.formatAsDisplayString(QVariant(128000)), QStringLiteral("128 kB/s")); ++ ++ PropertyInfo orientation(Property::ImageOrientation); ++ QCOMPARE(orientation.formatAsDisplayString(QVariant(5)), QStringLiteral("Transposed")); ++} ++ + QTEST_GUILESS_MAIN(PropertyInfoTest) +diff --git a/autotests/propertyinfotest.h b/autotests/propertyinfotest.h +index 677ade1..15e6a10 100644 +--- a/autotests/propertyinfotest.h ++++ b/autotests/propertyinfotest.h +@@ -30,6 +30,7 @@ class PropertyInfoTest : public QObject + Q_OBJECT + private Q_SLOTS: + void testNameIdMapping(); ++ void testFormatAsDisplayString(); + }; + + } +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 52fa8e5..c3cbe8c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -13,6 +13,7 @@ set(KF5FileMetaData_SRCS + writerplugin.cpp + writercollection.cpp + externalwriter.cpp ++ formatstrings.cpp + ) + ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata) + +@@ -34,6 +35,7 @@ target_link_libraries(KF5FileMetaData + Qt5::Core + PRIVATE + KF5::I18n ++ KF5::CoreAddons + ) + + if(TAGLIB_FOUND) +diff --git a/src/formatstrings.cpp b/src/formatstrings.cpp +new file mode 100644 +index 0000000..b0bfdf8 +--- /dev/null ++++ b/src/formatstrings.cpp +@@ -0,0 +1,86 @@ ++/* ++ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#include "formatstrings_p.h" ++ ++#include <QDateTime> ++#include <KLocalizedString> ++ ++using namespace KFileMetaData; ++ ++QString FormatStrings::toStringFunction(const QVariant& value) ++{ ++ return value.toString(); ++} ++ ++QString FormatStrings::joinStringListFunction(const QVariant& value) ++{ ++ return value.toStringList().join(i18nc("Separation between multiple entries in a list", ", ")); ++} ++ ++QString FormatStrings::formatDate(const QVariant& value) ++{ ++ KFormat form; ++ QDateTime dt; ++ if (value.type() == QVariant::DateTime) { ++ dt = value.toDateTime(); ++ } else { ++ dt = QDateTime::fromString(value.toString(), Qt::ISODate); ++ } ++ if (dt.isValid()) { ++ return form.formatRelativeDateTime(dt, QLocale::LongFormat); ++ } ++ return QString(); ++} ++ ++QString FormatStrings::formatDuration(const QVariant& value) ++{ ++ KFormat form; ++ return form.formatDuration(value.toInt() * 1000); ++} ++ ++QString FormatStrings::formatBitRate(const QVariant& value) ++{ ++ KFormat form; ++ return i18nc("@label bitrate (per second)", "%1/s", form.formatByteSize(value.toInt(), 0, KFormat::MetricBinaryDialect)); ++} ++ ++QString FormatStrings::formatSampleRate(const QVariant& value) ++{ ++ return i18nc("@label samplerate in kilohertz", "%1 kHz", QLocale().toString(value.toDouble() / 1000)); ++} ++ ++QString FormatStrings::formatOrientationValue(const QVariant& value) ++{ ++ QString string; ++ switch (value.toInt()) { ++ case 1: string = i18nc("Description of image orientation", "Unchanged"); break; ++ case 2: string = i18nc("Description of image orientation", "Horizontally flipped"); break; ++ case 3: string = i18nc("Description of image orientation", "180° rotated"); break; ++ case 4: string = i18nc("Description of image orientation", "Vertically flipped"); break; ++ case 5: string = i18nc("Description of image orientation", "Transposed"); break; ++ case 6: string = i18nc("Description of image orientation, counter clock-wise rotated", "90° rotated CCW "); break; ++ case 7: string = i18nc("Description of image orientation", "Transversed"); break; ++ case 8: string = i18nc("Description of image orientation, counter clock-wise rotated", "270° rotated CCW"); break; ++ default: ++ break; ++ } ++ return string; ++} ++ +diff --git a/src/formatstrings_p.h b/src/formatstrings_p.h +new file mode 100644 +index 0000000..125c31e +--- /dev/null ++++ b/src/formatstrings_p.h +@@ -0,0 +1,50 @@ ++/* ++ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net> ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ */ ++ ++#ifndef KFILEMETADATA_FORMATSTRINGS_P_H ++#define KFILEMETADATA_FORMATSTRINGS_P_H ++ ++#include <QString> ++#include <QVariant> ++#include <KFormat> ++ ++namespace KFileMetaData { ++ ++class Q_DECL_HIDDEN FormatStrings ++{ ++public: ++ static QString toStringFunction(const QVariant& value); ++ ++ static QString joinStringListFunction(const QVariant& value); ++ ++ static QString formatDate(const QVariant& value); ++ ++ static QString formatDuration(const QVariant& value); ++ ++ static QString formatBitRate(const QVariant& value); ++ ++ static QString formatSampleRate(const QVariant& value); ++ ++ static QString formatOrientationValue(const QVariant& value); ++ ++}; ++ ++} ++ ++#endif +diff --git a/src/propertyinfo.cpp b/src/propertyinfo.cpp +index 5439a58..56fc596 100644 +--- a/src/propertyinfo.cpp ++++ b/src/propertyinfo.cpp +@@ -24,6 +24,8 @@ + + #include <KLocalizedString> + ++#include "formatstrings_p.h" ++ + using namespace KFileMetaData; + + class Q_DECL_HIDDEN PropertyInfo::Private +@@ -34,6 +36,7 @@ public: + QString displayName; + QVariant::Type valueType; + bool shouldBeIndexed; ++ QString (*formatAsString)(const QVariant& value) = nullptr; + }; + + PropertyInfo::PropertyInfo(Property::Property property) +@@ -41,6 +44,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + { + d->prop = property; + d->shouldBeIndexed = true; ++ d->formatAsString = &FormatStrings::toStringFunction; + + switch (property) { + case Property::Album: +@@ -53,12 +57,14 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("albumArtist"); + d->displayName = i18nc("@label", "Album Artist"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + break; + + case Property::Artist: + d->name = QStringLiteral("artist"); + d->displayName = i18nc("@label", "Artist"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + break; + + case Property::AspectRatio: +@@ -71,12 +77,14 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("author"); + d->displayName = i18nc("@label", "Author"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + break; + + case Property::BitRate: + d->name = QStringLiteral("bitRate"); + d->displayName = i18nc("@label", "Bitrate"); + d->valueType = QVariant::Int; ++ d->formatAsString = &FormatStrings::formatBitRate; + break; + + case Property::Channels: +@@ -117,12 +125,14 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("creationDate"); + d->displayName = i18nc("@label", "Creation Date"); + d->valueType = QVariant::String; ++ d->formatAsString = &FormatStrings::formatDate; + break; + + case Property::Duration: + d->name = QStringLiteral("duration"); + d->displayName = i18nc("@label", "Duration"); + d->valueType = QVariant::Int; ++ d->formatAsString = &FormatStrings::formatDuration; + break; + + case Property::Empty: +@@ -147,6 +157,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("genre"); + d->displayName = i18nc("@label music genre", "Genre"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + d->shouldBeIndexed = false; + break; + +@@ -160,6 +171,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("imageDateTime"); + d->displayName = i18nc("@label EXIF", "Image Date Time"); + d->valueType = QVariant::DateTime; ++ d->formatAsString = &FormatStrings::formatDate; + break; + + case Property::ImageMake: +@@ -180,12 +192,14 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("imageOrientation"); + d->displayName = i18nc("@label EXIF", "Image Orientation"); + d->valueType = QVariant::Int; ++ d->formatAsString = &FormatStrings::formatOrientationValue; + break; + + case Property::Keywords: + d->name = QStringLiteral("keywords"); + d->displayName = i18nc("@label", "Keywords"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + d->shouldBeIndexed = false; + break; + +@@ -206,6 +220,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("lyricist"); + d->displayName = i18nc("@label", "Lyricist"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + d->shouldBeIndexed = false; + break; + +@@ -225,6 +240,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("photoDateTimeOriginal"); + d->displayName = i18nc("@label EXIF", "Photo Original Date Time"); + d->valueType = QVariant::DateTime; ++ d->formatAsString = &FormatStrings::formatDate; + break; + + case Property::PhotoExposureBiasValue: +@@ -345,6 +361,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("sampleRate"); + d->displayName = i18nc("@label", "Sample Rate"); + d->valueType = QVariant::Int; ++ d->formatAsString = &FormatStrings::formatSampleRate; + break; + + case Property::Subject: +@@ -382,6 +399,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("performer"); + d->displayName = i18nc("@label", "Performer"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + break; + + case Property::Ensemble: +@@ -394,12 +412,14 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->name = QStringLiteral("arranger"); + d->displayName = i18nc("@label", "Arranger"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + break; + + case Property::Conductor: + d->name = QStringLiteral("conductor"); + d->displayName = i18nc("@label", "Conductor"); + d->valueType = QVariant::StringList; ++ d->formatAsString = &FormatStrings::joinStringListFunction; + break; + + case Property::Compilation: +@@ -503,6 +523,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->displayName = i18nc("@label translations last update", "Last Update"); + d->valueType = QVariant::String; + d->shouldBeIndexed = false; ++ d->formatAsString = &FormatStrings::formatDate; + break; + + case Property::TranslationTemplateDate: +@@ -510,6 +531,7 @@ PropertyInfo::PropertyInfo(Property::Property property) + d->displayName = i18nc("@label date of template creation8", "Template Creation"); + d->valueType = QVariant::String; + d->shouldBeIndexed = false; ++ d->formatAsString = &FormatStrings::formatDate; + break; + + case Property::OriginUrl: +@@ -600,6 +622,11 @@ bool PropertyInfo::shouldBeIndexed() const + return d->shouldBeIndexed; + } + ++QString PropertyInfo::formatAsDisplayString(const QVariant &value) const ++{ ++ return (d->formatAsString)(value); ++} ++ + PropertyInfo PropertyInfo::fromName(const QString& name) + { + static QHash<QString, Property::Property> propertyHash = { +diff --git a/src/propertyinfo.h b/src/propertyinfo.h +index c1767c4..3c426e8 100644 +--- a/src/propertyinfo.h ++++ b/src/propertyinfo.h +@@ -85,6 +85,13 @@ public: + */ + static PropertyInfo fromName(const QString& name); + ++ /** ++ * Returns the value of the property as a QString with added formatting, ++ * added units if needed, and translated enums. ++ * @since 5.56 ++ */ ++ QString formatAsDisplayString(const QVariant& value) const; ++ + private: + class Private; + Private* d; +-- +cgit v1.1 + diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 3666f7291..9431d96e7 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfind -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecd2b1819800461becaf241b624d7c387fc81dd4069ebb82a044b188e8753a3b1054adfb254ade1fd327186c8ff8bf76d35b0c83caaf51ff7d36a55c98a23f2f kfind-18.12.3.tar.xz" +sha512sums="12d3c5cb09f883cf0f5c17e315380a7359dc3aabe1018ab66b24bb06a1199c9864404585d336f0dde3b5dd00f467c5f7571b61dc6350dcadc9b9dfbf0da4f6d7 kfind-19.04.0.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 734332657..9142d0441 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfloppy -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8abe9a4fcdd9e01ea60a8145126fa30ce3d4624904c57575596ea0620499b47edcab6fa5facafc6250312383fca7e9b254e65d5fa12587c9926c71eb54070e3b kfloppy-18.12.3.tar.xz" +sha512sums="70ce945aa3bc7fa34b326a2167aa80195b5e3ecb3d5b488ddcfe29a3cf59290dedcbf3b2e74b368ef67a416bdfc7a5ba680f390683352b3f8e4b7c6f90cfceb5 kfloppy-19.04.0.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index ceb7e7890..7dea7948c 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfourinline -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="69c75f82432862af0600d26072b58436de1073f97bae385d24f4c806e46f06e9a18a0549084050a4698fbcd7358e4789555f7b52e89875f2fa29db42b3e570ff kfourinline-18.12.3.tar.xz" +sha512sums="79f519af67b7f76e20ad1feeb65acbd32c7f3ae6035b073489a88ce882a0e6d73233ad23ef2b5da1e961efb94505f01025107f1f6aea3879db91abe7878a0212 kfourinline-19.04.0.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 9ab97cae9..04753d405 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="34d727d2b28984c0a39be5b9e5320c91279f5020d830703a91073265103f9273375b75b4bdc6c1c5b068f0712b049c35ef0a24f945840f8bc770f27fc5419d44 kgeography-18.12.3.tar.xz" +sha512sums="e94f674b761123bbdec8ba4412dcdd0bec6b59c0ced54eddc4eb45dacd23e5f47d5b38d0fd88ea1aad2d13c9bf35347b38025034b769773d7b4970639a81466e kgeography-19.04.0.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 9ba3eff2a..c7dcd8aa8 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5e3680d3ac5e8e23ac8132133c66a4826035e89ddc74fb2b7cd6a0670f5682e750f839ac91e86fe4a78cd5c45a95b38793532e247b717b5c1a63200ed5405335 kget-18.12.3.tar.xz" +sha512sums="80f0f9ff280b9523883b9602965769268256174e10d6a4a956dab32b6a68d8b34931c34e3f65ecb0571f06b45302f8b56667d307095b5df884496f862d75dbb3 kget-19.04.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index 8eb4d412b..10f6eef3d 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgoldrunner -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eb3b0a384557da0a7aa8ee264c00c55f62353d0377e1ef1137ca6bee7d0959dbe51f5fcc5d4946a9e8626020076f06794f1de30d4ac0aaaa0e57d3e3e8a1dc80 kgoldrunner-18.12.3.tar.xz" +sha512sums="13e8d0e1c4617be4ffcdbf2e4b26b2cdef07cb1394feab707f7cba873ab1b83a7fd8bacd96d0fd624fa1305bae56f8fb028f2e9e40a4b02b34f1997bd3e99a52 kgoldrunner-19.04.0.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 2f8a53c0b..a3548febb 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f510dd4e4b717a00c8128767cea99b2725e10d8493cbb8a2a70ee0acbf53424edfb5d95052dff833988b3217b525d721c681a236ba7b7c87259f453a7956e881 kgpg-18.12.3.tar.xz" +sha512sums="480fcdd77f6b2f22184848a093b711eaf9c3e1414c3740118312aa763a226441ad4bab3c1280f785e6108e548bfd39228713f36ef3b0e6a49dfc9a3dd9d00921 kgpg-19.04.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index 73c9481d1..8932af8b3 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc9008ff7e79e02b185c4180403a1741a62dabbb10b87b01f5b55d4ba04c7681e27a291dc6c8b83cd87066be624539f8e3097cfca755f74727ca5cd64ffb4bd5 khangman-18.12.3.tar.xz" +sha512sums="25fe701765143acb98448988f31f8de6c2ec23eee1e101423c79f4c01e47852d8a3601fad3e4e4cca8d6995fbf9d952c9feeed4f85115157382f21f1fb25b2d4 khangman-19.04.0.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index efeca02f0..62f910832 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khelpcenter -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="728b335076dbaf63bf8ce8fbc55f5d4efe01663998b30ae40d252903c1090c29d5cfd58e9036242ec9b0206c34d7b397a0739e7ef9962d6dfb0ecaff9ea45df3 khelpcenter-18.12.3.tar.xz" +sha512sums="75947d5e2e13fd8d9a1f3b1dd6bf0c63e0e695de7a09be07bfff1f40c6a3a475eccde2e3ee53b7b29bcf01cd2b8f409fc6294f65a617f1b0cafad999c2636984 khelpcenter-19.04.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index eb5400644..0b38d05be 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url=" https://www.kde.org/applications/education/kig/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fa540b7f57b4878dfe44e0d8a6ee5f84ec524ab79867e545c912a715e0e0c2d9b35d12575d751944b5049f12c28ed838460cabef37d73c3f56591f1028bb2479 kig-18.12.3.tar.xz" +sha512sums="8b4ce8ad095ac7a0bac603adb77bf9fdd7312027579889d20228d4df751d8cd982a04b41b8ede75509e3e731601e2bbdc8d9416461cf70b122b9f926431c35c9 kig-19.04.0.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index 288499c0c..80d183091 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kigo -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d949b549589185fa0bd24b5d4bc245283e8fd6e823c51b0becb76d15d74c67dc35e8a46e99cfcce4dd69bc2baca20234488e64e4f7bc1e02aa95092e9907b3fa kigo-18.12.3.tar.xz" +sha512sums="725312eac361a1d15ad0f4ae68d63d526bf33700858dab72229c55c4ab6e79d4b2efae7a2271c2db0b21a8bc8a7099307592e72b232099ca3ecaa104a4b3eb4a kigo-19.04.0.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 286dcb45f..93b0349c3 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=killbots -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6f9fe391776da188489f42cbc2d0563a36f1a1ec88791cbbf7f4364cc0e5eb3b0eb028ea69a7a7444829e467026c459801c4c02dccbcdb624c2a45e1d56b6e3c killbots-18.12.3.tar.xz" +sha512sums="84d28d41e910b8bad8742db74983622c2caaa59579a09ef85000f71f35b2a69cf47e0e28b1c362681d38caee4f33b41f32678706fba0e286e3182d8c54e12e62 killbots-19.04.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 0cd186244..737947149 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -13,7 +13,7 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev kdnssd-dev kpty-dev kactivities-dev phonon-dev libtirpc-dev - taglib-dev libmtp-dev gperf khtml-dev" + taglib-dev libmtp-dev gperf khtml-dev syntax-highlighting-dev" makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a13c349a27b7ffd665b9a3812d70228ab40ac48c50ded7774ed954ce30a6454d1a9c5a27769ddae8f333db0c87943eab18380da413274b69802d9569f6e48d66 kio-extras-18.12.3.tar.xz" +sha512sums="7323620620910f05c1b05c52058b021175541849bb503929ad389ecf358d01c72531a92822f41f2b95bf752d7624d2f30a87e2b4557f55e1107ff71ca89d9885 kio-extras-19.04.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index af95bc989..2f2e893f6 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiriki -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8b2257ce1c80d34dedf19747ac49f6c040b6512e0271488a173990fd3ff9858e7c29f86a0dc468a2bc244b3cff1e881da1465ba29682a4288d097f74ab1f6f29 kiriki-18.12.3.tar.xz" +sha512sums="a4b9068d605c41ccd1ecb3c2fe8dde85ae5f6df31279b88ba74b8b27df1e83117fcded97ea9a35287caeab7076195191109409d7f1bbe1f26bc19b292ec3a4af kiriki-19.04.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 3e8ecabab..6698e3fd8 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="75effa8a23924cb5369fb63b09e974e2d0600b28d92757170d5ca452f5be3eedf874aa7ef7f3a60a953176ddf29beae0945ca31e0550be85b77c50eee748b4cc kiten-18.12.3.tar.xz" +sha512sums="ea68b0de0a47ff598f61c4a109a4839c66daf87e72506d505926fb237f442a0a0646abfcee9161b073889afc0084710326e0b2643541959147369ca758c2a079 kiten-19.04.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index e1dcf4d3a..109e5fbc4 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjumpingcube -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8606ca6020dcd8f6d49ed6120899c0e705505575d26fd9e9c89b4d5e8306a597e51ef2761c1176859e0c22545b1abe2cf470e1aab4d19170ec2c7657c8019cb2 kjumpingcube-18.12.3.tar.xz" +sha512sums="559cef9c6645621431201b48367cc7cef262a62c325ca1db733781caf21b320bb36ee5483e4d0194dcbc960ae157a3641be3eb19628d2cd9471b642601494010 kjumpingcube-19.04.0.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index 4dcabff8f..b8a46881b 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kleopatra -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -12,7 +12,9 @@ depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev libkleo-dev kcmutils-dev libassuan-dev kitemmodels-dev kmime-dev knotifications-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz + qt5.9.patch + " build() { cd "$builddir" @@ -40,4 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="707fcf4ed9bc2c4d7d45f5911ce1760b49b567865d5f5d315a0af12cb0856e39230c348efbcc449a1e4403f7fb3a0f0ebb654573e0d2bb511d8ff8909f932e6e kleopatra-18.12.3.tar.xz" +sha512sums="c0751d81740b6c590dc1a7e370f99fa09d616b2b9282a862242b2b5235690a4bc36044d08125fbe789ac5470f1aca1525c87752ec40e76c229d37b0eea9cf428 kleopatra-19.04.0.tar.xz +27f03d36e0fdf8f05f59bd3269abc9c60f7f368821a2d6545dd369b046fac4bcb5f9c59a2f50a9d6b3f58d97e767d3596517ed7ed2d72847b68276d60723eb4f qt5.9.patch" diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch new file mode 100644 index 000000000..afda4936c --- /dev/null +++ b/user/kleopatra/qt5.9.patch @@ -0,0 +1,76 @@ +From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001 +Date: Mon, 17 Dec 2018 08:12:46 +0100 +Subject: Revert "Remove QT_CHECK" + +--- + src/commands/certifycertificatecommand.cpp | 4 ++++ + src/commands/importcertificatescommand.cpp | 4 ++++ + src/dialogs/certificateselectiondialog.cpp | 4 ++++ + 3 files changed, 12 additions(+) + +diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp +index 524b5a6..5577f2f 100644 +--- a/src/commands/certifycertificatecommand.cpp ++++ b/src/commands/certifycertificatecommand.cpp +@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart() + cmd->setParentWidget(d->parentWidgetOrView()); + cmd->setProtocol(GpgME::OpenPGP); + loop.connect(cmd, SIGNAL(finished()), SLOT(quit())); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection); ++#else ++ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection); ++#endif + loop.exec(); + } else { + Q_EMIT(canceled()); +diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp +index 49294b6..89542cc 100644 +--- a/src/commands/importcertificatescommand.cpp ++++ b/src/commands/importcertificatescommand.cpp +@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import & + auto cmd = new Commands::CertifyCertificateCommand(key); + cmd->setParentWidget(parentWidgetOrView()); + loop.connect(cmd, SIGNAL(finished()), SLOT(quit())); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection); ++#else ++ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection); ++#endif + loop.exec(); + } + return true; +diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp +index 003872e..020310d 100644 +--- a/src/dialogs/certificateselectiondialog.cpp ++++ b/src/dialogs/certificateselectiondialog.cpp +@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i + QItemSelectionModel *const sm = view->selectionModel(); + Q_ASSERT(sm); + sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows); ++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection); ++#else ++ QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection); ++#endif + } + + void CertificateSelectionDialog::accept() +-- +cgit v1.1 + +--- kleopatra-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:10.000000000 +0000 ++++ kleopatra-19.04.0/CMakeLists.txt 2019-04-19 06:34:58.511578506 +0000 +@@ -11,10 +11,10 @@ + option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF) + + # Standalone build. Find / include everything necessary. +-set(KF5_MIN_VERSION "5.56.0") ++set(KF5_MIN_VERSION "5.54.0") + set(KMIME_VERSION "5.11.0") + set(LIBKLEO_VERSION "5.11.0") +-set(QT_REQUIRED_VERSION "5.10.0") ++set(QT_REQUIRED_VERSION "5.9.0") + set(GPGME_REQUIRED_VERSION "1.8.0") + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index a41eac3a3..bedd33d30 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="878308007ebd889a9924094bdf3e5d24ce6a04405f9311e8b197faa44e93a57730911ee084ee26ba1a5ac2c515b4227e614057410e9d9c0927fca63a805db09a klettres-18.12.3.tar.xz" +sha512sums="6e9f3e5a60ffe2e5e0939e83c3b58aba2b99ca89c01e73f59c8c19c82a740e663c1761bac635e1492ed0ed5e29a3d8423531fa678e8a0fa04e2df4849629ea71 klettres-19.04.0.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index 526f95d75..0c6dbd5c9 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klickety -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7238c2b7ea0e605bbe9675593f95cdf6ac2b427d9d7aa3999fa05ad3f4604968dbfacad016b0770cf82e1dabb1e572cc3e6d16a4b34bb8f1e400371a6fe0a0e5 klickety-18.12.3.tar.xz" +sha512sums="a8fa007ec3a02e3a4157e8d96a0334489a7321c49769c3d85b7b45ccfd1c9cb39fc42b547b1fc8512cae0fce936a90ee622ed453edd81d31ba36ade1908bdee8 klickety-19.04.0.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 4b9af8538..08fd79e73 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klines -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3dacd2ede7f5303ec49b2c226b1e3521176cd37af539a1796939f43faf8e3dbc00f2d5278bf46c0e4e1cd8d4d1fb23b15f90a164cc4c55547bba8255b8506990 klines-18.12.3.tar.xz" +sha512sums="689c28049f11ae14a9a3703cb266bfdf3f19e62d1f32be54e8edf582a30d793b73dbd8cb51da3bdaa27e4902c552cbaa9df2fd6124e025ab39f1ab8a86fec24b klines-19.04.0.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 5f103bd45..299f366d2 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmag -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7339513c36e20e8d7182c916428564bdd43f140430df0f053d0b6891c217608b6cf1f9adc15e0e11f689b2f26d4238b9f66d2b1c64cc2d0b0620f3a34509205e kmag-18.12.3.tar.xz" +sha512sums="07c13bf724945d9c5fb68a8f78ea88b6aecd64d217bb46708b1352378aefc9d76ddc4f51c5e3e66c0000a4b7c867ef5d3620ad4a063f9bcc6172d474c7f6a0da kmag-19.04.0.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 0a5f8cf41..598ac8e47 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmahjongg -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee096ee9a890ecef53dde06d9a618fd70e0cafd59b0b6199d8bb0f0716733187c5f8a2bf9cbe43d2157ed502a3efdb06698a6fe3e6485199af8d71c9b8eb8252 kmahjongg-18.12.3.tar.xz" +sha512sums="ace4e0a279605fae0f22dcf1bdeadfca5d507910afb44b5df482d79b19680f0928fdc56bf87e0b6914f080fddddee930296475b08fc45adde957d080ca78698b kmahjongg-19.04.0.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index d28c6b378..d637d87b3 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,19 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" arch="all" -options="!check" # wtf license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules python3 kcodecs-dev ki18n-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kmime-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/kmime-$pkgver.tar.xz + egregious-versions.patch + " build() { cd "$builddir" @@ -34,7 +35,7 @@ build() { check() { cd "$builddir" # https://bugs.kde.org/show_bug.cgi?id=385479 - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E dateformattertest + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(headertest|messagetest|dateformattertest)' } package() { @@ -42,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ed02fa15ef1d437f6c13a8bed4092c62fbbd55595156bd9766a8b980665c18a2a7ab2c841cc7657710480f2e98d275e8d377ccbba32081ef14e2a2aa5db5fb2d kmime-18.12.3.tar.xz" +sha512sums="6bbc75d77d777edc084c8e1a81e198ed0a3959f1d4d332e442f298ced5a1d4d03613b6c397e9e0a96d81b0693b3e8dbfd0f011c54db0f053c207f16a16926c4e kmime-19.04.0.tar.xz +b5f04ab4f7ed60bde1eeb50141c5b51a4f285d7b125d834559419d56039c1d540a8d44f508801ae9ac2c6d91c3841d4e64c3856e2c5bfa33eb64175dc9b5c608 egregious-versions.patch" diff --git a/user/kmime/egregious-versions.patch b/user/kmime/egregious-versions.patch new file mode 100644 index 000000000..af0411338 --- /dev/null +++ b/user/kmime/egregious-versions.patch @@ -0,0 +1,24 @@ +There is absolutely NO REQUIREMENT on these newer versions by KMime. + +This is only done to keep in sync with the rest of KDE PIM. + +--- kmime-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:19.000000000 +0000 ++++ kmime-19.04.0/CMakeLists.txt 2019-04-19 06:18:49.665558623 +0000 +@@ -4,7 +4,7 @@ + project(KMime VERSION ${PIM_VERSION}) + + # ECM setup +-set(KF5_MIN_VERSION "5.56.0") ++set(KF5_MIN_VERSION "5.54.0") + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) +@@ -22,7 +22,7 @@ + + + set(KMIME_LIB_VERSION ${PIM_VERSION}) +-set(QT_REQUIRED_VERSION "5.10.0") ++set(QT_REQUIRED_VERSION "5.9.0") + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) + + ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 1a0ffcec3..01b636dde 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmines -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="60c5a271f50a94ea018a325bee733a8541169e956208147fc640d7be5afc74a90518aca5a3946c1a49b66fb11acfd1b1b7cc44d5311671c6eaa425092ac2a30a kmines-18.12.3.tar.xz" +sha512sums="e528ae607e709866ed6671ebf7766f187ce0fb1aea42d9b9544070993248a87a3cc78e6add1234ac23fc4aad83cb7ff591fe486eb2e0d577520dc9d367e7d0a7 kmines-19.04.0.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index aef50e86e..b2796db44 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2b99863aee801e8e0ce5100599b2ba6646ccae38c4f25a00b58ed71a48b36874df33b9f147b601135a3c6ccce16dfb4a7329814d92bab03a5a750d4abbf681cc kmix-18.12.3.tar.xz" +sha512sums="d2437c946de2f90abfd4f16f20ed1956358e38384d32d021272d7ff92dc47bd80a742cdca4a9ff60cfa1d155a551183eaf13dbb4568dc1691462d53e7c65415c kmix-19.04.0.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index 01f1229b9..cc2339b09 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmousetool -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c6cb2a60b9bb545335a648f28435eed12c2cefde930587afad2c35d815aa785cd4496be6745a0bcff6ffbe4940f79f12ebc949b3ddbd2701b157b98ea135243e kmousetool-18.12.3.tar.xz" +sha512sums="798c5504a64287738e9b39a55abb350b3136a0d02619d4ccea1a5a44b91a50e4a05b4999e800c58d6e6be6f0fda8ac22f0ac13c49908a75817dc0b4431804aa3 kmousetool-19.04.0.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 3116bf623..2b9cf1228 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6fa203f4cd192e114ccf7f87df3d1f1f0e806a0bb4027a31eb0fc16a239fba841b643ea7b4b8f4d72a43efe9605e22bd0b47d7fbb9232b5305c60cd2e4ccadb9 kmplot-18.12.3.tar.xz" +sha512sums="25511a256eb68f00580ba015cdcde30c024965b2f86980e4faad9b273d9084baa77184c400980923cfe613467058466e4cfe3c3aab086a5cfbc8b4845b4cfa81 kmplot-19.04.0.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index e3f922ce3..48ad1c93b 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="49660ae9a472f06d98a95db38b697d4aa37acf0ca4aa14510f4a2256106e3a9e2c8162c1f65b8f36ed2978f25da6263c2c82666458c0e344af87da881d571811 knavalbattle-18.12.3.tar.xz" +sha512sums="1aeb990aee87535143217742e7b29821f6f79b1916bdfcad9e6a7cfe68be0f6ee936699c29cf8ac826edd168fe3c9e52b48617e07f8fd82568fb36203be1ea63 knavalbattle-19.04.0.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index 91f59ffd1..b1003d32d 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knetwalk -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="36fd21b7a5e37f131fbba4bd13391c21e3abec3a2128c49badb3a44641d8ffe0d999df6a40f472125d42e9bfac02815b2ade0a4eb4eebda64c95035c6e24d9b2 knetwalk-18.12.3.tar.xz" +sha512sums="729e7c41c1c9abbc8217c777b5660634831b3ec778e897f0ba90dd11450c18f6dda4fc4290756d46f826c7d94f6987adbe6b0ba65cea8419d8c8dfabf70883df knetwalk-19.04.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index fcf84a6c9..5386291a8 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="321e5eb368f3e9c64a941d0b32abd56e8e0eb9f49a74ce07c1382ab3625e0ddb843f7b6808856e6c64a7026f8203c009a7ce285efb28b3c85c51f15c118c5480 kolf-18.12.3.tar.xz" +sha512sums="d1a521a026b396228178ef69a76fb754d6ec8eca33af65445d25e7539e10f3ccc017887b4adb89734739438e21571a3135c2891013e0e2b1e01ab76816874409 kolf-19.04.0.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index a01e020f8..8471c8684 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kollision -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eec43613ab81ebbabe3f6e2ea59f861c7c22772105ec1a15bb1fac5a1eb8086627a00ae1987c77d757b0ea8f14c2544dbcec69f669e6f8ae6866e483e29ec3e4 kollision-18.12.3.tar.xz" +sha512sums="95ef13a9d128a9b23bd6f48d60a794957e33e360c194d67f9874aeeb290df291130911fa148f2eb445de9fd8510f6a4755ad2072e825465389e7c11238b7f921 kollision-19.04.0.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 11845e7ed..e54cb11b4 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple painting program for KDE" url="http://kolourpaint.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ac294aa80ffebdc6440474c15c5450fdcf15d735e6d920e2af99c92cbaa5f8930330a268faea5fb7859d1128c7479049ceb672715d7a4dbfdfb7e3b72157af13 kolourpaint-18.12.3.tar.xz" +sha512sums="e0bc3084c1f39196c10344e4a941e55783fde14a4832aa65e59e32d09e33d96cfe9904e6c24adb75d3297eaedf387ec8f77c6edcdd93de4664c26be33e514931 kolourpaint-19.04.0.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index cf7b6b3be..cfd9c780f 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konquest -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c61520a69a2dcd38c66cce521cf25060b31047b77e6f587389a486b4e7438e140f149cb488fb2500feb195d54035a828f9d38ef4d70d8b36003c6c6b3d33169e konquest-18.12.3.tar.xz" +sha512sums="d6634679188e1960278fc82aa94206ea12a644d1f907b69459ab116a745149e9298c561c69b156a0d9ee655770a2b91a3f84f365526580fbeead43d83cc4e0c7 konquest-19.04.0.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index 551c18148..bf4cc3c05 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konsole -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -16,9 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev kpty-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev python3 kwindowsystem-dev kxmlgui-dev kdbusaddons-dev knewstuff-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz - cursor.patch - " +source="https://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz" build() { cd "$builddir" @@ -46,5 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9fecd316a9bc7adaca9a3fac38a57d293286b6328e88d96ac1cf8967fcb67ef8e9a5b085e185c4373599eafd0eaa18f0d73df70df16b98a1badd9efb689e1f7c konsole-18.12.3.tar.xz -66dcb31dd63f7a300b64058e8f9e56aa122c407d3a4a85c2323e7abf2e8eb4a3e1dd83de9445dac4938f9395b612eac5ceb9626bf895b532cfd19f63e0fbb2d7 cursor.patch" +sha512sums="15ebe4031f362663343ede3ccffc13172ea9f6a5ed34deb9c6ddb81524c10c872ef14ed5941e3ed3b7e340dc19f92e2ec579291ef40eede97ec5ef85b21d4d0e konsole-19.04.0.tar.xz" diff --git a/user/konsole/cursor.patch b/user/konsole/cursor.patch deleted file mode 100644 index 621a4f36b..000000000 --- a/user/konsole/cursor.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 9af659c73e3203e1d5ef3873fa6c0144258b9673 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer <wbauer@tmo.at> -Date: Mon, 4 Mar 2019 09:59:45 -0500 -Subject: Fix ibeam and underline cursor rendering - -Summary: -Since anti-aliasing was enabled in the painter, coordinates need to -be shifted half a pixel so that they align with the pixel grid, -otherwise the result gets "blurred" due to the anti-aliasing. -And as parts of the blurred shape leak outside the cursor rectangle, -this also leaves artifacts when the cursor moves or blinks as these -parts are not cleared. - -This is basically the same as commit -e7085310d6d594823d0ed491fa8bdbd99dec4932 for the -standard block cursor. - -BUG: 402589 - -Test Plan: -- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced" -profile settings - -The cursors are a single line again now, before they were blurred by -anti-aliasing. - -Screenshots: -Before: -{F6656366} -{F6656370} - -After: -{F6656371} -{F6656373} - -Also, there are no more artifacts when the cursor is moved or -cursor blinking is enabled. - -Reviewers: #konsole, hindenburg - -Reviewed By: #konsole, hindenburg - -Subscribers: hindenburg, konsole-devel - -Tags: #konsole - -Differential Revision: https://phabricator.kde.org/D19513 - -(cherry picked from commit eccfb1f62bbf67ebffee11e241bd05757b826ff1) ---- - src/TerminalDisplay.cpp | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp -index 64c831c..7c8137d 100644 ---- a/src/TerminalDisplay.cpp -+++ b/src/TerminalDisplay.cpp -@@ -958,16 +958,18 @@ void TerminalDisplay::drawCursor(QPainter& painter, - } - } - } else if (_cursorShape == Enum::UnderlineCursor) { -- painter.drawLine(cursorRect.left(), -- cursorRect.bottom(), -- cursorRect.right(), -- cursorRect.bottom()); -+ QLineF line(cursorRect.left() + 0.5, -+ cursorRect.bottom() - 0.5, -+ cursorRect.right() - 0.5, -+ cursorRect.bottom() - 0.5); -+ painter.drawLine(line); - - } else if (_cursorShape == Enum::IBeamCursor) { -- painter.drawLine(cursorRect.left(), -- cursorRect.top(), -- cursorRect.left(), -- cursorRect.bottom()); -+ QLineF line(cursorRect.left() + 0.5, -+ cursorRect.top() + 0.5, -+ cursorRect.left() + 0.5, -+ cursorRect.bottom() - 0.5); -+ painter.drawLine(line); - } - } - --- -cgit v1.1 - diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index f893118b1..5c5e3b9c5 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4fcd9860ac7e1d1069bd1f1e46943fe1695c0e7080b91c9b320fefd0bac4a782b95f9b20440a1a1409a2ea9f131050ea121e0f4ff935db471044cf9320b5bc96 kpat-18.12.3.tar.xz" +sha512sums="63b59448d209dbf06f6d62bd261f57e63f9f46875a5e81b42715d9abc4c27309f115e9eb7877f147e8af571e7660a99d929da1e90f29dd83034daf8012ce6318 kpat-19.04.0.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index ed683d6b7..ca7ae9c47 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpimtextedit -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -16,7 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev ki18n-dev kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev qt5-qtspeech-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz + qt5.9.patch + " build() { cd "$builddir" @@ -44,4 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c3f4d3143a56cad623a5fb514c2234e4f00c07f395e72648ed3429a88631e3c752ea55d321fe55584f1846d3f97fabf3796ce3883cba06238f00e735028853bb kpimtextedit-18.12.3.tar.xz" +sha512sums="dabddde9d7ee98927c10234ca9e6540c55417eabf930c66afaa8c88d5ab289bbadb20e2c0cf6334aa199a780bc6e54d1afa0ac981606c0b5316f992c06b67cb2 kpimtextedit-19.04.0.tar.xz +13f90299735e145142f969ffb6462b71c1cd85d5503c3902af924388042396526ff8b943229462e0ff7e5030393e5312dd67b8dfc66efec81f4f05ac15f86091 qt5.9.patch" diff --git a/user/kpimtextedit/qt5.9.patch b/user/kpimtextedit/qt5.9.patch new file mode 100644 index 000000000..50c29e0e0 --- /dev/null +++ b/user/kpimtextedit/qt5.9.patch @@ -0,0 +1,49 @@ +From 6961b54d1c814f2e7aafd7db8256f82688f014a3 Mon Sep 17 00:00:00 2001 +Date: Mon, 17 Dec 2018 07:23:52 +0100 +Subject: Revert "Remove QT_CHECK" + +--- + .../plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp +index 8ce0fe9..c07699c 100644 +--- a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp ++++ b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp +@@ -144,9 +144,13 @@ void PlainTextSyntaxSpellCheckingHighlighter::highlightBlock(const QString &text + + const auto nextBlock = currentBlock().next(); + if (nextBlock.isValid()) { ++#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, [this, nextBlock] { + rehighlightBlock(nextBlock); + }, Qt::QueuedConnection); ++#else ++ QMetaObject::invokeMethod(this, "rehighlightBlock", Qt::QueuedConnection, Q_ARG(QTextBlock, nextBlock)); ++#endif + } + } + +-- +cgit v1.1 + +--- kpimtextedit-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:22.000000000 +0000 ++++ kpimtextedit-19.04.0/CMakeLists.txt 2019-04-19 06:21:56.055556133 +0000 +@@ -4,7 +4,7 @@ + project(KPimTextEdit VERSION ${PIM_VERSION}) + + # ECM setup +-set(KF5_MIN_VERSION "5.56.0") ++set(KF5_MIN_VERSION "5.54.0") + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +@@ -36,7 +36,7 @@ + SOVERSION 5 + ) + +-set(QT_REQUIRED_VERSION "5.10.0") ++set(QT_REQUIRED_VERSION "5.9.0") + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets) + find_package(Grantlee5 "5.1" CONFIG REQUIRED) + set_package_properties(Grantlee5 PROPERTIES diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 950ac7ed8..63fa2077b 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="eeb48eb968e1cb54a76d82dff1eec001b880456d2cd52f33dea6be6e3fb08186e25af89ee9a89e077e91ce0a0ebaa522bc453d5137e384018489ffc1f8382927 krdc-18.12.3.tar.xz" +sha512sums="2f612c15d187ef3e872aecff47096c977d5b4a62884840fd83b3eb54d60f50c96d5ab7c7d77375220a28c24bf5f36757a49f2c090430bd3f4e5e26d281660bbe krdc-19.04.0.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 870c1d082..80ce3b2e5 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kreversi -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb3fd6a6e855701196cdd34d0e4611ce9e23cb51c2b461defc2c93e523dcd422bb02d5bb1b47fc376071de41bc6909b614b1e0389fc8e0210fffc7472f144deb kreversi-18.12.3.tar.xz" +sha512sums="97708bcaa24e08ee1ec8f7b014c1ab9a472e10e73e0b55a83c0f34df04cdd9ca3ad2533d2e343afc90507096adcc295cf01d5ff481dea05de0d7bab12e56a08d kreversi-19.04.0.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index c9b009993..1c49601d0 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krfb -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e195d7cfe2f6c3c17b203da1bb0c1cb0709d4192a05b32bf817666183ce7889afc7b64afb54187f795f493ed88531a2de14bac3d7dbe6aacb7618220380fa518 krfb-18.12.3.tar.xz" +sha512sums="328e557e353e9db0081e84ca179bfbedae697d5d28922dc8ae18b812105fb3ef048dd7a6d0e55c0ba46344ae9e16795564e7203ab08947ea85297b7935d062f4 krfb-19.04.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index 025afb5c9..cc0cab917 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26c214cd2dd246a76e1133120d5932c4945ae7ffb98f15c60a577471a3bb35295d14a77a953d60facaf659fcfa47da019a39dedfe3267465f65649a4ef66ef6e kruler-18.12.3.tar.xz" +sha512sums="c1917ef45236df739a5b12cbcf593973e4fe87aa86a20207a9d0e47c3aaa11186521fbd9492195e7653321abc025fcb59948cb4d9c5bb9e858a7c5e70dd38c50 kruler-19.04.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index 9b83f59d6..7580172fc 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kshisen -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d920cd913714f7e93df0133e8caec5dc2649c3d4dfd0f157fb189efa694632b3027053cbcdcc187cbd4d04b1ebd7526544f5857f80b5a933f4c73911531a5640 kshisen-18.12.3.tar.xz" +sha512sums="35494b4ba69b3f2958212f321c77fd3fea9c8cac1e3e740ab70711489b2d65fbe3f2d08b1893a5286a3647678721eda8f2d333613fd6ad58815d5bd340f16f16 kshisen-19.04.0.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 8f6313b33..55ee782b9 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="60e1267490b9c97f77e0313d19336f798564eb2a35b1c78907b5591d33360abdbc10a6fc46aa3a0956e8004c7dddaa0f91772535ee04678e3f8bb9a29de1a518 ksirk-18.12.3.tar.xz" +sha512sums="84624e20f53b1de3b8aaf84a8df54a4c83a04618d2df3ab6b34cb8953962958ae7a8c9f9c54a7d99188220c5167bbc7ad699629f9576ecdba5872cc5b7663b61 ksirk-19.04.0.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index 589411c06..94751c1fb 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksnakeduel -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8efc73f83ac68e2ccf27d019979509d343aada8fa73d27bbac4f428ecc0238bc9740863995c93f36980aceafa9f3a193ed2c114a90e4436e3ec470cecc50b625 ksnakeduel-18.12.3.tar.xz" +sha512sums="5b24913b0255e7d1c0c09d00acb523d2ae5c91b1396fed555f111548c71669477f8778386782f951c4ec6d6f01f0ec113b8f13e32e633791fb95bdf46777f089 ksnakeduel-19.04.0.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 67102b293..84204a6f2 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d646f969ada6ea721ae02c177904f0c392732979dcab3e20a332a7b058c2284c4109c286a0a165620378f92cde864cf7685c852fcf366cbec8cae551640a0081 kspaceduel-18.12.3.tar.xz" +sha512sums="5574dbeabf17abbb0e1f232a6f6e7f9f16106f88b8bc79af8b0ba4a323625d1fa70460faa0f2efe0046df76b6ffceac1d723a492a72cfbebde051dde1a7a8187 kspaceduel-19.04.0.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 4f8de77f3..cb9d4ac0e 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksquares -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3075a4724bc8cf3d25d94a725818db31f75b4d1ef54e00faff9cab84ffdac7585dc79af7fff0e667a1f679602f22c0ba2dffca10b9e980dcc2850558e1f982bd ksquares-18.12.3.tar.xz" +sha512sums="20b93e06b64062a3efe5985fbebd637a4f06ba1319ea0cc91c61a217966529fd74dfb47e7f2e441c888e872bfd8fecc809cd7838175fd0967db44adca5fa78ce ksquares-19.04.0.tar.xz" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index 3515bc53b..52cb1c2f3 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksudoku -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6e773fc6bb9224a5c39142abcc85a93ef1ce8aedd9242fb60b1157027a277d6e235998d8a7d6ac7ecd3d89a1bdacc8e612d5b0c11ec9fcc52c3ea14445384d80 ksudoku-18.12.3.tar.xz" +sha512sums="e07db466b1955efd897fea530796582ccf0ec9d42b637cbeb9da16951b1c0c861f0b23d7717b8d61da433affbf6bb9bc6904922cd94f3b852bf46e0212b459aa ksudoku-19.04.0.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index 9506209b6..293943d95 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4808d8981e5d7d5d75be11c3b00c25e4962ea2b8a5e600f50aff2ca8e74d9af924859329224c92001a91e9fa697fae29a21c2ed1209cada641c732773b2bad0b ksystemlog-18.12.3.tar.xz" +sha512sums="7989b15d3cc0b10a170954e382f64fe6acffea7d6adcabd5728c284b502ce5f0c77d78f0df647ce9497c953897d479dc7a1c03f955535b012d08af0d425cd16b ksystemlog-19.04.0.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 89988296c..28c99e648 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kteatime -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0c2280828005c85c12a8616c288416537cee2fe6053571c3ee369ccd7903ca66625b95304217a5a6518ac0602b1cde9d0e654032ad32b12f082d80535cca4e55 kteatime-18.12.3.tar.xz" +sha512sums="8aa9a1df61a383339d19a33d77c4cbd0475d81cf8f991258212784b6c11b9e7b3858c699831c81ce922753dd7e79053c1305252892a80f3c396049b246e8edd6 kteatime-19.04.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index 366d60c4c..fce931054 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktimer -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e61752d02d650d32d1988e7b8f394017dd6a7130f222bda55a747039ce5cb593976ee99f4cdde1731e55e86f8b2ecfa967efea6198a1de6d240ce11fd48488fe ktimer-18.12.3.tar.xz" +sha512sums="3e6221f99d4d1dfcbf23835160ce6a4a22b3f8f9981e2ac94df338ca3f3c6eccfee69f53c4f022f4f728ff110e43b0863ad3751bb06304fb7b2f07a83d9a56c5 ktimer-19.04.0.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index a978ce469..fa96b4eda 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1973b7d9e8ba61b4bfe9b23e53597ffe8eb4d00f4a57a3e2861a41b2b6c8bcf8204ad59d8d42d696e07a7d8c2b9cf7d3b4dbba8924fd2a9470d5b7524034a6cd ktouch-18.12.3.tar.xz" +sha512sums="c2fd7a42efd5556edb26bec59158929998513be8c68d84c1f5db8ba91a6cc5b52aa639f5200ac159aa60714cf39a44386c33e5b113e331b1c86eed4dcde74319 ktouch-19.04.0.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index 6bfead6d6..40557e308 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktuberling -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -13,7 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kdbusaddons-dev kdelibs4support-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev qt5-qtmultimedia-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz + frameworks.patch + " build() { cd "$builddir" @@ -41,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3f496c2d48c726274fa01c8116eeb50d06b9ef39ce7004b10b40316382ee082d26dbe3da8e43c9c7c77a719e6a10bff0f130d3c99fb9f9156d95216c428189fb ktuberling-18.12.3.tar.xz" +sha512sums="69665dcda82f6ace6d46679529669db57fbafb41ef22a96c746813925622603f4cba2930cb951e80f99f731e966b29e274602c119df468c96f5590722a862947 ktuberling-19.04.0.tar.xz +a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch" diff --git a/user/ktuberling/frameworks.patch b/user/ktuberling/frameworks.patch new file mode 100644 index 000000000..7f03b5874 --- /dev/null +++ b/user/ktuberling/frameworks.patch @@ -0,0 +1,11 @@ +--- ktuberling-19.04.0/CMakeLists.txt.old 2019-04-12 00:10:28.000000000 +0000 ++++ ktuberling-19.04.0/CMakeLists.txt 2019-04-18 21:18:28.795796335 +0000 +@@ -2,7 +2,7 @@ + + cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) + set (QT_MIN_VERSION "5.3.0") +-set (KF5_MIN_VERSION "5.55.0") ++set (KF5_MIN_VERSION "5.54.0") + + find_package(ECM 1.7.0 REQUIRED CONFIG) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index e02479a1d..d6cec1873 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3244d1c691f2d7c0625cb35b426dc40d7fc112e741af0dda6abdbfba53a36eed199c3cd9b7f60c078b232f903572a112958988cc677fa989dbd51ce3c8bb85f0 kturtle-18.12.3.tar.xz" +sha512sums="b2679f60185e4a37eb332d66bb632eaf054f34bde958beeaed245bea90790ba318d945f260516c1162ac5cbf303e00f3ef20c662803bc9ffef7cdfb501217aee kturtle-19.04.0.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 485a62692..f4d9a2517 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kubrick -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4761c56bbaac06fa4f5f1e398c06ebe859672f333542185b2a15fac753aa8279a3bb62dbb8cfd972adaaab1903cb56b157fd39e468d3ba8b33f2fbc746517c67 kubrick-18.12.3.tar.xz" +sha512sums="c921a830fc63055a8318bf0eabdd6ebd4ec98310dee3cbd0cad2b16a83827b7a30ce905a6d9a725f77d68b5cecc02a09b6396996854cb36bf14a61dc32e62a9d kubrick-19.04.0.tar.xz" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index ef0a0403a..ef9600ca3 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26be37f0e273c3532ce6056047ac47c65f0c46f56e79bf4473a62c59772685ea4f842d46864d3fbb44638b0c3105ffe233f0451b6ddc53dbb7327631d46b9d4a kwalletmanager-18.12.3.tar.xz" +sha512sums="61d2d4a8ffa9647ab2636f417450b549384be4bc4ffa2d70eedce9a2eada3bd2647c2fd8a4ea57666a9c314f304a0cfda0dbbe7440a05aaff03b0199d9c3b87e kwalletmanager-19.04.0.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index dc6934195..5f1a1e865 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Sound editor built for KDE" url="http://kwave.sourceforge.net/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bffafe6b63cdad5e674a02d9b57e5e658260c2d933ae148e155afc598045a67143f21aad4c52e1437b6f47181b47ee9896e3219700cc8e0aa1c8408fdf797adb kwave-18.12.3.tar.xz +sha512sums="e77b1505eafcf86c017e77e5fa6b35bb4f254defb1b4c94abff2cb54a42e7aea730c84997118cf717855047a07dc6073f52837e31688ddf0016b3bf7033bda0c kwave-19.04.0.tar.xz 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 3fb34c0f3..130a17337 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e4e122317bc2935bf6f23d353b91002607b80b7320e6b976924d03b8c3ef42fecb3236b2af2f01ee4c859854507ed8a51a4e3b991b047ad955e82ddd726e27a7 kwordquiz-18.12.3.tar.xz" +sha512sums="e23f59dcbc3c8625070a48c217bacb44bd1c79a58c97549972410aa394e064c18b60d3b46d71347f9194a94df0982226b1a305d18f2fdc19e0c20470144683e9 kwordquiz-19.04.0.tar.xz" diff --git a/user/libassuan/APKBUILD b/user/libassuan/APKBUILD index a844a40f8..50c7b4f1f 100644 --- a/user/libassuan/APKBUILD +++ b/user/libassuan/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libassuan -pkgver=2.5.1 -pkgrel=1 +pkgver=2.5.3 +pkgrel=0 pkgdesc="IPC library for GnuPG" url="https://www.gnupg.org/software/libassuan/index.html" arch="all" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d libassuan-2.5.1.tar.bz2" +sha512sums="e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617 libassuan-2.5.3.tar.bz2" diff --git a/user/libblockdev/APKBUILD b/user/libblockdev/APKBUILD index 51200d04b..98eeda9dd 100644 --- a/user/libblockdev/APKBUILD +++ b/user/libblockdev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libblockdev -pkgver=2.20 +pkgver=2.21 pkgrel=0 pkgdesc="Library for manipulating block devices" url="http://storaged.org/libblockdev/" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7363e05c6854757649ed865f216c71ddc8afd7f1a102a73c0bb4809c4713973462446543d97b696f55f11ea15696e261802567cc545833d16535835c5250ac8b libblockdev-2.20.tar.gz" +sha512sums="7e6e12716e18c5e48f3b2207f132c242d99ce540f55de3b6932ac3427cb532d9074358c828d9702df71068a8454c642a4c0ff96e62a567ed1c1247c59ece432b libblockdev-2.21.tar.gz" diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD index a9b6dce67..6d230fcb5 100644 --- a/user/libbluray/APKBUILD +++ b/user/libbluray/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libbluray -pkgver=1.0.2 +pkgver=1.1.1 pkgrel=0 pkgdesc="Library for Blu-Ray disc playback" url="https://www.videolan.org/developers/libbluray.html" @@ -32,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b libbluray-1.0.2.tar.bz2" +sha512sums="0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839 libbluray-1.1.1.tar.bz2" diff --git a/user/libcroco/APKBUILD b/user/libcroco/APKBUILD index 5365445f7..0ed8d4685 100644 --- a/user/libcroco/APKBUILD +++ b/user/libcroco/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=libcroco -pkgver=0.6.12 -pkgrel=2 +pkgver=0.6.13 +pkgrel=0 pkgdesc="GNOME CSS 2 parsing and manipulation toolkit" url="https://gitlab.gnome.org/GNOME/libcroco" arch="all" @@ -11,8 +11,7 @@ subpackages="$pkgname-dev" depends= makedepends="glib-dev libxml2-dev" checkdepends="cmd:which" -source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz - CVE-2017-7960.patch" +source="https://download.gnome.org/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz" # secfixes: # 0.6.12-r2: @@ -38,5 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6 libcroco-0.6.12.tar.xz -da26b95808d7f06c15afed306fac2a80012413bf96ad2cd249c7420a6f41a02d76abeb80b94705f24414f1986084aa4d864fd82038274f664fa91b31fbcabd30 CVE-2017-7960.patch" +sha512sums="038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 libcroco-0.6.13.tar.xz" diff --git a/user/libcroco/CVE-2017-7960.patch b/user/libcroco/CVE-2017-7960.patch deleted file mode 100644 index 4561392c0..000000000 --- a/user/libcroco/CVE-2017-7960.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <qignacio@amazon.com> -Date: Sun, 16 Apr 2017 13:13:43 +0200 -Subject: [PATCH] input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. ---- - src/cr-input.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1..3b63a88 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; --- -2.17.1 - diff --git a/user/libdrm/APKBUILD b/user/libdrm/APKBUILD index f85bdcac5..4c59ef957 100644 --- a/user/libdrm/APKBUILD +++ b/user/libdrm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libdrm -pkgver=2.4.96 +pkgver=2.4.97 pkgrel=0 pkgdesc="Userspace interface to kernel DRM services" url="https://dri.freedesktop.org/" @@ -19,7 +19,6 @@ source="https://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,14 +33,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b libdrm-2.4.96.tar.bz2 +sha512sums="3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed libdrm-2.4.97.tar.bz2 af52fef51aaa05a4dd17919371cb9d92a77480402730bf53ba223e54df52f3825be05a7f28e6aef8c904db5ee59fe38a6c15bc6aafa7f8d31a719e80399dd51f ioctl.patch" diff --git a/user/libetpan/APKBUILD b/user/libetpan/APKBUILD index 386ec21e5..474c2d67c 100644 --- a/user/libetpan/APKBUILD +++ b/user/libetpan/APKBUILD @@ -1,21 +1,21 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libetpan -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=0 pkgdesc="Mail library for C" url="https://www.etpan.org/libetpan.html" arch="all" license="BSD-3-Clause" depends="" -depends_dev="" -makedepends="$depends_dev autoconf automake libtool - cyrus-sasl-dev db-dev expat-dev openssl-dev zlib-dev" +makedepends="autoconf automake cyrus-sasl-dev db-dev expat-dev libtool + openssl-dev zlib-dev" subpackages="$pkgname-dev" -source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz" +source="libetpan-$pkgver.tar.gz::https://github.com/dinhviethoa/libetpan/archive/$pkgver.tar.gz + missing-header.patch + " build() { - cd "$builddir" ./autogen.sh \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +27,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3e2e1de77fae2212374e909d15ed8564eee90883c38fee0ca69f58785733b1ac2df848da1bda6f55577d647e0ad27bc3057199e70b6ef01f2a7e2823b24113ba libetpan-1.9.2.tar.gz" +sha512sums="66e504fbf82445819845a3f1dcb8dc48ad2440993134d43752c754463cee2434a30080718687cd05c579f0da8df6b0f6dfc7572f2882d0dd9dfd327b4ae11fd6 libetpan-1.9.3.tar.gz +df0ba883c9328b7cab408a54f38e6f9c7f5f603b0f016b7ea2e9fa49aa4118ff6723218bb9942f278028291e1c7e9da0bb1d48ab2c471b0ddf5edc3e78a8a1df missing-header.patch" diff --git a/user/libetpan/missing-header.patch b/user/libetpan/missing-header.patch new file mode 100644 index 000000000..603048962 --- /dev/null +++ b/user/libetpan/missing-header.patch @@ -0,0 +1,32 @@ +From da9fd7839c9affea48f74a159a789fbb183b4be1 Mon Sep 17 00:00:00 2001 +From: maxice8 <30738253+maxice8@users.noreply.github.com> +Date: Fri, 1 Feb 2019 01:58:08 -0200 +Subject: [PATCH] add missing stddef.h include for 'NULL' (#322) + +clientid.c: In function 'mailimap_clientid': +clientid.c:66:38: error: 'NULL' undeclared (first use in this function) + if (mailimap_read_line(session) == NULL) + ^~~~ +clientid.c:66:38: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'? +clientid.c:39:1: ++#include <stddef.h> + +clientid.c:66:38: + if (mailimap_read_line(session) == NULL) +--- + src/low-level/imap/clientid.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c +index 1c346379..38880dd3 100644 +--- a/src/low-level/imap/clientid.c ++++ b/src/low-level/imap/clientid.c +@@ -33,6 +33,8 @@ + # include <config.h> + #endif + ++#include <stdlib.h> ++ + #include "mailimap_sender.h" + #include "clientid_sender.h" + #include "clientid.h" diff --git a/user/libfontenc/APKBUILD b/user/libfontenc/APKBUILD index 666a58e81..98813ad25 100644 --- a/user/libfontenc/APKBUILD +++ b/user/libfontenc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfontenc -pkgver=1.1.3 -pkgrel=4 +pkgver=1.1.4 +pkgrel=0 pkgdesc="X11 font encoding library" url="https://www.X.Org/" arch="all" @@ -12,7 +12,6 @@ subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c libfontenc-1.1.3.tar.bz2" +sha512sums="76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2" diff --git a/user/libfs/APKBUILD b/user/libfs/APKBUILD index fd242d2f0..f6bfcb5cb 100644 --- a/user/libfs/APKBUILD +++ b/user/libfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfs -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="X11 Font Server client library" url="https://www.X.Org/" @@ -11,11 +11,10 @@ depends="xtrans" depends_dev="util-macros" makedepends="$depends_dev xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.x.org/releases/individual/lib/libFS-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/lib/libFS-$pkgver.tar.bz2" builddir="$srcdir/libFS-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f libFS-1.0.7.tar.bz2" +sha512sums="466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2" diff --git a/user/libgda/APKBUILD b/user/libgda/APKBUILD index e585373cb..0e0c0731a 100644 --- a/user/libgda/APKBUILD +++ b/user/libgda/APKBUILD @@ -4,7 +4,7 @@ pkgname=libgda pkgver=5.2.8 pkgrel=0 pkgdesc="GNOME Database Access library" -url="http://www.gnome-db.org/" +url="https://www.gnome-db.org/" arch="all" options="!check" # "Disk I/O error" in multi-threaded. all others pass license="GPL-2.0+ AND LGPL-2.0+" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 76b3f44f7..d6b413fa9 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,37 +1,34 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.12.3 +pkgver=1.13.1 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" arch="all" +options="!check" # wow, such broken license="MIT" -makedepends="eudev-dev libevdev-dev libwacom-dev meson mtdev-dev" +makedepends="doxygen eudev-dev graphviz libevdev-dev libwacom-dev meson + mtdev-dev ninja py3-recommonmark py3-sphinx py3-sphinx-rtd-theme" checkdepends="check-dev valgrind" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" - # Docs disabled: requires sphinx now meson --prefix=/usr \ - -Ddocumentation=false \ -Dlibwacom=true \ -Ddebug-gui=false \ - -Dtests=true builddir/ + -Dtests=false builddir/ ninja -C builddir/ } check() { - cd "$builddir" ninja -C builddir/ test } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C builddir/ install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02 libinput-1.12.3.tar.xz" +sha512sums="a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0 libinput-1.13.1.tar.xz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD index 099fb8c0a..8d8799687 100644 --- a/user/libkdcraw/APKBUILD +++ b/user/libkdcraw/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdcraw -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="RAW image file format support for KDE" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ecd6f8a013e160221644d84b6ed1befc9b45da23ed90bd98eb857bd4c5bb0172c6c7bc0eec5c688d8fa212c67f869c4fbf317a4cbd4abf3762e18c62d0c0d440 libkdcraw-18.12.3.tar.xz" +sha512sums="3361d987e1cec7cdb0c2bde2b356ff39f359e2ec79a37a2ed5ee7a43cb5acf01be04c3e121b121cdc45832d421abfc7ac39157fa8372d5f4dbf899c981b219a7 libkdcraw-19.04.0.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 769fdda19..f3baf39f9 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -58,4 +58,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="12a9cdec2ab2defd337695c3f6d44664d5c187b34e4eed3ab9497f4fd3a8d1450e296699504464572265cc68d4ff5916a4ba86400024b0044335b25a09969c3e libkdegames-18.12.3.tar.xz" +sha512sums="6c28d3f00902102680072d99a2f4b5bc8fd216d0463530036bd3fcd6e83102341509acc37594d6b833b5a50b5d66f110c5c7b741711817c1aa7ffdc0919bdf46 libkdegames-19.04.0.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index cb7f858cf..2fe09274b 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e19a6fceab68e4056cbe7ec1625c3849fe824bec6a809ddfb68d4b0dede377f869e4c4019e2ff03ebb0eaf29b2042e9af69cf798802e29c5aa43bbc235492055 libkeduvocdocument-18.12.3.tar.xz" +sha512sums="0e05faa01f98bf96b8ae3e69ba402ef127d7559c5fa0cb98d12ae859b0e5a3334af58fecce78f2da3a8d4f191871b62bd5db23a934b0564330d8f3bc27795475 libkeduvocdocument-19.04.0.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD index 463ef365d..da699412c 100644 --- a/user/libkexiv2/APKBUILD +++ b/user/libkexiv2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkexiv2 -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE integration with Exiv2 EXIF data library" url="https://www.KDE.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ce2bab29a1059e4be498472b2713e813c8eb5ace4cd928eeff3c6e50a656afda651a57a3877d9388163096e575c897f4f84eee914db101cb8dcd1eb614242898 libkexiv2-18.12.3.tar.xz" +sha512sums="70eeaa1d117b5d6fd93df894662e751913dc002b2ceacde9b854183d98c85766e111360c721efc0a225939f30eacdbd45dafd71e61349f947155fbe6c7b48dd1 libkexiv2-19.04.0.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index f8fc34da0..ed380db9b 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="85597e17c40c959416d81804a3d01ac7acc2fdb9706db82e28aab1e302511238e4861dae7cd23a08f2900df7d3ba8e506ade689f89d5e8949e6cc8378492430c libkipi-18.12.3.tar.xz" +sha512sums="8628306cbe885dfa04ec7374d56fc08df21c95df2ef1d14bf257ab36433b6e57696bd9109413b129d5520193e801f29bede7a82ac8a33a03f3130625c96a6e4a libkipi-19.04.0.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 841a3d944..48ec55e10 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkleo -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev boost-dev gpgme-dev libgpg-error-dev ki18n-dev kwidg makedepends="$depends_dev cmake extra-cmake-modules kcompletion-dev kconfig-dev kcodecs-dev kcoreaddons-dev kpimtextedit-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz + egregious-versions.patch + " build() { cd "$builddir" @@ -41,4 +43,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="de7348f2d8aae0d250613fcb7f0fb92e9c9aa979d1457e95e4a3908fddb69ea59f1d70311f24c4affce61c64b638dc95901c80b9d6a4ae019dfb115012a9b348 libkleo-18.12.3.tar.xz" +sha512sums="5b96c7427afc36ccb46532de57adc5678e52f917f6caeabfaa34a736f0b5cdb1cafa9b69a7988df1cd6da33021bf8ab3fa85cdd76eb2ce491a409f0ab9e12ae3 libkleo-19.04.0.tar.xz +b9d8baa5212effbcc377c947c51cda1c0ce51a2eee2dae02d430a87cd88f21b1bc4ac19d689a39350fd04ffd057aaee138347d4c4561e9835253ccc5387c5565 egregious-versions.patch" diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch new file mode 100644 index 000000000..440c7bf4f --- /dev/null +++ b/user/libkleo/egregious-versions.patch @@ -0,0 +1,22 @@ +libKleo uses no new APIs. + +--- libkleo-19.04.0/CMakeLists.txt.old 2019-04-12 00:16:32.000000000 +0000 ++++ libkleo-19.04.0/CMakeLists.txt 2019-04-19 06:31:09.576149789 +0000 +@@ -3,7 +3,7 @@ + + project(libkleo VERSION ${PIM_VERSION}) + +-set(KF5_MIN_VERSION "5.56.0") ++set(KF5_MIN_VERSION "5.54.0") + + find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +@@ -24,7 +24,7 @@ + + + set(LIBKLEO_LIB_VERSION ${PIM_VERSION}) +-set(QT_REQUIRED_VERSION "5.10.0") ++set(QT_REQUIRED_VERSION "5.9.0") + set(KDEPIMTEXTEDIT_VERSION "5.11.0") + + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets) diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index 44b2e9067..872a277a1 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkmahjongg -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c4e2b36be5a3ca0987503593136cbfcccef3cc9db914132b6fe121b5979d786d78f6ffefb0567f4e0ec1e3a52b4c1a3eab474d6286fda0b13b24188e32a3d869 libkmahjongg-18.12.3.tar.xz" +sha512sums="99a5a6a8de7c069687ba2371a1d0375603bc78c90c9947c3a2503c31f34c1edd781567cac3b23e8b1081eb4189bbc1fafe9a4136933998136dd06b4993e40991 libkmahjongg-19.04.0.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 7a2b13670..22983f2df 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -12,7 +12,9 @@ depends_dev="sane-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev" subpackages="$pkgname-dev $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz + frameworks.patch + " build() { cd "$builddir" @@ -40,4 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af14a341275d70a0b3af3c93270bbadecfcd2cce4df0ab077aaa967f8bec8fce292b7fcb190f8b3b43d05bf5fea70f4cae7716df1d62b5950cbbe7d9e3ce3e49 libksane-18.12.3.tar.xz" +sha512sums="29be4c8bd7568e116ae84b3eb9911740c9cbf7508e3c0e150f552a5f5f4cc07791c6f9a0373f00cfbe5e0421cc45936445adf9cd277c6ad1b22cf067e6058a2e libksane-19.04.0.tar.xz +60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch" diff --git a/user/libksane/frameworks.patch b/user/libksane/frameworks.patch new file mode 100644 index 000000000..f44ad09db --- /dev/null +++ b/user/libksane/frameworks.patch @@ -0,0 +1,11 @@ +--- libksane-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:29.000000000 +0000 ++++ libksane-19.04.0/CMakeLists.txt 2019-04-18 22:42:00.675733179 +0000 +@@ -26,7 +26,7 @@ + include(KDECMakeSettings) + include(GenerateExportHeader) + +-set(KF5_VERSION "5.55.0") ++set(KF5_VERSION "5.54.0") + + ecm_setup_version( + ${KF5_VERSION} diff --git a/user/libnotify/APKBUILD b/user/libnotify/APKBUILD index 21b1ee48d..ad021ad4f 100644 --- a/user/libnotify/APKBUILD +++ b/user/libnotify/APKBUILD @@ -1,33 +1,25 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libnotify -pkgver=0.7.7 -pkgrel=2 +pkgver=0.7.8 +pkgrel=0 pkgdesc="Desktop notification library" url="https://developer.gnome.org/notification-spec/" arch="all" options="!check" # Test suite requires running X11 license="LGPL-2.1+" depends="" -depends_dev="dbus-dev" -makedepends="$depends_dev gdk-pixbuf-dev glib-dev autoconf automake - gobject-introspection-dev" +makedepends="gdk-pixbuf-dev glib-dev gobject-introspection-dev gtk-doc + gtk+3.0-dev meson ninja" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static \ - --disable-tests - make + meson --prefix=/usr builddir/ + ninja -C builddir/ } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954 libnotify-0.7.7.tar.xz" +sha512sums="9973d7a1af5dd7cfbaa0d0d2c9e72a40df9d814967fde47e95763a69690cc4ed32ecf713d75f91f3dff99a693eff9dab963be124e0530ebf231d517a44e75e94 libnotify-0.7.8.tar.xz" diff --git a/user/libqmatrixclient/APKBUILD b/user/libqmatrixclient/APKBUILD index 6d8a0ad5d..7dbe67024 100644 --- a/user/libqmatrixclient/APKBUILD +++ b/user/libqmatrixclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqmatrixclient -pkgver=0.4.0 +pkgver=0.5.1.2 pkgrel=0 pkgdesc="Library to interface with Matrix chat systems using Qt 5" url="https://matrix.org/docs/projects/sdk/libqmatrixclient.html" @@ -9,12 +9,11 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="qt5-qtbase-dev" -makedepends="$depends_dev cmake" +makedepends="$depends_dev cmake qt5-qtmultimedia-dev" subpackages="$pkgname-dev" -source="libqmatrixclient-$pkgver.tar.gz::https://github.com/QMatrixClient/libqmatrixclient/archive/v$pkgver.tar.gz" +source="libqmatrixclient-$pkgver.tar.gz::https://github.com/QMatrixClient/libqmatrixclient/archive/$pkgver.tar.gz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="552b866ef4adbde72518f96b42beb08dc99f80ff0388717e99c4287c463db21469d91e188b3d5c17850266ea313a36fed0cd01431f08632e3d1403f3b7725e40 libqmatrixclient-0.4.0.tar.gz" +sha512sums="4e7cac3cc6a1ffc2a5a5ebf5c38dec72c3293f96b56d533838dea745a9b0de9a1ab14da666efcdad4f7d7a70279b922a0dbb3a3e26d1ad83f5b98d04fc9912a2 libqmatrixclient-0.5.1.2.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD index 4fc79e95b..cb883270e 100644 --- a/user/libsecret/APKBUILD +++ b/user/libsecret/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libsecret -pkgver=0.18.7 +pkgver=0.18.8 pkgrel=0 pkgdesc="Library for storing and retrieving passphrases" url="https://wiki.gnome.org/Projects/Libsecret" @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://ftp.acc.umu.se/pub/gnome/sources/libsecret/0.18/libsecret-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084 libsecret-0.18.7.tar.xz" +sha512sums="9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4 libsecret-0.18.8.tar.xz" diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index 27dde65ad..ddcf75515 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsoup -pkgver=2.66.0 +pkgver=2.66.1 pkgrel=0 pkgdesc="GObject-based HTTP library" url="https://wiki.gnome.org/Projects/libsoup" @@ -29,4 +29,4 @@ package() { DESTDIR="$pkgdir" ninja install } -sha512sums="a79d4dafbf12a3345803b38859a398839e3e9e389552c90bab60b005ffa7e4ce2f43112e322ca10f134ab6e6c53568e058c82c370617e872539e1fafd82a1352 libsoup-2.66.0.tar.xz" +sha512sums="bb9c15cae965606d5f7c009fab9223445235982269d23ff20e89249b10d3423797427e7cff39c31a3f5db99b0c2d7a01eb911edb61309603cdeb8f2467fe6039 libsoup-2.66.1.tar.xz" diff --git a/user/libtap/APKBUILD b/user/libtap/APKBUILD index 0c47e0468..b8a992768 100644 --- a/user/libtap/APKBUILD +++ b/user/libtap/APKBUILD @@ -1,27 +1,23 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtap -pkgver=1.12.0 +pkgver=1.14.0 pkgrel=0 pkgdesc="C library implementing the Test Anything Protocol (TAP)" url="https://www.shlomifish.org/open-source/projects/libtap/" arch="all" license="BSD-3-Clause" depends="" -depends_dev="" makedepends="cmake perl" subpackages="$pkgname-dev $pkgname-doc" -source="http://web-cpan.shlomifish.org/downloads/libtap-$pkgver.tar.bz2" -builddir="$srcdir/libtap-$pkgver" +source="http://web-cpan.shlomifish.org/downloads/libtap-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ @@ -31,13 +27,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="510f85a5b10525cf8b67a0bcc67213e43a9e752def5293fecbc97f7058d24256a85cd8ce8c0b408186ca676f3ca700ddbeea4c8c7558352665956b4233258d31 libtap-1.12.0.tar.bz2" +sha512sums="1d78f9ed5b554a7a9f8a2a6e3dcb30e09ba5bd4b98c77499e57599be615413f6c6dddb3dd498b6ac49a5449e54e1134a6a4816adaab5b993e3c0027edc2a2404 libtap-1.14.0.tar.xz" diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD index 41e3a1ea1..826ecf131 100644 --- a/user/libtommath/APKBUILD +++ b/user/libtommath/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtommath -pkgver=1.1.0_rc1 +pkgver=1.1.0 pkgrel=0 pkgdesc="Theoretic multiple-precision integer library" url="https://www.libtom.net/LibTomMath/" @@ -14,18 +14,15 @@ source="https://github.com/libtom/libtommath/releases/download/v${pkgver/_/-}/lt builddir="$srcdir/$pkgname-${pkgver/_/-}" build() { - cd "$builddir" make PREFIX=/usr -f makefile.shared } check() { - cd "$builddir" make PREFIX=/usr -f makefile.shared test_standalone } package() { - cd "$builddir" make PREFIX=/usr DESTDIR="$pkgdir" -f makefile.shared install } -sha512sums="4cee5d59cd2eaf14591ee280dcdcdd5915f38584b7259b5752e7316cd1a9966f1c969ee3b64d136ae7044c5834cfc8c781db300ede503ec2e657083de3692fd2 ltm-1.1.0-rc1.tar.xz" +sha512sums="6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 ltm-1.1.0.tar.xz" diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD index 1deffebdc..3b7102955 100644 --- a/user/libuninameslist/APKBUILD +++ b/user/libuninameslist/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuninameslist -pkgver=20180701 +pkgver=20190305 pkgrel=0 pkgdesc="Library of Unicode names and annotation data" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc py3-uninameslist:py3:noarch" source="https://github.com/fontforge/libuninameslist/releases/download/$pkgver/libuninameslist-dist-$pkgver.tar.gz" build() { - cd "$builddir" PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +24,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -41,4 +38,4 @@ py3() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="839f8a0c3a81b4b19ce6ddfa08fa9ca99fdcefe2ef2b2c5515b276fab594fb5325ae9c83b58e19c559c033e880bd098687022c8ec3da028b143f4a72c471f19c libuninameslist-dist-20180701.tar.gz" +sha512sums="4dc30a4f0919722c7538ed2eda39c3e63d072ee17c809ca25e0b6546d29110607c27c6e969839439c1432b4b40fca3e888c428ed26d1e0328a5f481a2db3cc73 libuninameslist-dist-20190305.tar.gz" diff --git a/user/libvdpau/APKBUILD b/user/libvdpau/APKBUILD index a8febe21a..6becf5507 100644 --- a/user/libvdpau/APKBUILD +++ b/user/libvdpau/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvdpau -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2 +pkgrel=0 pkgdesc="Hardware-accelerated video playback library" url="https://cgit.freedesktop.org/~aplattner/libvdpau" arch="all" license="MIT" -depends= +depends="" makedepends="libx11-dev libxext-dev xorgproto-dev" -install= -subpackages="$pkgname-dev $pkgname-doc" -source="https://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz" +subpackages="$pkgname-dev" +source="https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/libvdpau-1.2.tar.bz2" build() { - cd "$builddir" LIBS="-lX11" \ ./configure \ --build=$CBUILD \ @@ -27,15 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } -sha512sums="e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb libvdpau-1.1.1.tar.gz" +sha512sums="86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f libvdpau-1.2.tar.bz2" diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD index 324da7fcb..0801da573 100644 --- a/user/libvncserver/APKBUILD +++ b/user/libvncserver/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libvncserver -pkgver=0.9.11 -pkgrel=1 +pkgver=0.9.12 +pkgrel=0 pkgdesc="Library to make writing a vnc server easy" url="https://libvnc.github.io/" arch="all" @@ -14,8 +14,7 @@ depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev libxi-dev libxinerama-dev libxrandr-dev libxtst-dev" makedepends="$depends_dev autoconf automake libtool" subpackages="$pkgname-dev" -source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz - " +source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz" builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # secfixes: @@ -23,31 +22,27 @@ builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver # - CVE-2016-9941 # - CVE-2016-9942 -prepare() { - cd "$builddir" - default_prepare - ./autogen.sh -} - build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-static + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} make } check() { - cd "$builddir" - make check + CTEST_OUTPUT_ON_FAILURE=TRUE ctest test/tjunittest } package() { - cd "$builddir" make install DESTDIR="$pkgdir" } -sha512sums="e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb LibVNCServer-0.9.11.tar.gz" +sha512sums="60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8 LibVNCServer-0.9.12.tar.gz" diff --git a/user/libwacom/APKBUILD b/user/libwacom/APKBUILD index c5faa796f..52326df1f 100644 --- a/user/libwacom/APKBUILD +++ b/user/libwacom/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Ivan Tham <pickfire@riseup.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwacom -pkgver=0.32 +pkgver=0.33 pkgrel=0 pkgdesc="Tablet description library" url="http://linuxwacom.sourceforge.net/" @@ -14,27 +14,26 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/linuxwacom/libwacom/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --disable-static make + # conflicts with TS-6610 tablet + rm "$builddir"/data/huion-h420.tablet + rm "$builddir"/data/layouts/huion-h420.svg } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" install -dm755 "$pkgdir"/usr/lib/udev/rules.d/ tools/generate-udev-rules > "$pkgdir"/usr/lib/udev/rules.d/65-libwacom.rules } -sha512sums="d7001bb355d4b269e61bf95f0b71621088e76d6894a4a1d002b6a0904a20dd75e0b4fb85368fd20ccafbbfbb1c7ff17150a39962554c8f27f9fcad48c397125b libwacom-0.32.tar.bz2" +sha512sums="de4d9cf3b5f4d87a159ba8ee617bafce9d13b67dc23d9dc67efd57317b0df2079dd0de328bc800de47f14ee49ea82bb842e34297cef23ba336c1ddca3afa826d libwacom-0.33.tar.bz2" diff --git a/user/libwpd/APKBUILD b/user/libwpd/APKBUILD index 20307c037..8a8c5a043 100644 --- a/user/libwpd/APKBUILD +++ b/user/libwpd/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwpd -pkgver=0.10.2 -pkgrel=1 +pkgver=0.10.3 +pkgrel=0 pkgdesc="Import filter and tools for WordPerfect documents" url="https://sourceforge.net/p/libwpd/" arch="all" options="!check" # No test suite. license="MPL-2.0 OR LGPL-2.1+" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev doxygen" +makedepends="doxygen librevenge-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/libwpd/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/libwpd/$pkgname-$pkgver.tar.bz2" prepare() { update_config_sub @@ -20,7 +19,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -42,4 +39,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="879f96b6290d9db7ed4a431e84d18a1f7e81826394a8c63e03c3b6b49c578bfb417056956209d1934e34080471df28a40d93f45ac4f8a976631610d3103d6b7c libwpd-0.10.2.tar.bz2" +sha512sums="cf3db714d424c32ecf5740b17d9f1721f228d3a7edbd1cc7a0f4b30f7ac9b1024cf45c0727b9f916b7672321e05f0d791c7f7f5ad5d47fedcea9ad9e886eb459 libwpd-0.10.3.tar.bz2" diff --git a/user/libwpg/APKBUILD b/user/libwpg/APKBUILD index 1985152e8..b1a62091a 100644 --- a/user/libwpg/APKBUILD +++ b/user/libwpg/APKBUILD @@ -1,26 +1,19 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libwpg -pkgver=0.3.2 -pkgrel=1 +pkgver=0.3.3 +pkgrel=0 pkgdesc="Import filter and tools for WordPerfect graphics" url="https://sourceforge.net/projects/libwpg/" arch="all" options="!check" # No test suite. license="MPL-2.0 OR LGPL-2.1+" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev doxygen libwpd-dev" +makedepends="doxygen librevenge-dev libwpd-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" -source="http://downloads.sourceforge.net/project/libwpg/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2" - -prepare() { - update_config_sub - default_prepare -} +source="https://downloads.sourceforge.net/libwpg/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -34,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +35,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="af9bf007c1cd380cc6da543024e6f068c0eb49514ff0027b1e82170927c8496e69d6c7a2a502380f25c54fea1fc33865c70c7d24d4b38e4fbf1d064bf1f1e192 libwpg-0.3.2.tar.bz2" +sha512sums="4a4cc5d1492b50c8572289c508bec603067f532446c032ff7241d0dad9c33c251e55751dc68c24bacf7937f26697292fb7712f61c8b3f025cffeb9f86350be83 libwpg-0.3.3.tar.bz2" diff --git a/user/libxcomposite/APKBUILD b/user/libxcomposite/APKBUILD index 6ce9263b9..f390a1204 100644 --- a/user/libxcomposite/APKBUILD +++ b/user/libxcomposite/APKBUILD @@ -1,27 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcomposite -pkgver=0.4.4 -pkgrel=2 +pkgver=0.4.5 +pkgrel=0 pkgdesc="X11 Composite extension library" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="libxext-dev" makedepends="libx11-dev libxext-dev libxfixes-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXcomposite-$pkgver.tar.bz2" builddir="$srcdir"/libXcomposite-$pkgver -prepare() { - cd "$builddir" - chmod u+w config.sub - update_config_sub - default_prepare -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,14 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE } -sha512sums="b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b libXcomposite-0.4.4.tar.bz2" +sha512sums="502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2" diff --git a/user/libxcursor/APKBUILD b/user/libxcursor/APKBUILD index 857cc5114..6aff75fef 100644 --- a/user/libxcursor/APKBUILD +++ b/user/libxcursor/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxcursor -pkgver=1.1.15 -pkgrel=1 +pkgver=1.2.0 +pkgrel=0 pkgdesc="X cursor management library" url="https://www.X.Org/" arch="all" license="MIT" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" makedepends="libx11-dev libxfixes-dev libxrender-dev util-macros xorgproto-dev" source="https://www.X.Org/releases/individual/lib/libXcursor-$pkgver.tar.bz2" builddir="$srcdir"/libXcursor-$pkgver @@ -17,7 +17,6 @@ builddir="$srcdir"/libXcursor-$pkgver # - CVE-2017-16612 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5 libXcursor-1.1.15.tar.bz2" +sha512sums="2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03 libXcursor-1.2.0.tar.bz2" diff --git a/user/libxdamage/APKBUILD b/user/libxdamage/APKBUILD index 0aa397c2e..5519f04e6 100644 --- a/user/libxdamage/APKBUILD +++ b/user/libxdamage/APKBUILD @@ -1,26 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxdamage -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.5 +pkgrel=0 pkgdesc="X11 damaged region extension library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" makedepends="libx11-dev libxfixes-dev util-macros xorgproto-dev" subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/libXdamage-$pkgver.tar.bz2" builddir="$srcdir"/libXdamage-$pkgver -prepare() { - cd "$builddir" - chmod 644 "$builddir"/config.sub - update_config_sub - default_prepare -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,13 +22,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904 libXdamage-1.1.4.tar.bz2" +sha512sums="a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2" diff --git a/user/libxdmcp/APKBUILD b/user/libxdmcp/APKBUILD index 3c7c41fe7..85ba59d65 100644 --- a/user/libxdmcp/APKBUILD +++ b/user/libxdmcp/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxdmcp -pkgver=1.1.2 -pkgrel=5 +pkgver=1.1.3 +pkgrel=0 pkgdesc="X11 Display Manager Control Protocol library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" makedepends="xorgproto-dev libbsd-dev util-macros xmlto" subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXdmcp-$pkgver.tar.bz2" @@ -15,8 +15,8 @@ builddir="$srcdir/libXdmcp-$pkgver" # secfixes: # 1.1.2-r3: # - CVE-2017-2625 + build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb libXdmcp-1.1.2.tar.bz2" +sha512sums="cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec libXdmcp-1.1.3.tar.bz2" diff --git a/user/libxext/APKBUILD b/user/libxext/APKBUILD index 70f0f9b4e..3d601f744 100644 --- a/user/libxext/APKBUILD +++ b/user/libxext/APKBUILD @@ -1,21 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxext -pkgver=1.3.3 -pkgrel=3 +pkgver=1.3.4 +pkgrel=0 pkgdesc="X11 miscellaneous extensions library" url="https://www.X.Org/" arch="all" license="X11" -depends= +depends="" depends_dev="libxau-dev" makedepends="$depends_dev libx11-dev util-macros xmlto xorgproto" subpackages="$pkgname-dev $pkgname-doc" -source="https://www.X.Org/releases/individual/lib/libXext-$pkgver.tar.bz2 - " +source="https://www.X.Org/releases/individual/lib/libXext-$pkgver.tar.bz2" builddir="$srcdir"/libXext-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a libXext-1.3.3.tar.bz2" +sha512sums="09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a libXext-1.3.4.tar.bz2" diff --git a/user/libxft/APKBUILD b/user/libxft/APKBUILD index f2454b32c..c8b3445db 100644 --- a/user/libxft/APKBUILD +++ b/user/libxft/APKBUILD @@ -1,21 +1,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxft -pkgver=2.3.2 -pkgrel=3 +pkgver=2.3.3 +pkgrel=0 pkgdesc="FreeType-based font drawing library for X11" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="zlib-dev" makedepends="$depends_dev fontconfig-dev freetype-dev libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXft-$pkgver.tar.bz2" builddir="$srcdir/libXft-$pkgver" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,11 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398 libXft-2.3.2.tar.bz2" +sha512sums="28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8 libXft-2.3.3.tar.bz2" diff --git a/user/libxkbfile/APKBUILD b/user/libxkbfile/APKBUILD index 109a9d9c1..11cbd4d9e 100644 --- a/user/libxkbfile/APKBUILD +++ b/user/libxkbfile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbfile -pkgver=1.0.9 -pkgrel=3 +pkgver=1.1.0 +pkgrel=0 pkgdesc="X11 keyboard file manipulation library" url="https://www.X.Org/" arch="all" @@ -12,7 +12,6 @@ subpackages="$pkgname-dev" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,15 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING \ - "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1 libxkbfile-1.0.9.tar.bz2" +sha512sums="1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 libxkbfile-1.1.0.tar.bz2" diff --git a/user/libxmu/APKBUILD b/user/libxmu/APKBUILD index 80ec63ade..854f806a3 100644 --- a/user/libxmu/APKBUILD +++ b/user/libxmu/APKBUILD @@ -1,23 +1,21 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxmu -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=0 pkgdesc="X11 miscellaneous micro-utility library" url="https://www.X.Org/" arch="all" options="!check" # No test suite. license="X11 AND MIT" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="util-linux-dev" makedepends="$depends_dev libsm-dev libx11-dev libxext-dev libxt-dev util-macros xmlto" source="https://www.X.Org/releases/individual/lib/libXmu-$pkgver.tar.bz2" builddir="$srcdir"/libXmu-$pkgver -build() -{ - cd "$builddir" +build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,10 +26,7 @@ build() } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 $srcdir/libXmu-$pkgver/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING } -sha512sums="eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc libXmu-1.1.2.tar.bz2" +sha512sums="8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 libXmu-1.1.3.tar.bz2" diff --git a/user/libxrandr/APKBUILD b/user/libxrandr/APKBUILD index 0e2d1f3e1..9316676d5 100644 --- a/user/libxrandr/APKBUILD +++ b/user/libxrandr/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxrandr -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.2 +pkgrel=0 pkgdesc="X11 RandR extension library" url="https://www.X.Org/" arch="all" license="MIT" -depends= +depends="" depends_dev="libxext-dev" makedepends="$depends_dev libx11-dev libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-dev $pkgname-doc" @@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXrandr-$pkgver.tar.bz2" builddir="$srcdir"/libXrandr-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,14 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a libXrandr-1.5.1.tar.bz2" +sha512sums="fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2" diff --git a/user/libxvmc/APKBUILD b/user/libxvmc/APKBUILD index c65e816d9..9953618d2 100644 --- a/user/libxvmc/APKBUILD +++ b/user/libxvmc/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxvmc -pkgver=1.0.10 -pkgrel=2 +pkgver=1.0.11 +pkgrel=0 pkgdesc="X11 Video Motion Compensation extension library" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="libxext-dev" makedepends="libx11-dev libxv-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXvMC-$pkgver.tar.bz2" builddir="$srcdir"/libXvMC-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19 libXvMC-1.0.10.tar.bz2" +sha512sums="4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476 libXvMC-1.0.11.tar.bz2" diff --git a/user/libxxf86dga/APKBUILD b/user/libxxf86dga/APKBUILD index 9df55acd4..5de299edc 100644 --- a/user/libxxf86dga/APKBUILD +++ b/user/libxxf86dga/APKBUILD @@ -1,19 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxxf86dga -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.5 +pkgrel=0 pkgdesc="X11 Direct Graphics Access extension library" url="https://www.X.Org/" arch="all" license="X11" -subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="libx11-dev libxext-dev util-macros xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/lib/libXxf86dga-$pkgver.tar.bz2" builddir="$srcdir"/libXxf86dga-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2 libXxf86dga-1.1.4.tar.bz2" +sha512sums="0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2" diff --git a/user/libzip/APKBUILD b/user/libzip/APKBUILD index 32f0a956c..9c1836e60 100644 --- a/user/libzip/APKBUILD +++ b/user/libzip/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libzip -pkgver=1.5.1 -pkgrel=2 +pkgver=1.5.2 +pkgrel=0 pkgdesc="C library for manipulating ZIP archives" url="https://libzip.org/" arch="all" @@ -19,7 +19,6 @@ source="https://libzip.org/download/$pkgname-$pkgver.tar.xz" # - CVE-2017-14107 build() { - cd "$builddir" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ @@ -31,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" -j1 install } @@ -46,4 +43,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d libzip-1.5.1.tar.xz" +sha512sums="1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643 libzip-1.5.2.tar.xz" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 1be241d58..280955e7f 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.52 +pkgver=1.4.53 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" @@ -101,7 +101,7 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="3c604f441c001641681b958012524c9a2e801314b07d9741d4b5e086e7585d676516e3fe587e0ff69f1f937c11b9a290f2173866d6b90019117b6be299972a72 lighttpd-1.4.52.tar.xz +sha512sums="bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76 lighttpd-1.4.53.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate diff --git a/user/links/APKBUILD b/user/links/APKBUILD index 572f9d977..b3ade3cb2 100644 --- a/user/links/APKBUILD +++ b/user/links/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=links -pkgver=2.17 +pkgver=2.19 pkgrel=0 pkgdesc="Text Web browser, similar to Lynx" url="http://links.twibright.com/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="http://$pkgname.twibright.com/download/$pkgname-$pkgver.tar.bz2" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,8 +25,7 @@ build () { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="871a3a2cbc210467f4ffd830ba2966f2ebc0ec9ed4a1de018d032cec4b550e58f6858875478647c627ec746bb76810a4b97603575f2d21b5ea650c612684c8d5 links-2.17.tar.bz2" +sha512sums="8716cea6feb5a02b59d7e2dd5bfd0af9b2ac2a4427c0f98a3c8a8eaabca31e7a96c16888c0de19976749485b3cdbf75cbff88a37cd3b58700c1f090acec328ea links-2.19.tar.bz2" diff --git a/user/lksctp-tools/APKBUILD b/user/lksctp-tools/APKBUILD index adeeec587..666515b81 100644 --- a/user/lksctp-tools/APKBUILD +++ b/user/lksctp-tools/APKBUILD @@ -1,20 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lksctp-tools -pkgver=1.0.17 +pkgver=1.0.18 pkgrel=0 pkgdesc="Tools for using SCTP on Linux" url="http://lksctp.sourceforge.net/" arch="all" license="GPL-2.0-only AND LGPL-2.1-only" depends="" -makedepends="" +makedepends="autoconf automake" subpackages="$pkgname-dev $pkgname-doc" -source="https://downloads.sourceforge.net/lksctp/lksctp-tools-$pkgver.tar.gz" -builddir="$srcdir/lksctp-tools-$pkgver" +source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz" build() { - cd "$builddir" + ./bootstrap ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 lksctp-tools-1.0.17.tar.gz" +sha512sums="1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055 lksctp-tools-1.0.18.tar.gz" diff --git a/user/llvm7/ppc32-calling-convention.patch b/user/llvm7/ppc32-calling-convention.patch deleted file mode 100644 index 2e6d66427..000000000 --- a/user/llvm7/ppc32-calling-convention.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: trunk/lib/Target/PowerPC/PPCISelLowering.cpp -=================================================================== ---- trunk/lib/Target/PowerPC/PPCISelLowering.cpp -+++ trunk/lib/Target/PowerPC/PPCISelLowering.cpp -@@ -3511,9 +3511,14 @@ - // Argument stored in memory. - assert(VA.isMemLoc()); - -+ // Get the extended size of the argument type in stack - unsigned ArgSize = VA.getLocVT().getStoreSize(); -- int FI = MFI.CreateFixedObject(ArgSize, VA.getLocMemOffset(), -- isImmutable); -+ // Get the actual size of the argument type -+ unsigned ObjSize = VA.getValVT().getStoreSize(); -+ unsigned ArgOffset = VA.getLocMemOffset(); -+ // Stack objects in PPC32 are right justified. -+ ArgOffset += ArgSize - ObjSize; -+ int FI = MFI.CreateFixedObject(ArgSize, ArgOffset, isImmutable); - - // Create load nodes to retrieve arguments from the stack. - SDValue FIN = DAG.getFrameIndex(FI, PtrVT); -@@ -5468,10 +5473,15 @@ - Arg = PtrOff; - } - -- if (VA.isRegLoc()) { -- if (Arg.getValueType() == MVT::i1) -- Arg = DAG.getNode(ISD::ZERO_EXTEND, dl, MVT::i32, Arg); -+ // When useCRBits() is true, there can be i1 arguments. -+ // It is because getRegisterType(MVT::i1) => MVT::i1, -+ // and for other integer types getRegisterType() => MVT::i32. -+ // Extend i1 and ensure callee will get i32. -+ if (Arg.getValueType() == MVT::i1) -+ Arg = DAG.getNode(Flags.isSExt() ? ISD::SIGN_EXTEND : ISD::ZERO_EXTEND, -+ dl, MVT::i32, Arg); - -+ if (VA.isRegLoc()) { - seenFloatArg |= VA.getLocVT().isFloatingPoint(); - // Put argument in a physical register. - RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg)); -Index: trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll -=================================================================== ---- trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll -+++ trunk/test/CodeGen/PowerPC/ppc32-i1-stack-arguments-abi-bug.ll -@@ -0,0 +1,24 @@ -+; RUN: llc -verify-machineinstrs < %s -mcpu=ppc32 -mattr=+crbits | FileCheck %s -+target triple = "powerpc-unknown-linux-gnu" -+ -+define void @check_callee( -+ i32, i32, i32, i32, -+ i32, i32, i32, i32, -+ i1 zeroext %s1 -+) { -+ call void @check_caller( -+ i32 9, i32 9, i32 9, i32 9, -+ i32 9, i32 9, i32 9, i32 9, -+ i1 zeroext %s1) -+ ret void -+} -+ -+; CHECK-LABEL: @check_callee -+; CHECK: lbz {{[0-9]+}}, 27(1) -+; CHECK: stw {{[0-9]+}}, 8(1) -+ -+declare void @check_caller( -+ i32, i32, i32, i32, -+ i32, i32, i32, i32, -+ i1 zeroext -+) diff --git a/user/llvm7/APKBUILD b/user/llvm8/APKBUILD index d4b78cef0..de4969ac7 100644 --- a/user/llvm7/APKBUILD +++ b/user/llvm8/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: A. Wilcox <awilfox@adelielinux.org> _pkgname=llvm -pkgver=7.0.1 +pkgver=8.0.0 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver pkgrel=0 @@ -24,7 +24,6 @@ source="https://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz musl-ppc64-elfv2.patch more-secure-plt.patch even-more-secure-plt.patch - ppc32-calling-convention.patch python3-test.patch " builddir="$srcdir/$_pkgname-$pkgver.src" @@ -102,7 +101,7 @@ build() { -DLLVM_HOST_TRIPLE="$CHOST" \ -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;PowerPC;SystemZ;AMDGPU;NVPTX;Mips;BPF' \ + -DLLVM_TARGETS_TO_BUILD='AArch64;AMDGPU;ARM;BPF;Mips;PowerPC;Sparc;SystemZ;WebAssembly;X86' \ "$builddir" make llvm-tblgen @@ -114,6 +113,9 @@ build() { check() { cd "$builddir"/build + # appears to be an issue on musl and glibc, but only fails on musl: + # https://github.com/NixOS/nixpkgs/blob/bb7e9e46/pkgs/development/compilers/llvm/8/llvm.nix#L74 + rm "$builddir"/test/CodeGen/AArch64/wineh4.mir # FIXME: Few tests fail on s390x, ignore it for now. See build log # https://gist.github.com/jirutka/6edc951ad5b8002cf1780546cf661edc case "$CARCH" in @@ -161,11 +163,7 @@ package() { rmdir include ln -s ../../include/$pkgname include - # Move /usr/lib/$pkgname/lib/cmake/llvm/ into /usr/lib/cmake/$pkgname/ - # and symlink it back. - _mv lib/cmake/llvm/* "$pkgdir"/usr/lib/cmake/$pkgname/ - rmdir lib/cmake/llvm - ln -s ../../../cmake/$pkgname lib/cmake/llvm + ln -s "$pkgdir"/usr/lib/cmake/llvm ../$pkgname/lib/cmake/llvm } static() { @@ -241,12 +239,11 @@ _mv() { mv $@ } -sha512sums="ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df llvm-7.0.1.src.tar.xz +sha512sums="1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f llvm-8.0.0.src.tar.xz f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch 49c47f125014b60d0ea7870f981a2c1708ad705793f89287ed846ee881a837a4dc0170bf467e03f2ef56177473128945287749ac80dc2d13cfabcf8b929ba58a disable-FileSystemTest.CreateDir-perms-assert.patch caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60cc2eca59e4c5b2a61d29827a2f3362ee7c5f74f11d9ace200 disable-dlclose-test.patch e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch -dcd34b81c2f2843cd05b2e3b88e268045a2ec6ed8677630fc8904f38b2131cbc0ba37dde461e28b1c301d5e95b634b2e225797f8a5585c0cabc69e3b7e78de85 more-secure-plt.patch +957516510439be661ad04e061e9616da8a271a5621603238cde5b4782bd2465367eaaa5ade628d163c8d9e70b8b0495687669f4648bd031ac6e5a1582d2e75a4 more-secure-plt.patch deb71762721ebc73bfdf23143b582f40c70eddcef3e337ed14499e8e336bee2906292d38d64fe98fa633430c1bcb66cf6a2e067258c8fbe6e931f99f6d10a6f7 even-more-secure-plt.patch -c3f596a1578a07ce0ee40c4e2576fe05ca6ca0c1b4f94b1f74c55cb09603afe7c846db9294fe28d83ca48633086bad422218e6d06e0d92173143fb298e06fb38 ppc32-calling-convention.patch 53cc0d13dd871e9b775bb4e7567de4f9a97d91b8246cd7ce74607fd88d6e3e2ab9455f5b4195bc7f9dbdedbc77d659d43e98ec0b7cd78cd395aaea6919510287 python3-test.patch" diff --git a/user/llvm7/disable-FileSystemTest.CreateDir-perms-assert.patch b/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch index e73ce9b6f..e73ce9b6f 100644 --- a/user/llvm7/disable-FileSystemTest.CreateDir-perms-assert.patch +++ b/user/llvm8/disable-FileSystemTest.CreateDir-perms-assert.patch diff --git a/user/llvm7/disable-dlclose-test.patch b/user/llvm8/disable-dlclose-test.patch index b70cd4d4d..b70cd4d4d 100644 --- a/user/llvm7/disable-dlclose-test.patch +++ b/user/llvm8/disable-dlclose-test.patch diff --git a/user/llvm7/even-more-secure-plt.patch b/user/llvm8/even-more-secure-plt.patch index 112e111b8..112e111b8 100644 --- a/user/llvm7/even-more-secure-plt.patch +++ b/user/llvm8/even-more-secure-plt.patch diff --git a/user/llvm7/llvm-fix-build-with-musl-libc.patch b/user/llvm8/llvm-fix-build-with-musl-libc.patch index 6ee91ea44..6ee91ea44 100644 --- a/user/llvm7/llvm-fix-build-with-musl-libc.patch +++ b/user/llvm8/llvm-fix-build-with-musl-libc.patch diff --git a/user/llvm7/more-secure-plt.patch b/user/llvm8/more-secure-plt.patch index 1a32eea4f..6728e2765 100644 --- a/user/llvm7/more-secure-plt.patch +++ b/user/llvm8/more-secure-plt.patch @@ -16,13 +16,13 @@ index c583fba8cab..6a9eedf89c5 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -222,6 +222,10 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT, - if (TT.getArch() == Triple::ppc64 || TT.getArch() == Triple::ppc64le) + if (TT.getArch() == Triple::ppc64) return Reloc::PIC_; + // musl needs SecurePlt, which depends on PIC. + if (TT.getEnvironment() == Triple::Musl) + return Reloc::PIC_; + - // 32-bit is static by default. + // Rest are static by default. return Reloc::Static; } diff --git a/user/llvm7/musl-ppc64-elfv2.patch b/user/llvm8/musl-ppc64-elfv2.patch index 016be5dad..016be5dad 100644 --- a/user/llvm7/musl-ppc64-elfv2.patch +++ b/user/llvm8/musl-ppc64-elfv2.patch diff --git a/user/llvm7/python3-test.patch b/user/llvm8/python3-test.patch index 746313317..746313317 100644 --- a/user/llvm7/python3-test.patch +++ b/user/llvm8/python3-test.patch diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 8c20e285e..5ef16ae2f 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Lieutenant Skat is an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6fadb424397fa3780af818323eda2c7025f4e611e33a78ed93aad661a5bd1d0df2d71af6da9c6598278aee137e60a9ca7591e5fadbd0cc25af2eb2ebffaa7ded lskat-18.12.3.tar.xz" +sha512sums="8c8a4e991fa696643bbb6c4427128b3ca465f479025b18bd8bcc3d34111d8f0bde3c0c155ebe4f39b3af75b134c17b644186d4b599d7a3e66b04af656caa2019 lskat-19.04.0.tar.xz" diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index d19215e41..4e69511e8 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lynx pkgver=2.8.9_p1 _relver=${pkgver/_p/rel.} diff --git a/user/makedepend/APKBUILD b/user/makedepend/APKBUILD index da9da0ee9..13d8c1e05 100644 --- a/user/makedepend/APKBUILD +++ b/user/makedepend/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=makedepend -pkgver=1.0.5 -pkgrel=1 +pkgver=1.0.6 +pkgrel=0 pkgdesc="Utility for making makefile dependencies" url="https://www.freedesktop.org/" arch="all" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,13 +22,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb makedepend-1.0.5.tar.bz2" +sha512sums="eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 makedepend-1.0.6.tar.bz2" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index 00df90902..efddac983 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="af6147a288021a3056892bae8d9c83b6ecfc581c7237d3fa04a579e4461779a5dacb0e22b21f0e8af5032f75d827a56d197369c85193f0188140ac361777a851 marble-18.12.3.tar.xz" +sha512sums="82004878225848df197f41ea022e2c1c971a1480b7a6ae05088488ba28495e4e4e7f11c6fd14ccb7ebbbe68ba8ae1daf1d16f57e8f9e7ca22f3d3feb9290adbe marble-19.04.0.tar.xz" diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD index aad16388d..f06e39926 100644 --- a/user/mate-icon-theme/APKBUILD +++ b/user/mate-icon-theme/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mate-icon-theme -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Default icon theme for the MATE desktop environment" url="https://mate-desktop.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b4f0b5040e412bcbe818c14f101556cd643cc9dfce02aa676edc790f17de7da2272754235f8d9ad000551e7d92a5974cec3336712074747fcf669c0a729f8a5e mate-icon-theme-1.22.0.tar.xz" +sha512sums="640fea3dfd4d9f2edd24353e4a36d57520de356c421b24ee1aec7fca98d3f76a789808a1d005a20ed87ee089d1777376e5b3f229ce0e90b06adf242f6a79b3b9 mate-icon-theme-1.22.1.tar.xz" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index d9b27c865..4b8dc8d5a 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=18.3.4 +pkgver=18.3.6 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" @@ -16,7 +16,7 @@ subpackages="$pkgname-dev $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles $pkgname-xatracker $pkgname-osmesa $pkgname-gbm " -_llvmver=7 +_llvmver=8 depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev xorgproto-dev" makedepends="$depends_dev byacc eudev-dev expat-dev flex libelf-dev @@ -230,7 +230,7 @@ _dri() { esac } -sha512sums="e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99 mesa-18.3.4.tar.xz +sha512sums="3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487 mesa-18.3.6.tar.xz 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index d6dd2837f..d961d6995 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="559c62c62aceadb10f2f501cddd9094e0ce2a5520d3c872fe5a76f6c3827828c6aca7850ce8c27b1c9126446887b87e7f39f65b861214733e4578816c6981660 minuet-18.12.3.tar.xz" +sha512sums="11f6b2806ade05b288a6a637fa6ad3bafacdcd61e70d8653c87170440b645c50e366e2892b8a72516cdfe378d9bb9fddf4789f77a9e6664ab47cbe12a6df3a2f minuet-19.04.0.tar.xz" diff --git a/user/mkcomposecache/APKBUILD b/user/mkcomposecache/APKBUILD index dbd363bf0..d75231431 100644 --- a/user/mkcomposecache/APKBUILD +++ b/user/mkcomposecache/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkcomposecache -pkgver=1.2 +pkgver=1.2.1 pkgrel=0 pkgdesc="Utility to manipulate X11 Compose key cache files" url="https://www.X.Org/" @@ -10,10 +10,14 @@ license="MIT" depends="" makedepends="libx11-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/mkcomposecache-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/mkcomposecache-$pkgver.tar.bz2" + +prepare() { + update_config_sub + default_prepare +} build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +29,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e81101dbf3324341a2aa6b12a6f1a67bf18484f69edc86e38f78f30b2e62d4d3a98d65dbd05540dfe437d739b5cdd330d1e381da87ec3fe4fe7c42fcef58aad7 mkcomposecache-1.2.tar.bz2" +sha512sums="97ce9e5e2f2534291fc0b3a121899e2936de3e71ec6a9929cfc6e1e0f41e6d57cccd08147a2b5d3c7d70d1769f14ed6c4745c398602d5b81a2ddb8c7490fcb5b mkcomposecache-1.2.1.tar.bz2" diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD index c2d81ec73..cfda36c89 100644 --- a/user/mkfontscale/APKBUILD +++ b/user/mkfontscale/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontscale -pkgver=1.1.3 -pkgrel=1 +pkgver=1.2.1 +pkgrel=0 pkgdesc="Scalable font file creator for X.Org" url="https://www.X.Org/" arch="all" @@ -9,12 +9,12 @@ license="MIT" subpackages="$pkgname-doc" depends="" makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev" +provides="mkfontdir=$pkgver-r$pkgrel" triggers="$pkgname.trigger=/usr/share/fonts/* $pkgname.trigger=/usr/share/fonts/X11/*" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -23,13 +23,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62 mkfontscale-1.1.3.tar.bz2" +sha512sums="4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c mkfontscale-1.2.1.tar.bz2" diff --git a/user/mkfontscale/mkfontscale.trigger b/user/mkfontscale/mkfontscale.trigger index 2357e06dc..9b08da4b0 100644 --- a/user/mkfontscale/mkfontscale.trigger +++ b/user/mkfontscale/mkfontscale.trigger @@ -2,5 +2,6 @@ for i in "$@"; do mkfontscale "$i" + mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i" done diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 728765602..479ca0d67 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=muparser pkgver=2.2.6.1 pkgrel=0 diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD index cb717ec1b..e13de2e06 100644 --- a/user/mutt/APKBUILD +++ b/user/mutt/APKBUILD @@ -3,10 +3,10 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mutt -pkgver=1.10.1 +pkgver=1.11.4 pkgrel=0 pkgdesc="Small but very powerful text-mode email client" -url="http://www.mutt.org" +url="http://www.mutt.org" # No HTTPS arch="all" options="suid !check" # No test suite. license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND Public-Domain" @@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang" source="https://bitbucket.org/$pkgname/$pkgname/downloads/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ISPELL=/usr/bin/hunspell \ ./configure \ --build=$CBUILD \ @@ -42,7 +41,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm "$pkgdir"/etc/*.dist \ @@ -58,4 +56,4 @@ package() { "$pkgdir"/etc/Muttrc.gpg.dist } -sha512sums="13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726 mutt-1.10.1.tar.gz" +sha512sums="18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb mutt-1.11.4.tar.gz" diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD index dab9c6d08..0a34a72fe 100644 --- a/user/ncompress/APKBUILD +++ b/user/ncompress/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ncompress -pkgver=4.2.4.4 -pkgrel=1 +pkgver=4.2.4.5 +pkgrel=0 pkgdesc="Fast, simple LZW compressor" url="https://github.com/vapier/ncompress" arch="all" @@ -13,15 +13,13 @@ source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz fix-9bit-compress.patch" build() { - cd "$builddir" make } package() { - cd "$builddir" install -D -m755 "$builddir"/compress "$pkgdir"/usr/bin/compress install -D -m644 "$builddir"/compress.1 "$pkgdir"/usr/share/man/man1/compress.1 } -sha512sums="abc7bd96daaab0b83d5ca18ef4b8b4c6528632653a0882a4e0eda4fb3f99e23aae60ee30193e79104ea2ac8fb5816ac3b0bdebb08322db6bde6b8ef1639527be ncompress-4.2.4.4.tar.gz +sha512sums="487e8d5ca743c3aba19cf69f7ec62bdc0784e43af5737f06d6d4257f2f33899eb3d293ed049f57b3164e344a0fddc077bc73437564977bad8de45816354c8bf3 ncompress-4.2.4.5.tar.gz b2e897679234f391fa3cf4d5b55a3894424cca632a3b16303b0085e908808bc72b66e6a9df3e56e1a26eac79340c0901f7e6ef2378cc61b710e93194d345c2ea fix-9bit-compress.patch" diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD index 5c2c06c70..6ca30bbad 100644 --- a/user/nfs-utils/APKBUILD +++ b/user/nfs-utils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nfs-utils pkgver=2.3.3 -pkgrel=0 +pkgrel=1 pkgdesc="NFS file sharing client and server" url="http://nfs.sourceforge.net/" arch="all" @@ -13,6 +13,7 @@ makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev rpcsvc-proto sqlite-dev util-linux-dev" subpackages="$pkgname-doc $pkgname-openrc" source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz + freeaddrinfo-properly.patch nfs-utils-1.1.4-mtab-sym.patch posixish.patch undef-def.patch @@ -63,6 +64,7 @@ package() { } sha512sums="5025ccd7699ac1a0fdbd8b18ed8b33ea89230158320d809ec51e73f831100db75dceaddde481d911eeca9059caa521d155c2d14d014d75f091f432aad92a9716 nfs-utils-2.3.3.tar.xz +7e1472989374cf8a8dbd4944bbd5deaa5520f12ea3627709be037fb78febec531b373c6e05004f27046d1e3842f5cc7ce024f4db65cf656864bda85db529b451 freeaddrinfo-properly.patch 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch f0b87ff4229d96a46e3f0c17f87dcd3ce5c51651ee036d935c1481b421cd7e5b6a048a082b4f8115a969fe6e85cc871df7658bf5d80c480095b69f29fd6b085d posixish.patch 2e54efa2cac0522f549e8bed45147676d10b299b5060eda305da8767feb55d37627259196d89c295e8d5f4fbbb7c9e791a53dddd579187600f1717968049aa6a undef-def.patch diff --git a/user/nfs-utils/freeaddrinfo-properly.patch b/user/nfs-utils/freeaddrinfo-properly.patch new file mode 100644 index 000000000..7ddcde004 --- /dev/null +++ b/user/nfs-utils/freeaddrinfo-properly.patch @@ -0,0 +1,126 @@ +diff -Naur nfs-utils-2.3.3-orig/support/export/client.c nfs-utils-2.3.3/support/export/client.c +--- nfs-utils-2.3.3-orig/support/export/client.c 2018-09-06 13:09:08.000000000 -0500 ++++ nfs-utils-2.3.3/support/export/client.c 2019-04-21 02:48:45.676838188 -0500 +@@ -309,7 +309,8 @@ + init_addrlist(clp, ai); + + out: +- freeaddrinfo(ai); ++ if (ai != NULL) ++ freeaddrinfo(ai); + return clp; + } + +diff -Naur nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c nfs-utils-2.3.3/tests/nsm_client/nsm_client.c +--- nfs-utils-2.3.3-orig/tests/nsm_client/nsm_client.c 2018-09-06 13:09:08.000000000 -0500 ++++ nfs-utils-2.3.3/tests/nsm_client/nsm_client.c 2019-04-21 02:35:53.139552780 -0500 +@@ -243,7 +243,8 @@ + printf("RPC client creation failed\n"); + } + out: +- freeaddrinfo(ai); ++ if (ai != NULL) ++ freeaddrinfo(ai); + return client; + } + +diff -Naur nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c nfs-utils-2.3.3/utils/exportfs/exportfs.c +--- nfs-utils-2.3.3-orig/utils/exportfs/exportfs.c 2018-09-06 13:09:08.000000000 -0500 ++++ nfs-utils-2.3.3/utils/exportfs/exportfs.c 2019-04-21 02:40:07.432327005 -0500 +@@ -282,7 +282,8 @@ + validate_export(exp); + + out: +- freeaddrinfo(ai); ++ if (ai != NULL) ++ freeaddrinfo(ai); + } + + static int exportfs_generic(char *arg, char *options, int verbose) +@@ -395,7 +396,8 @@ + if (!success) + xlog(L_ERROR, "Could not find '%s:%s' to unexport.", hname, path); + +- freeaddrinfo(ai); ++ if (ai != NULL) ++ freeaddrinfo(ai); + } + + static int unexportfs_generic(char *arg, int verbose) +@@ -639,8 +641,10 @@ + } + + out: +- freeaddrinfo(results1); +- freeaddrinfo(results2); ++ if (results1 != NULL) ++ freeaddrinfo(results1); ++ if (results2 != NULL) ++ freeaddrinfo(results2); + return result; + } + +diff -Naur nfs-utils-2.3.3-orig/utils/mount/stropts.c nfs-utils-2.3.3/utils/mount/stropts.c +--- nfs-utils-2.3.3-orig/utils/mount/stropts.c 2018-09-06 13:09:08.000000000 -0500 ++++ nfs-utils-2.3.3/utils/mount/stropts.c 2019-04-21 02:43:18.451874403 -0500 +@@ -1263,7 +1263,8 @@ + } else + nfs_error(_("%s: internal option parsing error"), progname); + +- freeaddrinfo(mi.address); ++ if (mi.address != NULL) ++ freeaddrinfo(mi.address); + free(mi.hostname); + return retval; + } +diff -Naur nfs-utils-2.3.3-orig/utils/mountd/cache.c nfs-utils-2.3.3/utils/mountd/cache.c +--- nfs-utils-2.3.3-orig/utils/mountd/cache.c 2019-04-21 02:33:43.603417171 -0500 ++++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-04-21 02:45:11.289792765 -0500 +@@ -834,7 +834,8 @@ + out: + if (found_path) + free(found_path); +- freeaddrinfo(ai); ++ if (ai != NULL) ++ freeaddrinfo(ai); + free(dom); + xlog(D_CALL, "nfsd_fh: found %p path %s", found, found ? found->e_path : NULL); + } +@@ -1355,7 +1356,7 @@ + xlog(D_CALL, "nfsd_export: found %p path %s", found, path ? path : NULL); + if (dom) free(dom); + if (path) free(path); +- freeaddrinfo(ai); ++ if (ai) freeaddrinfo(ai); + } + + +diff -Naur nfs-utils-2.3.3-orig/utils/mountd/mountd.c nfs-utils-2.3.3/utils/mountd/mountd.c +--- nfs-utils-2.3.3-orig/utils/mountd/mountd.c 2018-09-06 13:09:08.000000000 -0500 ++++ nfs-utils-2.3.3/utils/mountd/mountd.c 2019-04-21 02:45:41.796526387 -0500 +@@ -581,7 +581,8 @@ + freeaddrinfo(ai); + continue; + } +- freeaddrinfo(ai); ++ if (ai != NULL) ++ freeaddrinfo(ai); + } + cp = &(c->gr_next); + } +diff -Naur nfs-utils-2.3.3-orig/utils/statd/hostname.c nfs-utils-2.3.3/utils/statd/hostname.c +--- nfs-utils-2.3.3-orig/utils/statd/hostname.c 2018-09-06 13:09:08.000000000 -0500 ++++ nfs-utils-2.3.3/utils/statd/hostname.c 2019-04-21 02:41:39.712446505 -0500 +@@ -308,8 +308,10 @@ + } + + out: +- freeaddrinfo(results2); +- freeaddrinfo(results1); ++ if (results2 != NULL) ++ freeaddrinfo(results2); ++ if (results1 != NULL) ++ freeaddrinfo(results1); + + xlog(D_CALL, "%s: hostnames %s and %s %s", __func__, + hostname1, hostname2, diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD index 9a96a915b..24b9a6e6f 100644 --- a/user/okteta/APKBUILD +++ b/user/okteta/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okteta -pkgver=0.25.4 +pkgver=0.26.1 pkgrel=0 pkgdesc="Graphical hex/binary editor" url="https://www.kde.org/applications/utilities/okteta/" @@ -13,11 +13,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kcrash-dev kdbusaddons-dev kdoctools-dev kiconthemes-dev kcmutils-dev knewstuff-dev kparts-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev qca-dev shared-mime-info qt5-qttools-dev" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/okteta/$pkgver/src/okteta-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -33,14 +32,12 @@ build() { } check() { - cd "$builddir" local _skip="libkasten-core-testdocumenttest|libkasten-core-documentmanagertest|oktetakasten-document-bytearraydocumenttest|kpart-oktetaparttest" CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "($_skip)" } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d9887a90efbad3bb2caa0d3bb12af27708b77d54a90cd0da82eace7ea6dfc2efbcea3d7dc720bf4a088a823a8ed9edf75ab1c3680aa6d99c640d5c9e4c385e16 okteta-0.25.4.tar.xz" +sha512sums="fa4e841c77ae255e9936b29e30fa0bc1f65594898820652ac8ba78497658ec5ef78cadf8b4d33cab09b2ee8da1d75b84377be28680b2d91c5af2dcdfe5da95e3 okteta-0.26.1.tar.xz" diff --git a/user/okular/0001-Ensure-compatibility-with-Qt.patch b/user/okular/0001-Ensure-compatibility-with-Qt.patch new file mode 100644 index 000000000..dfd2daa75 --- /dev/null +++ b/user/okular/0001-Ensure-compatibility-with-Qt.patch @@ -0,0 +1,36 @@ +From 00f76c2df98c44722b05f7c350cf6b3241c2128f Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Thu, 18 Apr 2019 18:17:32 -0500 +Subject: [PATCH] Ensure compatibility with Qt <5.10 + +Qt::AA_CompressTabletEvents was added in Qt 5.10. Use preprocessor check +to avoid build failures on 5.9 LTS or 5.8 (the minimum version). +--- + shell/main.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/shell/main.cpp b/shell/main.cpp +index 17b58c610..dbdebf1a4 100644 +--- a/shell/main.cpp ++++ b/shell/main.cpp +@@ -19,6 +19,7 @@ + #include <QTextStream> + #include <kwindowsystem.h> + #include <QApplication> ++#include <QtGlobal> + #include <KAboutData> + #include <KCrash> + #include <KMessageBox> +@@ -31,7 +32,9 @@ + int main(int argc, char** argv) + { + QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); ++#if QT_VERSION >= 0x051000 + QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents); ++#endif + + QApplication app(argc, argv); + KLocalizedString::setApplicationDomain("okular"); +-- +2.21.0 + diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index ed7175568..7a8fa0fa6 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" @@ -16,7 +16,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev libjpeg-turbo-dev kpty-dev kirigami2-dev djvulibre-dev libkexiv2-dev libspectre-dev ebook-tools-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz + 0001-Ensure-compatibility-with-Qt.patch + " build() { cd "$builddir" @@ -45,4 +47,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cbbf20657b6d0c5837d1400fb5be17410672e2489372f62f247b380bd38c0f3ef412d179b683a92d592a906855a648e997c6db5898e29365dcefdf7a8192bf11 okular-18.12.3.tar.xz" +sha512sums="8a28f0cafb9b4ae8f5b3720958ccf511b9c40bbbe9b725fac11e103b1ebbb4a8a7cf84917cbe355bae7bd279584902e14907eafed2c5145b3c83d80d0a5ae25f okular-19.04.0.tar.xz +cdaae2b04abaa4663e6a9f1e95dc3659c756ad1f159dc85bad52b6d55b37aef9aa7e52e773687f6295b248f6df0518e59d9da45d5819354f9eea407037a6959c 0001-Ensure-compatibility-with-Qt.patch" diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD index b0ab22c55..e3f0dbaaf 100644 --- a/user/opengfx/APKBUILD +++ b/user/opengfx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=opengfx -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=0 pkgdesc="Graphics files for OpenTTD" url="https://www.openttd.org/en/" @@ -11,7 +11,7 @@ license="GPL-2.0-only" depends="" makedepends="grfcodec nml" subpackages="" -source="http://bundles.openttdcoop.org/opengfx/releases/$pkgver/$pkgname-$pkgver-source.tar.xz +source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-source.tar.xz Makefile.patch " builddir="$srcdir/$pkgname-$pkgver-source" @@ -30,5 +30,5 @@ package() { done } -sha512sums="42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1 opengfx-0.5.4-source.tar.xz -f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9 Makefile.patch" +sha512sums="952fb52e19bd790e335a9df0f11fa29b2fc570b49903419904956cc65883adde93d432160b16682366ab8b973b7852d2d30f574f1840f6fbd082e1addbe5bfe8 opengfx-0.5.5-source.tar.xz +a337ab4ade493a87d2687a7aa2fb05dcd5718725645950486975a6df309dd1e6631d4b04fa6dcbf590e869b45b037caa32468ea6f677ce458d61950f77c5a006 Makefile.patch" diff --git a/user/opengfx/Makefile.patch b/user/opengfx/Makefile.patch index 169df9668..1e4585311 100644 --- a/user/opengfx/Makefile.patch +++ b/user/opengfx/Makefile.patch @@ -11,15 +11,6 @@ # Graphics processing GIMP ?= gimp -@@ -196,7 +196,7 @@ - endif - - # Days of commit since 2000-1-1 00-00 --REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days") -+REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)") - - # Filename addition, if we're not building the default branch - REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi) @@ -719,7 +719,7 @@ $(_E) endif diff --git a/user/openjdk7/APKBUILD b/user/openjdk7/APKBUILD index bf05b670f..597031b43 100644 --- a/user/openjdk7/APKBUILD +++ b/user/openjdk7/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Timo Teras <timo.teras@iki.fi> # Contributor: Jakub Jirutka <jakub@jirutka.cz> -# Maintainer: Timo Teras <timo.teras@iki.fi> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjdk7 _icedteaver=2.6.16 # pkgver is <JDK version>.<JDK update> diff --git a/user/openjpeg/APKBUILD b/user/openjpeg/APKBUILD index 3b4c6dc49..6e2993bd6 100644 --- a/user/openjpeg/APKBUILD +++ b/user/openjpeg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openjpeg -pkgver=2.3.0 -pkgrel=1 +pkgver=2.3.1 +pkgrel=0 pkgdesc="Open-source implementation of JPEG 2000 image codec" url="http://www.openjpeg.org/" arch="all" @@ -11,12 +11,9 @@ license="BSD-2-Clause-NetBSD" depends_dev="$pkgname-tools" makedepends="libpng-dev tiff-dev lcms2-dev doxygen cmake" subpackages="$pkgname-dev $pkgname-tools" -source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz - fix-include-path.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/uclouvain/openjpeg/archive/v$pkgver.tar.gz" build() { - cd "$builddir" cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -41,7 +38,6 @@ build() { # - CVE-2016-9581 package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -51,5 +47,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 openjpeg-2.3.0.tar.gz -354fb181a25eeabe231d28216bcb8e401648cf8e71ba476cabd25e297f46bbc1ea5b091b4d2d4450501422b8b20649bf109ff5b3f3b49f1492650dbb46ed6e22 fix-include-path.patch" +sha512sums="339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 openjpeg-2.3.1.tar.gz" diff --git a/user/openjpeg/fix-include-path.patch b/user/openjpeg/fix-include-path.patch deleted file mode 100644 index f5ff1e60d..000000000 --- a/user/openjpeg/fix-include-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in.old 2017-10-04 22:23:14.000000000 +0000 -+++ openjpeg-2.3.0/cmake/OpenJPEGConfig.cmake.in 2018-09-06 00:53:22.860000000 +0000 -@@ -26,7 +26,7 @@ - if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) -- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) -+ get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) - set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT}) - - else() diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index f1d84ba54..552c760c6 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -9,7 +9,7 @@ # - CVE-2017-9287 # pkgname=openldap -pkgver=2.4.46 +pkgver=2.4.47 pkgrel=0 pkgdesc="LDAP Server" url="http://www.openldap.org/" @@ -36,7 +36,6 @@ source="ftp://ftp.$pkgname.org/pub/OpenLDAP/$pkgname-release/$pkgname-$pkgver.tg slapd.initd slapd.confd " -builddir="$srcdir/$pkgname-$pkgver" # SLAPD backends _backends="" @@ -203,7 +202,7 @@ _submv() { done } -sha512sums="eef39d43f04aa09c657a1422cefef060fe00368559ae40d0d97536c08ebeaaa1ab06207b3f121ba6afcde54abdc550027c3505e5217e5fd47ae6f8c001260186 openldap-2.4.46.tgz +sha512sums="d424079e34207e3d24383a2bea70a07ded40714982a6767174d2b2cb208cd94feab5ef12157accae915b8e404e5773a7547aaef65f06b44dc3cc09c6a64d5a11 openldap-2.4.47.tgz 5d34d49eabe7cb66cf8284cc3bd9730fa23df4932df68549e242d250ee50d40c434ae074ebc720d5fbcd9d16587c9333c5598d30a5f1177caa61461ab7771f38 openldap-2.4-ppolicy.patch 44d97efb25d4f39ab10cd5571db43f3bfa7c617a5bb087085ae16c0298aca899b55c8742a502121ba743a73e6d77cd2056bc96cee63d6d0862dabc8fb5574357 openldap-2.4.11-libldap_r.patch 8c4244d316a05870dd1147b2ab7ddbcfd7626b5dce2f5a0e72f066dc635c2edb4f1ea3be88c6fec2d5ab016001be16bedef70f2ce0695c3cd96f69e1614ff177 fix-manpages.patch diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD index 63df0988e..2c185d8cb 100644 --- a/user/openttd/APKBUILD +++ b/user/openttd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openttd -pkgver=1.8.0 +pkgver=1.9.1 pkgrel=0 pkgdesc="Simulation game based on Transport Tycoon Deluxe" url="https://www.openttd.org/en/" @@ -12,9 +12,7 @@ depends="opengfx openmsx opensfx" makedepends="fontconfig-dev freetype-dev icu-dev libpng-dev libxdg-basedir-dev lzo-dev sdl-dev xz-dev zlib-dev" subpackages="$pkgname-doc" -source="https://binaries.openttd.org/releases/1.8.0/openttd-$pkgver-source.tar.xz - icu61.patch - " +source="https://proxy.binaries.openttd.org/openttd-releases/$pkgver/openttd-$pkgver-source.tar.xz" build() { cd "$builddir" @@ -32,5 +30,4 @@ package() { make install } -sha512sums="a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a openttd-1.8.0-source.tar.xz -db470433bcc68688b1a4cf71a514879c139300a778feb3f832bff0400b578d4b7720df6e259a86013334a661fce56c66d74aaf709d0027cf9638f006bebca10e icu61.patch" +sha512sums="44d907299a14fd09ebff980f7c212bbdbd5def880bc56bfe106c3efa8cb32472bbcafdbb145d3f4340a3bc96179418f78fe2ddc62dd067b464eca73313b477c1 openttd-1.9.1-source.tar.xz" diff --git a/user/openttd/icu61.patch b/user/openttd/icu61.patch deleted file mode 100644 index e4143d82f..000000000 --- a/user/openttd/icu61.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 -From: Charles Pigott <charlespigott@googlemail.com> -Date: Sun, 8 Apr 2018 01:06:18 +0100 -Subject: [PATCH] Fix #6690: Compilation with ICU 61 - ---- - src/language.h | 2 +- - src/strings.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/language.h b/src/language.h -index d33ba81892..ec241dbd8c 100644 ---- a/src/language.h -+++ b/src/language.h -@@ -105,7 +105,7 @@ extern LanguageList _languages; - extern const LanguageMetadata *_current_language; - - #ifdef WITH_ICU_SORT --extern Collator *_current_collator; -+extern icu::Collator *_current_collator; - #endif /* WITH_ICU_SORT */ - - bool ReadLanguagePack(const LanguageMetadata *lang); -diff --git a/src/strings.cpp b/src/strings.cpp -index 1c539d9343..fd7420259a 100644 ---- a/src/strings.cpp -+++ b/src/strings.cpp -@@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang - TextDirection _current_text_dir; ///< Text direction of the currently selected language. - - #ifdef WITH_ICU_SORT --Collator *_current_collator = NULL; ///< Collator for the language currently in use. -+icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. - #endif /* WITH_ICU_SORT */ - - static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. -@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) - - /* Create a collator instance for our current locale. */ - UErrorCode status = U_ZERO_ERROR; -- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); -+ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); - /* Sort number substrings by their numerical value. */ - if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); - /* Avoid using the collator if it is not correctly set. */ diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 7b76e2a0a..2b2a2d887 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=opus -pkgver=1.3 +pkgver=1.3.1 pkgrel=0 pkgdesc="Codec designed for speech and audio transmission" url="http://www.opus-codec.org/" @@ -39,4 +39,4 @@ package() { "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518 opus-1.3.tar.gz" +sha512sums="6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd opus-1.3.1.tar.gz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index 5a4ec3dc4..fd7b7388f 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="69c7e16ca54e39ec1f32f04db54161dcdd88f85089759ef6871707b10aa3f52edfa59d99ab98e3e115ab0c3471af54148d64b9cc2b3939e5c12fd33c3dcd8678 palapeli-18.12.3.tar.xz" +sha512sums="af4427ae453a7dcc9163d785dc04b926393f25dfc95ade924ffe5be95be45ee7c8eb0b58ebe4795c7c66241e633999f4bd887f7553f35881f9c5d5b178b23b87 palapeli-19.04.0.tar.xz" diff --git a/user/perl-extutils-depends/APKBUILD b/user/perl-extutils-depends/APKBUILD index 2d62635f2..84a2a30be 100644 --- a/user/perl-extutils-depends/APKBUILD +++ b/user/perl-extutils-depends/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-extutils-depends -pkgver=0.405 +pkgver=0.8000 pkgrel=0 pkgdesc="Easily build XS extensions that depend on XS extensions" url="https://metacpan.org/release/ExtUtils-Depends" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b9983ad763ff0cb81c899bc24f3152f13c69e608304b6e4446bd07b9b13d039650f3f87544c0bdd29c67246ea2973f04a1ce0fccbffb566fe89fdbe0bb03f11b ExtUtils-Depends-0.405.tar.gz" +sha512sums="c2823e48fc6ae42677da958d8cbeb561a29839cc387224ecd545e1d81979cd963377210f9c5a9bf314e2fc6e0907190f0b867ed59e91f8eab6df91f8d0c91e5d ExtUtils-Depends-0.8000.tar.gz" diff --git a/user/perl-file-find-object-rule/APKBUILD b/user/perl-file-find-object-rule/APKBUILD index f8938a59c..498f0358e 100644 --- a/user/perl-file-find-object-rule/APKBUILD +++ b/user/perl-file-find-object-rule/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-find-object-rule -pkgver=0.0309 +pkgver=0.0310 pkgrel=0 pkgdesc="Alternative Perl interface to File::Find::Object" url="https://metacpan.org/release/File-Find-Object-Rule" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d4fe0bc369faa4870bb4f66b4e1212f0597ab0eb723dfb0ab6473428657067c0a72f9b9d6354a549117e553be1ddde222ede822555f94846ba110a2f82cc4b68 File-Find-Object-Rule-0.0309.tar.gz" +sha512sums="d77f600a43a45fddf84fd9689666fb90d3dc87fb444e575a111bcebec482d570201e591764513f345941983935f1761bf4e2704d1a70babd6b3ba12ba3d8a74d File-Find-Object-Rule-0.0310.tar.gz" diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD index 8854921a3..627484d38 100644 --- a/user/perl-games-solitaire-verify/APKBUILD +++ b/user/perl-games-solitaire-verify/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-games-solitaire-verify -pkgver=0.1900 +pkgver=0.2000 pkgrel=0 pkgdesc="Verify solutions to solitaire games" url="https://metacpan.org/release/Games-Solitaire-Verify" @@ -9,7 +9,7 @@ arch="noarch" license="MIT" depends="perl-class-xsaccessor perl-exception-class perl-list-moreutils" makedepends="perl-dev perl-module-build" -checkdepends="perl-test-differences" +checkdepends="perl-test-differences perl-path-tiny" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-$pkgver.tar.gz" builddir="$srcdir/Games-Solitaire-Verify-$pkgver" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d161bc395f85f2aa404fe7aac893c840b302c7659e529b62bda9ad6c274508c4294c03c9037b9ab6a667e8a90292ef83445c88be26e42dde89625224f85027f0 Games-Solitaire-Verify-0.1900.tar.gz" +sha512sums="4abc5cd68bc57f96115a2f273aa16076b2f2ff50a597a8e1f4bf5b6f6dcb26771346d7cff3cadfc10eb1f8584c79141b06ecd6b07b6b19610405dc80977d9382 Games-Solitaire-Verify-0.2000.tar.gz" diff --git a/user/perl-http-headers-fast/APKBUILD b/user/perl-http-headers-fast/APKBUILD index b7496496b..ec547543e 100644 --- a/user/perl-http-headers-fast/APKBUILD +++ b/user/perl-http-headers-fast/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-http-headers-fast _pkgname=HTTP-Headers-Fast -pkgver=0.21 +pkgver=0.22 pkgrel=0 pkgdesc="Fast HTTP header parsing for Perl" url="https://metacpan.org/release/HTTP-Headers-Fast" @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="ce04b70f0748ee2d5911c772149b71c8c130d172267c11716151c1ca21b26e8c793af22227098d73a9253c9bfae57d618b6d67454c41862e2ba3a9798c067cf6 HTTP-Headers-Fast-0.21.tar.gz" +sha512sums="60435c11b5846c1a6256227c7edb00fd444c76346797424f186f971c5bebec93b1c84be805e0a4589c92b8c571d0c3e0332436b21ad099677a31544305d819b2 HTTP-Headers-Fast-0.22.tar.gz" diff --git a/user/perl-test-perltidy/APKBUILD b/user/perl-test-perltidy/APKBUILD index 392257c83..428c833cf 100644 --- a/user/perl-test-perltidy/APKBUILD +++ b/user/perl-test-perltidy/APKBUILD @@ -1,16 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-perltidy -pkgver=20130104 +pkgver=20190402 pkgrel=0 pkgdesc="Check all your Perl files for tidiness" url="https://metacpan.org/release/Test-PerlTidy" arch="noarch" license="Artistic-1.0-Perl" depends="perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff" +checkdepends="perl-path-tiny" makedepends="perl-dev" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/L/LA/LARRYL/Test-PerlTidy-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/Test-PerlTidy-$pkgver.tar.gz" builddir="$srcdir/Test-PerlTidy-$pkgver" build() { @@ -30,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="47d77083ec6f4808ac60bdb19431b3013b996f83506b0af490a6fa52f4f71a8c1812cf21b447568661495c845d524f9c2be6842380bd41c9ccfe22ec6acd802f Test-PerlTidy-20130104.tar.gz" +sha512sums="0fcdb45fff1f6d29ccd4a88b88e6c81a3e12d32ec618b33cb5751582c5c0580a628f7cddbc7c657e17c6626ac6a4d7c3b259d4d1bede8617a48adadb8985cd1a Test-PerlTidy-20190402.tar.gz" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 42578f61e..87a8c5a80 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-libyaml -pkgver=0.76 +pkgver=0.77 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="1a5058cc957bc891aaf1468bd03b7a169372f2711ce027ec701126f8c3d2c15d2029946ca2db77438cf8d43a3a1964238c50fc1a3da20addb3a525733b4499c8 YAML-LibYAML-0.76.tar.gz" +sha512sums="20d35718ebd318c2e7cfd618274dafb9c4489596e6ee77ca957f58d4971b7c712cbbf71517c9b29f316d0059b1b9f375aab57facc895c61c200cc0e40589de33 YAML-LibYAML-0.77.tar.gz" diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD index 4d1d8a3c2..19a7ec59e 100644 --- a/user/phonon-vlc/APKBUILD +++ b/user/phonon-vlc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon-vlc -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=0 pkgdesc="Phonon backend utilising VLC for media playback" url="https://www.kde.org/" @@ -10,9 +10,9 @@ license="LGPL-2.1+" depends="vlc" makedepends="cmake extra-cmake-modules qt5-qtbase-dev phonon-dev vlc-dev" source="https://download.kde.org/stable/phonon/phonon-backend-vlc/$pkgver/phonon-backend-vlc-$pkgver.tar.xz" +builddir="$srcdir/phonon-backend-vlc-$pkgver" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df phonon-backend-vlc-0.10.1.tar.xz" +sha512sums="3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5 phonon-backend-vlc-0.10.2.tar.xz" diff --git a/user/phonon/APKBUILD b/user/phonon/APKBUILD index af4ac50f5..c89f68a37 100644 --- a/user/phonon/APKBUILD +++ b/user/phonon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=phonon -pkgver=4.10.1 +pkgver=4.10.2 pkgrel=0 pkgdesc="Qt library for playing multimedia files" url="https://phonon.kde.org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-designer" source="https://download.kde.org/stable/phonon/$pkgver/phonon-$pkgver.tar.xz" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -34,12 +33,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -52,4 +49,4 @@ designer() { rmdir "$pkgdir"/usr/lib/qt5/plugins || true # Never mind } -sha512sums="a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007 phonon-4.10.1.tar.xz" +sha512sums="205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e phonon-4.10.2.tar.xz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 187646dd3..8da8caab5 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -36,7 +36,7 @@ pkgname=php7 _pkgname=php -pkgver=7.2.16 +pkgver=7.2.17 pkgrel=0 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" @@ -82,7 +82,7 @@ makedepends="autoconf subpackages="$pkgname-dev $pkgname-doc $pkgname-apache $pkgname-phpdbg $pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm $pkgname-pear::noarch $pkgname-dbg" -source="http://php.net/distributions/$_pkgname-$pkgver.tar.bz2 +source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2 $_pkgname-fpm.initd $_pkgname-fpm.logrotate $_pkgname-module.conf @@ -526,7 +526,7 @@ _mv() { mv $@ } -sha512sums="f97545905a3ec4bc1ce431e306bffb2d7b6357164ea035a6899ea1589d8df4e6617af3924fa1abcb5da428ad691967504c3f94187d4cae6f2ef285e963d07e3d php-7.2.16.tar.bz2 +sha512sums="6d14311cb3699eec7a8eacfb82e0a00e8f5dcfb31474dd32071c1c3261ddf52157a43a1ead4762da01283b0f5ccbbae8dfbbad2fb59e0900a1769e9f318e5830 php-7.2.17.tar.bz2 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f php-fpm.initd 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf diff --git a/user/physfs/APKBUILD b/user/physfs/APKBUILD index 4c9fde504..86f57e0cc 100644 --- a/user/physfs/APKBUILD +++ b/user/physfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=physfs -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=0 pkgdesc="Library to access various archives for game engines" url="https://www.icculus.org/physfs" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-tools" source="https://icculus.org/physfs/downloads/physfs-$pkgver.tar.bz2" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -29,12 +28,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -44,4 +41,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="ddf3b075ccb506da5e9a1ce96001be402752b9b777c2e816a85d48aff3626ff0886ea43eb07bd300fe3a9f59b9a002f54d822c51d483a4ee94b38378534c1879 physfs-3.0.1.tar.bz2" +sha512sums="4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472 physfs-3.0.2.tar.bz2" diff --git a/user/physlock/APKBUILD b/user/physlock/APKBUILD index a2c4e471f..f9a5f9574 100644 --- a/user/physlock/APKBUILD +++ b/user/physlock/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=physlock -pkgver=11 +pkgver=13 pkgrel=0 pkgdesc="Lightweight Linux console-locking tool" url="https://github.com/muennich/physlock" @@ -12,17 +12,17 @@ depends="" makedepends="linux-headers linux-pam-dev utmps-dev" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/muennich/physlock/archive/v$pkgver.tar.gz - utmps.patch" + utmps.patch + makefile.patch" build() { - cd "$builddir" make } package() { - cd "$builddir" make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938 physlock-11.tar.gz -d461b462dedfb7505f506ce1050d5140b8729f50a383157157e4f65465f63174cc11dc0a46cc1eed57cec0293006c5ec6cc6e96af9acab009ab3c9fe5e2381d5 utmps.patch" +sha512sums="85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c physlock-13.tar.gz +69367872c48985db31f2d84b038089da71e48ca79db0b0089f4a94f0cd853409bf9253fd5ee0b0729c01d9252072be1998141fad675baee97e93af1100ce71e6 utmps.patch +54119c1059231f15ab5ea5543583e12f7e3f9907e9c71b3ec76b10ee5df64a0303d6caf88be9c768d7b679cfcaf0a374c924a3232f221329bc54d22b31c771ce makefile.patch" diff --git a/user/physlock/makefile.patch b/user/physlock/makefile.patch new file mode 100644 index 000000000..9cae82168 --- /dev/null +++ b/user/physlock/makefile.patch @@ -0,0 +1,14 @@ +--- physlock-13/Makefile 2019-01-28 18:46:20.000000000 +0000 ++++ physlock-13/Makefile 2019-04-18 07:17:28.779909174 +0000 +@@ -7,9 +7,9 @@ + MANPREFIX = $(PREFIX)/share/man + + # enable user detection using libsystemd +-HAVE_SYSTEMD = 1 ++HAVE_SYSTEMD = 0 + +-cflags = -Wall -pedantic $(CFLAGS) ++cflags = -D_GNU_SOURCE -Wall -pedantic $(CFLAGS) + cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=500 + + lib_systemd_0 = diff --git a/user/physlock/utmps.patch b/user/physlock/utmps.patch index efae166a9..f3ba5e575 100644 --- a/user/physlock/utmps.patch +++ b/user/physlock/utmps.patch @@ -1,31 +1,23 @@ ---- physlock-11/auth.c 2017-07-13 07:23:52.000000000 +0000 -+++ physlock-11/auth.c 2018-09-21 21:21:36.240024566 +0000 -@@ -16,13 +16,14 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -+#define _GNU_SOURCE - #include <paths.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> +--- physlock-13/session.c 2019-01-28 18:46:20.000000000 +0000 ++++ physlock-13/session.c 2019-04-18 07:11:54.749911535 +0000 +@@ -6,7 +7,7 @@ #include <pwd.h> #include <unistd.h> + #include <errno.h> -#include <utmp.h> +#include <utmpx.h> - #include <errno.h> - #include <security/pam_misc.h> - -@@ -41,12 +42,12 @@ static void get_pam(userinfo_t *uinfo) { - void get_user(userinfo_t *uinfo, int vt, uid_t owner) { + #if HAVE_SYSTEMD + #include <systemd/sd-login.h> +@@ -50,11 +51,11 @@ + int get_user_utmp(userinfo_t *uinfo, int vt) { + int ret = -1; FILE *uf; - struct utmp r; + struct utmpx r; - struct passwd *pw; - char tty[16], name[UT_NAMESIZE+1]; + char tty[UT_LINESIZE+1], name[UT_NAMESIZE+1]; - uinfo->name = NULL; + name[0] = '\0'; - while ((uf = fopen(_PATH_UTMP, "r")) == NULL && errno == EINTR); + while ((uf = fopen(UTMPX_FILE, "r")) == NULL && errno == EINTR); diff --git a/user/pixman/APKBUILD b/user/pixman/APKBUILD index 332cc576d..0e545f547 100644 --- a/user/pixman/APKBUILD +++ b/user/pixman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pixman -pkgver=0.38.0 +pkgver=0.38.4 pkgrel=0 pkgdesc="Low-level pixel manipulation library" url="https://www.X.Org/" @@ -31,5 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f2279a30947df0c75064fdc36c3e0b735d9392d516191d99a9a66c9bae86778c538a552f1bf9eb75cdbd141891e3addb4836b37ef1553bc6d55285f214311b78 pixman-0.38.0.tar.bz2 +sha512sums="0683b7f67caa0881b23188b7e6f8487c7e0a1257a912686616b7d862efd5a9efdb51641c81ec54905a6f6b1029d796ca4e25c0909db28fc29fa3617bf09f9cf9 pixman-0.38.4.tar.bz2 3d75e7328e6eaaa6e8f4defa4402db815764369f94b81be38fba07933267fe24b03b591dd4c3f3544cb090650153728bfbdd81a91acaf19524c3d08f61427f63 stacksize-reduction.patch" diff --git a/user/powerpc-utils/APKBUILD b/user/powerpc-utils/APKBUILD index 878466c74..c16fd2d05 100644 --- a/user/powerpc-utils/APKBUILD +++ b/user/powerpc-utils/APKBUILD @@ -1,20 +1,18 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=powerpc-utils -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=0 pkgdesc="Maintenance utilities for PowerPC computers" -url="https://github.com/nfont/powerpc-utils" +url="https://github.com/ibm-power-utilities/powerpc-utils" arch="ppc ppc64 ppc64le" options="!check" # No test suite. license="GPL-2.0+" depends="bash bc" makedepends="autoconf automake zlib-dev" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/nfont/$pkgname/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/ibm-power-utilities/$pkgname/archive/v$pkgver.tar.gz" build() { - cd "$builddir" - ./autogen.sh ./configure \ --build=$CBUILD \ @@ -26,8 +24,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a01f8fc45abd91d0629f8f48e3c2877a863aa1f244907bb65fcc457c2c933e7043181666c237956723f956b7c3d7ce7a0cedc36eaf26ce3cf777aa8f0525244d powerpc-utils-1.3.5.tar.gz" +sha512sums="a30516ccdfe19a198cd5c1a7ad3646d15b599fb40f772cbc7ac95c6d3b364575a3ebb16708022886ba3bcd3184070a3f4d72b649427879fcdd2655406470e977 powerpc-utils-1.3.6.tar.gz" diff --git a/user/py3-cffi/APKBUILD b/user/py3-cffi/APKBUILD index 9c7e1124c..90d72670f 100644 --- a/user/py3-cffi/APKBUILD +++ b/user/py3-cffi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-cffi -pkgver=1.11.5 +pkgver=1.12.2 pkgrel=0 pkgdesc="Interface for Python to call in to C code" url="https://cffi.readthedocs.io/" @@ -11,22 +11,19 @@ depends="python3 py3-cparser" makedepends="libffi-dev python3-dev" checkdepends="py3-pytest" subpackages="" -source="https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700ff9b8b4d471620629074913e3735fb2/cffi-$pkgver.tar.gz" +source="https://files.pythonhosted.org/packages/64/7c/27367b38e6cc3e1f49f193deb761fe75cda9f95da37b67b422e62281fcac/cffi-1.12.2.tar.gz" builddir="$srcdir/cffi-$pkgver" build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880 cffi-1.11.5.tar.gz" +sha512sums="af4fe47cf5d6f1126222898365cfa21e9f11d0e71b87d869014dbb37af30dca9ddf50c989030d0f610f50e8099e8dfd08a688d8c3629abbcc4f0294f5f91b817 cffi-1.12.2.tar.gz" diff --git a/user/py3-commonmark/APKBUILD b/user/py3-commonmark/APKBUILD new file mode 100644 index 000000000..90bc7fe56 --- /dev/null +++ b/user/py3-commonmark/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-commonmark +_pkgname=commonmark +pkgver=0.8.1 +pkgrel=0 +pkgdesc="Python parser for the CommonMark Markdown flavour" +url="https://pypi.org/project/CommonMark/" +arch="noarch" +license="BSD-3-Clause" +depends="python3" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + PYTHONPATH=. python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf commonmark-0.8.1.tar.gz" diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD index 69e4721e7..fd522ca47 100644 --- a/user/py3-lxml/APKBUILD +++ b/user/py3-lxml/APKBUILD @@ -3,25 +3,24 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-lxml _pkgname=lxml -pkgver=4.2.5 +pkgver=4.3.3 pkgrel=0 pkgdesc="Python LXML Library" url="https://lxml.de/" arch="all" -license="BSD-3-Clause" options="!check" # No test suite. +license="BSD-3-Clause" +depends="" makedepends="python3-dev libxml2-dev libxslt-dev" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="4cf336d3e1471e8a26492760a143881517d12eb1c2dad82f8786540471bfabd68f8c795d97b7362166418c2be3c7996816638fdbd5a594536b9981478b90fdfe lxml-4.2.5.tar.gz" +sha512sums="cbc1cd30bac4b9ac845d99949c8c231a7870398f942695df5a00586d70d0f6b6ebd457a1a9306806af7d0fd521a14c54d266902943263927a0d940abc3cdf5c0 lxml-4.3.3.tar.gz" diff --git a/user/py3-mako/APKBUILD b/user/py3-mako/APKBUILD index ac08c1f47..9cb68ea75 100644 --- a/user/py3-mako/APKBUILD +++ b/user/py3-mako/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=py3-mako _pkgname=Mako -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Fast templating language for Python" url="http://www.makotemplates.org/" @@ -10,23 +10,21 @@ arch="noarch" license="MIT" depends="python3" makedepends="python3-dev" -checkdepends="py3-pluggy py3-py py3-pytest py3-six" +checkdepends="py3-markupsafe py3-mock py3-pbr py3-pluggy py3-py py3-pytest + py3-six" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py test } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571 Mako-1.0.7.tar.gz" +sha512sums="84da36cf798421528156a93c1b722fe604df5811a9db66244a9085af9ae17ce13d1e8057b3e53aa1af61acf457ce9d13ae240ebade3a7e60ea3cde1f1d9bf264 Mako-1.0.8.tar.gz" diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD index 10978ca79..2394872d5 100644 --- a/user/py3-pexpect/APKBUILD +++ b/user/py3-pexpect/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pexpect -pkgver=4.6.0 +_pkgname=${pkgname#*-} +pkgver=4.7.0 pkgrel=0 pkgdesc="Python library for managing console applications" url="https://pexpect.readthedocs.io/" @@ -9,8 +10,7 @@ arch="noarch" license="ISC" depends="python3 py3-ptyprocess" makedepends="" -source="https://files.pythonhosted.org/packages/89/43/07d07654ee3e25235d8cea4164cdee0ec39d1fda8e9203156ebe403ffda4/pexpect-$pkgver.tar.gz" -sha512sums="9a2b1ef19d885e69cfd17ba0519581f782574019010043e66d8b68f98ac86b359f4a1ca42f8bb0059a5dfdd43275ad93531c076cc0ac2049e109408961b46bbd pexpect-4.6.0.tar.gz" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/pexpect-$pkgver" build() { @@ -28,3 +28,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } +sha512sums="4cea4229332c1f3de26dfcad596877665b3c02e91d51ca3c45c1f9b44462adb7c82abc7b76eb09a73822c2d1ccc9d812574cf79bf6bc8fb0b7d2f1093962cc3f pexpect-4.7.0.tar.gz" diff --git a/user/py3-pygments/APKBUILD b/user/py3-pygments/APKBUILD index 59055ed48..699de3ca5 100644 --- a/user/py3-pygments/APKBUILD +++ b/user/py3-pygments/APKBUILD @@ -1,6 +1,6 @@ # Contributor: Peter Bui <pnutzh4x0r@gmail.com> # Contributor: Matt Smith <mcs@darkregion.net> -# Maintainer: zlg <zlg+packages@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-pygments _pkgname=Pygments pkgver=2.2.0 diff --git a/user/py3-recommonmark/APKBUILD b/user/py3-recommonmark/APKBUILD new file mode 100644 index 000000000..2b0d6db68 --- /dev/null +++ b/user/py3-recommonmark/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-recommonmark +_pkgname=recommonmark +pkgver=0.5.0 +pkgrel=0 +pkgdesc="Bridge between CommonMark and docutils" +url="https://pypi.org/project/recommonmark/" +arch="noarch" +options="!check" # Test data not shipped with tarball +license="MIT" +depends="python3 py3-commonmark py3-docutils py3-sphinx" +checkdepends="py3-future" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="581b3492e082ab4f0a53e50df0c9cfa3badda7ba9ee28dadbea85c55de96304257790e6aa06ebc793fba1d9ac399ce470fe821492106150b3a0db10dc734ee4b recommonmark-0.5.0.tar.gz" diff --git a/user/py3-sphinx-rtd-theme/APKBUILD b/user/py3-sphinx-rtd-theme/APKBUILD new file mode 100644 index 000000000..58f55ff89 --- /dev/null +++ b/user/py3-sphinx-rtd-theme/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-sphinx-rtd-theme +_pkgname=sphinx_rtd_theme +pkgver=0.4.3 +pkgrel=0 +pkgdesc="Sphinx documentation theme: Read the Docs" +url="https://pypi.org/project/sphinx-rtd-theme/" +arch="noarch" +license="MIT" +depends="python3 py3-sphinx" +checkdepends="py3-pytest" +makedepends="" +subpackages="" +source="https://files.pythonhosted.org/packages/source/s/sphinx-rtd-theme/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + python3 setup.py build +} + +check() { + python3 setup.py test +} + +package() { + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="44b9309ddd041181542747c70b6e180c07aaf8cd7ee9e4c7eb9e3948685b8bd578e815c022bd991cc7f4bc7d02bb3c7a6d213e5d0c2e8214aa85d50b73e53853 sphinx_rtd_theme-0.4.3.tar.gz" diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD index 1ef39bd3f..1c6203faf 100644 --- a/user/qt-creator/APKBUILD +++ b/user/qt-creator/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt-creator pkgver=4.8.2 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform multi-language programming IDE" url="https://doc.qt.io/qtcreator/index.html" arch="all" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="LGPL-2.0 WITH Qt-LGPL-exception-1.1" depends="qt5-qtquickcontrols" makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtserialport-dev - qt5-qtscript-dev qt5-qttools-dev clang-dev llvm7-dev python3 + qt5-qtscript-dev qt5-qttools-dev clang-dev llvm8-dev python3 libexecinfo-dev" subpackages="$pkgname-dev" source="https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.gz" @@ -21,7 +21,9 @@ build() { cd "$builddir" export LLVM_INSTALL_DIR=/usr qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo" - make + ln -s /usr/bin/python3 "$srcdir"/python + PATH="$PATH:$srcdir" make + rm "$srcdir"/python } package() { diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index 363e30f5c..47ad7253b 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion -pkgver=0.0.9.3 +pkgver=0.0.9.4_rc2 pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" @@ -9,13 +9,12 @@ arch="all" license="GPL-3.0+" depends="qt5-qtquickcontrols" makedepends="cmake libqmatrixclient-dev qt5-qtbase-dev qt5-qtdeclarative-dev - qt5-qttools-dev" + qt5-qtmultimedia-dev qt5-qttools-dev" subpackages="" -source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz" -builddir="$srcdir/Quaternion-$pkgver" +source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/${pkgver/_/-}.tar.gz" +builddir="$srcdir/Quaternion-${pkgver/_/-}" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -30,13 +29,11 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3836338cddc674b3a8b6e7d8376f0136db5c548788a0e56f27023fe7b238e2c07d77bf5e5b50e49cdb011c61f05700818b6a22a394ee8d52015f5f32b3fe4d47 quaternion-0.0.9.3.tar.gz" +sha512sums="543e760fb92ed8a94f124ba6b7de93633a2e074c977ffb5227e17251ac1b483978ef7c54ccbcf3662d0ffb7fa5dd0a418a10bc9360072a58fe3f3dc38cf6dd47 quaternion-0.0.9.4_rc2.tar.gz" diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD index 9fded5c45..1970f15af 100644 --- a/user/ristretto/APKBUILD +++ b/user/ristretto/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=ristretto -pkgver=0.8.3 +pkgver=0.8.4 pkgrel=0 pkgdesc="Image viewer for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c43b48dfdf9e8ed0ea3c5f2bbac1c837881aa6a467c78377b6f53dcce030b5a3b8134a7b8cbad1008ae758295953fde50a916c284e54e8c5490158e776554514 ristretto-0.8.3.tar.bz2" +sha512sums="c5479cde66e4f0903b9b8d9b1b8f4c7cde35ebfa334e414c8202e783c332bd4bfec650f85d308c7151d31fe84b27a13bb4048290b0a82ce7b8ba4baf3e4088b8 ristretto-0.8.4.tar.bz2" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index f93856aa6..d58282500 100644 --- a/user/rocs/APKBUILD +++ b/user/rocs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=rocs -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="66bc803ec316bad8f81849acebdc67c92ab175715404253a6e82cb2ab58738bc161bbbea33b15b3d212d853d2f45acf29348d351d957820b37a9fd943ef5b655 rocs-18.12.3.tar.xz" +sha512sums="681a51b25be2e8e31e66bf7ea8252ac1d5c12a3ec4d99ba2231dee39a362a6cb94a05c3421ba561d10d9efd100e217d6b20d2f6a3c56dcfdd73472945f7997d9 rocs-19.04.0.tar.xz" diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD new file mode 100644 index 000000000..bb9b5e7b0 --- /dev/null +++ b/user/rttr/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rttr +pkgver=0.9.6 +pkgrel=0 +pkgdesc="C++ reflection library" +url=" " +arch="all" +license="MIT" +depends="" +makedepends="doxygen graphviz" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver-src.tar.gz + arm64.patch + dlclose-doesnt-work.patch + install-doc.patch + permissions.patch + " + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -DNDEBUG" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="7e0d4fa87f83feda0b926d4d0e52aaf0f369f25fe7e23e5ffe86c0bba159e8353cef44eed37611a81e8ccc8d6facb36942f940d0d0b965f873177d7078f91cf4 rttr-0.9.6-src.tar.gz +559b4d55109b7021082cdd15663075312d80a896325db2b6bba43bf9d3ba17ecc2152aa30617f200be904351c7f8ba188b7e7a6b29a71612b42d48a5a0535aa7 arm64.patch +76efa45715d2a6459ae3cf5a6189de414775eed11a1f6780de563005765139ae6be86e30ead63b5ef8e9a5e84ba77a4ef2b7a75ded7506c6c8d81a696a887ff3 dlclose-doesnt-work.patch +825ca43fb35f6139db13f0b01818b49bb1556a1190ac2941c643e4d438c5b458883fa2ffb64d95625125c251632da7b3d8b703141335df8883b6e186f2e6a349 install-doc.patch +905e4c62093ee3877a8a15a1cbd4bc20499e04916ce869a495cf4ef9f47aa94d56aa5ac861d0ca8b6079f2a3b398f92237dc423e452130f7c40b9a170a8aa625 permissions.patch" diff --git a/user/rttr/arm64.patch b/user/rttr/arm64.patch new file mode 100644 index 000000000..012a30b3f --- /dev/null +++ b/user/rttr/arm64.patch @@ -0,0 +1,22 @@ +From fe98842255defe9f0b922f46b2dd1c067088a1f2 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@suse.de> +Date: Tue, 2 Apr 2019 09:34:47 +0200 +Subject: [PATCH] Support all LP64 architectures + +--- + src/rttr/detail/base/core_prerequisites.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rttr/detail/base/core_prerequisites.h b/src/rttr/detail/base/core_prerequisites.h +index f60d91c3..6aa29d77 100644 +--- a/src/rttr/detail/base/core_prerequisites.h ++++ b/src/rttr/detail/base/core_prerequisites.h +@@ -89,7 +89,7 @@ namespace rttr + // Architecture + ///////////////////////////////////////////////////////////////////////////////////////// + #if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) ||\ +- defined(__ia64__) || defined(__s390__) || defined(__s390x__) ++ defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(_LP64) || defined(__LP64__) + # define RTTR_ARCH_TYPE RTTR_ARCH_64 + #else + # define RTTR_ARCH_TYPE RTTR_ARCH_32 diff --git a/user/rttr/dlclose-doesnt-work.patch b/user/rttr/dlclose-doesnt-work.patch new file mode 100644 index 000000000..146f16944 --- /dev/null +++ b/user/rttr/dlclose-doesnt-work.patch @@ -0,0 +1,94 @@ +musl doesn't support dlclose, so don't test it. + +--- rttr-0.9.6/src/unit_tests/misc/library_test.cpp.old 2018-03-26 21:31:07.000000000 +0000 ++++ rttr-0.9.6/src/unit_tests/misc/library_test.cpp 2019-04-19 00:10:52.775313358 +0000 +@@ -71,7 +71,7 @@ + CHECK(lib.get_types().size() == 0); + CHECK(lib.get_global_properties().size() == 0); + CHECK(lib.get_global_methods().size() == 0); +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + } + + SECTION("negative test") +@@ -102,7 +102,7 @@ + #else + #error "Don't know library suffix on this plattform!" + #endif +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + CHECK(lib.load() == true); + REQUIRE(lib.get_error_string().empty() == true); + CHECK(does_plugin_type_exist() == true); +@@ -110,7 +110,7 @@ + CHECK(lib.get_error_string().empty() == true); + CHECK(lib.unload() == true); + +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + } + } + +@@ -122,19 +122,19 @@ + { + library lib(library_name); + +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + CHECK(lib.load() == true); + CHECK(lib.load() == true); + + REQUIRE(lib.get_error_string().empty() == true); + CHECK(does_plugin_type_exist() == true); + +- CHECK(lib.get_types().size() > 1); ++ //CHECK(lib.get_types().size() > 1); + CHECK(lib.get_global_properties().size() == 0); + CHECK(lib.get_global_methods().size() == 0); + + CHECK(lib.unload() == true); +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + } + + SECTION("load the same lib from different instance multiple times") +@@ -142,7 +142,7 @@ + library lib1(library_name); + library lib2(library_name); + +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + + CHECK(lib1.load() == true); + CHECK(lib2.load() == true); +@@ -156,26 +156,26 @@ + + CHECK(lib2.unload() == true); + +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + } + + SECTION("load the same lib multiple times 2xload() and 2xunload()") + { + library lib(library_name); + +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + + CHECK(lib.load() == true); + CHECK(does_plugin_type_exist() == true); + + CHECK(lib.unload() == true); +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + + CHECK(lib.load() == true); + CHECK(does_plugin_type_exist() == true); + + CHECK(lib.unload() == true); +- CHECK(does_plugin_type_exist() == false); ++ //CHECK(does_plugin_type_exist() == false); + } + } + diff --git a/user/rttr/install-doc.patch b/user/rttr/install-doc.patch new file mode 100644 index 000000000..ec33d2440 --- /dev/null +++ b/user/rttr/install-doc.patch @@ -0,0 +1,11 @@ +--- rttr-0.9.6/doc/CMakeLists.txt.old 2018-03-26 21:30:36.000000000 +0000 ++++ rttr-0.9.6/doc/CMakeLists.txt 2019-04-19 00:14:33.471673713 +0000 +@@ -33,7 +33,7 @@ + set(DOXYGEN_INPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/rttr \\ + ${CMAKE_CURRENT_SOURCE_DIR}" ) + set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/doc") +-set(DOXYGEN_DOC_INSTALL_DIR "doc") ++set(DOXYGEN_DOC_INSTALL_DIR "share/doc/rttr") + set(DOXYGEN_CONFIG_FILE_IN "DoxyFile.cfg.in") + set(DOXYGEN_LAYOUT_FILE_IN "doxygen-customization/layout/DoxygenLayout.xml.in") + set(DOXYGEN_EXCLUDE "") diff --git a/user/rttr/permissions.patch b/user/rttr/permissions.patch new file mode 100644 index 000000000..f572d9f23 --- /dev/null +++ b/user/rttr/permissions.patch @@ -0,0 +1,36 @@ +--- rttr-0.9.6/CMake/config.cmake.old 2018-03-26 21:30:35.000000000 +0000 ++++ rttr-0.9.6/CMake/config.cmake 2019-04-19 02:03:32.738933898 +0000 +@@ -172,5 +172,5 @@ + + install(FILES "${LICENSE_FILE}" "${README_FILE}" + DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR} +- PERMISSIONS OWNER_READ) ++ PERMISSIONS WORLD_READ) + endif() +--- rttr-0.9.6/CMake/utility.cmake.old 2018-03-26 21:30:35.000000000 +0000 ++++ rttr-0.9.6/CMake/utility.cmake 2019-04-19 02:03:40.268125422 +0000 +@@ -165,7 +165,7 @@ + getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME) + if (${shouldInstall}) + if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private +- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ) ++ install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS WORLD_READ) + endif() + endif() + endforeach() +--- rttr-0.9.6/doc/CMakeLists.txt.old 2018-03-26 21:30:36.000000000 +0000 ++++ rttr-0.9.6/doc/CMakeLists.txt 2019-04-19 02:04:09.075032169 +0000 +@@ -133,11 +133,11 @@ + install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}" + DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" + PATTERN "*.*" +- PERMISSIONS OWNER_READ) ++ PERMISSIONS WORLD_READ) + + install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}" + DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}" +- PERMISSIONS OWNER_READ) ++ PERMISSIONS WORLD_READ) + + ######################################################################################### + diff --git a/user/rust/0050-LLVM-8.0-compatibility.patch b/user/rust/0050-LLVM-8.0-compatibility.patch new file mode 100644 index 000000000..a8bffb2b9 --- /dev/null +++ b/user/rust/0050-LLVM-8.0-compatibility.patch @@ -0,0 +1,310 @@ +From 78ff5598497c95a696ca669f88a93d127aa24c8d Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Wed, 16 Jan 2019 09:59:03 -0800 +Subject: [PATCH 08/15] LLVM 8.0 compatibility + +Backported from commit df0466d upstream. +--- + src/librustc_codegen_llvm/debuginfo/mod.rs | 15 ++-- + src/librustc_codegen_llvm/llvm/ffi.rs | 22 +++-- + src/rustllvm/PassWrapper.cpp | 7 +- + src/rustllvm/RustWrapper.cpp | 93 ++++++++++++++++++++-- + src/test/codegen/enum-debug-clike.rs | 5 +- + 5 files changed, 123 insertions(+), 19 deletions(-) + +diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs +index 2eab626ae8..7aca63caa4 100644 +--- a/src/librustc_codegen_llvm/debuginfo/mod.rs ++++ b/src/librustc_codegen_llvm/debuginfo/mod.rs +@@ -12,7 +12,7 @@ use self::source_loc::InternalDebugLocation::{self, UnknownLocation}; + + use llvm; + use llvm::debuginfo::{DIFile, DIType, DIScope, DIBuilder, DISubprogram, DIArray, DIFlags, +- DILexicalBlock}; ++ DISPFlags, DILexicalBlock}; + use rustc::hir::CodegenFnAttrFlags; + use rustc::hir::def_id::{DefId, CrateNum}; + use rustc::ty::subst::{Substs, UnpackedKind}; +@@ -283,7 +283,6 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { + let linkage_name = mangled_name_of_instance(self, instance); + + let scope_line = span_start(self, span).line; +- let is_local_to_unit = is_node_local_to_unit(self, def_id); + + let function_name = CString::new(name).unwrap(); + let linkage_name = SmallCStr::new(&linkage_name.as_str()); +@@ -301,6 +300,14 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { + flags |= DIFlags::FlagNoReturn; + } + ++ let mut spflags = DISPFlags::SPFlagDefinition; ++ if is_node_local_to_unit(self, def_id) { ++ spflags |= DISPFlags::SPFlagLocalToUnit; ++ } ++ if self.sess().opts.optimize != config::OptLevel::No { ++ spflags |= DISPFlags::SPFlagOptimized; ++ } ++ + let fn_metadata = unsafe { + llvm::LLVMRustDIBuilderCreateFunction( + DIB(self), +@@ -310,11 +317,9 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> { + file_metadata, + loc.line as c_uint, + function_type_metadata, +- is_local_to_unit, +- true, + scope_line as c_uint, + flags, +- self.sess().opts.optimize != config::OptLevel::No, ++ spflags, + llfn, + template_parameters, + None) +diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs +index 11e34f600c..853c1ff004 100644 +--- a/src/librustc_codegen_llvm/llvm/ffi.rs ++++ b/src/librustc_codegen_llvm/llvm/ffi.rs +@@ -2,7 +2,7 @@ use super::debuginfo::{ + DIBuilder, DIDescriptor, DIFile, DILexicalBlock, DISubprogram, DIType, + DIBasicType, DIDerivedType, DICompositeType, DIScope, DIVariable, + DIGlobalVariableExpression, DIArray, DISubrange, DITemplateTypeParameter, DIEnumerator, +- DINameSpace, DIFlags, ++ DINameSpace, DIFlags, DISPFlags, + }; + + use libc::{c_uint, c_int, size_t, c_char}; +@@ -591,6 +591,20 @@ pub mod debuginfo { + const FlagMainSubprogram = (1 << 21); + } + } ++ ++ // These values **must** match with LLVMRustDISPFlags!! ++ bitflags! { ++ #[repr(C)] ++ #[derive(Default)] ++ pub struct DISPFlags: ::libc::uint32_t { ++ const SPFlagZero = 0; ++ const SPFlagVirtual = 1; ++ const SPFlagPureVirtual = 2; ++ const SPFlagLocalToUnit = (1 << 2); ++ const SPFlagDefinition = (1 << 3); ++ const SPFlagOptimized = (1 << 4); ++ } ++ } + } + + extern { pub type ModuleBuffer; } +@@ -1387,11 +1401,9 @@ extern "C" { + File: &'a DIFile, + LineNo: c_uint, + Ty: &'a DIType, +- isLocalToUnit: bool, +- isDefinition: bool, + ScopeLine: c_uint, + Flags: DIFlags, +- isOptimized: bool, ++ SPFlags: DISPFlags, + Fn: &'a Value, + TParam: &'a DIArray, + Decl: Option<&'a DIDescriptor>) +@@ -1529,7 +1541,7 @@ extern "C" { + AlignInBits: u32, + Elements: &'a DIArray, + ClassType: &'a DIType, +- IsFixed: bool) ++ IsScoped: bool) + -> &'a DIType; + + pub fn LLVMRustDIBuilderCreateUnionType(Builder: &DIBuilder<'a>, +diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp +index df7a81643b..18d277be21 100644 +--- a/src/rustllvm/PassWrapper.cpp ++++ b/src/rustllvm/PassWrapper.cpp +@@ -789,7 +789,7 @@ struct LLVMRustThinLTOData { + StringMap<GVSummaryMapTy> ModuleToDefinedGVSummaries; + + #if LLVM_VERSION_GE(7, 0) +- LLVMRustThinLTOData() : Index(/* isPerformingAnalysis = */ false) {} ++ LLVMRustThinLTOData() : Index(/* HaveGVs = */ false) {} + #endif + }; + +@@ -865,7 +865,12 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules, + auto deadIsPrevailing = [&](GlobalValue::GUID G) { + return PrevailingType::Unknown; + }; ++#if LLVM_VERSION_GE(8, 0) ++ computeDeadSymbolsWithConstProp(Ret->Index, Ret->GUIDPreservedSymbols, ++ deadIsPrevailing, /* ImportEnabled = */ true); ++#else + computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols, deadIsPrevailing); ++#endif + #else + computeDeadSymbols(Ret->Index, Ret->GUIDPreservedSymbols); + #endif +diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp +index 9d3e6f93b0..7905e9f0f2 100644 +--- a/src/rustllvm/RustWrapper.cpp ++++ b/src/rustllvm/RustWrapper.cpp +@@ -294,7 +294,7 @@ extern "C" void LLVMRustSetHasUnsafeAlgebra(LLVMValueRef V) { + extern "C" LLVMValueRef + LLVMRustBuildAtomicLoad(LLVMBuilderRef B, LLVMValueRef Source, const char *Name, + LLVMAtomicOrdering Order) { +- LoadInst *LI = new LoadInst(unwrap(Source), 0); ++ LoadInst *LI = new LoadInst(unwrap(Source)); + LI->setAtomic(fromRust(Order)); + return wrap(unwrap(B)->Insert(LI, Name)); + } +@@ -511,6 +511,71 @@ static DINode::DIFlags fromRust(LLVMRustDIFlags Flags) { + return Result; + } + ++// These values **must** match debuginfo::DISPFlags! They also *happen* ++// to match LLVM, but that isn't required as we do giant sets of ++// matching below. The value shouldn't be directly passed to LLVM. ++enum class LLVMRustDISPFlags : uint32_t { ++ SPFlagZero = 0, ++ SPFlagVirtual = 1, ++ SPFlagPureVirtual = 2, ++ SPFlagLocalToUnit = (1 << 2), ++ SPFlagDefinition = (1 << 3), ++ SPFlagOptimized = (1 << 4), ++ // Do not add values that are not supported by the minimum LLVM ++ // version we support! see llvm/include/llvm/IR/DebugInfoFlags.def ++ // (In LLVM < 8, createFunction supported these as separate bool arguments.) ++}; ++ ++inline LLVMRustDISPFlags operator&(LLVMRustDISPFlags A, LLVMRustDISPFlags B) { ++ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(A) & ++ static_cast<uint32_t>(B)); ++} ++ ++inline LLVMRustDISPFlags operator|(LLVMRustDISPFlags A, LLVMRustDISPFlags B) { ++ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(A) | ++ static_cast<uint32_t>(B)); ++} ++ ++inline LLVMRustDISPFlags &operator|=(LLVMRustDISPFlags &A, LLVMRustDISPFlags B) { ++ return A = A | B; ++} ++ ++inline bool isSet(LLVMRustDISPFlags F) { return F != LLVMRustDISPFlags::SPFlagZero; } ++ ++inline LLVMRustDISPFlags virtuality(LLVMRustDISPFlags F) { ++ return static_cast<LLVMRustDISPFlags>(static_cast<uint32_t>(F) & 0x3); ++} ++ ++#if LLVM_VERSION_GE(8, 0) ++static DISubprogram::DISPFlags fromRust(LLVMRustDISPFlags SPFlags) { ++ DISubprogram::DISPFlags Result = DISubprogram::DISPFlags::SPFlagZero; ++ ++ switch (virtuality(SPFlags)) { ++ case LLVMRustDISPFlags::SPFlagVirtual: ++ Result |= DISubprogram::DISPFlags::SPFlagVirtual; ++ break; ++ case LLVMRustDISPFlags::SPFlagPureVirtual: ++ Result |= DISubprogram::DISPFlags::SPFlagPureVirtual; ++ break; ++ default: ++ // The rest are handled below ++ break; ++ } ++ ++ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit)) { ++ Result |= DISubprogram::DISPFlags::SPFlagLocalToUnit; ++ } ++ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagDefinition)) { ++ Result |= DISubprogram::DISPFlags::SPFlagDefinition; ++ } ++ if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagOptimized)) { ++ Result |= DISubprogram::DISPFlags::SPFlagOptimized; ++ } ++ ++ return Result; ++} ++#endif ++ + extern "C" uint32_t LLVMRustDebugMetadataVersion() { + return DEBUG_METADATA_VERSION; + } +@@ -575,16 +640,26 @@ LLVMRustDIBuilderCreateSubroutineType(LLVMRustDIBuilderRef Builder, + extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction( + LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + const char *LinkageName, LLVMMetadataRef File, unsigned LineNo, +- LLVMMetadataRef Ty, bool IsLocalToUnit, bool IsDefinition, +- unsigned ScopeLine, LLVMRustDIFlags Flags, bool IsOptimized, +- LLVMValueRef Fn, LLVMMetadataRef TParam, LLVMMetadataRef Decl) { ++ LLVMMetadataRef Ty, unsigned ScopeLine, LLVMRustDIFlags Flags, ++ LLVMRustDISPFlags SPFlags, LLVMValueRef Fn, LLVMMetadataRef TParam, ++ LLVMMetadataRef Decl) { + DITemplateParameterArray TParams = + DITemplateParameterArray(unwrap<MDTuple>(TParam)); ++#if LLVM_VERSION_GE(8, 0) ++ DISubprogram *Sub = Builder->createFunction( ++ unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File), ++ LineNo, unwrapDI<DISubroutineType>(Ty), ScopeLine, fromRust(Flags), ++ fromRust(SPFlags), TParams, unwrapDIPtr<DISubprogram>(Decl)); ++#else ++ bool IsLocalToUnit = isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit); ++ bool IsDefinition = isSet(SPFlags & LLVMRustDISPFlags::SPFlagDefinition); ++ bool IsOptimized = isSet(SPFlags & LLVMRustDISPFlags::SPFlagOptimized); + DISubprogram *Sub = Builder->createFunction( + unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File), + LineNo, unwrapDI<DISubroutineType>(Ty), IsLocalToUnit, IsDefinition, + ScopeLine, fromRust(Flags), IsOptimized, TParams, + unwrapDIPtr<DISubprogram>(Decl)); ++#endif + unwrap<Function>(Fn)->setSubprogram(Sub); + return wrap(Sub); + } +@@ -773,14 +848,14 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType( + LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name, + LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits, + uint32_t AlignInBits, LLVMMetadataRef Elements, +- LLVMMetadataRef ClassTy, bool IsFixed) { ++ LLVMMetadataRef ClassTy, bool IsScoped) { + #if LLVM_VERSION_GE(7, 0) + return wrap(Builder->createEnumerationType( + unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber, + SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)), +- unwrapDI<DIType>(ClassTy), "", IsFixed)); ++ unwrapDI<DIType>(ClassTy), "", IsScoped)); + #else +- // Ignore IsFixed on older LLVM. ++ // Ignore IsScoped on older LLVM. + return wrap(Builder->createEnumerationType( + unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber, + SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)), +@@ -920,7 +995,11 @@ extern "C" void LLVMRustUnpackOptimizationDiagnostic( + if (loc.isValid()) { + *Line = loc.getLine(); + *Column = loc.getColumn(); ++#if LLVM_VERSION_GE(8, 0) ++ FilenameOS << loc.getAbsolutePath(); ++#else + FilenameOS << loc.getFilename(); ++#endif + } + + RawRustStringOstream MessageOS(MessageOut); +diff --git a/src/test/codegen/enum-debug-clike.rs b/src/test/codegen/enum-debug-clike.rs +index 98f07505f7..62cfef5a84 100644 +--- a/src/test/codegen/enum-debug-clike.rs ++++ b/src/test/codegen/enum-debug-clike.rs +@@ -8,8 +8,11 @@ + + // compile-flags: -g -C no-prepopulate-passes + ++// DIFlagFixedEnum was deprecated in 8.0, renamed to DIFlagEnumClass. ++// We match either for compatibility. ++ + // CHECK-LABEL: @main +-// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: DIFlagFixedEnum,{{.*}} ++// CHECK: {{.*}}DICompositeType{{.*}}tag: DW_TAG_enumeration_type,{{.*}}name: "E",{{.*}}flags: {{(DIFlagEnumClass|DIFlagFixedEnum)}},{{.*}} + // CHECK: {{.*}}DIEnumerator{{.*}}name: "A",{{.*}}value: {{[0-9].*}} + // CHECK: {{.*}}DIEnumerator{{.*}}name: "B",{{.*}}value: {{[0-9].*}} + // CHECK: {{.*}}DIEnumerator{{.*}}name: "C",{{.*}}value: {{[0-9].*}} +-- +2.19.2 + diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD index 9a37b97c3..e855f770f 100644 --- a/user/rust/APKBUILD +++ b/user/rust/APKBUILD @@ -6,7 +6,7 @@ pkgname=rust pkgver=1.33.0 _bootcargover=0.33.0 _bootver=1.32.0 -_llvmver=7 +_llvmver=8 pkgrel=0 pkgdesc="The Rust Programming Language" url="https://www.rust-lang.org" @@ -60,6 +60,7 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz 0014-Add-foxkit-target-specs.patch 0030-libc-linkage.patch 0040-rls-atomics.patch + 0050-LLVM-8.0-compatibility.patch " builddir="$srcdir/rustc-$pkgver-src" _rlibdir="/usr/lib/rustlib/$CTARGET/lib" @@ -308,4 +309,5 @@ c32c5d807ec23f5e88f47f83220a117ff3f048cec4731e50d0cae082c971ea03993a6e4f95225046 d9568a3e21b60831b193c4a9554756d0be77d0c63d06d6c3ff1c7fd35822aaa3b2e2cf8acd29fe07eb698ebf48673245e052a6ddfa4d39bb687eea8c4c236e50 0013-Move-debugger-scripts-to-usr-share-rust.patch f1269241ccddf4594752b97e6856dad98ca987d2491b1bd95f6123352eec52f3acb3f17dae1c2a42be55e25db4a7e0d6bb1fb2b468cc139ad14559e0753a4c87 0014-Add-foxkit-target-specs.patch 7197503a3bf1cdd6cb5ff3350add2682cc64f7d33f7a4b270c53321401e439de5c24ddb2f7c5a76bb3488c8b766237f674fedaa9202c480f53595d7837214f0f 0030-libc-linkage.patch -41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e 0040-rls-atomics.patch" +41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e 0040-rls-atomics.patch +ba39acb52fb65eb203ad08735b5d1c9150e49f9d0abd5e87a849d40c22e5847043521154cbb529fb3cc39005b309cafda5422fbd5a3598dac519db4456f6c571 0050-LLVM-8.0-compatibility.patch" diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD index c3ebf5694..b2c55c08d 100644 --- a/user/scons/APKBUILD +++ b/user/scons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=scons -pkgver=3.0.4 +pkgver=3.0.5 pkgrel=0 pkgdesc="Python-based software building system" url="https://scons.org/" @@ -15,19 +15,16 @@ source="https://prdownloads.sourceforge.net/scons/scons-$pkgver.tar.gz " build() { - cd "$builddir" python3 setup.py build } check() { - cd "$builddir" python3 setup.py check } package() { - cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627 scons-3.0.4.tar.gz +sha512sums="0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945 scons-3.0.5.tar.gz cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch" diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD index 954f978d8..94f03db23 100644 --- a/user/sddm/APKBUILD +++ b/user/sddm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sddm -pkgver=0.18.0 +pkgver=0.18.1 pkgrel=0 pkgdesc="Simple Desktop Display Manager" url="https://github.com/sddm/sddm/" @@ -23,7 +23,6 @@ source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar xdm.confd" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -42,12 +41,10 @@ build() { } check() { - cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE ctest } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -57,7 +54,7 @@ xdm() { install -D -m644 "$srcdir"/xdm.confd "$subpkgdir"/etc/conf.d/xdm } -sha512sums="359ea6060d02bcc1c810c8338b836f1c8e76d7e3ec132c4ed2327374f4e52b8a56884626dd2d0df87465137b275deba7b6c48b2e992aafed4375f0929fafda6f sddm-0.18.0.tar.xz +sha512sums="ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 sddm-0.18.1.tar.xz 075e3baf24606cdea620737dbc00f7cf5c487ab6d88e37b23a581afcfbcf872c379753c89c80ad5c90c28fa27d3e5c5df64d4fd30764fdbfc0586e0f26666fe1 ck2-support.patch f0b4eb7ef0581701157f9decc637629156f36f6711b9a4bae517f94d7a1df614c81bbd891c918f07ac50e2a3d1519c43ccb9eefd80282c95dd79eca0e8d90904 pam-path-fix.patch c42d8b3edbc0ae7e3d5ea7bb0080c5c50e0569f0ea947e1ba17bc794c8c0d67a214e62aad7eba0a51791c44b29a3017692bbe738250c63cb2219891bb1313422 utmpx.patch diff --git a/user/shared-mime-info/APKBUILD b/user/shared-mime-info/APKBUILD index e28f8915f..3e132dee4 100644 --- a/user/shared-mime-info/APKBUILD +++ b/user/shared-mime-info/APKBUILD @@ -1,20 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shared-mime-info -pkgver=1.10 +pkgver=1.12 pkgrel=0 pkgdesc="MIME database for desktop software" url="https://freedesktop.org/wiki/Software/shared-mime-info" arch="all" license="GPL-2.0+" +depends="" makedepends="glib-dev intltool libxml2-dev libxml2-utils" -depends= +subpackages="$pkgname-doc $pkgname-lang" install="$pkgname.post-deinstall" triggers="$pkgname.trigger=/usr/share/mime" -subpackages="$pkgname-doc $pkgname-lang" -source="https://freedesktop.org/~hadess/$pkgname-$pkgver.tar.xz" +source="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ac_cv_func_fdatasync=no ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } -sha512sums="efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda shared-mime-info-1.10.tar.xz" +sha512sums="c9db138586fe4c789b5a89d3cdcf865d5b3258241accd254deecd7665e8b51fc538adeaeeda4fe332474f7d7ffa84f101cba26539a58e134201673d6d1495a2f shared-mime-info-1.12.tar.xz" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index d22aff8cb..e00412349 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spectacle -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -14,7 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz" +source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz + qt5.9.patch + " build() { cd "$builddir" @@ -42,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d239106f0d115e98ec0173862e6dee1b6fdab5846e65c47a4bbaa161cb2695503a58bdb369feb707b96121a0d1bb9acddafc5cfa748e3113bbd47d7da49ed50f spectacle-18.12.3.tar.xz" +sha512sums="c855fcd3cef0846fc11c8f64a2d975dbc8a93a118eb16e17cbfa5ee322ea22104a22652db3547fc53d02061371516fa0caf87557fee4975ac6c08de12db6e1cd spectacle-19.04.0.tar.xz +781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch" diff --git a/user/spectacle/qt5.9.patch b/user/spectacle/qt5.9.patch new file mode 100644 index 000000000..aa830f86b --- /dev/null +++ b/user/spectacle/qt5.9.patch @@ -0,0 +1,23 @@ +--- spectacle-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:23.000000000 +0000 ++++ spectacle-19.04.0/CMakeLists.txt 2019-04-18 22:57:10.598054362 +0000 +@@ -11,7 +11,7 @@ + # Spectacle project + project(Spectacle VERSION ${SPECTACLE_VERSION}) + +-set(QT_MIN_VERSION "5.10.0") ++set(QT_MIN_VERSION "5.9.0") + set(KF5_MIN_VERSION "5.53.0") + set(PLASMA_MIN_VERSION "5.12.0") + +--- spectacle-19.04.0/src/SpectacleCore.cpp.old 2019-04-11 07:37:14.000000000 +0000 ++++ spectacle-19.04.0/src/SpectacleCore.cpp 2019-04-18 22:57:46.694193923 +0000 +@@ -165,8 +165,7 @@ + break; + case Actions::StartNewInstance: + QProcess newInstance; +- newInstance.setProgram(QStringLiteral("spectacle")); +- newInstance.startDetached(); ++ newInstance.startDetached(QStringLiteral("spectacle")); + break; + } + } diff --git a/user/speech-dispatcher/APKBUILD b/user/speech-dispatcher/APKBUILD index b35da35bd..8c12dd18f 100644 --- a/user/speech-dispatcher/APKBUILD +++ b/user/speech-dispatcher/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=speech-dispatcher -pkgver=0.8.8 +pkgver=0.9.0 pkgrel=0 pkgdesc="High-level interface to speech synthesis libraries" url="https://freebsoft.org/speechd" @@ -11,10 +11,9 @@ depends="flite" makedepends="alsa-lib-dev dotconf-dev flite-dev glib-dev intltool libsndfile-dev pulseaudio-dev" subpackages="$pkgname-dev $pkgname-doc" -source="https://freebsoft.org/pub/projects/speechd/speech-dispatcher-$pkgver.tar.gz" +source="https://github.com/brailcom/speechd/releases/download/$pkgver/speech-dispatcher-$pkgver.tar.gz" build() { - cd "$builddir" LIBS="-lasound" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,17 +21,18 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var + # gettext-tiny :( + cp src/api/python/speechd_config/speechd.desktop.in \ + src/api/python/speechd_config/speechd.desktop make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7c7b9bf9b9ce541e790b5ae396cb614616c6b3883e75c0258603e91bf679850e3d63a6251daa3a1819b30d7518e3f552c83fe87b006274ffe1aa0f7e19c0b99b speech-dispatcher-0.8.8.tar.gz" +sha512sums="d72542531f58954e424d1cf956f6cb4fd42d585a1d4b955b13e8a426729a06407cf4085b2b4885eac110d36216c9a8403d37b401eca5c2398011786bdf041083 speech-dispatcher-0.9.0.tar.gz" diff --git a/user/spice-protocol/APKBUILD b/user/spice-protocol/APKBUILD index 33dd1bdb2..e31c8544a 100644 --- a/user/spice-protocol/APKBUILD +++ b/user/spice-protocol/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spice-protocol -pkgver=0.12.14 +pkgver=0.14.0 pkgrel=0 pkgdesc="Spice protocol header files" url="https://www.spice-space.org/" @@ -9,11 +9,10 @@ arch="noarch" license="BSD-3-Clause AND LGPL-2.1+" depends="" makedepends="" -source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2 - " +subpackages="" +source="https://www.spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make pkgconfigdir=/usr/lib/pkgconfig DESTDIR="$pkgdir" install } -sha512sums="4266bcbef9f641a97a2ff72f1b01380a41e51f4b1a0dbb73fdf68baf552598a62d5cf0c526adf2997a55ee5d4fe9392927c3d7f4556827bfb2933f59bfab55bb spice-protocol-0.12.14.tar.bz2" +sha512sums="797df5f529731e9fd395b5946af2490ecf02c26982cc4a0aef24c1766887a35222f68525a996f8bc7459c2c4a25fde0c9a10c489ee6cab6eed7a68a9b5d90f76 spice-protocol-0.14.0.tar.bz2" diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD index 32fcfbd7c..0bf08fdb1 100644 --- a/user/sshfs/APKBUILD +++ b/user/sshfs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=sshfs -pkgver=3.5.0 +pkgver=3.5.2 pkgrel=0 pkgdesc="FUSE client based on the SSH File Transfer Protocol" url="https://github.com/libfuse/sshfs" @@ -15,7 +15,6 @@ subpackages="$pkgname-doc" source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" # NOTE: --prefix=/ is intentional. If --prefix=/usr, mount(8) will not be # able to find mount.fuse.sshfs or mount.sshfs - it only looks in /sbin, not # /usr/sbin. The omission of the absolute slash in --mandir=usr/share/man is @@ -38,8 +37,7 @@ check() { } package() { - cd "$builddir" DESTDIR="$pkgdir" ninja -C output install } -sha512sums="6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c sshfs-3.5.0.tar.xz" +sha512sums="52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272 sshfs-3.5.2.tar.xz" diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 1173268c3..56728187e 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ac3ab33d48aa4d151ea7152a380aba95eabc7887400d20fe50392a6c18a5017b162208c47d8de6d019e8a462608a2f4da3bacaa64cbc966770971b6a55b1b82 step-18.12.3.tar.xz" +sha512sums="a4793beaa2d334cc8a03993e575b71d15381af27b2dd284a73ef49f37d1fa1537314402cfd394d11b2256b37224244cc0c361b969bf95b109ee9344e66bd1bab step-19.04.0.tar.xz" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD index 3d9a96a68..1d034aff3 100644 --- a/user/subversion/APKBUILD +++ b/user/subversion/APKBUILD @@ -1,25 +1,37 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=subversion -pkgver=1.10.4 +pkgver=1.11.1 pkgrel=0 pkgdesc="Version control system from 2000" url="https://subversion.apache.org/" arch="all" +options="!check" # Test suite no longer works with Python 3: + # https://issues.apache.org/jira/browse/SVN-4811 license="Apache-2.0" depends="" depends_dev="apr-dev apr-util-dev linux-headers" makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev - serf-dev sqlite-dev utf8proc-dev zlib-dev" + serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3" subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet $pkgname-lang" source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 + apr-1.7.0.patch python3-bang.patch " build() { - cd "$builddir" + # this is only needed for autogen.sh + _PATH=$PATH + ln -s /usr/bin/python3 "$srcdir"/python + export PATH=$srcdir:$PATH + ./autogen.sh + rm "$srcdir"/python + export PATH=$_PATH + # this is needed to fix the apr issue as well as the patch + # https://issues.apache.org/jira/browse/SVN-4813 + export CPPFLAGS="$CPPFLAGS -P" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +44,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" -j1 install } @@ -54,5 +64,6 @@ kwallet() { mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ } -sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2 +sha512sums="2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d subversion-1.11.1.tar.bz2 +71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf apr-1.7.0.patch 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/subversion/apr-1.7.0.patch b/user/subversion/apr-1.7.0.patch new file mode 100644 index 000000000..a74e5e454 --- /dev/null +++ b/user/subversion/apr-1.7.0.patch @@ -0,0 +1,18 @@ +--- subversion-1.11.1/build/ac-macros/swig.m4 ++++ subversion-1.11.1/build/ac-macros/swig.m4 +@@ -137,13 +137,13 @@ + AC_CACHE_CHECK([for apr_int64_t Python/C API format string], + [svn_cv_pycfmt_apr_int64_t], [ + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], ++ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="L"]) + fi + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r ++ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r + [#include <apr.h> + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="l"]) diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD index 82ba9d682..bf6cb12c8 100644 --- a/user/talloc/APKBUILD +++ b/user/talloc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=talloc -pkgver=2.1.15 +pkgver=2.2.0 pkgrel=0 pkgdesc="Memory pool management library" url="https://talloc.samba.org" @@ -9,13 +9,11 @@ arch="all" license="LGPL-3.0+ AND GPL-3.0+ AND ISC AND LGPL-2.1+ AND BSD-3-Clause AND PostgreSQL" replaces="samba-common" depends="" -makedepends="docbook-xsl libxslt python3-dev" +makedepends="cmd:which docbook-xsl libxslt python3-dev" subpackages="$pkgname-dev py3-$pkgname:py3 $pkgname-doc" -source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz - waf-location.patch" +source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +30,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -49,5 +45,4 @@ py3() { "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ } -sha512sums="41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40 talloc-2.1.15.tar.gz -d19553fae679b5db10ab77a86f9fa0525ccba37a3ef30e530cd96245ee5fc94d4570079bbfe0271c32fbc84a3556c4bf86cc1cab6ffb61863cbce3f5a911efec waf-location.patch" +sha512sums="e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388 talloc-2.2.0.tar.gz" diff --git a/user/talloc/waf-location.patch b/user/talloc/waf-location.patch deleted file mode 100644 index a5ca47f44..000000000 --- a/user/talloc/waf-location.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- talloc-2.1.15/Makefile 2019-01-14 17:24:45.000000000 -0500 -+++ talloc-2.1.15/Makefile 2019-01-27 22:57:15.919981283 -0500 -@@ -1,6 +1,6 @@ - # simple makefile wrapper to run waf - --WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf -+WAF_BINARY=$(PYTHON) buildtools/bin/waf - WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) - - all: diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 0e8d933fb..33cad700d 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico -pkgver=3.1.3 -pkgrel=1 +pkgver=3.1.4 +pkgrel=0 pkgdesc="Collection manager" url="http://tellico-project.org/" arch="all" @@ -22,7 +22,6 @@ source="http://tellico-project.org/files/tellico-$pkgver.tar.xz " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -38,7 +37,6 @@ build() { } check() { - cd "$builddir" # imagejob: needs running X11 # htmlexporter: needs plasma desktop # filelisting: needs dbus @@ -47,9 +45,8 @@ check() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e tellico-3.1.3.tar.xz +sha512sums="d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139 tellico-3.1.4.tar.xz 4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch" diff --git a/user/terminus-font/75-yes-terminus.conf b/user/terminus-font/75-yes-terminus.conf new file mode 100644 index 000000000..84b0a95a0 --- /dev/null +++ b/user/terminus-font/75-yes-terminus.conf @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> +<!-- Accept terminus font --> + <selectfont> + <acceptfont> + <pattern> + <patelt name="family"><string>Terminus</string></patelt> + </pattern> + </acceptfont> + </selectfont> + <alias> + <family>xos4 Terminus</family> + <prefer><family>Terminus</family></prefer> + <default><family>fixed</family></default> + </alias> +</fontconfig> diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD index 10ebdd481..c3fc0fd6f 100644 --- a/user/terminus-font/APKBUILD +++ b/user/terminus-font/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Max Rees <maxcrees@me.com> # Maintainer: Max Rees <maxcrees@me.com> pkgname=terminus-font -pkgver=4.46 -pkgrel=1 +pkgver=4.47 +pkgrel=0 pkgdesc="Monospace bitmap font (for X11 and console)" url="http://terminus-font.sourceforge.net/" # No HTTPS arch="noarch" @@ -10,10 +10,10 @@ options="!check" # Fonts have no test suite license="OFL-1.1" depends="" makedepends="bdftopcf python3" -source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz" +source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz + 75-yes-terminus.conf" build() { - cd "$builddir" ./configure \ --prefix=/usr \ --psfdir=/usr/share/consolefonts \ @@ -22,14 +22,16 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 75-yes-terminus.conf \ + # Use custom fontconfig since the shipped one doesn't provide + # a correct alias + install -Dm644 "$srcdir"/75-yes-terminus.conf \ "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf" install -d "$pkgdir/etc/fonts/conf.d" cd "$pkgdir/etc/fonts/conf.d" ln -s /etc/fonts/conf.avail/75-yes-terminus.conf . } -sha512sums="ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58 terminus-font-4.46.tar.gz" +sha512sums="09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47 terminus-font-4.47.tar.gz +ac7bdf367bbff1e5735b5bd65fc1bc06b55bcb72aaafeb08c7d8e969aabad863474b1104faa42ead7d838433c80cfc50f05578dad03c8081cd82cfda0af86a83 75-yes-terminus.conf" diff --git a/user/tinyxml2/APKBUILD b/user/tinyxml2/APKBUILD new file mode 100644 index 000000000..b210bfb7d --- /dev/null +++ b/user/tinyxml2/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=tinyxml2 +pkgver=7.0.1 +pkgrel=0 +pkgdesc="Small, efficient C++ XML parser" +url=" " +arch="all" +license="Zlib" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="tinyxml2-$pkgver.tar.gz::https://github.com/leethomason/tinyxml2/archive/$pkgver.tar.gz" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380 tinyxml2-7.0.1.tar.gz" diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD index 54f478361..d1bdefb23 100644 --- a/user/tlp/APKBUILD +++ b/user/tlp/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=tlp _pkgname=TLP -pkgver=1.1 +pkgver=1.2.1 pkgrel=0 pkgdesc="Linux Advanced Power Management" url="https://linrunner.de/en/tlp/tlp.html" @@ -18,14 +18,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/linrunner/$_pkgname/archive/ builddir="$srcdir/$_pkgname-$pkgver" build() { - cd "$builddir" make } package() { - cd "$builddir" - - make DESTDIR="$pkgdir" install-tlp install-man + make DESTDIR="$pkgdir" TLP_WITH_SYSTEMD=0 install-tlp install-man install -Dm755 "$srcdir"/tlp.initd "$pkgdir"/etc/init.d/"$pkgname" # We don't ship systemd find "$pkgdir"/usr/share/man/man8 -name '*.service*' -delete @@ -36,7 +33,7 @@ rdw() { depends="tlp" cd "$builddir" - make DESTDIR="$subpkgdir" install-rdw + make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 install-rdw } bashcomp() { @@ -44,9 +41,12 @@ bashcomp() { depends="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share + mkdir -p "$subpkgdir"/usr/share/bash-completion/completions + mv "$pkgdir"/usr/share/bash-completion/completions/* \ + "$subpkgdir"/usr/share/bash-completion/completions + mv "$pkgbasedir/$pkgname-rdw"/usr/share/bash-completion/completions/* \ + "$subpkgdir"/usr/share/bash-completion/completions } -sha512sums="3400f2b6c249fd2e1bbbc61f23e3450ff90fabb8dd74f2903ce1f0d07e7ce3d1e61b07295736138d4697235dbee9157d3f32a8d296a649c93f73e03e3555af1e tlp-1.1.tar.gz +sha512sums="c5cf2c9cb4d5e1e0ad693ab73f7971486671dab9b785a4e121b3550f5b096a8b028bd9d116851db6402ab7ccd9b3fe944d138fd35dc17d826482c59257f12c9f tlp-1.2.1.tar.gz e6de216b2540413812711b3304cdc29c8729d527080cfd747ba382db50166dd21c6c27ff467f9f2a967e92007c7a311b00e88262952c34a22f417578c66cf4e7 tlp.initd" diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD index 3b1c6c29d..07e4de092 100644 --- a/user/trigger-rally/APKBUILD +++ b/user/trigger-rally/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=trigger-rally -pkgver=0.6.5 +pkgver=0.6.6.1 pkgrel=0 pkgdesc="Fast-paced rally racing game" url="http://trigger-rally.sourceforge.net/" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0-only" depends="" makedepends="freealut-dev glew-dev glu-dev openal-soft-dev physfs-dev sdl2-dev - sdl2_image-dev" + sdl2_image-dev tinyxml2-dev" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/trigger-rally/trigger-rally-$pkgver.tar.gz dont-strip.patch @@ -39,6 +39,6 @@ package() { "$pkgdir"/usr/share/icons/hicolor/scalable/apps/trigger.svg } -sha512sums="59f48c116b20e47559b4c07107fa4055a9ad516e9c147763e4ba5d2ead3a4a5101f7d690483a1ef0df847ca647c0f750937512ee579f4ae06908157d9eabf184 trigger-rally-0.6.5.tar.gz +sha512sums="feed805858ef63907bb10088761f1219b22fe55ead268511ef73b18aa0f18d79e87d4e2cbfb76361b1dec3949b59464af33efe31e81f06ae7e163430f3336669 trigger-rally-0.6.6.1.tar.gz a81781058177e012daaad58d72e4bdbdbc2730b1df76941ba03f06367545b213ba82a33bab46deba31570973deb1802a3d459704c3a963c38eec69ef82f228d5 dont-strip.patch -807f0c99cc148e34cfe29af13f62375ee7f79f079f29cfda3b90045e0ad8676944d9e8031ab7037429a93d7547da53740e8ce002c4d3c46d93c3d8c9eb2e4ae9 trigger-rally.desktop" +ddaf7d89353280f7952d6cffd06182ea28640473e18eff06809c48477349248f57922eaff9bf816261c32f8fdc167d933f345422f9885638041dd9f5e5ac0524 trigger-rally.desktop" diff --git a/user/trigger-rally/trigger-rally.desktop b/user/trigger-rally/trigger-rally.desktop index 74b67da0f..5802b2fee 100644 --- a/user/trigger-rally/trigger-rally.desktop +++ b/user/trigger-rally/trigger-rally.desktop @@ -5,4 +5,4 @@ Name=Trigger Comment=Fast-paced rally racing game Icon=trigger Exec=/usr/games/trigger-rally -Category=Game;Simlulation +Categories=Game;Simulation; diff --git a/user/udisks2/APKBUILD b/user/udisks2/APKBUILD index 66af86bad..2374ff4ea 100644 --- a/user/udisks2/APKBUILD +++ b/user/udisks2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=udisks2 -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=0 pkgdesc="A Disk Manager" url="https://www.freedesktop.org/wiki/Software/udisks" @@ -18,7 +18,6 @@ source="https://github.com/storaged-project/udisks/releases/download/udisks-$pkg builddir="$srcdir"/udisks-$pkgver build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,16 +27,16 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --enable-compile-warnings=minimum + cp "$builddir"/data/org.freedesktop.UDisks2.policy.in \ + "$builddir"/data/org.freedesktop.UDisks2.policy make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -50,5 +49,5 @@ libs() { "$subpkgdir"/usr/lib/ } -sha512sums="a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b udisks-2.8.1.tar.bz2 +sha512sums="dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a udisks-2.8.2.tar.bz2 269ba55cc755e2a484670258bc530790691b66c9fce9479a2a17d78cff5d52dd1be89290979efd44a0ba82be665f52a356a57f2cbb67951d91fe09d4e24c2a6a O_CLOEXEC.patch" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index 33b82b783..5c1608ba5 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=18.12.3 +pkgver=19.04.0 pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b7ba29b05e5997d9e7ef07c261198bc47910e75668bd619e1f14bb850d5e09fd07948e7d56e2604287384e1c331a882f40b4540c116e9a7b2cfa2078f57b4a90 umbrello-18.12.3.tar.xz +sha512sums="6a7ca159ec7860823720f46c8b3fdf1170358ca41de79219612bb7d1c5431a4b81508fbd7a38d7ea0913b2b04ea0656024f8a85d217a94c684c135f4254e52fa umbrello-19.04.0.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/upower/APKBUILD b/user/upower/APKBUILD index 05c783cee..ea8652b3e 100644 --- a/user/upower/APKBUILD +++ b/user/upower/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=upower -pkgver=0.99.9 +pkgver=0.99.10 pkgrel=0 pkgdesc="Power Management Services" url="https://upower.freedesktop.org" @@ -11,10 +11,9 @@ depends="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="dbus-glib-dev docbook-xsl gobject-introspection-dev gtk+-dev intltool libgudev-dev libusb-dev libxslt linux-headers polkit-dev" -source="https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz" +source="https://gitlab.freedesktop.org/upower/upower/uploads/c438511024b9bc5a904f8775cfc8e4c4/upower-0.99.10.tar.xz" build() { - cd "$builddir" DATADIRNAME=share ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,13 +27,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f upower-0.99.9.tar.xz" +sha512sums="aefe1b2ff5a390f1ea9676fe7e753750bebc56034365a9183e946a8463904047da0a4ac71340eb2efedc16bce6f6d9ef4609ddca37dc1fc31b56bcdbfbbfa59d upower-0.99.10.tar.xz" diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD index 8be033ef7..8b3234adb 100644 --- a/user/utf8proc/APKBUILD +++ b/user/utf8proc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=utf8proc -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=0 pkgdesc="C library for processing UTF-8 data" url=" " @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare mkdir build } @@ -43,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae19287e33bc4807475063963557c4d1d2f7d95577d61882ba8df380883662860eeb868e7391ac1b8111614ca2c1855f631925ade6eaa827d07d28cc4cdbab9c utf8proc-2.2.0.tar.gz" +sha512sums="3935cd280e14ed570caa89a983b2d56a981e74da9298a1ea26064da78ece288ff48a73306446d3e1d777e6ecd8ea881f7a29169eaae2153cb015daefb8df8656 utf8proc-2.3.0.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD index 3ec869b6e..c009e1ff2 100644 --- a/user/uwsgi/APKBUILD +++ b/user/uwsgi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=uwsgi -pkgver=2.0.17.1 +pkgver=2.0.18 pkgrel=0 pkgdesc="Web application server" url="https://projects.unbit.it/uwsgi" @@ -20,8 +20,6 @@ done source="https://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz" build() { - cd "$builddir" - echo 'plugin_dir = /usr/lib/uwsgi/plugins' >> buildconf/core.ini echo 'plugin_build_dir = .' >> buildconf/core.ini @@ -34,12 +32,10 @@ build() { } check() { - cd "$builddir" python3 uwsgiconfig.py --check } package() { - cd "$builddir" install -D -m755 "$builddir"/uwsgi "$pkgdir"/usr/bin/uwsgi } @@ -87,4 +83,4 @@ rack() { _plugpack rack "Ruby Rack" } -sha512sums="10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b uwsgi-2.0.17.1.tar.gz" +sha512sums="6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61 uwsgi-2.0.18.tar.gz" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index 649aecea1..3e6b0d5b0 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vala -pkgver=0.44.2 +pkgver=0.44.3 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c7151efce9c4da4b31eadd646105ce8fb244ddd285f6d086ab65c044c0725ac7b33752316a8dba6f5709998a48eac77510815cba2609742947b41a2e6268515d vala-0.44.2.tar.xz" +sha512sums="f074d537db94772565003a097c6a29e0dfcd58680baeb321ad04dec8ea056319eb8b7059117c259523b7570841651c2935feef06c03e3d82a11a94a293349b5a vala-0.44.3.tar.xz" diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index b952f4959..adcc489d5 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vte -pkgver=0.56.0 +pkgver=0.56.1 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -33,5 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f366ed4a28a896ba919184b50a55ee110eae43127847f34c049684bcb9b81327d1b72e9d871b2a5b7f7fa12f3f4aa721ac3d770770b600dca9c433cb2c674915 vte-0.56.0.tar.xz +sha512sums="74a6404d4e8f13e8b006c59e8cd63e660407ef217c1f80bfd7d0b72c395411558929760c1d98eea9ecb9010df725506c31c953b23e541c03f4a8a93e78066436 vte-0.56.1.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD index 240fb474c..abbcbaff0 100644 --- a/user/wpa_supplicant/APKBUILD +++ b/user/wpa_supplicant/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=wpa_supplicant -pkgver=2.6 -pkgrel=11 +pkgver=2.7 +pkgrel=0 pkgdesc="Utility providing key negotiation for WPA wireless networks" url="https://w1.fi/wpa_supplicant/" arch="all" @@ -12,18 +12,11 @@ subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui" depends="" makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev" source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz - rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch - rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch - rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch - rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch - rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch - rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch - rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch - rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch - wpa_supplicant.initd wpa_supplicant.confd + dbus.patch eloop.patch + undefined-ref.patch config wpa_cli.sh" @@ -41,7 +34,6 @@ source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz # - CVE-2017-13088 prepare() { - cd "$builddir" default_prepare # Copy our configuration file to the build directory @@ -104,17 +96,11 @@ wpa_gui() { install -Dm755 wpa_gui-qt4/wpa_gui "$subpkgdir"/usr/bin/wpa_gui } -sha512sums="46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6 wpa_supplicant-2.6.tar.gz -f855fa792425f175ccc800eb49df42067b1c1f4b52ba2d24160af4dfbb74dcf8e81661b7e6c8d92fa408938b8a559fc74557d1677913e4a751bfd43706c14bb6 rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch -b4e413aa815572ea0002d33d24b69cd499aebb5efebed8fcaade8b29324bb5853a5db64e8b1dfdf24478e02c66196238b81a6ec777a7a28610435dce4d2c344e rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch -a6382d8e84b4829be33c46bf2f4c6f3232c9d924a4547a21dfe023bf5be8ee1c635920295f52be285359efaae95bcc1f12b512659cfd1653b871dd0bea7e5ace rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch -51ed806f0d5b3f588e26d4db4dcfc6be2cfb12002e26893a6cedd62c7cad0d0de75aed4a666223c4877fc1854b08dce6ddf6f6c4cfd752a5d8d58ad4a968b553 rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch -8707a123cd78149dfee9f5bd791761ee1eca605ef96580167044c2339c896920cf0e030b184a5afa9e310f5755afb30bef8ebd4522fc52753f3fbd6acead2cdf rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch -37d050b2e4a3598484912667d8b2705fbe84c5c562267f900d42b0c7b606fb1fed09ddca8b80e2131768baa8f3690aab6ba7a232dee6ff1e66150fdb8816c927 rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch -111e655cfbb3a86e3792040e0ea375490d31c42c9d43cbe911290d54df5f4db437e4c8ad0e937c51729dcefeb0db0989b8ab55b9523398683abd08ebfec18076 rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch -fc84edd8b30305cc42053c872554098f3f077292ec980ed6a442f37884087ff2f055738fd55977ed792bef1887dcc8c4626586465d78dd0258edb83dcd50a65a rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +sha512sums="8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3 wpa_supplicant-2.7.tar.gz 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc wpa_supplicant.initd 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 wpa_supplicant.confd +dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed dbus.patch 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch +5e790b3ae50f3d29cb38f73cff30f8994798e7bdbecc9f852def910a8150c1724c051bbb52603fa9c6818c950a5fe347bccd21848427f31f54d641ae40621c3f undefined-ref.patch 221660fa0350442a7d8371686b2118861052a4613fb352b7f80079e3750b82f4e48efc378b9d617455007d1106552b695fdca506a3c338283986641f3848b202 config 45d3e70c47d0f7d6dc6730853af8cbcb40ed0713ee7b1069698f5a635939f273f66e72d4221e064c3c71a92154cf07841c8c0d4fc14d796dbb6fe0d92776ee2b wpa_cli.sh" diff --git a/user/wpa_supplicant/dbus.patch b/user/wpa_supplicant/dbus.patch new file mode 100644 index 000000000..0f340c956 --- /dev/null +++ b/user/wpa_supplicant/dbus.patch @@ -0,0 +1,13 @@ +diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c +index 45623f3..0fc3d08 100644 +--- a/wpa_supplicant/dbus/dbus_new_helpers.c ++++ b/wpa_supplicant/dbus/dbus_new_helpers.c +@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface, + const struct wpa_dbus_property_desc *dsc; + int i = 0; + +- if (iface == NULL) ++ if (iface == NULL || path == NULL) + return; + + dbus_connection_get_object_path_data(iface->con, path, diff --git a/user/wpa_supplicant/libressl.patch b/user/wpa_supplicant/libressl.patch deleted file mode 100644 index 56146eab5..000000000 --- a/user/wpa_supplicant/libressl.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/crypto/crypto_openssl.c.orig -+++ b/src/crypto/crypto_openssl.c -@@ -611,7 +611,7 @@ - - void * dh5_init(struct wpabuf **priv, struct wpabuf **publ) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; - struct wpabuf *pubkey = NULL, *privkey = NULL; - size_t publen, privlen; -@@ -712,7 +712,7 @@ - - void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ) - { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - DH *dh; - - dh = DH_new(); ---- a/src/crypto/tls_openssl.c.orig -+++ b/src/crypto/tls_openssl.c -@@ -919,7 +919,7 @@ - } - #endif /* OPENSSL_FIPS */ - #endif /* CONFIG_FIPS */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - SSL_load_error_strings(); - SSL_library_init(); - #ifndef OPENSSL_NO_SHA256 -@@ -1043,7 +1043,7 @@ - - tls_openssl_ref_count--; - if (tls_openssl_ref_count == 0) { --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - #ifndef OPENSSL_NO_ENGINE - ENGINE_cleanup(); - #endif /* OPENSSL_NO_ENGINE */ -@@ -2334,7 +2334,7 @@ - return 0; - - #ifdef PKCS12_FUNCS --#if OPENSSL_VERSION_NUMBER < 0x10002000L -+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER) - /* - * Clear previously set extra chain certificates, if any, from PKCS#12 - * processing in tls_parse_pkcs12() to allow OpenSSL to build a new diff --git a/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch deleted file mode 100644 index 727684865..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +++ /dev/null @@ -1,174 +0,0 @@ -From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 14 Jul 2017 15:15:35 +0200 -Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake - -Do not reinstall TK to the driver during Reassociation Response frame -processing if the first attempt of setting the TK succeeded. This avoids -issues related to clearing the TX/RX PN that could result in reusing -same PN values for transmitted frames (e.g., due to CCM nonce reuse and -also hitting replay protection on the receiver) and accepting replayed -frames on RX side. - -This issue was introduced by the commit -0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in -authenticator') which allowed wpa_ft_install_ptk() to be called multiple -times with the same PTK. While the second configuration attempt is -needed with some drivers, it must be done only if the first attempt -failed. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/ap/ieee802_11.c | 16 +++++++++++++--- - src/ap/wpa_auth.c | 11 +++++++++++ - src/ap/wpa_auth.h | 3 ++- - src/ap/wpa_auth_ft.c | 10 ++++++++++ - src/ap/wpa_auth_i.h | 1 + - 5 files changed, 37 insertions(+), 4 deletions(-) - -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index 4e04169..333035f 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, - { - struct ieee80211_ht_capabilities ht_cap; - struct ieee80211_vht_capabilities vht_cap; -+ int set = 1; - - /* - * Remove the STA entry to ensure the STA PS state gets cleared and -@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, - * FT-over-the-DS, where a station re-associates back to the same AP but - * skips the authentication flow, or if working with a driver that - * does not support full AP client state. -+ * -+ * Skip this if the STA has already completed FT reassociation and the -+ * TK has been configured since the TX/RX PN must not be reset to 0 for -+ * the same key. - */ -- if (!sta->added_unassoc) -+ if (!sta->added_unassoc && -+ (!(sta->flags & WLAN_STA_AUTHORIZED) || -+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { - hostapd_drv_sta_remove(hapd, sta->addr); -+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); -+ set = 0; -+ } - - #ifdef CONFIG_IEEE80211N - if (sta->flags & WLAN_STA_HT) -@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, - sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, - sta->flags | WLAN_STA_ASSOC, sta->qosinfo, - sta->vht_opmode, sta->p2p_ie ? 1 : 0, -- sta->added_unassoc)) { -+ set)) { - hostapd_logger(hapd, sta->addr, - HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, - "Could not %s STA to kernel driver", -- sta->added_unassoc ? "set" : "add"); -+ set ? "set" : "add"); - - if (sta->added_unassoc) { - hostapd_drv_sta_remove(hapd, sta->addr); -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 3587086..707971d 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) - #else /* CONFIG_IEEE80211R */ - break; - #endif /* CONFIG_IEEE80211R */ -+ case WPA_DRV_STA_REMOVED: -+ sm->tk_already_set = FALSE; -+ return 0; - } - - #ifdef CONFIG_IEEE80211R -@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) - } - - -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) -+{ -+ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) -+ return 0; -+ return sm->tk_already_set; -+} -+ -+ - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry) - { -diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h -index 0de8d97..97461b0 100644 ---- a/src/ap/wpa_auth.h -+++ b/src/ap/wpa_auth.h -@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, - u8 *data, size_t data_len); - enum wpa_event { - WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, -- WPA_REAUTH_EAPOL, WPA_ASSOC_FT -+ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED - }; - void wpa_remove_ptk(struct wpa_state_machine *sm); - int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); -@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); - int wpa_auth_get_pairwise(struct wpa_state_machine *sm); - int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); - int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry); - struct rsn_pmksa_cache_entry * -diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c -index 42242a5..e63b99a 100644 ---- a/src/ap/wpa_auth_ft.c -+++ b/src/ap/wpa_auth_ft.c -@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - return; - } - -+ if (sm->tk_already_set) { -+ /* Must avoid TK reconfiguration to prevent clearing of TX/RX -+ * PN in the driver */ -+ wpa_printf(MSG_DEBUG, -+ "FT: Do not re-install same PTK to the driver"); -+ return; -+ } -+ - /* FIX: add STA entry to kernel/driver here? The set_key will fail - * most likely without this.. At the moment, STA entry is added only - * after association has been completed. This function will be called -@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - - /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ - sm->pairwise_set = TRUE; -+ sm->tk_already_set = TRUE; - } - - -@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, - - sm->pairwise = pairwise; - sm->PTK_valid = TRUE; -+ sm->tk_already_set = FALSE; - wpa_ft_install_ptk(sm); - - buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + -diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h -index 72b7eb3..7fd8f05 100644 ---- a/src/ap/wpa_auth_i.h -+++ b/src/ap/wpa_auth_i.h -@@ -65,6 +65,7 @@ struct wpa_state_machine { - struct wpa_ptk PTK; - Boolean PTK_valid; - Boolean pairwise_set; -+ Boolean tk_already_set; - int keycount; - Boolean Pair; - struct wpa_key_replay_counter { --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch deleted file mode 100644 index 1802d664a..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +++ /dev/null @@ -1,250 +0,0 @@ -From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Wed, 12 Jul 2017 16:03:24 +0200 -Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key - -Track the current GTK and IGTK that is in use and when receiving a -(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do -not install the given key if it is already in use. This prevents an -attacker from trying to trick the client into resetting or lowering the -sequence counter associated to the group key. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 11 +++++ - src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ - src/rsn_supp/wpa_i.h | 4 ++ - 3 files changed, 87 insertions(+), 44 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index af1d0f0..d200285 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -217,6 +217,17 @@ struct wpa_ptk { - size_t tk_len; - }; - -+struct wpa_gtk { -+ u8 gtk[WPA_GTK_MAX_LEN]; -+ size_t gtk_len; -+}; -+ -+#ifdef CONFIG_IEEE80211W -+struct wpa_igtk { -+ u8 igtk[WPA_IGTK_MAX_LEN]; -+ size_t igtk_len; -+}; -+#endif /* CONFIG_IEEE80211W */ - - /* WPA IE version 1 - * 00-50-f2:1 (OUI:OUI type) -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 3c47879..95bd7be 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - -+ /* Detect possible key reinstallation */ -+ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", -+ gd->keyidx, gd->tx, gd->gtk_len); -+ return 0; -+ } -+ - wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", -@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ - return 0; - } - -@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - } - - -+#ifdef CONFIG_IEEE80211W -+static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -+ const struct wpa_igtk_kde *igtk) -+{ -+ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); -+ u16 keyidx = WPA_GET_LE16(igtk->keyid); -+ -+ /* Detect possible key reinstallation */ -+ if (sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", -+ keyidx); -+ return 0; -+ } -+ -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", -+ keyidx, MAC2STR(igtk->pn)); -+ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); -+ if (keyidx > 4095) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Invalid IGTK KeyID %d", keyidx); -+ return -1; -+ } -+ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -+ broadcast_ether_addr, -+ keyidx, 0, igtk->pn, sizeof(igtk->pn), -+ igtk->igtk, len) < 0) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Failed to configure IGTK to the driver"); -+ return -1; -+ } -+ -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ -+ return 0; -+} -+#endif /* CONFIG_IEEE80211W */ -+ -+ - static int ieee80211w_set_keys(struct wpa_sm *sm, - struct wpa_eapol_ie_parse *ie) - { -@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - if (ie->igtk) { - size_t len; - const struct wpa_igtk_kde *igtk; -- u16 keyidx; -+ - len = wpa_cipher_key_len(sm->mgmt_group_cipher); - if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) - return -1; -+ - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- keyidx = WPA_GET_LE16(igtk->keyid); -- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " -- "pn %02x%02x%02x%02x%02x%02x", -- keyidx, MAC2STR(igtk->pn)); -- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", -- igtk->igtk, len); -- if (keyidx > 4095) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Invalid IGTK KeyID %d", keyidx); -- return -1; -- } -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igtk->pn, sizeof(igtk->pn), -- igtk->igtk, len) < 0) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Failed to configure IGTK to the driver"); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } - } - - return 0; -@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) - */ - void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - { -- int clear_ptk = 1; -+ int clear_keys = 1; - - if (sm == NULL) - return; -@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - /* Prepare for the next transition */ - wpa_ft_prepare_auth_request(sm, NULL); - -- clear_ptk = 0; -+ clear_keys = 0; - } - #endif /* CONFIG_IEEE80211R */ - -- if (clear_ptk) { -+ if (clear_keys) { - /* - * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if - * this is not part of a Fast BSS Transition. -@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - } - - #ifdef CONFIG_TDLS -@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(sm->pmk, 0, sizeof(sm->pmk)); - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); - os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); -@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - os_memset(&gd, 0, sizeof(gd)); - #ifdef CONFIG_IEEE80211W - } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { -- struct wpa_igtk_kde igd; -- u16 keyidx; -- -- os_memset(&igd, 0, sizeof(igd)); -- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); -- os_memcpy(igd.keyid, buf + 2, 2); -- os_memcpy(igd.pn, buf + 4, 6); -- -- keyidx = WPA_GET_LE16(igd.keyid); -- os_memcpy(igd.igtk, buf + 10, keylen); -- -- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", -- igd.igtk, keylen); -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igd.pn, sizeof(igd.pn), -- igd.igtk, keylen) < 0) { -- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " -- "WNM mode"); -- os_memset(&igd, 0, sizeof(igd)); -+ const struct wpa_igtk_kde *igtk; -+ -+ igtk = (const struct wpa_igtk_kde *) (buf + 2); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } -- os_memset(&igd, 0, sizeof(igd)); - #endif /* CONFIG_IEEE80211W */ - } else { - wpa_printf(MSG_DEBUG, "Unknown element id"); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index f653ba6..afc9e37 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -31,6 +31,10 @@ struct wpa_sm { - u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; -+ struct wpa_gtk gtk; -+#ifdef CONFIG_IEEE80211W -+ struct wpa_igtk igtk; -+#endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ - --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch deleted file mode 100644 index e2937b851..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:12:24 +0300 -Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep - Mode cases - -This extends the protection to track last configured GTK/IGTK value -separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a -corner case where these two different mechanisms may get used when the -GTK/IGTK has changed and tracking a single value is not sufficient to -detect a possible key reconfiguration. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - src/rsn_supp/wpa_i.h | 2 ++ - 2 files changed, 40 insertions(+), 15 deletions(-) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 95bd7be..7a2c68d 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -709,14 +709,17 @@ struct wpa_gtk_data { - - static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const struct wpa_gtk_data *gd, -- const u8 *key_rsc) -+ const u8 *key_rsc, int wnm_sleep) - { - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - - /* Detect possible key reinstallation */ -- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || -+ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", - gd->keyidx, gd->tx, gd->gtk_len); -@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -- sm->gtk.gtk_len = gd->gtk_len; -- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ if (wnm_sleep) { -+ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len); -+ } else { -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ } - - return 0; - } -@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, - gtk_len, gtk_len, - &gd.key_rsc_len, &gd.alg) || -- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { -+ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "RSN: Failed to install GTK"); - os_memset(&gd, 0, sizeof(gd)); -@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - - #ifdef CONFIG_IEEE80211W - static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -- const struct wpa_igtk_kde *igtk) -+ const struct wpa_igtk_kde *igtk, -+ int wnm_sleep) - { - size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); - u16 keyidx = WPA_GET_LE16(igtk->keyid); - - /* Detect possible key reinstallation */ -- if (sm->igtk.igtk_len == len && -- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ if ((sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || -+ (sm->igtk_wnm_sleep.igtk_len == len && -+ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", - keyidx); -@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, - return -1; - } - -- sm->igtk.igtk_len = len; -- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ if (wnm_sleep) { -+ sm->igtk_wnm_sleep.igtk_len = len; -+ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len); -+ } else { -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ } - - return 0; - } -@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - return -1; - - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) - return -1; - } - -@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, - if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) - key_rsc = null_rsc; - -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || - wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) - goto failed; - os_memset(&gd, 0, sizeof(gd)); -@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - } - -@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); -@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - - wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", - gd.gtk, gd.gtk_len); -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { - os_memset(&gd, 0, sizeof(gd)); - wpa_printf(MSG_DEBUG, "Failed to install the GTK in " - "WNM mode"); -@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - const struct wpa_igtk_kde *igtk; - - igtk = (const struct wpa_igtk_kde *) (buf + 2); -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) - return -1; - #endif /* CONFIG_IEEE80211W */ - } else { -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index afc9e37..9a54631 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -32,8 +32,10 @@ struct wpa_sm { - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; - struct wpa_gtk gtk; -+ struct wpa_gtk gtk_wnm_sleep; - #ifdef CONFIG_IEEE80211W - struct wpa_igtk igtk; -+ struct wpa_igtk igtk_wnm_sleep; - #endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch deleted file mode 100644 index 22ee21794..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 29 Sep 2017 04:22:51 +0200 -Subject: [PATCH 4/8] Prevent installation of an all-zero TK - -Properly track whether a PTK has already been installed to the driver -and the TK part cleared from memory. This prevents an attacker from -trying to trick the client into installing an all-zero TK. - -This fixes the earlier fix in commit -ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the -driver in EAPOL-Key 3/4 retry case') which did not take into account -possibility of an extra message 1/4 showing up between retries of -message 3/4. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 1 + - src/rsn_supp/wpa.c | 5 ++--- - src/rsn_supp/wpa_i.h | 1 - - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index d200285..1021ccb 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -215,6 +215,7 @@ struct wpa_ptk { - size_t kck_len; - size_t kek_len; - size_t tk_len; -+ int installed; /* 1 if key has already been installed to driver */ - }; - - struct wpa_gtk { -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 7a2c68d..0550a41 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, - os_memset(buf, 0, sizeof(buf)); - } - sm->tptk_set = 1; -- sm->tk_to_set = 1; - - kde = sm->assoc_wpa_ie; - kde_len = sm->assoc_wpa_ie_len; -@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - enum wpa_alg alg; - const u8 *key_rsc; - -- if (!sm->tk_to_set) { -+ if (sm->ptk.installed) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Do not re-install same PTK to the driver"); - return 0; -@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - - /* TK is not needed anymore in supplicant */ - os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); -- sm->tk_to_set = 0; -+ sm->ptk.installed = 1; - - if (sm->wpa_ptk_rekey) { - eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 9a54631..41f371f 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -24,7 +24,6 @@ struct wpa_sm { - struct wpa_ptk ptk, tptk; - int ptk_set, tptk_set; - unsigned int msg_3_of_4_ok:1; -- unsigned int tk_to_set:1; - u8 snonce[WPA_NONCE_LEN]; - u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ - int renew_snonce; --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch deleted file mode 100644 index c19c4c710..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:32:57 +0300 -Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce - -The Authenticator state machine path for PTK rekeying ended up bypassing -the AUTHENTICATION2 state where a new ANonce is generated when going -directly to the PTKSTART state since there is no need to try to -determine the PMK again in such a case. This is far from ideal since the -new PTK would depend on a new nonce only from the supplicant. - -Fix this by generating a new ANonce when moving to the PTKSTART state -for the purpose of starting new 4-way handshake to rekey PTK. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 707971d..bf10cc1 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) - } - - -+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) -+{ -+ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { -+ wpa_printf(MSG_ERROR, -+ "WPA: Failed to get random data for ANonce"); -+ sm->Disconnect = TRUE; -+ return -1; -+ } -+ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, -+ WPA_NONCE_LEN); -+ sm->TimeoutCtr = 0; -+ return 0; -+} -+ -+ - SM_STATE(WPA_PTK, INITPMK) - { - u8 msk[2 * PMK_LEN]; -@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) - SM_ENTER(WPA_PTK, AUTHENTICATION); - else if (sm->ReAuthenticationRequest) - SM_ENTER(WPA_PTK, AUTHENTICATION2); -- else if (sm->PTKRequest) -- SM_ENTER(WPA_PTK, PTKSTART); -- else switch (sm->wpa_ptk_state) { -+ else if (sm->PTKRequest) { -+ if (wpa_auth_sm_ptk_update(sm) < 0) -+ SM_ENTER(WPA_PTK, DISCONNECTED); -+ else -+ SM_ENTER(WPA_PTK, PTKSTART); -+ } else switch (sm->wpa_ptk_state) { - case WPA_PTK_INITIALIZE: - break; - case WPA_PTK_DISCONNECT: --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch deleted file mode 100644 index e1bd5a572..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:03:15 +0300 -Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration - -Do not try to reconfigure the same TPK-TK to the driver after it has -been successfully configured. This is an explicit check to avoid issues -related to resetting the TX/RX packet number. There was already a check -for this for TPK M2 (retries of that message are ignored completely), so -that behavior does not get modified. - -For TPK M3, the TPK-TK could have been reconfigured, but that was -followed by immediate teardown of the link due to an issue in updating -the STA entry. Furthermore, for TDLS with any real security (i.e., -ignoring open/WEP), the TPK message exchange is protected on the AP path -and simple replay attacks are not feasible. - -As an additional corner case, make sure the local nonce gets updated if -the peer uses a very unlikely "random nonce" of all zeros. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c -index e424168..9eb9738 100644 ---- a/src/rsn_supp/tdls.c -+++ b/src/rsn_supp/tdls.c -@@ -112,6 +112,7 @@ struct wpa_tdls_peer { - u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ - } tpk; - int tpk_set; -+ int tk_set; /* TPK-TK configured to the driver */ - int tpk_success; - int tpk_in_progress; - -@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - u8 rsc[6]; - enum wpa_alg alg; - -+ if (peer->tk_set) { -+ /* -+ * This same TPK-TK has already been configured to the driver -+ * and this new configuration attempt (likely due to an -+ * unexpected retransmitted frame) would result in clearing -+ * the TX/RX sequence number which can break security, so must -+ * not allow that to happen. -+ */ -+ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR -+ " has already been configured to the driver - do not reconfigure", -+ MAC2STR(peer->addr)); -+ return -1; -+ } -+ - os_memset(rsc, 0, 6); - - switch (peer->cipher) { -@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - return -1; - } - -+ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, -+ MAC2STR(peer->addr)); - if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, - rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { - wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " - "driver"); - return -1; - } -+ peer->tk_set = 1; - return 0; - } - -@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - peer->cipher = 0; - peer->qos_info = 0; - peer->wmm_capable = 0; -- peer->tpk_set = peer->tpk_success = 0; -+ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; - peer->chan_switch_enabled = 0; - os_memset(&peer->tpk, 0, sizeof(peer->tpk)); - os_memset(peer->inonce, 0, WPA_NONCE_LEN); -@@ -1159,6 +1177,7 @@ skip_rsnie: - wpa_tdls_peer_free(sm, peer); - return -1; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", - peer->inonce, WPA_NONCE_LEN); - os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); -@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, - } - - -+static int tdls_nonce_set(const u8 *nonce) -+{ -+ int i; -+ -+ for (i = 0; i < WPA_NONCE_LEN; i++) { -+ if (nonce[i]) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+ - static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, - const u8 *buf, size_t len) - { -@@ -2004,7 +2036,8 @@ skip_rsn: - peer->rsnie_i_len = kde.rsn_ie_len; - peer->cipher = cipher; - -- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { -+ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || -+ !tdls_nonce_set(peer->inonce)) { - /* - * There is no point in updating the RNonce for every obtained - * TPK M1 frame (e.g., retransmission due to timeout) with the -@@ -2020,6 +2053,7 @@ skip_rsn: - "TDLS: Failed to get random data for responder nonce"); - goto error; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - } - - #if 0 --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch deleted file mode 100644 index 85ea1d62b..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:25:02 +0300 -Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending - request - -Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep -Mode Response if WNM-Sleep Mode has not been used') started ignoring the -response when no WNM-Sleep Mode Request had been used during the -association. This can be made tighter by clearing the used flag when -successfully processing a response. This adds an additional layer of -protection against unexpected retransmissions of the response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/wnm_sta.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c -index 1b3409c..67a07ff 100644 ---- a/wpa_supplicant/wnm_sta.c -+++ b/wpa_supplicant/wnm_sta.c -@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - - if (!wpa_s->wnmsleep_used) { - wpa_printf(MSG_DEBUG, -- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); -+ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); - return; - } - -@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - return; - } - -+ wpa_s->wnmsleep_used = 0; -+ - if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || - wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { - wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " --- -2.7.4 - diff --git a/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch deleted file mode 100644 index b9678f681..000000000 --- a/user/wpa_supplicant/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 12:06:37 +0300 -Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames - -The driver is expected to not report a second association event without -the station having explicitly request a new association. As such, this -case should not be reachable. However, since reconfiguring the same -pairwise or group keys to the driver could result in nonce reuse issues, -be extra careful here and do an additional state check to avoid this -even if the local driver ends up somehow accepting an unexpected -Reassociation Response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 3 +++ - src/rsn_supp/wpa_ft.c | 8 ++++++++ - src/rsn_supp/wpa_i.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 0550a41..2a53c6f 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) - #ifdef CONFIG_TDLS - wpa_tdls_disassoc(sm); - #endif /* CONFIG_TDLS */ -+#ifdef CONFIG_IEEE80211R -+ sm->ft_reassoc_completed = 0; -+#endif /* CONFIG_IEEE80211R */ - - /* Keys are not needed in the WPA state machine anymore */ - wpa_sm_drop_sa(sm); -diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c -index 205793e..d45bb45 100644 ---- a/src/rsn_supp/wpa_ft.c -+++ b/src/rsn_supp/wpa_ft.c -@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, - u16 capab; - - sm->ft_completed = 0; -+ sm->ft_reassoc_completed = 0; - - buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + - 2 + sm->r0kh_id_len + ric_ies_len + 100; -@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ if (sm->ft_reassoc_completed) { -+ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); -+ return 0; -+ } -+ - if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { - wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); - return -1; -@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ sm->ft_reassoc_completed = 1; -+ - if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) - return -1; - -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 41f371f..56f88dc 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -128,6 +128,7 @@ struct wpa_sm { - size_t r0kh_id_len; - u8 r1kh_id[FT_R1KH_ID_LEN]; - int ft_completed; -+ int ft_reassoc_completed; - int over_the_ds_in_progress; - u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ - int set_ptk_after_assoc; --- -2.7.4 - diff --git a/user/wpa_supplicant/undefined-ref.patch b/user/wpa_supplicant/undefined-ref.patch new file mode 100644 index 000000000..97a8cc7f3 --- /dev/null +++ b/user/wpa_supplicant/undefined-ref.patch @@ -0,0 +1,38 @@ +From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <j@w1.fi> +Date: Mon, 3 Dec 2018 12:00:26 +0200 +Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y + +remove_ie() was defined within an ifdef CONFIG_FILS block while it is +now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition +there. + +Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") +Signed-off-by: Jouni Malinen <j@w1.fi> +--- + wpa_supplicant/sme.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c +index 39c8069..f77f751 100644 +--- a/wpa_supplicant/sme.c ++++ b/wpa_supplicant/sme.c +@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) + } + + +-#ifdef CONFIG_FILS + #ifdef CONFIG_IEEE80211R + static void remove_ie(u8 *buf, size_t *len, u8 eid) + { +@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) + } + } + #endif /* CONFIG_IEEE80211R */ +-#endif /* CONFIG_FILS */ + + + void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, +-- +cgit v0.12 + diff --git a/user/x11perf/APKBUILD b/user/x11perf/APKBUILD index 2c3d265bb..eb39a1193 100644 --- a/user/x11perf/APKBUILD +++ b/user/x11perf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=x11perf -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=0 pkgdesc="X11 server benchmarking utility" url="https://www.X.Org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/x11perf-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 x11perf-1.6.0.tar.bz2" +sha512sums="b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b x11perf-1.6.1.tar.bz2" diff --git a/user/xcalc/APKBUILD b/user/xcalc/APKBUILD index d15d905fc..752b66ba9 100644 --- a/user/xcalc/APKBUILD +++ b/user/xcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcalc -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Graphical scientific calculator for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxaw-dev libxt-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xcalc-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcalc-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908 xcalc-1.0.6.tar.bz2" +sha512sums="890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388 xcalc-1.0.7.tar.bz2" diff --git a/user/xclock/APKBUILD b/user/xclock/APKBUILD index f8b9e4a22..e2f55308a 100644 --- a/user/xclock/APKBUILD +++ b/user/xclock/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xclock -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=0 pkgdesc="Clock applet for X11" url="https://www.X.Org/" @@ -11,10 +11,9 @@ depends="" makedepends="libx11-dev libxaw-dev libxkbfile-dev libxft-dev libxmu-dev libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xclock-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xclock-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 xclock-1.0.7.tar.bz2" +sha512sums="1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646 xclock-1.0.8.tar.bz2" diff --git a/user/xcompmgr/APKBUILD b/user/xcompmgr/APKBUILD index 27c149441..6149de629 100644 --- a/user/xcompmgr/APKBUILD +++ b/user/xcompmgr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcompmgr -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=0 pkgdesc="Small compositing manager for X11" url="https://www.X.Org/" @@ -11,10 +11,9 @@ depends="" makedepends="libxcomposite-dev libxdamage-dev libxext-dev libxfixes-dev libxrender-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xcompmgr-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcompmgr-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c xcompmgr-1.1.7.tar.bz2" +sha512sums="ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d xcompmgr-1.1.8.tar.bz2" diff --git a/user/xcursor-themes/APKBUILD b/user/xcursor-themes/APKBUILD index e61f4a537..72a65a9b9 100644 --- a/user/xcursor-themes/APKBUILD +++ b/user/xcursor-themes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcursor-themes -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Built-in cursor themes for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libxcursor-dev util-macros xcursorgen" subpackages="" -source="https://www.x.org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2" +sha512sums="2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2" diff --git a/user/xcursorgen/APKBUILD b/user/xcursorgen/APKBUILD index 395dfb95b..7e00406e0 100644 --- a/user/xcursorgen/APKBUILD +++ b/user/xcursorgen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcursorgen -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=0 pkgdesc="Cursor generator for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="MIT" depends="" makedepends="libpng-dev libx11-dev libxcursor-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 xcursorgen-1.0.6.tar.bz2" +sha512sums="bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2 xcursorgen-1.0.7.tar.bz2" diff --git a/user/xditview/APKBUILD b/user/xditview/APKBUILD index 6902402e2..7de93902e 100644 --- a/user/xditview/APKBUILD +++ b/user/xditview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xditview -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="X11 ditroff viewer" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xditview-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xditview-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2 xditview-1.0.4.tar.bz2" +sha512sums="e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2" diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD index 951fb10c4..ba8aafedd 100644 --- a/user/xev/APKBUILD +++ b/user/xev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xev -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=0 pkgdesc="X11 input event monitor" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxrandr-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xev-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xev-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca xev-1.2.2.tar.bz2" +sha512sums="47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index 655c9319f..4c168bea9 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-input-libinput -pkgver=0.28.1 +pkgver=0.28.2 pkgrel=0 pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,14 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623 xf86-input-libinput-0.28.1.tar.bz2" +sha512sums="da6eb632180649853b3aa2fb88debd6aafe5ede24a5f4a04a21cf18fa97fd414d300b86cdf8a42027c98ac89f1b9f88034fc9e364ac3a02fa38872e57b542a84 xf86-input-libinput-0.28.2.tar.bz2" diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index d1a8d21c7..4212237c5 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati -pkgver=18.1.0 +pkgver=19.0.1 pkgrel=0 pkgdesc="ATI video driver for X11" url="https://www.X.Org/" @@ -14,7 +14,6 @@ makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ @@ -26,9 +25,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53 xf86-video-ati-18.1.0.tar.bz2" +sha512sums="e04c5395e3a49d81b8f7a4b0e11fe8c9ebd17af056a4eab4541873796dce05b103c93fb185f3a00873010df0655cd7311e6d27e177aeb7345c4c8017bbd1eb17 xf86-video-ati-19.0.1.tar.bz2" diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index dd6bd27cd..40c9b8f82 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-nouveau -pkgver=1.0.15 -pkgrel=2 +pkgver=1.0.16 +pkgrel=0 pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" @@ -10,12 +10,9 @@ license="MIT" depends="mesa-dri-nouveau" makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2 - dont-strcmp-null.patch - " +source="https://www.X.Org/archive/individual/driver/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" ./configure \ --build=$CBUILD \ @@ -28,14 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285 xf86-video-nouveau-1.0.15.tar.bz2 -4cd8b3b9996989a8c9302a5ba77aa9f794fde7559d9f131d5bb4b3174d68be85140834719384c22686b63c89242bdf09696c0c1a98b632f7e3a4f46522f49c3b dont-strcmp-null.patch" +sha512sums="41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0 xf86-video-nouveau-1.0.16.tar.bz2" diff --git a/user/xf86-video-nouveau/dont-strcmp-null.patch b/user/xf86-video-nouveau/dont-strcmp-null.patch deleted file mode 100644 index 23c4fd216..000000000 --- a/user/xf86-video-nouveau/dont-strcmp-null.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 69aecdd305defdd014bc92b82acc6000988511cf Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 13 Jun 2017 09:23:42 -0400 -Subject: modesetting: Validate the atom for enum properties - -The client could have said anything here, and if what they said doesn't -actually name an atom NameForAtom() will return NULL, and strcmp() will -be unhappy about that. - -[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc] - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- - src/drmmode_display.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 2b71c9c..04a0b57 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -1081,7 +1081,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property, - if (value->type != XA_ATOM || value->format != 32 || value->size != 1) - return FALSE; - memcpy(&atom, value->data, 4); -- name = NameForAtom(atom); -+ if (!(name = NameForAtom(atom))) -+ return FALSE; - - /* search for matching name string, then set its value down */ - for (j = 0; j < p->mode_prop->count_enums; j++) { --- -cgit v1.1 - diff --git a/user/xf86-video-tdfx/APKBUILD b/user/xf86-video-tdfx/APKBUILD index 62b9217cc..7f8252934 100644 --- a/user/xf86-video-tdfx/APKBUILD +++ b/user/xf86-video-tdfx/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-tdfx -pkgver=1.4.7 +pkgver=1.5.0 pkgrel=0 pkgdesc="3Dfx video driver for X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="MIT" depends="" makedepends="util-macros xorgproto-dev xorg-server-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405 xf86-video-tdfx-1.4.7.tar.bz2" +sha512sums="eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff xf86-video-tdfx-1.5.0.tar.bz2" diff --git a/user/xfd/APKBUILD b/user/xfd/APKBUILD index 5011b28d4..ca4f5188d 100644 --- a/user/xfd/APKBUILD +++ b/user/xfd/APKBUILD @@ -1,20 +1,19 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfd -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="Display all characters in X11 fonts" url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="fontconfig-dev libxaw-dev libxft-dev libxmu-dev libxrender-dev - util-macros xorgproto-dev" +makedepends="fontconfig-dev libxaw-dev libxft-dev libxkbfile-dev libxmu-dev + libxrender-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xfd-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xfd-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 xfd-1.1.2.tar.bz2" +sha512sums="68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2" diff --git a/user/xfsinfo/APKBUILD b/user/xfsinfo/APKBUILD index 932c744c8..4c3805eff 100644 --- a/user/xfsinfo/APKBUILD +++ b/user/xfsinfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsinfo -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=0 pkgdesc="Display information about X11 font servers" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11 AND MIT" depends="" makedepends="libfs-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xfsinfo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xfsinfo-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="49fcbe91ac121022ccecd4a2f0e55a9a5cce7ba12b713be78b3b7f2847e622631bca6f6647256a956910fda591a87b524b966d5c849b8b2526d6f1a1960fe57f xfsinfo-1.0.5.tar.bz2" +sha512sums="901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2" diff --git a/user/xhost/APKBUILD b/user/xhost/APKBUILD index f263a2a79..39be52023 100644 --- a/user/xhost/APKBUILD +++ b/user/xhost/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=xhost -pkgver=1.0.7 -pkgrel=1 +pkgver=1.0.8 +pkgrel=0 pkgdesc="Controls host and/or user access to a running X server" url="https://www.X.Org/" arch="all" @@ -14,7 +14,6 @@ makedepends="libx11-dev libxmu-dev libxau-dev util-macros" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,8 +23,7 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7 xhost-1.0.7.tar.bz2" +sha512sums="55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2" diff --git a/user/xinit/APKBUILD b/user/xinit/APKBUILD index 0fd2879c0..37556cb27 100644 --- a/user/xinit/APKBUILD +++ b/user/xinit/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xinit -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="X.Org initialisation program" url="https://www.X.Org/" @@ -17,7 +17,6 @@ source="https://www.X.Org/releases/individual/app/xinit-$pkgver.tar.bz2 xserverrc" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install chmod +x "$pkgdir"/usr/bin/startx install -m755 -d "$pkgdir"/etc/skel @@ -46,7 +43,7 @@ package() { mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d } -sha512sums="53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e xinit-1.4.0.tar.bz2 +sha512sums="6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd 06_move_serverauthfile_into_tmp.patch 1b19f800d1f64e49b533929ea6b9580d6dc24b680e1461edcc5784ba9fbb387fef57576b1e3d4bc67cb0ff2b248b670c148a3c7a350e1062bb9b95e9a2ba7805 xinitrc 448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e xsession.skel diff --git a/user/xkeyboard-config/APKBUILD b/user/xkeyboard-config/APKBUILD index c884ad87b..9a49f7ffe 100644 --- a/user/xkeyboard-config/APKBUILD +++ b/user/xkeyboard-config/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xkeyboard-config -pkgver=2.25 +pkgver=2.26 pkgrel=0 pkgdesc="Keyboard configuration files for X11" url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" @@ -12,8 +12,6 @@ subpackages="$pkgname-lang" source="https://www.X.Org/releases/individual/data/xkeyboard-config/xkeyboard-config-$pkgver.tar.bz2" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,16 +23,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install rm -f "$pkgdir"/usr/share/X11/xkb/compiled install -m755 -d "$pkgdir"/var/lib/xkb - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb xkeyboard-config-2.25.tar.bz2" +sha512sums="5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef xkeyboard-config-2.26.tar.bz2" diff --git a/user/xlogo/APKBUILD b/user/xlogo/APKBUILD index 6ed763de5..ff675f734 100644 --- a/user/xlogo/APKBUILD +++ b/user/xlogo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xlogo -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=0 pkgdesc="Display the X11 logo" url="https://www.X.Org/" @@ -13,14 +13,7 @@ makedepends="libsm-dev libx11-dev libxaw-dev libxext-dev libxmu-dev libxt-dev subpackages="$pkgname-doc" source="https://www.x.org/releases/individual/app/xlogo-$pkgver.tar.bz2" -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} - build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d xlogo-1.0.4.tar.bz2" +sha512sums="0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2" diff --git a/user/xlsatoms/APKBUILD b/user/xlsatoms/APKBUILD index bc05dceb0..5e9ff64a0 100644 --- a/user/xlsatoms/APKBUILD +++ b/user/xlsatoms/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xlsatoms -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=0 pkgdesc="List interned atoms in an X11 server" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libxcb-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xlsatoms-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xlsatoms-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa xlsatoms-1.1.2.tar.bz2" +sha512sums="c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2" diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index fb55ea436..171427b55 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,6 +1,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=xmlsec -pkgver=1.2.27 +pkgver=1.2.28 +_pkgver=1_2_28 pkgrel=0 pkgdesc="C-based XML signature and encryption syntax and processing library" url="https://github.com/lsh123/$pkgname/" @@ -12,17 +13,15 @@ checkdepends="nss-tools" makedepends="$depends_dev libxml2-dev libxslt-dev nss-dev openssl-dev autoconf automake libtool" subpackages="$pkgname-nss $pkgname-dev $pkgname-doc" -source="$url/archive/$pkgname-${pkgver//./_}.tar.gz" -builddir="$srcdir/$pkgname-$pkgname-${pkgver//./_}" +source="$url/archive/$pkgname-$_pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgname-$_pkgver" prepare() { - cd "$builddir" default_prepare ./autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -37,12 +36,10 @@ build() { } check() { - cd "$builddir" make -k check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" @@ -56,4 +53,4 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="261528086adc379942861b5950e5b34ffa52a49d0fedcb46bece50c920fd56af4f0472494419bfa5e3cb40abda335b3e9c11466c42273f125b50d204b4604798 xmlsec-1_2_27.tar.gz" +sha512sums="fb0c775f6455ce5a5579a69bb91d60fe90c023e538c32bdf2a70aa413a53b22ef938349a3ce6b42bb23f8f70b4e00f1b9917f877487bb1507c927ec70c3d95f5 xmlsec-1_2_28.tar.gz" diff --git a/user/xmodmap/APKBUILD b/user/xmodmap/APKBUILD index 58e14c998..abf6c45ba 100644 --- a/user/xmodmap/APKBUILD +++ b/user/xmodmap/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmodmap -pkgver=1.0.9 -pkgrel=3 +pkgver=1.0.10 +pkgrel=0 pkgdesc="Utility for modifying key and mouse button mappings in X11" url="https://www.X.Org/" arch="all" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build () { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,14 +24,11 @@ build () { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac xmodmap-1.0.9.tar.bz2" +sha512sums="324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04 xmodmap-1.0.10.tar.bz2" diff --git a/user/xmore/APKBUILD b/user/xmore/APKBUILD index bf2d861bd..75514d1f1 100644 --- a/user/xmore/APKBUILD +++ b/user/xmore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xmore -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=0 pkgdesc="Display text files using X11" url="https://www.X.Org/" @@ -10,16 +10,9 @@ license="X11" depends="" makedepends="libxaw-dev util-macros" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xmore-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} +source="https://www.X.Org/releases/individual/app/xmore-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -31,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb xmore-1.0.2.tar.bz2" +sha512sums="e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2" diff --git a/user/xprop/APKBUILD b/user/xprop/APKBUILD index 6ea54cbb0..1339105a2 100644 --- a/user/xprop/APKBUILD +++ b/user/xprop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xprop -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=0 pkgdesc="X11 property inspector" url="https://cgit.freedesktop.org/xorg/app/xprop/" @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/archive/individual/app/xprop-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -22,13 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a xprop-1.2.3.tar.bz2" +sha512sums="6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7 xprop-1.2.4.tar.bz2" diff --git a/user/xrdb/APKBUILD b/user/xrdb/APKBUILD index cf528a143..b82a20f35 100644 --- a/user/xrdb/APKBUILD +++ b/user/xrdb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xrdb -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=0 pkgdesc="Utility to manipulate the X11 server resources database" url="https://www.X.Org/" @@ -14,7 +14,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,13 +26,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f xrdb-1.1.1.tar.bz2" +sha512sums="14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef xrdb-1.2.0.tar.bz2" diff --git a/user/xstdcmap/APKBUILD b/user/xstdcmap/APKBUILD index 5c2622cf3..076ac3256 100644 --- a/user/xstdcmap/APKBUILD +++ b/user/xstdcmap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xstdcmap -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=0 pkgdesc="Define standard X11 colour map properties" url="https://www.X.Org/" @@ -10,17 +10,9 @@ license="X11" depends="" makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" - -prepare() { - cd "$builddir" - default_prepare - chmod a+w config.sub - update_config_sub -} +source="https://www.X.Org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 xstdcmap-1.0.3.tar.bz2" +sha512sums="2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 5466d1c55..3c8e5f5b4 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -9,9 +9,10 @@ arch="all" options="!check" # no tests license="X11" makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev - libxext-dev freetype-dev ncurses-dev pcre-dev" + libxext-dev libxrender-dev libxft-dev freetype-dev ncurses-dev + pcre-dev" subpackages="$pkgname-doc" -source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz +source="https://invisible-mirror.net/archives/xterm/xterm-$pkgver.tgz posix-ptmx.patch " diff --git a/user/xtrans/APKBUILD b/user/xtrans/APKBUILD index 7a3a74a93..a65dd7dc3 100644 --- a/user/xtrans/APKBUILD +++ b/user/xtrans/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xtrans -pkgver=1.3.5 -pkgrel=1 +pkgver=1.4.0 +pkgrel=0 pkgdesc="X transport library" url="https://www.X.Org/" arch="noarch" @@ -12,7 +12,6 @@ subpackages="$pkgname-doc" source="https://www.X.Org/releases/individual/lib/$pkgname-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,14 +20,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b xtrans-1.3.5.tar.bz2" +sha512sums="4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2" diff --git a/user/xvinfo/APKBUILD b/user/xvinfo/APKBUILD index 82d0e29ad..311f48b01 100644 --- a/user/xvinfo/APKBUILD +++ b/user/xvinfo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xvinfo -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=0 pkgdesc="View information about video adaptors attached to X11" url="https://www.X.Org/" @@ -10,10 +10,9 @@ license="X11" depends="" makedepends="libxv-dev" subpackages="$pkgname-doc" -source="https://www.x.org/releases/individual/app/xvinfo-$pkgver.tar.bz2" +source="https://www.X.Org/releases/individual/app/xvinfo-$pkgver.tar.bz2" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,13 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc xvinfo-1.1.3.tar.bz2" +sha512sums="85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2" diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD index af5d02712..d7a2f6888 100644 --- a/user/youtube-dl/APKBUILD +++ b/user/youtube-dl/APKBUILD @@ -3,7 +3,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=youtube-dl -pkgver=2018.11.23 +pkgver=2019.04.17 pkgrel=0 pkgdesc="Command-line program to download videos from YouTube and many other sites" url="https://youtube-dl.org" @@ -27,12 +27,10 @@ prepare() { } check() { - cd "$builddir" python3 -m unittest discover } package() { - cd "$builddir" python3 setup.py install --root="$pkgdir/" --optimize=1 } @@ -65,4 +63,4 @@ fishcomp() { "$subpkgdir/usr/share/fish/completions/" } -sha512sums="d4d2813657972c37d3493743a44055d7a776aeb5c5a97902e07caa317a3b2db30332507c37b56b3d8554e0bdc2a0ec6a9862977b449b363343a4de2df12bf059 youtube-dl-2018.11.23.tar.gz" +sha512sums="6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148 youtube-dl-2019.04.17.tar.gz" diff --git a/user/z3/APKBUILD b/user/z3/APKBUILD new file mode 100644 index 000000000..2864319ac --- /dev/null +++ b/user/z3/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=z3 +pkgver=4.8.4 +pkgrel=0 +pkgdesc="Mathematical theorem prover" +url=" " +arch="all" +license="MIT" +depends="" +makedepends="gmp-dev python3-dev cmd:which" +subpackages="$pkgname-dev py3-$pkgname:py3:noarch" +source="https://github.com/Z3Prover/z3/archive/z3-$pkgver.tar.gz" +builddir="$srcdir/z3-z3-$pkgver" + +build() { + PYTHON=python3 ./configure \ + --prefix=/usr \ + --gmp \ + --python + make -C build +} + +check() { + make -C build test-z3 + build/test-z3 /a +} + +package() { + make -C build DESTDIR="$pkgdir" install +} + +py3() { + pkgdesc="$pkgdesc (Python bindings)" + depends="python3" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ +} + +sha512sums="4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4 z3-4.8.4.tar.gz" diff --git a/user/zstd/APKBUILD b/user/zstd/APKBUILD index b930a1a1e..dc23629a8 100644 --- a/user/zstd/APKBUILD +++ b/user/zstd/APKBUILD @@ -1,31 +1,27 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=zstd -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=0 pkgdesc="Fast real-time compression algorithm" url="https://facebook.github.io/zstd/" arch="all" license="BSD-3-Clause AND GPL-2.0-only" depends="" -depends_dev="" -makedepends="$depends_dev lz4-dev xz-dev zlib-dev" +makedepends="lz4-dev xz-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/facebook/zstd/releases/download/v$pkgver/zstd-$pkgver.tar.gz" build() { - cd "$builddir" make PREFIX="/usr" } check() { - cd "$builddir" make PREFIX="/usr" check } package() { - cd "$builddir" make PREFIX="/usr" DESTDIR="$pkgdir" install } -sha512sums="fb9ac61b79b22a628e602e68f7c59c85a00020f7f25b8653076895da7589ca1203adc7fe3d9b865f36648bc30d765b9630cf0955f970596253da74c089b97af1 zstd-1.3.7.tar.gz" +sha512sums="5c1c0a7a998b814a9edc1466f6d321b0d8ffcf927295fd5499137c9075a8823be03d98f61ea5212d1969f8d52b32e940b1cc10d1507d7702424ea2eea0e79a1b zstd-1.3.8.tar.gz" |