diff options
Diffstat (limited to 'user')
36 files changed, 694 insertions, 325 deletions
diff --git a/user/cdrtools/APKBUILD b/user/cdrtools/APKBUILD index c9e6c1d70..0145aa351 100644 --- a/user/cdrtools/APKBUILD +++ b/user/cdrtools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cdrtools pkgver=3.01 -pkgrel=0 +pkgrel=1 pkgdesc="Highly portable CD/DVD/Blu-Ray command line recording software" url="http://cdrecord.sourceforge.net/private/cdrecord.html" arch="all" @@ -26,6 +26,9 @@ check() { package() { cd "$builddir" smake INS_BASE=/usr DESTDIR="$pkgdir" install + + mv "$pkgdir"/usr/share/man/man3 "$pkgdir"/usr/share/man/man3sch + rename .3 .3sch "$pkgdir"/usr/share/man/man3sch/*.3 } sha512sums="54f06496e47184e324fc9d8b1153d3c806ed43c3c57e2a8d79a79afe12aa5334e82fa500fe1b1bf49307ad7dfabe687f6e1ad914fc2f0c5c429d8e6a34c293eb cdrtools-3.01.tar.bz2" diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD index 88a1ea38b..14ce2c5f6 100644 --- a/user/gnu-ghostscript/APKBUILD +++ b/user/gnu-ghostscript/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnu-ghostscript pkgver=9.14.1 -pkgrel=1 +pkgrel=2 pkgdesc="PostScript utilities" url="https://www.gnu.org/software/ghostscript/" arch="all" @@ -44,4 +44,4 @@ package() { } sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz -2c1d3a487ff7ee65855d3c587747bd8bf0f5a61ef30f4c84e6df237d6680a88ba72f328c7294eee0058eb69f770f3e539f29cb2ea4c55bcac98f22c5bd203020 do-not-use-sprintf.patch" +1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch" diff --git a/user/gnu-ghostscript/do-not-use-sprintf.patch b/user/gnu-ghostscript/do-not-use-sprintf.patch index 7bf03cd89..e0e84b4fe 100644 --- a/user/gnu-ghostscript/do-not-use-sprintf.patch +++ b/user/gnu-ghostscript/do-not-use-sprintf.patch @@ -18,3 +18,68 @@ wl(linebuf); } mergefile(os_prefix, inname, in, config, false); +--- gnu-ghostscript-9.14.1/cups/gdevcups.c.old 2014-07-02 15:13:25.000000000 +0000 ++++ gnu-ghostscript-9.14.1/cups/gdevcups.c 2019-01-23 20:56:04.082290416 +0000 +@@ -1039,7 +1039,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsInteger%d", i); ++ snprintf(name, sizeof(name), "cupsInteger%d", i); + if ((code = param_write_int(plist, strdup(name), + (int *)(cups->header.cupsInteger + i))) < 0) + return (code); +@@ -1047,7 +1047,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsReal%d", i); ++ snprintf(name, sizeof(name), "cupsReal%d", i); + if ((code = param_write_float(plist, strdup(name), + cups->header.cupsReal + i)) < 0) + return (code); +@@ -1055,7 +1055,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsString%d", i); ++ snprintf(name, sizeof(name), "cupsString%d", i); + param_string_from_string(s, cups->header.cupsString[i]); + if ((code = param_write_string(plist, strdup(name), &s)) < 0) + return (code); +@@ -3166,19 +3166,19 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsInteger%d", i); ++ snprintf(name, sizeof(name), "cupsInteger%d", i); + intoption(cupsInteger[i],strdup(name), unsigned) + } + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsReal%d", i); ++ snprintf(name, sizeof(name), "cupsReal%d", i); + floatoption(cupsReal[i], strdup(name)) + } + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsString%d", i); ++ snprintf(name, sizeof(name), "cupsString%d", i); + stringoption(cupsString[i], strdup(name)) + } + +@@ -4247,10 +4247,10 @@ + */ + + if (pdev->HWResolution[0] != pdev->HWResolution[1]) +- sprintf(resolution, "%.0fx%.0fdpi", pdev->HWResolution[0], ++ snprintf(resolution, sizeof(resolution), "%.0fx%.0fdpi", pdev->HWResolution[0], + pdev->HWResolution[1]); + else +- sprintf(resolution, "%.0fdpi", pdev->HWResolution[0]); ++ snprintf(resolution, sizeof(resolution), "%.0fdpi", pdev->HWResolution[0]); + + for (i = 0, profile = cups->PPD->profiles; + i < cups->PPD->num_profiles; diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD index 815de92d2..07c02e4ef 100644 --- a/user/gnumeric/APKBUILD +++ b/user/gnumeric/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gnumeric pkgver=1.12.44 -pkgrel=0 +pkgrel=1 pkgdesc="GNOME spreadsheet software" url="http://www.gnumeric.org/" arch="all" @@ -13,7 +13,7 @@ license="GPL-2.0-only OR GPL-3.0-only" depends="" makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool itstool libgda-dev libxml2-utils perl-dev zlib-dev" -subpackages="$pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz cs.patch diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index dd1215897..555fec878 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base pkgver=1.14.4 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" @@ -9,26 +9,10 @@ license="GPL LGPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" replaces="gst-plugins-base1" -makedepends=" - alsa-lib-dev - cdparanoia-dev - expat-dev - glib-dev - gobject-introspection-dev - gstreamer-dev - libice-dev - libogg-dev - libsm-dev - libtheora-dev - libvorbis-dev - libx11-dev - libxt-dev - libxv-dev - opus-dev - orc-dev - pango-dev - perl - " +makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev + gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev + libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev + opus-dev orc-dev pango-dev perl" checkdepends="orc-compiler" source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" ldpath="/usr/lib/gstreamer-1.0" diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD new file mode 100644 index 000000000..83dc7d866 --- /dev/null +++ b/user/haveged/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Danilo Godec <danilo.godec@agenda.si> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=haveged +pkgver=1.9.4 +pkgrel=1 +pkgdesc="Entropy harvesting daemon using CPU timings" +url="http://www.issihosts.com/haveged/" +arch="all" +license="GPL-3.0+" +subpackages="$pkgname-doc $pkgname-openrc" +makedepends="linux-headers" +source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/$pkgver.tar.gz + fix-cpu-cache-size-detection.patch + haveged.initd + haveged.confd" + +build() { + cd "$builddir" + + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + + make DESTDIR="$pkgdir" install + + rm "$pkgdir"/usr/lib/libhavege.la + + install -Dm755 "$srcdir"/haveged.initd \ + "$pkgdir"/etc/init.d/haveged + install -Dm644 "$srcdir"/haveged.confd \ + "$pkgdir"/etc/conf.d/haveged +} + +sha512sums="20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d haveged-1.9.4.tar.gz +6279296b057f19daf25020ac14997268230af4b11510d6e5c4a86989c119d6b081d2501069af198772302d5cce1464514c749033a4928fb95671268825a84ba8 fix-cpu-cache-size-detection.patch +5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd +58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd" diff --git a/user/haveged/fix-cpu-cache-size-detection.patch b/user/haveged/fix-cpu-cache-size-detection.patch new file mode 100644 index 000000000..07da2b46d --- /dev/null +++ b/user/haveged/fix-cpu-cache-size-detection.patch @@ -0,0 +1,15 @@ +Some ARM cpus does not report the cache size or say it is -1 + +diff --git a/src/havegetune.c b/src/havegetune.c +index f1a99f2..de39c53 100644 +--- a/src/havegetune.c ++++ b/src/havegetune.c +@@ -795,6 +795,8 @@ static int vfs_configInfoCache( + ctype = vfs_configFile(pAnchor, path, vfs_configType); + strcpy(path+plen, "size"); + size = vfs_configFile(pAnchor, path, vfs_configInt); ++ if (size == -1) ++ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; + cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); + } + } diff --git a/user/haveged/haveged.confd b/user/haveged/haveged.confd new file mode 100644 index 000000000..c4c1e0a3b --- /dev/null +++ b/user/haveged/haveged.confd @@ -0,0 +1,5 @@ +# Config file for /etc/init.d/haveged + +# Any extra options you want to pass to haveged +# on start-up should be put here. +HAVEGED_OPTS="-w 1024" diff --git a/user/haveged/haveged.initd b/user/haveged/haveged.initd new file mode 100644 index 000000000..86660e9c3 --- /dev/null +++ b/user/haveged/haveged.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run + +command="/usr/sbin/haveged" +command_args="$HAVEGED_OPTS" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" + +depend() { + need net +} diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD new file mode 100644 index 000000000..e2b1002d4 --- /dev/null +++ b/user/hermit/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=hermit +pkgver=2.0 +pkgrel=0 +pkgdesc="A monospace font designed to be clear, pragmatic and very readable" +url="https://pcaro.es/p/hermit/" +arch="noarch" +options="!check" # No testing fonts +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42 otf-hermit-2.0.tar.gz" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 418e9e361..c36074f8a 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=18.1.8 +pkgver=18.3.2 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" @@ -15,26 +15,21 @@ subpackages="$pkgname-dev $pkgname-dri-virtio:_dri $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles $pkgname-xatracker $pkgname-osmesa $pkgname-gbm - $pkgname-libwayland-egl:_wayland " _llvmver=6 -depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto - dri3proto presentproto libxshmfence-dev" -makedepends="$depends_dev expat-dev xextproto libxt-dev makedepend py3-mako - flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev python3 py-libxml2 - libxvmc-dev libxfixes-dev wayland-dev libelf-dev wayland-protocols - autoconf automake libtool libxxf86vm-dev libx11-dev zlib-dev" +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 + libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev + libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend python3 + py3-libxml2 py3-mako zlib-dev" source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz - glx_ro_text_segm.patch musl-fixes.patch musl-fix-includes.patch amdgpu-pthread-header.patch disk_cache-stack-overflow.patch drmdeps.patch - python3-compat.patch - intel.patch " -replaces="mesa-dricore" _dri_driverdir=/usr/lib/xorg/modules/dri _dri_drivers="r200,radeon,nouveau,swrast" @@ -73,22 +68,20 @@ build() { cd "$builddir" export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700" - PYTHON2=python3 ./configure \ + PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=$_dri_driverdir \ --disable-asm \ - --disable-xvmc \ - --enable-glx-rts \ --with-gallium-drivers=${_gallium_drivers} \ --with-dri-drivers=${_dri_drivers} \ --with-vulkan-drivers=${_vulkan_drivers} \ --with-llvm-prefix=/usr/lib/llvm$_llvmver \ --enable-llvm-shared-libs \ --enable-llvm \ - --with-platforms=x11,drm,wayland \ + --with-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --disable-glx-tls \ @@ -100,7 +93,6 @@ build() { --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --enable-texture-float \ --enable-xa \ --enable-vdpau \ $_arch_opts @@ -238,19 +230,9 @@ _dri() { esac } -_wayland() { - pkgdesc="Mesa libwayland-egl library" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/ \ - || return 1 -} - -sha512sums="ab89c6d27b765d3efdf61b24dc56d863ae590d83003d2eae4bfe25ecfbeda5bee0227f21d057523bb4eceeaf3d9955df48087ffb472c41b123c100e593056cb9 mesa-18.1.8.tar.xz -c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch +sha512sums="34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45 mesa-18.3.2.tar.xz 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch -6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch -61ddf4f33f11b4fbaa334bec04d184236f01bc8cad4340cb74b66c92fc8c0c985d36507cf43b504d186dc108fc2e5ae348ed28ea8a680ba4dfdb74994fc440f7 python3-compat.patch -baa0039c65b760ac60d55a112cc3fe9c59759e6f6e31c9c0dc46cfc1dcca91726706d6fb3328e11c043ba1f84f01dd56d0208ee153b05174fde74252d3d7d95c intel.patch" +6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch" diff --git a/user/mesa/glx_ro_text_segm.patch b/user/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 8cad4876b..000000000 --- a/user/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org - - #240956 - * configure.ac add support to enable readonly test segment on x86 - ---- ./configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 -+++ ./configure.ac 2008-11-17 23:20:17.000000000 +0100 -@@ -499,6 +499,20 @@ - enable_xcb=no - fi - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl libGL configuration per driver - dnl diff --git a/user/mesa/intel.patch b/user/mesa/intel.patch deleted file mode 100644 index 10871fc7c..000000000 --- a/user/mesa/intel.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-06-29 13:47:29.000000000 -0400 -+++ mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-07-24 03:18:37.479847335 -0400 -@@ -37,6 +37,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> - #include "util/u_atomic.h" - #include "util/list.h" - ---- mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:15:05.009848837 -0400 -+++ mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:12:21.739849990 -0400 -@@ -91,7 +91,7 @@ - % endfor - """, output_encoding='utf-8') - --TEMPLATE_C = Template(u"""\ -+TEMPLATE_C = Template("""\ - /* - * Copyright © 2015 Intel Corporation - * -@@ -145,7 +145,7 @@ - /* Hash table stats: - * size ${len(strmap.sorted_strings)} entries - * collisions entries: --% for i in xrange(10): -+% for i in range(10): - * ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]} - % endfor - */ -@@ -388,7 +388,7 @@ - - def bake(self): - self.sorted_strings = \ -- sorted(self.strings.values(), key=lambda x: x.string) -+ sorted(list(self.strings.values()), key=lambda x: x.string) - offset = 0 - for entry in self.sorted_strings: - entry.offset = offset -@@ -507,7 +507,7 @@ - assert e.core_version is None - e.extensions.append(ext) - -- return [e for e in entrypoints.itervalues() if e.enabled] -+ return [e for e in list(entrypoints.values()) if e.enabled] - - - def get_entrypoints_defines(doc): ---- mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-06-29 13:47:29.000000000 -0400 -+++ mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-07-24 03:07:13.599852168 -0400 -@@ -146,14 +146,32 @@ - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __lt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() < other.__int_ver() -+ -+ def __gt__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() > other.__int_ver() -+ -+ def __eq__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() == other.__int_ver() - - - MAX_API_VERSION = VkVersion('0.0.0') diff --git a/user/mesa/python3-compat.patch b/user/mesa/python3-compat.patch deleted file mode 100644 index 9dc213e9f..000000000 --- a/user/mesa/python3-compat.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (original) -+++ mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (refactored) -@@ -60,7 +60,7 @@ - """ - fragments = [ - '"%s\\0" /* %s */' % ( -- te[0].encode('string_escape'), -+ te[0].encode('unicode-escape'), - ', '.join(str(idx) for idx in te[2]) - ) - for te in self.table -@@ -217,10 +217,10 @@ - strings = StringTable() - strings_offsets = IntTable("int") - -- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */' -- print -- print CopyRight.strip() -- print ''' -+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */') -+ print() -+ print(CopyRight.strip()) -+ print(''' - #ifndef EG_TABLES_H - #define EG_TABLES_H - -@@ -242,20 +242,20 @@ - unsigned name_offset; - unsigned op; - }; --''' -- -- print 'static const struct eg_packet3 packet3_table[] = {' -+''') -+ -+ print('static const struct eg_packet3 packet3_table[] = {') - for pkt in packets: -- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt) -- print '};' -- print -- -- print 'static const struct eg_field egd_fields_table[] = {' -+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) -+ print('};') -+ print() -+ -+ print('static const struct eg_field egd_fields_table[] = {') - - fields_idx = 0 - for reg in regs: - if len(reg.fields) and reg.own_fields: -- print '\t/* %s */' % (fields_idx) -+ print('\t/* %s */' % (fields_idx)) - - reg.fields_idx = fields_idx - -@@ -266,34 +266,34 @@ - while value[1] >= len(values_offsets): - values_offsets.append(-1) - values_offsets[value[1]] = strings.add(strip_prefix(value[0])) -- print '\t{%s, %s(~0u), %s, %s},' % ( -+ print('\t{%s, %s(~0u), %s, %s},' % ( - strings.add(field.name), field.s_name, -- len(values_offsets), strings_offsets.add(values_offsets)) -+ len(values_offsets), strings_offsets.add(values_offsets))) - else: -- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name) -+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)) - fields_idx += 1 - -- print '};' -- print -- -- print 'static const struct eg_reg egd_reg_table[] = {' -+ print('};') -+ print() -+ -+ print('static const struct eg_reg egd_reg_table[] = {') - for reg in regs: - if len(reg.fields): -- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx) -+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)) - else: -- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name) -- print '};' -- print -+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name)) -+ print('};') -+ print() - - strings.emit(sys.stdout, "egd_strings") - -- print -+ print() - - strings_offsets.emit(sys.stdout, "egd_strings_offsets") - -- print -- print '#endif' -+ print() -+ print('#endif') - - - def main(): ---- mesa-18.1.3/m4/ax_check_python_mako_module.m4.old 2018-06-29 17:47:29.000000000 +0000 -+++ mesa-18.1.3/m4/ax_check_python_mako_module.m4 2018-07-09 01:55:22.740000000 +0000 -@@ -48,8 +48,8 @@ - except ImportError as err: - sys.exit(err) - else: -- ver_req = map(int, '$1'.split('.')) -- ver_act = map(int, mako.__version__.split('.')) -+ ver_req = list(map(int, '$1'.split('.'))) -+ ver_act = list(map(int, mako.__version__.split('.'))) - sys.exit(int(ver_req > ver_act)) - " | $PYTHON2 - - diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD new file mode 100644 index 000000000..54fdea907 --- /dev/null +++ b/user/netsurf/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=netsurf +pkgver=3.8 +pkgrel=0 +pkgdesc="Modern, lightweight GTK-based browser" +url="http://www.netsurf-browser.org/" +arch="all" +options="!check" # No tests +license="MIT AND GPL-2.0-only WITH openssl-exception" +depends="" +makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev + openssl-dev expat-dev gperf gtk+2.0-dev librsvg-dev + perl-html-parser" +source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz + Makefile.config" +builddir="$srcdir/netsurf-all-$pkgver" + +prepare() { + default_prepare + cp "$srcdir"/Makefile.config "$builddir"/netsurf +} + +build() { + cd "$builddir" + make PREFIX=/usr NETSURF_USE_VIDEO=YES +} + +package() { + cd "$builddir" + make PREFIX=/usr DESTDIR="$pkgdir" install +} + +sha512sums="cc040566b2ae4bda1fa15f75f246b2977f17b1f0adc747ddf86a9f8873bc25dce46cacce8e3d80146e72cc0227b1642c9da8b39a73ca2b5bb254334a25b8136a netsurf-all-3.8.tar.gz +cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" diff --git a/user/netsurf/Makefile.config b/user/netsurf/Makefile.config new file mode 100644 index 000000000..0e58d6e7d --- /dev/null +++ b/user/netsurf/Makefile.config @@ -0,0 +1 @@ +override NETSURF_USE_VIDEO := NO diff --git a/user/perl-term-readkey/APKBUILD b/user/perl-term-readkey/APKBUILD new file mode 100644 index 000000000..6b789b097 --- /dev/null +++ b/user/perl-term-readkey/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-term-readkey +_pkgreal=TermReadKey +pkgver=2.38 +pkgrel=0 +pkgdesc="Change terminal modes, and perform non-blocking reads" +url="https://metacpan.org/release/TermReadKey" +arch="all" +license="Artistic-1.0-Perl OR GPL-1.0+" +depends="perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/$_pkgreal-$pkgver.tar.gz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + cd "$builddir" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "$builddir" + make test +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete +} + +sha512sums="fb09f013f9f0d8a4397e39f6f3db7a6d023259219af8f76744094e396437a01b19141b3cdb39a158d3b518903fb010088bc37406763bfbeb3fcab810bb0bb157 TermReadKey-2.38.tar.gz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 89ab74709..9da2b1de2 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -26,7 +26,7 @@ pkgname=php7 _pkgname=php pkgver=7.2.11 -pkgrel=2 +pkgrel=3 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" url="https://php.net/" @@ -34,7 +34,8 @@ arch="all" options="!checkroot" license="PHP-3.01 AND Zend-2.0 AND Custom:TSRM AND LGPL-2.1+ AND MIT AND Beerware AND Public-Domain AND BSD-3-Clause AND Apache-1.0 AND PostgreSQL AND BSD-2-Clause AND Zlib AND BSD-4-Clause" depends="" -depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre-dev" +depends_dev="$pkgname=$pkgver-r$pkgrel autoconf icu-dev libedit-dev libxml2-dev + pcre-dev zlib-dev" makedepends="autoconf apache-httpd-dev aspell-dev diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD index a48fcc7bd..5269c55bd 100644 --- a/user/postfix/APKBUILD +++ b/user/postfix/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=postfix pkgver=3.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" url="http://www.postfix.org/" arch="all" @@ -12,8 +12,8 @@ depends="" makedepends="cyrus-sasl-dev db-dev icu-dev linux-pam-dev lmdb-dev openldap-dev openssl-dev pcre-dev perl postgresql-dev sqlite-dev" install="$pkgname.pre-install" -subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-pgsql - $pkgname-sqlite" +subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc + $pkgname-pgsql $pkgname-sqlite" pkgusers="postfix" pkggroups="postfix postdrop" source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz @@ -52,12 +52,16 @@ package() { !var/spool/postfix EOF + chown -R root:postfix \ + "$pkgdir"/var/lib/postfix chown -R postfix:postfix \ - "$pkgdir"/var/lib/postfix \ "$pkgdir"/var/spool/postfix + chgrp postdrop "$pkgdir"/var/spool/postfix/{public,maildrop} chmod 0750 "$pkgdir"/var/lib/postfix chgrp postdrop "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue chmod 2755 "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue + + install -D -m755 "$srcdir"/postfix.initd "$pkgdir"/etc/init.d/postfix } _database() { diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD index 15d8dcca3..9e3f7a565 100644 --- a/user/pulseaudio/APKBUILD +++ b/user/pulseaudio/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pulseaudio pkgver=12.2 -pkgrel=2 +pkgrel=3 pkgdesc="A featureful, general-purpose sound server" url="https://www.freedesktop.org/wiki/Software/PulseAudio" pkgusers="pulse" @@ -78,6 +78,7 @@ libs() { "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/libpulse.so.0* \ "$pkgdir"/usr/lib/libpulse-simple.so.0* \ + "$pkgdir"/usr/lib/libpulse-mainloop-*.so.0* \ "$subpkgdir"/usr/lib/ mv "$pkgdir"/etc/pulse/client.conf \ "$subpkgdir"/etc/pulse/ diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD new file mode 100644 index 000000000..c3ebf5694 --- /dev/null +++ b/user/scons/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=scons +pkgver=3.0.4 +pkgrel=0 +pkgdesc="Python-based software building system" +url="https://scons.org/" +arch="noarch" +license="MIT" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://prdownloads.sourceforge.net/scons/scons-$pkgver.tar.gz + python3-bang.patch + " + +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 +cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch" diff --git a/user/scons/python3-bang.patch b/user/scons/python3-bang.patch new file mode 100644 index 000000000..e902e7418 --- /dev/null +++ b/user/scons/python3-bang.patch @@ -0,0 +1,8 @@ +--- scons-3.0.4/script/scons.old 2019-01-23 17:30:36.000000000 +0000 ++++ scons-3.0.4/script/scons 2019-01-23 22:08:17.600000000 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # SCons - a Software Constructor + # diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD new file mode 100644 index 000000000..db2ae5425 --- /dev/null +++ b/user/serf/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=serf +pkgver=1.3.9 +pkgrel=0 +pkgdesc="High-performance HTTP library from Apache" +url="https://serf.apache.org/" +arch="all" +license="Apache-2.0" +depends="" +makedepends="apr-dev apr-util-dev openssl-dev scons zlib-dev" +subpackages="$pkgname-dev" +source="https://www.apache.org/dist/serf/serf-$pkgver.tar.bz2 + py3.patch + " + +build() { + cd "$builddir" + scons PREFIX=/usr -j "$JOBS" +} + +check() { + cd "$builddir" + scons test +} + +package() { + cd "$builddir" + local _header + install -D -m644 libserf-1.a "$pkgdir"/usr/lib/libserf-1.a + install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0 + ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1 + ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so + for _header in serf{_bucket_{types,util},}.h; do + install -D -m644 $_header "$pkgdir"/usr/include/serf-1/$_header + done + install -D -m644 serf-1.pc "$pkgdir"/usr/lib/pkgconfig/serf-1.pc +} + +sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2 +4f55a30f8e505e757c36debc8e19041dbf824c5708495d9e0338e4bac736445eff72ea60aa9a9bafdcdde9b26e2ffb6c79c39b4e6f6422cffc34d3986e49d1b1 py3.patch" diff --git a/user/serf/py3.patch b/user/serf/py3.patch new file mode 100644 index 000000000..12e7be1bc --- /dev/null +++ b/user/serf/py3.patch @@ -0,0 +1,24 @@ +--- serf-1.3.9/SConstruct.old 2015-09-17 12:46:24.000000000 +0000 ++++ serf-1.3.9/SConstruct 2019-01-23 22:11:30.900000000 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD new file mode 100644 index 000000000..93b519d45 --- /dev/null +++ b/user/socat/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=socat +pkgver=1.7.3.2 +pkgrel=0 +pkgdesc="Multipurpose network relay" +url="http://www.dest-unreach.org/socat/" +arch="all" +options="!check" # No testsuite +license="GPL-2.0-only" +depends="" +makedepends="openssl-dev" +subpackages="$pkgname-doc" +source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz + netdb-internal.patch" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972 socat-1.7.3.2.tar.gz +22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch" diff --git a/user/socat/netdb-internal.patch b/user/socat/netdb-internal.patch new file mode 100644 index 000000000..d1ebc8e5b --- /dev/null +++ b/user/socat/netdb-internal.patch @@ -0,0 +1,13 @@ +--- socat-1.7.2.4.orig/compat.h ++++ socat-1.7.2.4/compat.h +@@ -656,6 +656,10 @@ + # define NETDB_INTERNAL h_NETDB_INTERNAL + #endif + ++#if !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) ++#endif ++ + #ifndef INET_ADDRSTRLEN + # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) + #endif diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD new file mode 100644 index 000000000..3d9a96a68 --- /dev/null +++ b/user/subversion/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=subversion +pkgver=1.10.4 +pkgrel=0 +pkgdesc="Version control system from 2000" +url="https://subversion.apache.org/" +arch="all" +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" +subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet + $pkgname-lang" +source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 + python3-bang.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-kwallet + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" -j1 install +} + +gnome() { + pkgdesc="$pkgdesc (GNOME Keychain integration)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libsvn_auth_gnome* "$subpkgdir"/usr/lib/ +} + +kwallet() { + pkgdesc="$pkgdesc (KDE Wallet integration)" + install_if="$pkgname=$pkgver-r$pkgrel kwallet" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ +} + +sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2 +1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/subversion/python3-bang.patch b/user/subversion/python3-bang.patch new file mode 100644 index 000000000..fa92ff098 --- /dev/null +++ b/user/subversion/python3-bang.patch @@ -0,0 +1,8 @@ +--- subversion-1.10.4/subversion/tests/cmdline/svneditor.py.old 2010-02-22 19:47:55.000000000 +0000 ++++ subversion-1.10.4/subversion/tests/cmdline/svneditor.py 2019-01-23 23:08:14.830000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # svneditor.py: a mock $SVN_EDITOR for the Subversion test suite + # diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD new file mode 100644 index 000000000..8be033ef7 --- /dev/null +++ b/user/utf8proc/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=utf8proc +pkgver=2.2.0 +pkgrel=0 +pkgdesc="C library for processing UTF-8 data" +url=" " +arch="all" +license="MIT AND Unicode-DFS-2016" +depends="" +makedepends="" +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 +} + +build() { + cd "$builddir"/build + 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_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + cd "$builddir"/build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir"/build + make DESTDIR="$pkgdir" install +} + +sha512sums="ae19287e33bc4807475063963557c4d1d2f7d95577d61882ba8df380883662860eeb868e7391ac1b8111614ca2c1855f631925ade6eaa827d07d28cc4cdbab9c utf8proc-2.2.0.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD new file mode 100644 index 000000000..3ec869b6e --- /dev/null +++ b/user/uwsgi/APKBUILD @@ -0,0 +1,90 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=uwsgi +pkgver=2.0.17.1 +pkgrel=0 +pkgdesc="Web application server" +url="https://projects.unbit.it/uwsgi" +arch="all" +options="!check" # Requires unpackaged `cppcheck`. +license="GPL-2.0-only" +depends="" +makedepends="libxml2-dev openssl-dev zlib-dev + perl-dev php7-dev php7-embed python3-dev ruby-dev" +subpackages="" +# Keep psgi at the end for the CFLAGS hack. +_plugins="asyncio cgi corerouter http logfile php python rack psgi" +for _plugin in $_plugins; do + subpackages="$subpackages $pkgname-$_plugin" +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 + + python3 uwsgiconfig.py --build core + + for _plugin in $_plugins; do + [ $_plugin != "psgi" ] || export CFLAGS="-D_GNU_SOURCE -include /usr/include/setjmp.h" + python3 uwsgiconfig.py --plugin plugins/$_plugin core + done +} + +check() { + cd "$builddir" + python3 uwsgiconfig.py --check +} + +package() { + cd "$builddir" + install -D -m755 "$builddir"/uwsgi "$pkgdir"/usr/bin/uwsgi +} + +_plugpack() { + pkgdesc="$pkgdesc ($2 plugin)" + depends="" + + install -D -m755 "$builddir"/$1_plugin.so \ + "$subpkgdir"/usr/lib/uwsgi/plugins/$1_plugin.so +} + +asyncio() { + _plugpack asyncio "Python asyncio" +} + +cgi() { + _plugpack cgi "CGI" +} + +corerouter() { + _plugpack corerouter "Core router" +} + +http() { + _plugpack http "HTTP server" +} + +logfile() { + _plugpack logfile "Log file" +} + +php() { + _plugpack php "PHP" +} + +psgi() { + _plugpack psgi "PSGI" +} + +python() { + _plugpack python "Python 3" +} + +rack() { + _plugpack rack "Ruby Rack" +} + +sha512sums="10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b uwsgi-2.0.17.1.tar.gz" diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD index 1e4ed29b2..134acd67d 100644 --- a/user/w3m/APKBUILD +++ b/user/w3m/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=w3m -pkgver=0.5.3 +pkgver=0.5.3_git20190105 pkgrel=0 pkgdesc="Text-based Web browser" url="http://w3m.sourceforge.net/" @@ -12,15 +12,8 @@ depends="compface" makedepends="compface-dev gc-dev gdk-pixbuf-dev glib-dev gtk+2.0-dev imlib2-dev libbsd-dev libx11-dev ncurses-dev openssl-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://downloads.sourceforge.net/w3m/w3m-$pkgver.tar.gz - use-modern-gc.patch - " - -prepare() { - cd "$builddir" - default_prepare - update_config_sub -} +source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz" +builddir="$srcdir"/w3m-${pkgver/_/-} build() { cd "$builddir" @@ -40,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14 w3m-0.5.3.tar.gz -d43f99e2277b0daabb6080b06b4e06af7a1b679da9203bad782ef57e137ca18d27b85ef7a0691aeb293bd3f6f00bd556d1fe021fed0b725b5b78b376671f1494 use-modern-gc.patch" +sha512sums="b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4 w3m-0.5.3_git20190105.tar.gz" diff --git a/user/w3m/use-modern-gc.patch b/user/w3m/use-modern-gc.patch deleted file mode 100644 index a30d642bb..000000000 --- a/user/w3m/use-modern-gc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- w3m-0.5.3/main.c.old 2011-01-04 09:42:19.000000000 +0000 -+++ w3m-0.5.3/main.c 2019-01-18 20:12:22.570000000 +0000 -@@ -833,7 +833,8 @@ - mySignal(SIGPIPE, SigPipe); - #endif - -- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); -+ orig_GC_warn_proc = GC_get_warn_proc(); -+ GC_set_warn_proc(wrap_GC_warn_proc); - err_msg = Strnew(); - if (load_argc == 0) { - /* no URL specified */ diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 181bbde15..e5f0041eb 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server pkgver=1.20.3 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" @@ -27,6 +27,7 @@ makedepends="$depends_dev autoconf automake libtool util-macros source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-sis.patch fix-musl-arm.patch + support-coffeelake.patch " # secfixes: @@ -141,4 +142,5 @@ xwayland() { sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" +b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch +1deae020ffd7e3ea91d8d3d8118dbb80c5d08308d9a253deaa3afc42f93ff13d1a93d3aaca7acce5d45213dee9c072a15c3ed385432bc833f403e7c8472e9fd6 support-coffeelake.patch" diff --git a/user/xorg-server/support-coffeelake.patch b/user/xorg-server/support-coffeelake.patch new file mode 100644 index 000000000..99f12aada --- /dev/null +++ b/user/xorg-server/support-coffeelake.patch @@ -0,0 +1,14 @@ +This PCI ID has been seen in the wild on the i7-9700K. + +diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +index 82e4a549e..1ef1a0edf 100644 +--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h ++++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +@@ -174,6 +174,7 @@ CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") + CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") ++CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") + CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index 35177bf1a..ab8a22b7a 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm pkgver=341 -pkgrel=0 +pkgrel=1 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" arch="all" @@ -11,11 +11,13 @@ license="X11" makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev libxext-dev freetype-dev ncurses-dev pcre-dev" subpackages="$pkgname-doc" -source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz" +source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz + posix-ptmx.patch + " build() { cd "$builddir" - LIBS="-lutmps -lskarnet -ltinfow" ./configure \ + LIBS="-ltinfow" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -23,7 +25,18 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --with-pcre - make + # This is NOT A TYPO! + # + # XTerm does not use ld(1) as a linker. It uses a shell script + # called 'plink.sh' which tries to Be Smart, but is actually + # Quite Dumb. + # + # It determines that the utmp symbols are in musl, and decides + # -lutmps really isn't necessary. However! There is some solace. + # + # -k is like -l, but is forced, even if it isn't "really needed". + # So we use -k for utmps. + make EXTRA_LOADFLAGS="-kutmps -lskarnet" } package() { @@ -31,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz" +sha512sums="336b8e8d3bfbc373ce1a0547571f705401142b54a8206050d2cdf961dfd99e01c9e78e10df443eb3278fb02116536cf55bc1501835978b9b390399614ab77494 xterm-341.tgz +e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch new file mode 100644 index 000000000..351aba9ab --- /dev/null +++ b/user/xterm/posix-ptmx.patch @@ -0,0 +1,21 @@ +--- xterm/main.c.old ++++ xterm/main.c +@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED) + close(opened_tty); + opened_tty = -1; + } +-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY) ++#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) + if ((*pty = posix_openpt(O_RDWR)) >= 0) { + char *name = ptsname(*pty); + if (name != 0) { +@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) + /* + * now in child process + */ +-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) ++#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) + int pgrp = setsid(); /* variable may not be used... */ + #else + int pgrp = getpid(); + |