diff options
29 files changed, 629 insertions, 49 deletions
diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index 38a367e10..61d755e27 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd pkgver=2.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Console keyboard and font management utilities" url=" " arch="all" @@ -10,8 +10,8 @@ license="GPL-2.0+" depends="" makedepends="linux-headers linux-pam-dev" checkdepends="check-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-fonts::noarch - $pkgname-keymaps::noarch $pkgname-lang" +subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch + $pkgname-lang" source="https://mirrors.kernel.org/pub/linux/utils/kbd/kbd-$pkgver.tar.xz" build() { diff --git a/user/awesome/APKBUILD b/user/awesome/APKBUILD new file mode 100644 index 000000000..aba8a99cb --- /dev/null +++ b/user/awesome/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Łukasz Jendrysik <scadu@yandex.com> +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=awesome +pkgver=4.2 +pkgrel=0 +pkgdesc="lua-configurable window manager framework" +url="http://awesome.naquadah.org/" +arch="all" +license="GPL-2.0+" +options="!check" # Tests require X and D-Bus +depends="imagemagick lua-lgi cairo-gobject pango" +makedepends="lua5.3 lua5.3-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev + imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev + xcb-util-keysyms-dev xcb-util-image-dev xcb-util-dev xcb-util-wm-dev + dbus-dev gdk-pixbuf-dev xcb-util-cursor-dev libxkbcommon-dev + xcb-util-xrm-dev libexecinfo-dev xmlto" +checkdepends="xorg-server-xephyr" +subpackages="$pkgname-doc" +source="https://github.com/awesomeWM/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz" + +build() { + # Awesome does not support in-tree builds + mkdir -p "$builddir/build" + cd "$builddir/build" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc \ + -DCMAKE_BUILD_TYPE=Release \ + -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \ + -DLUA_LIBRARIES=/usr/lib/lua5.3/liblua.so \ + .. + make +} + +check() { + cd "$builddir/build" + make check +} + +package() { + cd "$builddir/build" + make DESTDIR="$pkgdir" install +} + +sha512sums="134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09 awesome-4.2.tar.xz" diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD new file mode 100644 index 000000000..f1c42d607 --- /dev/null +++ b/user/ddrescue/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Leonardo Arena <rnalrd@alpinelinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=ddrescue +pkgver=1.23 +pkgrel=0 +pkgdesc="Data recovery tool for block devices with errors" +url="https://www.gnu.org/s/ddrescue/ddrescue.html" +license="GPL-3.0+" +arch="all !aarch64" +subpackages="$pkgname-doc" +source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" + +build() { + cd "$builddir" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info + make +} + +check() { + cd "$builddir" + + # XXX: Some tests fail on s390x, but only on builder, so ignore it for now. + case "$CARCH" in + s390x) make check || true;; + *) make check;; + esac +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4f0b27067966b71efaae809d4f38714863cf3663f3b8c3f26055d482debb15c0fab77752411a9d242f18dbb8e4edc68494f866721dae9c95cfc5354439eaa656 ddrescue-1.23.tar.lz" diff --git a/user/fuse/APKBUILD b/user/fuse/APKBUILD new file mode 100644 index 000000000..92840ed41 --- /dev/null +++ b/user/fuse/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=fuse +pkgver=2.9.8 +pkgrel=2 +pkgdesc="Linux Filesystem in Userspace (legacy version)" +url="https://github.com/libfuse/libfuse" +arch="all" +options="suid !check" # No test suite. +license="GPL-2.0-only AND LGPL-2.1-only AND (GPL-2.0-only OR BSD-2-Clause)" +depends="fuse-common" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc" +source="https://github.com/libfuse/libfuse/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz + fix-realpath.patch +" + +# secfixes: +# 2.9.8-r0: +# - CVE-2018-10906 + +build() { + cd "$builddir" + UDEV_RULES_PATH='/lib/udev/rules.d' ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-static \ + --disable-example \ + --enable-lib \ + --enable-util + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d +} + +sha512sums="0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad fuse-2.9.8.tar.gz +5672ceb35acabb4bd97b6efc30614f22def62882fe198e2a8598a074d45b6b5337c082a5e09b5e399b6e5212dc1fbde9071c2a5051534c32091444c350b9c657 fix-realpath.patch" diff --git a/user/fuse/fix-realpath.patch b/user/fuse/fix-realpath.patch new file mode 100644 index 000000000..1199eb338 --- /dev/null +++ b/user/fuse/fix-realpath.patch @@ -0,0 +1,28 @@ +--- fuse-2.9.3.orig/util/fusermount.c 2015-02-07 08:58:54.000000000 -0200 ++++ fuse-2.9.3/util/fusermount.c 2015-02-09 09:15:16.737367957 -0200 +@@ -1255,19 +1255,16 @@ + + origmnt = argv[optind]; + +- drop_privs(); + mnt = fuse_mnt_resolve_path(progname, origmnt); +- if (mnt != NULL) { +- res = chdir("/"); +- if (res == -1) { +- fprintf(stderr, "%s: failed to chdir to '/'\n", progname); +- exit(1); +- } +- } +- restore_privs(); + if (mnt == NULL) + exit(1); + ++ res = chdir("/"); ++ if (res == -1) { ++ fprintf(stderr, "%s: failed to chdir to '/'\n", progname); ++ exit(1); ++ } ++ + umask(033); + if (unmount) + goto do_unmount; diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD index 17d1a88e6..22de8c82a 100644 --- a/user/libixion/APKBUILD +++ b/user/libixion/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libixion -pkgver=0.14.0 +pkgver=0.13.0 pkgrel=0 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" arch="all" license="MPL-2.0" depends="" -depends_dev="mdds" +depends_dev="mdds~1.3" makedepends="$depends_dev boost-dev" subpackages="$pkgname-dev" source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz @@ -45,5 +45,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="8681912fb1bebb4de1fdcb4f0589aa84a3e38cd21747c81a204a87594f67879732461f3c02b70d0bf5659af59c1af1fa17df425eba5946d22a8599bc8da9fd92 libixion-0.14.0.tar.xz +sha512sums="15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0 libixion-0.13.0.tar.xz a6d26bfc8721f8f65a1eafa527e5b29166c9e0c45de39493bcaae17896ad6e145b78e123ea01903a96b0fb4a5b7def3dc2d256c3e301a0676e07c840603570ac 32bit.patch" diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD index fc7d0ba13..a991df5eb 100644 --- a/user/liborcus/APKBUILD +++ b/user/liborcus/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liborcus -pkgver=0.14.0 +pkgver=0.13.4 pkgrel=0 pkgdesc="Library for processing spreadsheet documents" url="https://gitlab.com/orcus/orcus" arch="all" license="MPL-2.0 AND MIT" -depends_dev="boost-dev mdds libixion-dev" +depends_dev="boost-dev mdds~1.3 libixion-dev~0.13" makedepends="$depends_dev zlib-dev" subpackages="$pkgname-dev" source="http://kohei.us/files/orcus/src/liborcus-$pkgver.tar.xz" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0dca1508f3b235d9e52e131a54b0e7ec5473e4a5863a70aa7c703d3b16e8dff49de954af924c4235c5cdbd592528df15192545f08a878c5d469d7394825525b3 liborcus-0.14.0.tar.xz" +sha512sums="f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b liborcus-0.13.4.tar.xz" diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD index fd36400dd..013787576 100644 --- a/user/libreoffice/APKBUILD +++ b/user/libreoffice/APKBUILD @@ -30,7 +30,7 @@ pkgname=libreoffice pkgver=6.0.6.2 -pkgrel=0 +pkgrel=1 case "$pkgver" in *.*.*.*) _ver="${pkgver%.*}";; *.*.*) _ver="$pkgver";; @@ -49,26 +49,29 @@ license="MPL-2.0 AND Apache-2.0 AND MIT AND X11 AND (MPL-1.1 OR GPL-2.0+ OR LGPL depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer" # 1. Base dependencies -# 2. GUIs -# 3. File formats +# 2. GUIs - gen +# 3. GUIs - gtk+2.0 +# 4. File formats makedepends="apr-dev bash bison boost-dev cairo-dev clucene-dev cmd:which coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex fontconfig-dev freetype-dev gettext-tiny-dev glm gperf gpgme-dev gst-plugins-base-dev gstreamer-dev harfbuzz-dev hunspell-dev hyphen-dev icu icu-dev lcms2-dev libcmis-dev libexttextcat-dev - libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds mythes-dev - neon-dev nss-dev openldap-dev openssl-dev paxmark perl poppler-dev - postgresql-dev python3-dev redland-dev sane-dev sed ucpp + libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds~1.3 + mythes-dev neon-dev nss-dev openldap-dev openssl-dev paxmark perl + poppler-dev postgresql-dev python3-dev redland-dev sane-dev sed ucpp unixodbc-dev util-linux xmlsec-dev zip - gtk+3.0-dev libepoxy-dev libice-dev libsm-dev libxext-dev - libxinerama-dev libxrandr-dev libxrender-dev + libepoxy-dev libxinerama-dev libxrandr-dev libxrender-dev libxext-dev + + gtk+2.0-dev gdk-pixbuf-dev glib-dev libabw-dev libcdr-dev libe-book-dev libepubgen-dev libetonyek-dev - libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev + libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev~0.13 libpagemaker-dev libqxp-dev libstaroffice-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev libzmf-dev " + # -common also depends on these fonts _fonts="ttf-liberation ttf-dejavu ttf-carlito" checkdepends="$_fonts" @@ -77,7 +80,7 @@ checkdepends="$_fonts" # -doc comes first since it redirects manpages from the other subpackages # -lang-* comes before -common since it redirects miscellaneous # language-specific files from -common -subpackages="$pkgname-doc $pkgname-gtk3 $pkgname-base +subpackages="$pkgname-doc $pkgname-base $pkgname-gtk2 $pkgname-calc $pkgname-draw $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer" source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkgver.tar.xz @@ -89,6 +92,7 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg fix-includes.patch gettext-tiny.patch disable-crc-test.patch + disable-outdated-font-test.patch " ldpath="/usr/lib/$pkgname/program" @@ -275,8 +279,8 @@ build() { --disable-firebird-sdbc \ --disable-coinmp \ --disable-lpsolve \ - --enable-gtk3 \ - --disable-gtk \ + --disable-gtk3 \ + --enable-gtk \ --disable-qt5 \ --disable-odk \ --disable-avahi \ @@ -400,7 +404,7 @@ _split_lang() { common() { pkgdesc="LibreOffice - common files" - depends="$pkgname-lang-en_us $pkgname-gtk3 $_fonts" + depends="$pkgname-lang-en_us $_fonts" _split common @@ -410,9 +414,6 @@ common() { mkdir -p "$subpkgdir/usr/share/appdata" mv "$pkgdir"/usr/share/appdata/*.xml "$subpkgdir/usr/share/appdata" - mkdir -p "$subpkgdir/usr/lib/libreoffice/share/libreofficekit" - mv "$pkgdir"/usr/lib/libreoffice/share/libreofficekit/*.png \ - "$subpkgdir/usr/lib/libreoffice/share/libreofficekit" # At this point there should only be empty directories left in # the "libreoffice" metapackage @@ -423,9 +424,10 @@ common() { fi } -gtk3() { - pkgdesc="LibreOffice - GTK+3.0 GUI" +gtk2() { + pkgdesc="LibreOffice - GTK+2.0 GUI" depends="libreoffice-common" + install_if="$pkgname-common=$pkgver-r$pkgrel gtk+2.0" _split gnome } @@ -479,4 +481,5 @@ fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5 4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e fix-includes.patch c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b gettext-tiny.patch -4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055 disable-crc-test.patch" +4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055 disable-crc-test.patch +887680966f8e8754d551ca7e4acc3bcae57c4fb835c49240fde05f65eb4282b8ad03deda3944b50e73b0da97ca8b28e7b1f1861907e6dbd012f5646e6d55efb4 disable-outdated-font-test.patch" diff --git a/user/libreoffice/disable-outdated-font-test.patch b/user/libreoffice/disable-outdated-font-test.patch new file mode 100644 index 000000000..2278fb587 --- /dev/null +++ b/user/libreoffice/disable-outdated-font-test.patch @@ -0,0 +1,22 @@ +https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg217102.html + +--- libreoffice-6.0.6.2/editeng/qa/unit/core-test.cxx 2018-07-27 13:15:59.000000000 +0000 ++++ libreoffice-6.0.6.2/editeng/qa/unit/core-test.cxx 2018-09-27 03:45:48.400130363 +0000 +@@ -195,8 +195,6 @@ void Test::testLineSpacing() + + // Check the first line + ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL((sal_uInt16)122, aInfo.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL((sal_uInt16)153, (sal_uInt16)aEditEngine.GetLineHeight(0)); + + // Prepare second case - 150% + std::unique_ptr<SfxItemSet> pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet())); +@@ -218,8 +216,6 @@ void Test::testLineSpacing() + + // Check the first line + ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL(sal_uInt16(337), aInfo2.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL(sal_uInt16(382), static_cast<sal_uInt16>(aEditEngine.GetLineHeight(0))); + } + + void Test::testConstruction() diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index 170e00fae..64124563a 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libtirpc pkgver=1.1.4 -pkgrel=0 +pkgrel=1 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="http://libtirpc.sourceforge.net/" arch="all" @@ -11,7 +11,8 @@ depends="" depends_dev="bsd-compat-headers krb5-dev" makedepends="$depends_dev autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + musl.patch" build() { cd "$builddir" @@ -29,4 +30,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 libtirpc-1.1.4.tar.bz2" +sha512sums="392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 libtirpc-1.1.4.tar.bz2 +8e52246ae478ae9e4689426627e17d9c58d701f4fd21a40ffe3cf17c4ceaa4ab2e8e91d2fa3ba0d0c7adc52ae4b986fcda113ec86e370ede83903bb641de520c musl.patch" diff --git a/user/libtirpc/musl.patch b/user/libtirpc/musl.patch new file mode 100644 index 000000000..5a4fb04f5 --- /dev/null +++ b/user/libtirpc/musl.patch @@ -0,0 +1,11 @@ +--- ./tirpc/rpc/types.h.orig 2018-03-17 10:23:10.022055255 +0100 ++++ ./tirpc/rpc/types.h 2018-03-17 10:23:30.877751656 +0100 +@@ -66,7 +66,7 @@ + #define mem_free(ptr, bsize) free(ptr) + + +-#if defined __APPLE_CC__ || defined __FreeBSD__ ++#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) + # define __u_char_defined + # define __daddr_t_defined + #endif diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD index aa2e4ca5b..50a1e7dfc 100644 --- a/user/libxdg-basedir/APKBUILD +++ b/user/libxdg-basedir/APKBUILD @@ -14,10 +14,15 @@ makedepends="" subpackages="$pkgname-dev" source="https://nevill.ch/libxdg-basedir/downloads/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgname-$pkgver" +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + build() { cd "$builddir" - ./autogen.sh \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -35,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406 libxdg-basedir-1.2.0.tar.gz" +sha512sums="346553ddd9d0a0c854af9320f2ced695a0838adc18736b66120bea48ea60cb9ea3a7390672a42f83909db92f692e94de833d9e8bcfe51568a72ad1f4661fde06 libxdg-basedir-1.2.0.tar.gz" diff --git a/user/lua-lgi/APKBUILD b/user/lua-lgi/APKBUILD index 857fa26be..f9b07ca3b 100644 --- a/user/lua-lgi/APKBUILD +++ b/user/lua-lgi/APKBUILD @@ -9,24 +9,25 @@ arch="all" license="MIT" options="!check" # checks require dbus depends="" -makedepends="glib-dev gobject-introspection-dev libffi-dev" +makedepends="glib-dev gobject-introspection-dev libffi-dev lua5.3-dev" subpackages="$pkgname-doc" source="lgi-$pkgver.tar.gz::https://github.com/pavouk/lgi/archive/$pkgver.tar.gz" - builddir="$srcdir"/lgi-$pkgver + build() { cd "$builddir" - make PREFIX=/usr LUA_CFLAGS="$(pkg-config --cflags lua)" + make PREFIX=/usr LUA_VERSION="5.3" \ + LUA_CFLAGS="$(pkg-config --cflags lua)" } check() { - cd "$builddir" - make -C "$srcdir"/build-$_i check + cd "$builddir" + make check } package() { cd "$builddir" - make install PREFIX=/usr DESTDIR="$pkgdir" + make install PREFIX=/usr LUA_VERSION="5.3" DESTDIR="$pkgdir" mkdir -p "$pkgdir"/usr/share/doc/lua-lgi cp -r docs/* samples "$pkgdir"/usr/share/doc/lua-lgi/ diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD index 9b930c8ae..c4a28fe12 100644 --- a/user/mdds/APKBUILD +++ b/user/mdds/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mdds -pkgver=1.4.1 -pkgrel=0 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Multi-dimensional data index algorithms" url="https://gitlab.com/mdds/mdds" arch="noarch" @@ -39,4 +39,4 @@ package() { mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -sha512sums="3ad7cf821cd1a0a4b632c5d11cc3bd7bd6da2b14069e142e087dd81c1dfa817a961edbde1d59021a5bd4859eb252d8c461341070406b952a5b46b00eb7444384 mdds-1.4.1.tar.bz2" +sha512sums="c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8 mdds-1.3.1.tar.bz2" diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD index 9d2b4627d..f89083ae4 100644 --- a/user/mesa-demos/APKBUILD +++ b/user/mesa-demos/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mesa-demos -pkgver=8.3.0 +pkgver=8.4.0 pkgrel=0 pkgdesc="Mesa demos and utils" url="http://mesa3d.org" @@ -10,7 +10,7 @@ arch="all" license="X11" options="!check" # No testsuite makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool" -source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2" +source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgname-$pkgver.tar.bz2" build() { cd "$builddir" @@ -27,4 +27,4 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f mesa-demos-8.3.0.tar.bz2" +sha512sums="b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2" diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD index 830d07377..45583d16a 100644 --- a/user/nano/APKBUILD +++ b/user/nano/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> -# Maintainer: +# Maintainer: Dan Theisen <djt@hxx.in> pkgname=nano -pkgver=3.0 +pkgver=3.1 pkgrel=0 pkgdesc="Enhanced clone of the Pico text editor" url="https://www.nano-editor.org" @@ -44,4 +44,4 @@ package() { rm -rf "$pkgdir"/usr/lib/charset.alias } -sha512sums="120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1 nano-3.0.tar.xz" +sha512sums="dc50381a129fec32d85982d8129324268e3e27a28c5b958fb7bcfca690646bd0a3b995dc456971355b91952c0ac3ea3e0a873b228010238a76e8dbb0ddaf1143 nano-3.1.tar.xz" diff --git a/user/ntfs-3g/APKBUILD b/user/ntfs-3g/APKBUILD new file mode 100644 index 000000000..d403c4f42 --- /dev/null +++ b/user/ntfs-3g/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Valery Kartel <valery.kartel@gmail.com> +# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=ntfs-3g +_pkgname=ntfs-3g_ntfsprogs +pkgver=2017.3.23 +pkgrel=1 +pkgdesc="Stable, full-featured, read-write NTFS" +url="https://www.tuxera.com/community/open-source-ntfs-3g/" +arch="all" +options="!check" # No test suite. +license="LGPL-2.1-only AND BSD-2-Clause AND GPL-2.0+ AND GPL-3.0+" +makedepends="attr-dev util-linux-dev linux-headers fuse-dev" +subpackages="$pkgname-doc $pkgname-dev $pkgname-libs" +source="https://tuxera.com/opensource/$_pkgname-$pkgver.tgz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --with-fuse=external + make +} + +package() { + cd "$builddir" + mkdir -p "$pkgdir"/lib + make -j1 DESTDIR="$pkgdir" LDCONFIG=: install + ln -s /bin/ntfs-3g "$pkgdir"/sbin/mount.ntfs +} + +sha512sums="3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef ntfs-3g_ntfsprogs-2017.3.23.tgz" diff --git a/user/ode/APKBUILD b/user/ode/APKBUILD new file mode 100644 index 000000000..f21ef2b42 --- /dev/null +++ b/user/ode/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ode +pkgver=0.14 +pkgrel=0 +pkgdesc="High performance library for simulating rigid body dynamics" +url="https://www.ode-wiki.org/wiki/index.php?title=Main_Page" +arch="all" +options="!check" # Fails 48/52 tests +license="LGPL-2.1+ OR BSD-3-Clause" +depends="" +makedepends="autoconf automake libtool" +subpackages="$pkgname-dev" +source="https://bitbucket.org/odedevs/ode/downloads/ode-$pkgver.tar.gz + fix-test-link.patch + " + +build() { + cd "$builddir" + + ./bootstrap + CXXFLAGS="$CXXFLAGS -fpermissive" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-shared \ + --disable-static \ + --disable-double-precision \ + --enable-libccd \ + --enable-ou + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="1f74c3c4687ee9665fa70e65a79100747fba577729830a90806e374115f1c161a2f4545cf591b0979054aa3e2f9a3673635668cb7362ab5c213ada0d39b1a03d ode-0.14.tar.gz +8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch" diff --git a/user/ode/fix-test-link.patch b/user/ode/fix-test-link.patch new file mode 100644 index 000000000..a9d66dbbe --- /dev/null +++ b/user/ode/fix-test-link.patch @@ -0,0 +1,9 @@ +--- ode-0.15.2/tests/Makefile.am.old 2017-06-05 08:12:18.000000000 +0000 ++++ ode-0.15.2/tests/Makefile.am 2018-09-30 22:44:06.310000000 +0000 +@@ -26,5 +26,5 @@ + + tests_LDADD = \ + $(top_builddir)/ode/src/libode.la \ +- joints/*.o \ ++ joints/libjoints.la \ + UnitTest++/src/libunittestpp.la diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD new file mode 100644 index 000000000..c9f8cc956 --- /dev/null +++ b/user/rpcbind/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=rpcbind +pkgver=1.2.5 +pkgrel=0 +pkgdesc="portmap replacement which supports RPC over various protocols" +url="http://rpcbind.sourceforge.net" +arch="all" +options="!check" # No test suite. +license="BSD-3-Clause" +depends="" +install="$pkgname.pre-install $pkgname.pre-upgrade" +makedepends="libtirpc-dev bsd-compat-headers" +subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc" +source="http://downloads.sourceforge.net/project/rpcbind/rpcbind/$pkgver/rpcbind-$pkgver.tar.bz2 + rpcbind.initd + rpcbind.confd" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --bindir=/sbin \ + --enable-warmstarts \ + --with-statedir=/var/lib/rpcbind \ + --with-rpcuser=rpc \ + --enable-debug \ + --with-systemdsystemunitdir='no' + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind + install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING +} +sha512sums="e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4 rpcbind-1.2.5.tar.bz2 +1cd655d86226a45fa3e927f8ac2bb580537644d2fb3684e0f4a956bf3721c95d95b8b8c1d9a2a742fb714eeba9277e0400a7493bf1bf676466d70adb2b35a88e rpcbind.initd +0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3 rpcbind.confd" diff --git a/user/rpcbind/rpcbind.confd b/user/rpcbind/rpcbind.confd new file mode 100644 index 000000000..973320202 --- /dev/null +++ b/user/rpcbind/rpcbind.confd @@ -0,0 +1,5 @@ +# /etc/conf.d/rpcbind + +# Options for `rpcbind`. +RPCBIND_OPTS="-w" + diff --git a/user/rpcbind/rpcbind.initd b/user/rpcbind/rpcbind.initd new file mode 100644 index 000000000..b979c2226 --- /dev/null +++ b/user/rpcbind/rpcbind.initd @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/files/rpcbind.initd,v 1.1 2007/12/29 09:13:55 vapier Exp $ + +depend() { + use net + before inetd xinetd + after firewall + provide portmap +} + +start() { + ebegin "Starting rpcbind" + start-stop-daemon --start --quiet --exec /sbin/rpcbind \ + -- ${RPCBIND_OPTS} + eend $? +} + +stop() { + ebegin "Stopping rpcbind" + start-stop-daemon --stop --quiet --exec /sbin/rpcbind + eend $? +} + diff --git a/user/rpcbind/rpcbind.pre-install b/user/rpcbind/rpcbind.pre-install new file mode 100644 index 000000000..771cdbf7b --- /dev/null +++ b/user/rpcbind/rpcbind.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S rpc 2>/dev/null +adduser -S -D -h /var/lib/rpcbind -s /sbin/nologin -G rpc -g rpc rpc 2>/dev/null + +exit 0 diff --git a/user/rpcbind/rpcbind.pre-upgrade b/user/rpcbind/rpcbind.pre-upgrade new file mode 120000 index 000000000..1ba8b0c77 --- /dev/null +++ b/user/rpcbind/rpcbind.pre-upgrade @@ -0,0 +1 @@ +rpcbind.pre-install
\ No newline at end of file diff --git a/user/sdl_net/APKBUILD b/user/sdl_net/APKBUILD new file mode 100644 index 000000000..6172ddc1e --- /dev/null +++ b/user/sdl_net/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sdl_net +_pkgname=SDL_net +pkgver=1.2.8 +pkgrel=0 +pkgdesc="Cross-platform networking library" +url="https://www.libsdl.org/projects/SDL_net/release-1.2.html" +arch="all" +license="zlib" +depends="" +makedepends="sdl-dev" +subpackages="$pkgname-dev" +source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-static + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2766ca55343127c619958ab3a3ae3052a27a676839f10a158f7dfc071b8db38c2f1fc853e8add32b9fef94ab07eaa986f46a68e264e8087b57c990af30ea9a0b SDL_net-1.2.8.tar.gz" diff --git a/user/sdl_ttf/APKBUILD b/user/sdl_ttf/APKBUILD new file mode 100644 index 000000000..96321243a --- /dev/null +++ b/user/sdl_ttf/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sdl_ttf +_pkgname=SDL_ttf +pkgver=2.0.11 +pkgrel=0 +pkgdesc="TrueType font library for SDL applications" +url="https://www.libsdl.org/projects/SDL_ttf/release-1.2.html" +arch="all" +license="zlib" +depends="" +makedepends="freetype-dev libice-dev sdl-dev" +subpackages="$pkgname-dev" +source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b SDL_ttf-2.0.11.tar.gz" diff --git a/user/xmoto/APKBUILD b/user/xmoto/APKBUILD new file mode 100644 index 000000000..7efa7a9c6 --- /dev/null +++ b/user/xmoto/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmoto +pkgver=0.5.11 +pkgrel=0 +pkgdesc="Challenging 2D motocross platform game" +url="https://xmoto.tuxfamily.org/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="bzip2-dev curl-dev glu-dev libjpeg-turbo-dev libpng-dev + libxdg-basedir-dev libxml2-dev lua5.3-dev mesa-dev ode-dev sdl-dev + sdl_mixer-dev sdl_net-dev sdl_ttf-dev sqlite-dev zlib-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-$pkgver-src.tar.gz + stupid-lua.patch + utf8.patch + " + +prepare() { + cd "$builddir" + default_prepare + update_config_sub + rm -r src/ode +} + +build() { + cd "$builddir" + ./bootstrap + CPPFLAGS="$CPPFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" \ + LDFLAGS="$LDFLAGS $(pkg-config --libs lua)" \ + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -D -m644 "$builddir"/extra/xmoto.desktop \ + "$pkgdir"/usr/share/applications/xmoto.desktop + install -D -m644 "$builddir"/extra/xmoto.xpm \ + "$pkgdir"/usr/share/icons/hicolor/48x48/apps/xmoto.xpm +} + +sha512sums="7046745e8f7a045fa2ce1deb3fd75b73b233dc1092f5ecd6dd4e42938f70269a93a3a623a39a1f0520c90643a42dc1ce93c43ad07bf225ff6c50741cc02511f6 xmoto-0.5.11-src.tar.gz +34dc4d83df72d0323d2995b35faacd6c097f1f381805a724c6a8a1edbf59c894e3db68057ef68b65f659d73e9d0976263bc5229b0502281d7c748519de86c55b stupid-lua.patch +a43cafba12864bc2efd978fcef69ac5256b625dd581f02a93bafae7c4edaad9ebcadbd597fe31db77c85747400405c9fb6b55e494b9d6ded893e5d48f37e57ec utf8.patch" diff --git a/user/xmoto/stupid-lua.patch b/user/xmoto/stupid-lua.patch new file mode 100644 index 000000000..d99a1ed4a --- /dev/null +++ b/user/xmoto/stupid-lua.patch @@ -0,0 +1,41 @@ +--- xmoto-0.5.11/configure.in.old 2014-03-29 10:35:24.000000000 +0000 ++++ xmoto-0.5.11/configure.in 2018-09-29 03:51:05.210000000 +0000 +@@ -174,6 +174,7 @@ + AC_CHECK_HEADER(lua50/lua.h, AC_DEFINE(HAVE_LUA50_LUA_H) [USE_LUA_VERSION="5.0"]) + AC_CHECK_HEADER(lua51/lua.h, AC_DEFINE(HAVE_LUA51_LUA_H) [USE_LUA_VERSION="5.1"]) + AC_CHECK_HEADER(lua5.1/lua.h, AC_DEFINE(HAVE_LUA5_1_LUA_H)[USE_LUA_VERSION="5.1"]) ++AC_CHECK_HEADER(lua5.3/lua.h, AC_DEFINE(HAVE_LUA5_3_LUA_H)[USE_LUA_VERSION="5.3"]) + AC_DEFINE(LUA_COMPAT_MODULE, 1) + + AC_LANG_PUSH([C++]) +--- xmoto-0.5.11/src/include/xm_lua.h.old 2011-10-11 20:18:17.000000000 +0000 ++++ xmoto-0.5.11/src/include/xm_lua.h 2018-09-29 03:51:49.230000000 +0000 +@@ -4,7 +4,11 @@ + #include "lauxlib.h" + #include "lualib.h" + #else +- #if defined(HAVE_LUA5_1_LUA_H) ++ #if defined(HAVE_LUA5_3_LUA_H) ++ #include <lua5.3/lua.h> ++ #include <lua5.3/lauxlib.h> ++ #include <lua5.3/lualib.h> ++ #elif defined(HAVE_LUA5_1_LUA_H) + #include <lua5.1/lua.h> + #include <lua5.1/lauxlib.h> + #include <lua5.1/lualib.h> +--- xmoto-0.5.11/src/LuaLibBase.cpp.old 2014-03-29 09:46:24.000000000 +0000 ++++ xmoto-0.5.11/src/LuaLibBase.cpp 2018-09-30 23:34:51.800000000 +0000 +@@ -42,7 +42,13 @@ + luaL_requiref(m_pL, LUA_TABLIBNAME, luaopen_table, 1); + #endif + ++#if LUA_VERSION_NUM < 503 + luaL_openlib(m_pL, i_libname.c_str(), i_reg, 0); ++#else ++ lua_newtable(m_pL); ++ luaL_setfuncs(m_pL, i_reg, 0); ++ lua_setglobal(m_pL, i_libname.c_str()); ++#endif + } + + LuaLibBase::~LuaLibBase() { diff --git a/user/xmoto/utf8.patch b/user/xmoto/utf8.patch new file mode 100644 index 000000000..535bb515e --- /dev/null +++ b/user/xmoto/utf8.patch @@ -0,0 +1,13 @@ +--- xmoto-0.5.11/src/helpers/utf8.h.old 2011-10-11 20:18:14.000000000 +0000 ++++ xmoto-0.5.11/src/helpers/utf8.h 2018-09-30 23:29:10.310000000 +0000 +@@ -18,8 +18,8 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + =============================================================================*/ + +-#ifndef __UTF8_H__ +-#define __UTF8_H__ ++#ifndef __HELPER_UTF8_H__ ++#define __HELPER_UTF8_H__ + + #include <vector> + #include <string> |