diff options
28 files changed, 671 insertions, 268 deletions
diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD index b47e03f7a..38acc491c 100644 --- a/system/ed/APKBUILD +++ b/system/ed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=ed -pkgver=1.14.2 -pkgrel=2 +pkgver=1.15 +pkgrel=0 pkgdesc="GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files" url="https://www.gnu.org/software/ed/" arch="all" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="653bcb89788b2d18c726336fb6f17678ac031fe6ea03a93ff248886a075c867ba5423d5471401e44cbdcce3b4cb766b621ca7b70d76881f5044ec3412767b11f ed-1.14.2.tar.lz" +sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba ed-1.15.tar.lz" diff --git a/user/catcodec/APKBUILD b/user/catcodec/APKBUILD new file mode 100644 index 000000000..9a18b7b29 --- /dev/null +++ b/user/catcodec/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=catcodec +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Encode and decode sound sample catalogues for OpenTTD" +url="https://www.openttd.org/en/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-$pkgver-source.tar.xz" + +build() { + cd "$builddir" + make +} + +package() { + cd "$builddir" + make prefix=/usr DESTDIR="$pkgdir" install +} + +sha512sums="e6e17da17f2449ff5d3a18c34ba3125d475a481ef1dc73ba03dac32fc8523a8929d2cbdfda5f647a0226aa007a217fc90c85ec4cc46937f75e15a596277e0db5 catcodec-1.0.5-source.tar.xz" diff --git a/user/docbook2x/APKBUILD b/user/docbook2x/APKBUILD index edd43eb3c..463e60300 100644 --- a/user/docbook2x/APKBUILD +++ b/user/docbook2x/APKBUILD @@ -11,6 +11,7 @@ depends="docbook-xml docbook-xsl libxml2-utils libxslt perl-xml-sax" makedepends="$depends_dev" subpackages="$pkgname-doc" source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz + autoconf.patch doc-typo.patch manpage-comments.patch refentry-whitespace.patch @@ -42,6 +43,7 @@ package() { } sha512sums="cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c docbook2X-0.8.8.tar.gz +eec73ea9e5b626dbc7d0107226ea15dd1b84194f83d97bd93b52d61acc6e03e7d683c6b52d3bd191a995db034dd09044005a18b565b9f55fe5ec2824eec0b639 autoconf.patch a563b46e7eaa8052dc2daea6ad8b0f3b12780ef063fafd37a6345ae663f6229ccb0b52be5e7b1fd6584d31e56de89af391efb856bbabfed164353578b39fb458 doc-typo.patch f204384bb206324d813b36e4e87e6a96f8b5808bfb3d7396505c84efc6784d4950a87533a3be1c67fce5f7b1d2f76eee8cf57f3ae48e3df43cf0cdc6531fbe14 manpage-comments.patch 10ce7f7da9bb2e05701a38d9e6900e87e62043604736eef5dbb52d8b143c8693463cffacf24453ec3d1e057b0b243d1c53952247f412e6f036c7067ad5840c1f refentry-whitespace.patch diff --git a/user/docbook2x/autoconf.patch b/user/docbook2x/autoconf.patch new file mode 100644 index 000000000..f4a471d67 --- /dev/null +++ b/user/docbook2x/autoconf.patch @@ -0,0 +1,30 @@ +The evaluation of datadir results in "${prefix}/share" without +evaluation of the ${prefix} variable with autoconf 2.60. + +Index: docbook2X-0.8.8/configure.ac +=================================================================== +--- docbook2X-0.8.8.orig/configure.ac ++++ docbook2X-0.8.8/configure.ac +@@ -148,7 +148,7 @@ + dnl they will reside and should use these static_* values. + dnl Ensure that all static_* are fully expanded. + +-eval static_datadir="$datadir" ++eval eval static_datadir="$datadir" + + eval static_bindir="$bindir" + old_val="" +--- docbook2X-0.8.8/configure.old 2007-03-03 13:45:28.000000000 +0000 ++++ docbook2X-0.8.8/configure 2019-01-13 19:36:53.820000000 +0000 +@@ -5266,6 +5266,11 @@ + + + eval static_datadir="$datadir" ++old_val="" ++until test "$static_datadir" = "$old_val"; do ++ old_val="$static_datadir" ++ eval static_datadir="$static_datadir" ++done + + eval static_bindir="$bindir" + old_val="" diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD new file mode 100644 index 000000000..c0e97d2ac --- /dev/null +++ b/user/grfcodec/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=grfcodec +pkgver=6.0.6 +pkgrel=0 +pkgdesc="Tool for manipulating OpenTTD GRF files" +url="https://dev.openttdcoop.org/projects/grfcodec" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="boost-dev" +subpackages="$pkgname-doc" +source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz" + +build() { + cd "$builddir" + make +} + +package() { + cd "$builddir" + make prefix=/usr DESTDIR="$pkgdir" install +} + +sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 grfcodec-6.0.6-source.tar.xz" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 877f9bed9..765718db2 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.1 +pkgver=3.24.2 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -19,7 +19,8 @@ makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev replaces="gtk+" replaces_dev="gtk+-dev" replaces_doc="gtk+-doc" -source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + releng-what-releng.patch" builddir="$srcdir"/gtk+-$pkgver build() { @@ -53,4 +54,5 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d gtk+-3.24.1.tar.xz" +sha512sums="da225045cc577fccb4dc5fd2595da812d802b597950e378a678a0be0250815d982cb0b53519a2cdc02755f123164dbdad79a9178c03ecf29c85a45e757c47840 gtk+-3.24.2.tar.xz +33431daf4ceb2983768a66d7368bc6ce9769eff481c35420e60e4a3650edc24843f10c13328bc95d77d9170ee478e0d5d672f5ae5087c3ab73b47391cf8a8dbd releng-what-releng.patch" diff --git a/user/gtk+3.0/releng-what-releng.patch b/user/gtk+3.0/releng-what-releng.patch new file mode 100644 index 000000000..5a1091de3 --- /dev/null +++ b/user/gtk+3.0/releng-what-releng.patch @@ -0,0 +1,12 @@ +diff -Nurd gtk+-3.24.2/docs/tools/shooter.c gtk+-3.24.2.new/docs/tools/shooter.c +--- gtk+-3.24.2/docs/tools/shooter.c 2018-12-12 11:46:09.000000000 -0600 ++++ gtk+-3.24.2.new/docs/tools/shooter.c 2019-01-10 20:55:41.402365069 -0600 +@@ -170,7 +170,7 @@ + y_orig = 0; + } + +- if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ())) ++ if (x_orig + width > gdk_screen_get_width (gdk_screen_get_default ())) + width = gdk_screen_width () - x_orig; + + if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ())) diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 7f3d91d5d..b4675904a 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=icewm -pkgver=1.4.2 +pkgver=1.5.1 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -10,14 +10,11 @@ options="!check" # no tests license="LGPL-2.0-only AND MirOS" depends="" makedepends="libxft-dev libxinerama-dev libxpm-dev libjpeg-turbo-dev - libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev $depends_dev" + libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev librsvg-dev + alsa-lib-dev libsndfile-dev libao-dev asciidoctor $depends_dev" install="" subpackages="$pkgname-doc $pkgname-lang" -source="https://github.com/bbidulock/icewm/releases/download/$pkgver/icewm-$pkgver.tar.bz2 - guard-string-funcs.patch - portable-ylocale.patch - fix-globit.patch - " +source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.xz" prepare() { default_prepare @@ -47,7 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0d227d75d2e3e6e5314eb0990375b85a34496e61e8b504ee023decb52b0c3a20bfd65c0d491b738d3742ddf3f21acfabfc8e4d43df51d137f568580b6c5ed0cd icewm-1.4.2.tar.bz2 -07bbaff552d26828089d6c0aaa4a70d321c2e1b21a70545232c31b464281a857c267ba93b23d8267c4cc7e599067be6508554d2b9aea3aa2b18372c9bb7b4dfe guard-string-funcs.patch -d7389a2ee6627612280991765c9c4a3c3d8305624b28bef0aa9b7d8316fc4708bd8e32dc5777fb3abed61cec8546e905257fe1cdb6ad7e3da2c169e747199173 portable-ylocale.patch -1cadda6a5ac03ebe7671e173af4bff43be9ba4680d015edf4222fd739b6d11c1d6b1ca058f6cf5c350d5bf7d587298a23e178b660d121c517e8bc551f3fec5aa fix-globit.patch" +sha512sums="e7329ccf87da5ad12402c70a3946303f58c76563d25319b9e8f6d153b34a67df0e17612874f8af3bea701b52d15168557842e8ffce0a5a255c59e67bd2022a01 icewm-1.5.1.tar.xz" diff --git a/user/icewm/fix-globit.patch b/user/icewm/fix-globit.patch deleted file mode 100644 index be04bd219..000000000 --- a/user/icewm/fix-globit.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3817103bae789b2bff7cf8c1bbe2255b60878ab3 Mon Sep 17 00:00:00 2001 -From: Bert Gijsbers <gijsbers@science.uva.nl> -Date: Sun, 3 Jun 2018 09:34:12 +0200 -Subject: [PATCH] portability - ---- - src/globit.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/globit.c b/src/globit.c -index 9bc8dc76..726c8bd8 100644 ---- a/src/globit.c -+++ b/src/globit.c -@@ -143,7 +143,9 @@ globit_best(const char *pattern_, char **result) - } else if (*pattern == '~') { - /* yes, tilde */ - is_absolute = 2; -+#ifdef GLOB_TILDE - glob_flags |= GLOB_TILDE; -+#endif - /* any slash in the pattern? */ - while (*cp && *cp != '/') - ++cp; diff --git a/user/icewm/guard-string-funcs.patch b/user/icewm/guard-string-funcs.patch deleted file mode 100644 index dfb412b9c..000000000 --- a/user/icewm/guard-string-funcs.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 57b8f15fbd67709055c245222b0c20cd27d3c3a1 Mon Sep 17 00:00:00 2001 -From: Bert Gijsbers <gijsbers@science.uva.nl> -Date: Mon, 31 Jul 2017 21:30:20 +0200 -Subject: [PATCH] Changes for ALTLinux which has its own prototypes for - strlcpy/strlcat. Also cleanup obsolete AC_FUNC_*s and sort -u the - CHECK_FUNCs. Add two AC_RUN_IFELSE to detect correct operations of - strlcpy/strcat. Define HAVE_STRLCPY / HAVE_STRLCAT if they do. Don't include - our own strlcpy/strlcat if these are defined. - ---- - configure.ac | 49 ++++++++++++++++++++++++++++++++++++++++--------- - src/CMakeLists.txt | 19 +++++++------------ - src/base.h | 5 +++++ - src/misc.cc | 4 ++++ - 4 files changed, 56 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fe9176ea..e00cb147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,21 +110,52 @@ AC_CHECK_SIZEOF(long, 4) - AC_TYPE_SIGNAL - - # Checks for library functions. --AC_FUNC_STRFTIME --AC_FUNC_VPRINTF --AC_FUNC_ERROR_AT_LINE - if test x$cross_compling != xyes ; then :; AC_FUNC_FORK fi --AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK - if test x$cross_compling != xyes ; then :; AC_FUNC_MALLOC fi --AC_FUNC_MMAP - if test x$cross_compling != xyes ; then :; AC_FUNC_REALLOC fi --AC_FUNC_STRNLEN --AC_CHECK_FUNCS([dup2 getcwd gethostbyname gethostname gettimeofday mblen memchr memmove memset mkdir nl_langinfo putenv select setlocale socket strcasecmp strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol sysinfo uname abort wordexp]) --AC_CHECK_FUNCS([gettimeofday putenv select socket strtol strtoul basename]) --AC_CHECK_FUNCS([sysctlbyname asprintf]) -+AC_CHECK_FUNCS([abort basename dup2]) -+AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday]) -+AC_CHECK_FUNCS([mblen memchr memmove memset mkdir nl_langinfo]) -+AC_CHECK_FUNCS([select setlocale socket]) -+AC_CHECK_FUNCS([strcasecmp strchr strcspn strdup strerror]) -+AC_CHECK_FUNCS([strncasecmp strrchr strspn strstr strtol strtoul]) -+AC_CHECK_FUNCS([sysctlbyname sysinfo uname wordexp]) - AC_CHECK_FUNC([getloadavg],[AC_DEFINE([HAVE_GETLOADAVG2], 1, [getloadavg() is available])]) - AC_FUNC_SELECT_ARGTYPES - -+AC_MSG_CHECKING([for strlcpy]) -+AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ -+ char a[2]; -+ if (strlcpy(a, "yes", 2) != 3) -+ return 1;]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCPY], 1, -+ [Define to 1 if you have the strlcpy function.]) -+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCPY], 0, -+ [Define to 1 if you have the strlcpy function.]) -+ ]) -+ -+AC_MSG_CHECKING([for strlcat]) -+AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ -+ char a[4] = "no"; -+ if (strlcat(a, "yes", 4) != 5) -+ return 1;]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCAT], 1, -+ [Define to 1 if you have the strlcat function.]) -+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCAT], 0, -+ [Define to 1 if you have the strlcat function.]) -+ ]) -+ -+ - PKG_CHECK_MODULES([CORE],[fontconfig xext x11]) - AC_SUBST([CORE_CFLAGS]) - AC_SUBST([CORE_LIBS]) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index da476a0b..6f694c18 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -59,10 +59,12 @@ endif() - # for x in `cat funclist` ; do grep $x src/* lib/* && echo $x >> exlist ; done - # perl -e 'print "CHECK_FUNCTION_EXISTS($_ HAVE_".uc($_).")\n" for @ARGV' `cat exlist` - # perl -e 'print "#cmakedefine HAVE_".uc($_)."\n" for @ARGV' `cat exlist` -+CHECK_FUNCTION_EXISTS(abort HAVE_ABORT) -+CHECK_FUNCTION_EXISTS(basename HAVE_BASENAME) - CHECK_FUNCTION_EXISTS(dup2 HAVE_DUP2) --CHECK_FUNCTION_EXISTS(getcwd HAVE_GETCWD) - CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME) - CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME) -+CHECK_FUNCTION_EXISTS(getloadavg HAVE_GETLOADAVG) - CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) - CHECK_FUNCTION_EXISTS(mblen HAVE_MBLEN) - CHECK_FUNCTION_EXISTS(memchr HAVE_MEMCHR) -@@ -70,7 +72,6 @@ CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) - CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) - CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR) - CHECK_FUNCTION_EXISTS(nl_langinfo HAVE_NL_LANGINFO) --CHECK_FUNCTION_EXISTS(putenv HAVE_PUTENV) - CHECK_FUNCTION_EXISTS(select HAVE_SELECT) - CHECK_FUNCTION_EXISTS(setlocale HAVE_SETLOCALE) - CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET) -@@ -79,23 +80,17 @@ CHECK_FUNCTION_EXISTS(strchr HAVE_STRCHR) - CHECK_FUNCTION_EXISTS(strcspn HAVE_STRCSPN) - CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP) - CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) -+CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY) -+CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT) - CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP) - CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR) - CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN) - CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR) - CHECK_FUNCTION_EXISTS(strtol HAVE_STRTOL) -+CHECK_FUNCTION_EXISTS(strtoul HAVE_STRTOL) -+CHECK_FUNCTION_EXISTS(sysctlbyname HAVE_SYSCTLBYNAME) - CHECK_FUNCTION_EXISTS(sysinfo HAVE_SYSINFO) - CHECK_FUNCTION_EXISTS(uname HAVE_UNAME) --CHECK_FUNCTION_EXISTS(abort HAVE_ABORT) --CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) --CHECK_FUNCTION_EXISTS(putenv HAVE_PUTENV) --CHECK_FUNCTION_EXISTS(select HAVE_SELECT) --CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET) --CHECK_FUNCTION_EXISTS(strtol HAVE_STRTOL) --CHECK_FUNCTION_EXISTS(basename HAVE_BASENAME) --CHECK_FUNCTION_EXISTS(sysctlbyname HAVE_SYSCTLBYNAME) --CHECK_FUNCTION_EXISTS(getloadavg HAVE_GETLOADAVG) --CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF) - CHECK_FUNCTION_EXISTS(wordexp HAVE_WORDEXP) - - CHECK_LIBRARY_EXISTS (X11 XInternAtoms "" HAVE_XINTERNATOMS) -diff --git a/src/base.h b/src/base.h -index 0df34ccb..2083ca6f 100644 ---- a/src/base.h -+++ b/src/base.h -@@ -49,9 +49,14 @@ inline T abs(T v) { - /*** String Functions *********************************************************/ - - /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ -+#ifndef HAVE_STRLCPY - size_t strlcpy(char *dest, const char *from, size_t dest_size); -+#endif -+ - /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ -+#ifndef HAVE_STRLCAT - size_t strlcat(char *dest, const char *from, size_t dest_size); -+#endif - - char *newstr(char const *str); - char *newstr(char const *str, int len); -diff --git a/src/misc.cc b/src/misc.cc -index b0ac1c95..97638495 100644 ---- a/src/misc.cc -+++ b/src/misc.cc -@@ -448,6 +448,7 @@ void operator delete[](void *p) { - #endif - - /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ -+#ifndef HAVE_STRLCPY - size_t strlcpy(char *dest, const char *from, size_t dest_size) - { - const char *in = from; -@@ -461,8 +462,10 @@ size_t strlcpy(char *dest, const char *from, size_t dest_size) - while (*in) ++in; - return in - from; - } -+#endif - - /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ -+#ifndef HAVE_STRLCAT - size_t strlcat(char *dest, const char *from, size_t dest_size) - { - char *to = dest; -@@ -470,6 +473,7 @@ size_t strlcat(char *dest, const char *from, size_t dest_size) - while (to < stop && *to) ++to; - return to - dest + strlcpy(to, from, dest_size - (to - dest)); - } -+#endif - - char *newstr(char const *str) { - return (str != NULL ? newstr(str, strlen(str)) : NULL); --- -2.15.0 - diff --git a/user/icewm/portable-ylocale.patch b/user/icewm/portable-ylocale.patch deleted file mode 100644 index b9a2b243c..000000000 --- a/user/icewm/portable-ylocale.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurd icewm-1.4.2/src/ylocale.cc icewm-1.4.2.new/src/ylocale.cc ---- icewm-1.4.2/src/ylocale.cc 2017-07-30 03:53:35.524267864 -0500 -+++ icewm-1.4.2.new/src/ylocale.cc 2018-06-27 08:29:55.967038048 -0500 -@@ -56,7 +56,11 @@ - #ifdef CONFIG_NL_CODESETS - CONFIG_NL_CODESETS - #else -- CODESET, _NL_CTYPE_CODESET_NAME, 0 -+ CODESET, -+#ifdef _NL_CTYPE_CODESET_NAME -+ _NL_CTYPE_CODESET_NAME, -+#endif -+ 0 - #endif - }; - diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD index c3d89fd43..d722a9c53 100644 --- a/user/libwnck/APKBUILD +++ b/user/libwnck/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libwnck -pkgver=3.24.1 +pkgver=3.30.0 +_pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Window navigator construction kit library from Gnome" url="https://gnome.org" @@ -10,9 +11,7 @@ license="LGPL-2.0+" makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev vala-dev startup-notification-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/libwnck/3.24/libwnck-$pkgver.tar.xz" -sha512sums="e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1 libwnck-3.24.1.tar.xz" -builddir="$srcdir/libwnck-$pkgver" +source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz" build() { cd "$builddir" @@ -36,3 +35,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128 libwnck-3.30.0.tar.xz" diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 0aabeb17e..b68f414f2 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.48.2 +pkgver=0.49.0 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="http://mesonbuild.com/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="6d8a7f8089a56bb96c01e7ced4b8cb3ffc95c1d35e7940573dbd77fa563d42c19cf9e1477e0712ca7e504d469579d9c7ac2656a2bea63f46a8fcafd66d541193 meson-0.48.2.tar.gz" +sha512sums="f36994d1a030c985a51aa335eaceea608dcb1692cea7d2d4caeeb2b3bf471837dffdc502aa940742eb8c605d15b8adb35ba36b7da5d10455b7fd0ef5a48663e3 meson-0.49.0.tar.gz" diff --git a/user/nml/APKBUILD b/user/nml/APKBUILD new file mode 100644 index 000000000..6b7f9facb --- /dev/null +++ b/user/nml/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=nml +pkgver=0.4.5 +pkgrel=0 +pkgdesc="NewGRF Meta Language utilities for OpenTTD mods" +url="https://newgrf-specs.tt-wiki.net/wiki/NML:Main" +arch="all" +license="GPL-2.0+" +depends="python3 py3-pillow py3-ply" +makedepends="python3-dev" +subpackages="" +source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz" + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + make -C regression +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz" diff --git a/user/openal-soft/APKBUILD b/user/openal-soft/APKBUILD index db823c6de..fe3cbda8b 100644 --- a/user/openal-soft/APKBUILD +++ b/user/openal-soft/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=openal-soft -pkgver=1.18.2 -pkgrel=1 +pkgver=1.19.1 +pkgrel=0 pkgdesc="Software implementation of OpenAL API" url="http://kcat.strangesoft.net/openal.html" arch="all" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d openal-soft-1.18.2.tar.bz2" +sha512sums="356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 openal-soft-1.19.1.tar.bz2" diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD new file mode 100644 index 000000000..b0ab22c55 --- /dev/null +++ b/user/opengfx/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=opengfx +pkgver=0.5.4 +pkgrel=0 +pkgdesc="Graphics files for OpenTTD" +url="https://www.openttd.org/en/" +arch="noarch" +options="!check" # Requires GIMP +license="GPL-2.0-only" +depends="" +makedepends="grfcodec nml" +subpackages="" +source="http://bundles.openttdcoop.org/opengfx/releases/$pkgver/$pkgname-$pkgver-source.tar.xz + Makefile.patch + " +builddir="$srcdir/$pkgname-$pkgver-source" + +build() { + cd "$builddir" + make GIMP="" _V="" bundle_tar +} + +package() { + cd "$builddir" + local _file + for _file in *.grf opengfx.obg; do + install -D -m644 -g games $_file \ + "$pkgdir"/usr/share/games/openttd/data/$_file + done +} + +sha512sums="42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1 opengfx-0.5.4-source.tar.xz +f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9 Makefile.patch" diff --git a/user/opengfx/Makefile.patch b/user/opengfx/Makefile.patch new file mode 100644 index 000000000..169df9668 --- /dev/null +++ b/user/opengfx/Makefile.patch @@ -0,0 +1,31 @@ +--- opengfx-0.5.3-source/Makefile ++++ opengfx-0.5.3-source/Makefile +@@ -99,8 +99,8 @@ + AWK ?= awk + GREP ?= grep + PYTHON ?= python +-UNIX2DOS ?= $(shell which unix2dos) +-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "") ++UNIX2DOS ?= $(shell which unix2dos 2>/dev/null) ++UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "") + + # 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 + $(_E) "Release:" +- $(_E) "bananas: Upload bundle to BaNaNaS ++ $(_E) "bananas: Upload bundle to BaNaNaS" + $(_E) + $(_E) "Valid command line variables are:" + $(_E) "Helper programmes:" diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD new file mode 100644 index 000000000..5e29f657e --- /dev/null +++ b/user/openmsx/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=openmsx +pkgver=0.3.1 +pkgrel=0 +pkgdesc="Music files for OpenTTD" +url="https://www.openttd.org/en/" +arch="noarch" +options="!check" # No way to test MIDIs +license="GPL-2.0-only" +depends="" +makedepends="python3" +subpackages="" +source="https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-$pkgver-source.tar.gz + python3.patch + " +builddir="$srcdir/$pkgname-$pkgver-source" + +build() { + cd "$builddir" + make _V="" bundle +} + +package() { + cd "$builddir"/$pkgname-$pkgver + local _file + for _file in *.mid openmsx.obm; do + install -D -m644 -g games $_file \ + "$pkgdir"/usr/share/games/openttd/gm/$_file + done +} + +sha512sums="e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e openmsx-0.3.1-source.tar.gz +b6690158831cb3da9e0e65a523529ee0bb694a4a8b23c89f615b2481601a71fd84caecf29430054e69afa3ffcb53cf8dd5826358d7ef89429c661dd4d47bbb74 python3.patch" diff --git a/user/openmsx/python3.patch b/user/openmsx/python3.patch new file mode 100644 index 000000000..191aacfd6 --- /dev/null +++ b/user/openmsx/python3.patch @@ -0,0 +1,265 @@ +--- openmsx-0.3.1-source/scripts/authorlist.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/authorlist.py 2019-01-12 18:12:26.010000000 +0000 +@@ -10,7 +10,6 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: +@@ -18,10 +17,10 @@ + if data != '': + # do some processing of the contents of + # the data variable +- separate = string.split(data,";") +- print '%-30s %s' % (separate[1]+":", separate[2]) ++ separate = data.split(";") ++ print('%-30s %s' % (separate[1]+":", separate[2])) + # end of data processing command group +- # sys.stdout.write(res) ++ # sys.stdout.write(res) + else: + sys.stdout.flush() + break +--- openmsx-0.3.1-source/scripts/md5list.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/md5list.py 2019-01-12 18:16:21.260000000 +0000 +@@ -10,7 +10,6 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + import subprocess + import os +@@ -18,25 +17,25 @@ + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- systemtype = (os.uname())[0] +- if systemtype == 'Linux': +- md5call = ["md5sum"] +- elif systemtype == 'Darwin': +- md5call = ["md5", "-r"] +- else: +- md5call = ["md5sum"] +- md5call = md5call + ["src/"+string.strip(separate[1])] +- md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] +- md5sum = string.split(md5sum) +- res = "%-32s = %s\n" % (separate[1], md5sum[0]) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ systemtype = (os.uname())[0] ++ if systemtype == 'Linux': ++ md5call = ["md5sum"] ++ elif systemtype == 'Darwin': ++ md5call = ["md5", "-r"] ++ else: ++ md5call = ["md5sum"] ++ md5call = md5call + ["src/"+separate[1].strip()] ++ md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] ++ md5sum = md5sum.split() ++ res = "%-32s = %s\n" % (separate[1], md5sum[0].decode('utf-8')) + sys.stdout.write(res) + else: + sys.stdout.flush() +--- openmsx-0.3.1-source/scripts/midifiles.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/midifiles.py 2019-01-12 18:09:21.660000000 +0000 +@@ -10,23 +10,22 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + res = "" + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = res + " src/" + string.strip(separate[1]) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ res = res + " src/" + separate[1].strip() + else: +- sys.stdout.write(res) ++ sys.stdout.write(res) + sys.stdout.flush() + break +--- openmsx-0.3.1-source/scripts/namelist.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/namelist.py 2019-01-12 18:24:41.820000000 +0000 +@@ -10,27 +10,26 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = "%-32s = %s\n" % (separate[1], string.strip(separate[3])) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ res = "%-32s = %s\n" % (separate[1], separate[3].strip()) + sys.stdout.write(res) + else: + sys.stdout.flush() + break + + def authorlist(mystr): +- separate = string.split() +- for str in separate: +- print string.strip(str) +\ No newline at end of file ++ separate = mystr.split() ++ for str in separate: ++ print(str.strip()) +--- openmsx-0.3.1-source/scripts/playlist.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/playlist.py 2019-01-12 18:24:46.440000000 +0000 +@@ -10,31 +10,30 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- res = "" +- # leave out all lines which don't have the proper number of elements +- if len(separate) >= 1: +- res = string.strip(separate[0]) + " = " +- if len(separate) == 4: +- res = res + separate[1] +- res = res + "\n" ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ res = "" ++ # leave out all lines which don't have the proper number of elements ++ if len(separate) >= 1: ++ res = separate[0].strip() + " = " ++ if len(separate) == 4: ++ res = res + separate[1] ++ res = res + "\n" + sys.stdout.write(res) + else: + sys.stdout.flush() + break + + def authorlist(mystr): +- separate = string.split() +- for str in separate: +- print string.strip(str) +\ No newline at end of file ++ separate = mystr.split() ++ for str in separate: ++ print(str.strip()) +--- openmsx-0.3.1-source/scripts/sanitize_list.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/sanitize_list.py 2019-01-12 18:25:21.200000000 +0000 +@@ -10,34 +10,33 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = "" +- for str in separate: +- if res != '': +- res = res + ";" + string.strip(str) +- else: +- res = string.strip(str) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ res = "" ++ for str in separate: ++ if res != '': ++ res = res + ";" + str.strip() ++ else: ++ res = str.strip() + # end of data processing command group +- res = res + "\n" ++ res = res + "\n" + sys.stdout.write(res) + else: + sys.stdout.flush() + break + + def authorlist(mystr): +- separate = string.split() +- for str in separate: +- print string.strip(str) +\ No newline at end of file ++ separate = mystr.split() ++ for str in separate: ++ print(str.strip()) diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD new file mode 100644 index 000000000..00093833d --- /dev/null +++ b/user/opensfx/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=opensfx +pkgver=0.2.3 +pkgrel=0 +pkgdesc="Sound files for OpenTTD" +url="https://www.openttd.org/en/" +arch="noarch" +license="CC-Sampling-Plus-1.0" +depends="" +makedepends="catcodec" +subpackages="" +source="https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-$pkgver-source.tar.gz" +builddir="$srcdir/$pkgname-$pkgver-source" + +build() { + cd "$builddir" + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + install -D -m644 -g games opensfx.cat \ + "$pkgdir"/usr/share/games/openttd/data/opensfx.cat + install -D -m644 -g games opensfx.obs \ + "$pkgdir"/usr/share/games/openttd/data/opensfx.obs +} + +sha512sums="7575c8febcbcabe8f9042a1a197ba76b9020e335663bf70b0aaebafe4b0758f82ff7acc624b1dfdc12d38e346f139454b78ea29e18a8bb8bd2afd3d6a209669c opensfx-0.2.3-source.tar.gz" diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD new file mode 100644 index 000000000..63df0988e --- /dev/null +++ b/user/openttd/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=openttd +pkgver=1.8.0 +pkgrel=0 +pkgdesc="Simulation game based on Transport Tycoon Deluxe" +url="https://www.openttd.org/en/" +arch="all" +options="!check" # Test files not shipped in release package. +license="GPL-2.0-only" +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 + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --install-dir="$pkgdir" \ + --disable-strip + make +} + +package() { + cd "$builddir" + make install +} + +sha512sums="a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a openttd-1.8.0-source.tar.xz +db470433bcc68688b1a4cf71a514879c139300a778feb3f832bff0400b578d4b7720df6e259a86013334a661fce56c66d74aaf709d0027cf9638f006bebca10e icu61.patch" diff --git a/user/openttd/icu61.patch b/user/openttd/icu61.patch new file mode 100644 index 000000000..e4143d82f --- /dev/null +++ b/user/openttd/icu61.patch @@ -0,0 +1,45 @@ +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/poppler/APKBUILD b/user/poppler/APKBUILD index 4542c0de7..5b97c1ff8 100644 --- a/user/poppler/APKBUILD +++ b/user/poppler/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=poppler -pkgver=0.69.0 +pkgver=0.73.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" @@ -59,4 +59,4 @@ _cpp() { "$subpkgdir"/usr/lib/ } -sha512sums="9c0382059c786e17b16dc0847212006a7c05e51b3963a7470e49cede87c7855bdfa1b80b2d884e4fb4a430cdd5ab666391ecf53230486e245b6f28af03890e1d poppler-0.69.0.tar.xz" +sha512sums="6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a poppler-0.73.0.tar.xz" diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 990de722f..8fc6ce35c 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=prosody -pkgver=0.10.2 +pkgver=0.11.2 pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" @@ -17,7 +17,6 @@ pkgusers="prosody" pkggroups="prosody" source="https://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz prosody.cfg.lua.patch - mallinfo.patch $pkgname.initd " @@ -53,7 +52,6 @@ package() { install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -sha512sums="9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f prosody-0.10.2.tar.gz +sha512sums="22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1 prosody-0.11.2.tar.gz a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch -b07498cd42677d09f1a3fd4a5d91a085e90dd10cee7d6ee7c5e41438cfc2f4049ab9948c0fd0f7e148dd81f6a25c64c6ae832ea4864cee2329d3c6735216b78b mallinfo.patch 24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c prosody.initd" diff --git a/user/py3-ply/APKBUILD b/user/py3-ply/APKBUILD new file mode 100644 index 000000000..495a66d53 --- /dev/null +++ b/user/py3-ply/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-ply +pkgver=3.11 +pkgrel=0 +pkgdesc="lex(1) and yacc(1) parser in Python" +url="http://www.dabeaz.com/ply/" +arch="noarch" +license="BSD-3-Clause" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="http://www.dabeaz.com/ply/ply-$pkgver.tar.gz" +builddir="$srcdir/ply-$pkgver" + +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="37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008 ply-3.11.tar.gz" diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD index b93a99c1e..87de6f166 100644 --- a/user/py3-pycairo/APKBUILD +++ b/user/py3-pycairo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pycairo -pkgver=1.17.1 +pkgver=1.18.0 pkgrel=0 pkgdesc="Python bindings for Cairo" url="https://pycairo.readthedocs.io/" @@ -9,8 +9,7 @@ arch="all" license="MIT AND (LGPL-2.1-only OR MPL-1.1)" makedepends="python3-dev cairo-dev meson" subpackages="$pkgname-dev" -source="https://files.pythonhosted.org/packages/68/76/340ff847897296b2c8174dfa5a5ec3406e3ed783a2abac918cf326abad86/pycairo-$pkgver.tar.gz" -sha512sums="b6a6af4afa4ac92020b375a72e6f8a7981e6628d4e68877a7fd08bd8ae3835063000b16214d84a40aff4c6b4cf0937236724631ae6dac368a9db0bf3837063fe pycairo-1.17.1.tar.gz" +source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz" builddir="$srcdir/pycairo-$pkgver" build() { @@ -34,3 +33,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } +sha512sums="29af1eff8fc3ca942c6d7fcda8e5e004f01d1bfdab911f4ebb34213520922cf35c12d07bd18fe74a2c6d3c7f5a1aefd7fb5fe9b7cd310e6707b7451d5d5e18b0 pycairo-1.18.0.tar.gz" diff --git a/user/qpdf/APKBUILD b/user/qpdf/APKBUILD index 0b957061b..144939793 100644 --- a/user/qpdf/APKBUILD +++ b/user/qpdf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=qpdf -pkgver=8.2.1 +pkgver=8.3.0 pkgrel=0 pkgdesc="Command-line tools and library for transforming PDF files" url="http://qpdf.sourceforge.net" @@ -60,4 +60,4 @@ fix_qdf() { mv "$pkgdir"/usr/bin/fix-qdf "$subpkgdir"/usr/bin/ } -sha512sums="ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c qpdf-8.2.1.tar.gz" +sha512sums="9982a489cc6b9c880adc7decb18f1941930a86f430a00505f230364fbadf83c5afd832a1ccf7966a9453cdbb40b7c60db438f7b27d836a242eefb07a77d7284d qpdf-8.3.0.tar.gz" diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 7aa9b05af..ef45a6035 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-whiskermenu-plugin -pkgver=2.2.1 +pkgver=2.3.0 +_pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" url="https://xfce.org" @@ -10,7 +11,7 @@ options="!check" # no tests license="GPL-2.0+" makedepends="gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -source="http://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.2/xfce4-whiskermenu-plugin-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/$_pkgmaj/xfce4-whiskermenu-plugin-$pkgver.tar.bz2" build() { cd "$builddir" @@ -33,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e5b8ab54b66397d0d956d0ddcf7ab9c7531936fa7413094d4cae99aca8f7fca4659012beceec06c9bd6f1ba7695a3e0955d1fd2f10ebf08cf5701224a5dbeb18 xfce4-whiskermenu-plugin-2.2.1.tar.bz2" +sha512sums="c4dbf7b45d6dca59b0034dbe995ada5f51a09588d2dddbcb940c8c7af0975ebad066763534ac93e65896551e1a9b10459308a4b2f38772fb28d5d7ceabec043d xfce4-whiskermenu-plugin-2.3.0.tar.bz2" |