diff options
Diffstat (limited to 'user')
78 files changed, 1402 insertions, 1099 deletions
diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD new file mode 100644 index 000000000..311041c2f --- /dev/null +++ b/user/alkimia/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=alkimia +pkgver=7.0.2 +pkgrel=0 +pkgdesc="Library for common financial functionality" +url="https://community.kde.org/Alkimia/libalkimia" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="gmp-dev qt5-qtbase-dev" +makedepends="$depends_dev cmake extra-cmake-modules" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="275ea48cd33caed9393a170efcc6053a581c1cc000862dd73a63bdb6de3e3c3ad2e492901a859e517033e1239e297a43088580553efe32f1d99a85051f5af3e4 alkimia-7.0.2.tar.xz" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index 84db40dc6..fc27c9821 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=apache-httpd _pkgreal=httpd -pkgver=2.4.35 +pkgver=2.4.37 pkgrel=0 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" @@ -135,7 +135,7 @@ ldap() { "$subpkgdir"/usr/libexec/apache2 } -sha512sums="f5d6a849850ebdf4e38b586c84cc1063d68ac4c6737895c9ac1c8796c22655681c55b4de77ed9f1f807338fdb9f7824faf911361aa31cc46f3c3a2cbabe20543 httpd-2.4.35.tar.bz2 +sha512sums="e802915801bbe885a65dada04b0116d145b293fabfff734dddb61a79ca1c6d65326f51155d1b864b093c3ec00d0bdfdf1401ab55677bae1ea3da1d199d7bcad4 httpd-2.4.37.tar.bz2 c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 9893248f1724748c9ef91171728b4c557ced7de543e23ed72cb75c02728048b2813ac99015a4a28e7984daa51faa6e42403c17b875539fe71c33424865eccecf apache-httpd.initd diff --git a/user/at-spi2-atk/APKBUILD b/user/at-spi2-atk/APKBUILD index fa464e08f..51e4d1ea4 100644 --- a/user/at-spi2-atk/APKBUILD +++ b/user/at-spi2-atk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-atk -pkgver=2.26.2 +pkgver=2.30.0 pkgrel=0 pkgdesc="GTK+ module to bridge ATK to D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -12,7 +12,6 @@ depends="" depends_dev="atk-dev dbus-dev" makedepends="$depends_dev at-spi2-core-dev glib-dev intltool libxml2-dev meson ninja" -install="" subpackages="$pkgname-dev" source="https://download.gnome.org/sources/at-spi2-atk/${pkgver%.*}/at-spi2-atk-$pkgver.tar.xz" @@ -38,4 +37,4 @@ package() { DESTDIR="$pkgdir" ninja install } -sha512sums="f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2 at-spi2-atk-2.26.2.tar.xz" +sha512sums="d7a02c347e31d78da81455cff77b44ab6d9e11add8d9457fba6a6b354cef731ab73e8a83060c150f3ef3d5191bfbc649618360a61c9826816b1aafb3e2bea7d5 at-spi2-atk-2.30.0.tar.xz" diff --git a/user/at-spi2-core/APKBUILD b/user/at-spi2-core/APKBUILD index 00c49e856..1280740d3 100644 --- a/user/at-spi2-core/APKBUILD +++ b/user/at-spi2-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=at-spi2-core -pkgver=2.29.1 +pkgver=2.30.0 pkgrel=0 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" url="https://wiki.linuxfoundation.org/accessibility/d-bus" @@ -31,4 +31,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="d8e68637dbfd3917a0594ead5de223dcd6d6f43670c9d3880994942967343d41828636cef09b465f1f7b48bcb6f2b9e34af430873f43e42f56cb68cfb0cacfbe at-spi2-core-2.29.1.tar.xz" +sha512sums="f875738fd8a30dc8eeebb0b1a2631d7ef03e93db4dd8475cddb91c173a4ca7b473149ccb4fa2480df53555654612aa02f571461160e8931f50fda10b6a8b8c21 at-spi2-core-2.30.0.tar.xz" diff --git a/user/atk/APKBUILD b/user/atk/APKBUILD index c63ae166f..6beebfcb0 100644 --- a/user/atk/APKBUILD +++ b/user/atk/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=atk -pkgver=2.28.1 +pkgver=2.30.0 pkgrel=0 pkgdesc="A library providing a set of interfaces for accessibility" url="https://www.gtk.org/" @@ -19,8 +19,7 @@ prepare() { build() { cd "$builddir"/_build - # enable_docs becomes docs in 2.30 release. - meson -Dprefix=/usr -Dintrospection=true -Denable_docs=true + meson -Dprefix=/usr -Dintrospection=true -Ddocs=true ninja } @@ -34,4 +33,4 @@ package() { DESTDIR="$pkgdir" ninja install } -sha512sums="aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb atk-2.28.1.tar.xz" +sha512sums="03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e atk-2.30.0.tar.xz" diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD index 23d1a30dd..3e4b8be76 100644 --- a/user/bzflag/APKBUILD +++ b/user/bzflag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=bzflag -pkgver=2.4.16 +pkgver=2.4.18 pkgrel=0 pkgdesc="3D networked multi-player multi-platform tank battle game" url="https://www.bzflag.org/" @@ -35,5 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="809adc39088f3fc8ca0d2ead9c7172cfbe582789bc80b3ac55fabe078a0868f0cf7cfa8027ac696718e9983a19386933fd370684a0bd33e63c3106f2ce8a9d63 bzflag-2.4.16.tar.bz2 +sha512sums="8e3183f2d78b686c92f3b9911b3cad2fa0df5693401537dc674c75e192fd59451167b7ddc546aa8a090b38d7864b8f22459ba9a4702451987f9c1dfa87fdb246 bzflag-2.4.18.tar.bz2 6c7a1873706140b1b0b254d6f8350f47adef8f499a7e7b3418331beda11bdc71e2e0dee74e17d4a955960de66adf90d22796b440e1afa78d328077235e2e3dde defineAddrLen.patch" diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD new file mode 100644 index 000000000..c03a90f7f --- /dev/null +++ b/user/calligra/APKBUILD @@ -0,0 +1,80 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=calligra +pkgver=3.1.0 +pkgrel=0 +pkgdesc="KDE Office suite" +url="https://www.calligra.org/" +arch="all" +options="!check" # Tests require X11 +license="GPL-2.0-only" +depends="shared-mime-info" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev + + karchive-dev kcmutils-dev kcodecs-dev kcompletion-dev kconfig-dev + kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev + kguiaddons-dev ki18n-dev kiconthemes-dev kio-dev kitemviews-dev + kjobwidgets-dev kdelibs4support-dev knotifications-dev kparts-dev + knotifyconfig-dev kross-dev ktextwidgets-dev kwallet-dev + kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev sonnet-dev + + kactivities-dev khtml-dev kholidays-dev qt5-qtwebkit-dev + + boost-dev eigen-dev fontconfig-dev freetype-dev gsl-dev lcms2-dev + libetonyek-dev libgit2-dev libodfgen-dev librevenge-dev libvisio-dev + libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev + qca-dev + + kcalcore-dev kcontacts-dev kdiagram-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz + https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz + c99-math.patch + poppler.patch + " + +prepare() { + default_prepare + + cd "$builddir" + mv ../calligraplan-$pkgver plan + sed -e "/add_subdirectory(plan)/s/#//" \ + -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ + -i CMakeLists.txt + 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 \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ + -DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \ + -DBUILD_UNMAINTAINED=True \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + cd "$builddir"/build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir"/build + make DESTDIR="$pkgdir" install +} + +sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz +a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz +b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch +960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch" diff --git a/user/calligra/c99-math.patch b/user/calligra/c99-math.patch new file mode 100644 index 000000000..4326dd7fa --- /dev/null +++ b/user/calligra/c99-math.patch @@ -0,0 +1,18 @@ +--- calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt.old 2018-01-26 09:24:44.000000000 +0000 ++++ calligra-3.1.0/filters/words/msword-odf/wv2/CMakeLists.txt 2018-10-24 23:22:43.440000000 +0000 +@@ -64,12 +64,12 @@ + set( CMAKE_REQUIRED_INCLUDES math.h ) + endif() + +-check_function_exists( isinf HAVE_FUNC_ISINF ) +-check_function_exists( isnan HAVE_FUNC_ISNAN ) ++check_symbol_exists( isinf math.h HAVE_FUNC_ISINF ) ++check_symbol_exists( isnan math.h HAVE_FUNC_ISNAN ) + if(MINGW) + add_definitions( -DHAVE_FUNC_ISFINITE ) + endif() +-check_function_exists( finite HAVE_FUNC_FINITE ) ++check_symbol_exists( finite math.h HAVE_FUNC_FINITE ) + check_function_exists( _finite HAVE_FUNC__FINITE ) + + # diff --git a/user/calligra/poppler.patch b/user/calligra/poppler.patch new file mode 100644 index 000000000..458a31514 --- /dev/null +++ b/user/calligra/poppler.patch @@ -0,0 +1,84 @@ +From a615718222f8ad3bba4b88fad640382e517f7dd9 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Wed, 24 Oct 2018 08:28:00 +0200 +Subject: Fix build with poppler>=0.69 + +Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's + +Differential Revision: https://phabricator.kde.org/D16388 +--- + filters/karbon/pdf/PdfImport.cpp | 3 --- + filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- + filters/karbon/pdf/SvgOutputDev.h | 2 +- + 3 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index c3e96b0..48b08df 100644 +--- a/filters/karbon/pdf/PdfImport.cpp ++++ b/filters/karbon/pdf/PdfImport.cpp +@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + delete globalParams; + globalParams = 0; + +- // check for memory leaks +- Object::memCheck(stderr); +- + return KoFilter::OK; + } + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 931917a..7901317 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) + .arg(matrix.dx()) .arg(matrix.dy()); + } + +-QString SvgOutputDev::convertMatrix(double * matrix) ++QString SvgOutputDev::convertMatrix(const double * matrix) + { + return QString("matrix(%1 %2 %3 %4 %5 %6)") + .arg(matrix[0]).arg(matrix[1]) +@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + + QString str; + +- char * p = s->getCString(); ++ const char * p = s->getCString(); + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + double x = state->getCurX(); + double y = state->getCurY(); + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + + QMatrix mirror; +@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + return; + } + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix m; + m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); + +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 85fe55d..2a44908 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -84,7 +84,7 @@ public: + private: + QString convertPath(GfxPath *path); + QString convertMatrix(const QMatrix &matrix); +- QString convertMatrix(double * matrix); ++ QString convertMatrix(const double * matrix); + QString printFill(); + QString printStroke(); + +-- +cgit v0.11.2 + diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD new file mode 100644 index 000000000..be9e833df --- /dev/null +++ b/user/cantor/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cantor +pkgver=18.08.2 +pkgrel=0 +pkgdesc="KDE worksheet interface for popular mathematical applications" +url="https://edu.kde.org/cantor/" +arch="all" +license="GPL-2.0-only" +depends="r" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev + qt5-qtxmlpatterns-dev karchive-dev kcompletion-dev kconfig-dev + kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev + kio-dev knewstuff-dev kparts-dev kpty-dev ktexteditor-dev + ktextwidgets-dev kxmlgui-dev + + analitza-dev gfortran libqalculate-dev python3-dev r r-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/applications/$pkgver/src/cantor-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="39cf171e3eb00b39ff472e4b1734cbd6aa7f0c20bac9cdc9ff8230200b0ccb9fcb7ac2a1cd85f333edcb39b49f4d4a82cdb44958fc66e98ff690d0ef02a58299 cantor-18.08.2.tar.xz" diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD index c85d7cc54..09f3359c8 100644 --- a/user/checkbashisms/APKBUILD +++ b/user/checkbashisms/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=checkbashisms -pkgver=2.18.4 +pkgver=2.18.6 pkgrel=0 pkgdesc="Check shell scripts for POSIX compliance" url="https://tracker.debian.org/pkg/devscripts" @@ -11,7 +11,7 @@ makedepends="" depends="perl" checkdepends="shunit2" subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" -source="http://cdn.debian.net/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz" +source="https://cdn-aws.deb.debian.org/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz" builddir="$srcdir/devscripts-$pkgver" prepare() { @@ -40,4 +40,4 @@ bashcomp() { "$subpkgdir/usr/share/bash-completion/completions/$pkgname" } -sha512sums="91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897 devscripts_2.18.4.tar.xz" +sha512sums="6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014 devscripts_2.18.6.tar.xz" diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index a95693351..6d2a11703 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -56,10 +56,24 @@ check() { } package() { + local _dir _file cd "$builddir"/build make DESTDIR="$pkgdir" install install -m 644 lib/libclang.a "$pkgdir"/usr/lib + + # mozilla will never be happy + mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/bin + mkdir -p "$pkgdir"/usr/lib/llvm$_llvmver/lib + for _dir in bin lib; do + pushd "$pkgdir"/usr/$_dir + for _file in *; do + [ -f $_file ] || continue + ln -s "../../../$_dir/$_file" \ + "$pkgdir"/usr/lib/llvm$_llvmver/$_dir/$_file + done + popd + done } static() { diff --git a/user/dmidecode/APKBUILD b/user/dmidecode/APKBUILD index 4c15ce8b9..811c0a361 100644 --- a/user/dmidecode/APKBUILD +++ b/user/dmidecode/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=dmidecode -pkgver=3.1 -pkgrel=1 +pkgver=3.2 +pkgrel=0 pkgdesc="Utility for gathering information about system hardware" url="http://www.nongnu.org/dmidecode" arch="all" @@ -9,11 +9,6 @@ options="!check" # No test suite. license="GPL-2.0-only" subpackages="$pkgname-doc" source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz - hpe1.patch - hpe2.patch - correctness1.patch - security1.patch - security2.patch " build() { @@ -26,9 +21,4 @@ package() { make prefix=/usr DESTDIR="${pkgdir}" install } -sha512sums="226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9 dmidecode-3.1.tar.xz -30faca2ef81c925278dc1d027a4a7c19ef7c9fc27d11fdf3647fd4d8cd77f524e1d159b7e7873294ece08228a99dedbdb1913f610de8a3975ce027d0570ace89 hpe1.patch -734e388cc27e89fbaf3a3f5a875c78e04e0dabd92706a9336b504a8be6d3ede72372cc13b860cd32a66d17c8e1cb6a1d881f8fce97d01a28ea299075d0952609 hpe2.patch -43931cce1824908dcc054e82ad5d5389ce76f6dc643b7610a9a87d59ad54ba4816b4ca16b159b7545dd1c462af956b7a1a19752dde369e24f1d10acab8f173ca correctness1.patch -d377a7ccd809f019568cfce7eaae35cd3eed076c7347779fbc4b2a949ec81abfdd5142dc74ffd740a1b973c3bb49117537dea1e9f590290ee555dd00abc57fc9 security1.patch -89fcf20e883ce92245eeb0136e9c6e04f4f038e582f6a46dc1d4621625137efe558ef2bfc5625b1e1576a5276f81ee4ab45a82209b0e65a0259f937bacee174a security2.patch" +sha512sums="b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18 dmidecode-3.2.tar.xz" diff --git a/user/dmidecode/correctness1.patch b/user/dmidecode/correctness1.patch deleted file mode 100644 index 07f4f7ed7..000000000 --- a/user/dmidecode/correctness1.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 174387405e98cd94c627832ae23abcb9be7e5623 Mon Sep 17 00:00:00 2001 -From: Jean Delvare <jdelvare@suse.de> -Date: Wed, 31 Jan 2018 18:52:47 +0100 -Subject: dmidecode: Fix firmware version of TPM device - -Both the operator (detected by clang, reported by Xorg) and the mask -for the minor firmware version field of TPM devices were wrong. - -Signed-off-by: Jean Delvare <jdelvare@suse.de> -Fixes: 48a8132058a0 ("dmidecode: Add support for structure type 43 (TPM Device)") ---- - dmidecode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dmidecode.c b/dmidecode.c -index 87faaa9..a593170 100644 ---- a/dmidecode.c -+++ b/dmidecode.c -@@ -4511,7 +4511,7 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) - case 0x02: - printf("\tFirmware Revision: %u.%u\n", - DWORD(data + 0x0A) >> 16, -- DWORD(data + 0x0A) && 0xFF); -+ DWORD(data + 0x0A) & 0xFFFF); - /* - * We skip the next 4 bytes, as their - * format is not standardized and their --- -cgit v1.0-41-gc330 - diff --git a/user/dmidecode/hpe1.patch b/user/dmidecode/hpe1.patch deleted file mode 100644 index ca294d0af..000000000 --- a/user/dmidecode/hpe1.patch +++ /dev/null @@ -1,141 +0,0 @@ -From ee07a1b4249560d620d05194eb8ff61b40d3ce23 Mon Sep 17 00:00:00 2001 -From: Jerry Hoemann <jerry.hoemann@hpe.com> -Date: Wed, 13 Sep 2017 15:54:22 -0600 -Subject: dmioem: Reflect HPE's new company name - -After Hewlett Packard Enterprise split from Hewlett-Packard, DMI OEM -tables reflect the new company name. Gen10 and subsequent systems will -use HPE. Gen9 and prior systems continue to use the old "HP" name. - -Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> -Signed-off-by: Jean Delvare <jdelvare@suse.de> ---- - dmioem.c | 32 +++++++++++++++++++------------- - 1 file changed, 19 insertions(+), 13 deletions(-) - -diff --git a/dmioem.c b/dmioem.c -index 034ad9f..a032344 100644 ---- a/dmioem.c -+++ b/dmioem.c -@@ -35,6 +35,7 @@ enum DMI_VENDORS - VENDOR_UNKNOWN, - VENDOR_HP, - VENDOR_ACER, -+ VENDOR_HPE, - }; - - static enum DMI_VENDORS dmi_vendor = VENDOR_UNKNOWN; -@@ -58,12 +59,14 @@ void dmi_set_vendor(const char *s) - - if (strncmp(s, "HP", len) == 0 || strncmp(s, "Hewlett-Packard", len) == 0) - dmi_vendor = VENDOR_HP; -+ else if (strncmp(s, "HPE", len) == 0 || strncmp(s, "Hewlett Packard Enterprise", len) == 0) -+ dmi_vendor = VENDOR_HPE; - else if (strncmp(s, "Acer", len) == 0) - dmi_vendor = VENDOR_ACER; - } - - /* -- * HP-specific data structures are decoded here. -+ * HPE-specific data structures are decoded here. - * - * Code contributed by John Cagle and Tyler Bell. - */ -@@ -98,14 +101,15 @@ static int dmi_decode_hp(const struct dmi_header *h) - u8 *data = h->data; - int nic, ptr; - u32 feat; -+ const char *company = (dmi_vendor == VENDOR_HP) ? "HP" : "HPE"; - - switch (h->type) - { - case 204: - /* -- * Vendor Specific: HP ProLiant System/Rack Locator -+ * Vendor Specific: HPE ProLiant System/Rack Locator - */ -- printf("HP ProLiant System/Rack Locator\n"); -+ printf("%s ProLiant System/Rack Locator\n", company); - if (h->length < 0x0B) break; - printf("\tRack Name: %s\n", dmi_string(h, data[0x04])); - printf("\tEnclosure Name: %s\n", dmi_string(h, data[0x05])); -@@ -119,7 +123,7 @@ static int dmi_decode_hp(const struct dmi_header *h) - case 209: - case 221: - /* -- * Vendor Specific: HP ProLiant NIC MAC Information -+ * Vendor Specific: HPE ProLiant NIC MAC Information - * - * This prints the BIOS NIC number, - * PCI bus/device/function, and MAC address -@@ -137,9 +141,10 @@ static int dmi_decode_hp(const struct dmi_header *h) - * - * Type 221: is deprecated in the latest docs - */ -- printf(h->type == 221 ? -- "HP BIOS iSCSI NIC PCI and MAC Information\n" : -- "HP BIOS PXE NIC PCI and MAC Information\n"); -+ printf("%s %s\n", company, -+ h->type == 221 ? -+ "BIOS iSCSI NIC PCI and MAC Information" : -+ "BIOS PXE NIC PCI and MAC Information"); - nic = 1; - ptr = 4; - while (h->length >= ptr + 8) -@@ -155,7 +160,7 @@ static int dmi_decode_hp(const struct dmi_header *h) - - case 233: - /* -- * Vendor Specific: HP ProLiant NIC MAC Information -+ * Vendor Specific: HPE ProLiant NIC MAC Information - * - * This prints the BIOS NIC number, - * PCI bus/device/function, and MAC address -@@ -171,7 +176,7 @@ static int dmi_decode_hp(const struct dmi_header *h) - * 0x08 | MAC | 32B | MAC addr padded w/ 0s - * 0x28 | Port No| BYTE | Each NIC maps to a Port - */ -- printf("HP BIOS PXE NIC PCI and MAC Information\n"); -+ printf("%s BIOS PXE NIC PCI and MAC Information\n", company); - if (h->length < 0x0E) break; - /* If the record isn't long enough, we don't have an ID - * use 0xFF to use the internal counter. -@@ -183,11 +188,11 @@ static int dmi_decode_hp(const struct dmi_header *h) - - case 212: - /* -- * Vendor Specific: HP 64-bit CRU Information -+ * Vendor Specific: HPE 64-bit CRU Information - * - * Source: hpwdt kernel driver - */ -- printf("HP 64-bit CRU Information\n"); -+ printf("%s 64-bit CRU Information\n", company); - if (h->length < 0x18) break; - printf("\tSignature: 0x%08x", DWORD(data + 0x04)); - if (is_printable(data + 0x04, 4)) -@@ -208,11 +213,11 @@ static int dmi_decode_hp(const struct dmi_header *h) - - case 219: - /* -- * Vendor Specific: HP ProLiant Information -+ * Vendor Specific: HPE ProLiant Information - * - * Source: hpwdt kernel driver - */ -- printf("HP ProLiant Information\n"); -+ printf("%s ProLiant Information\n", company); - if (h->length < 0x08) break; - printf("\tPower Features: 0x%08x\n", DWORD(data + 0x04)); - if (h->length < 0x0C) break; -@@ -281,6 +286,7 @@ int dmi_decode_oem(const struct dmi_header *h) - switch (dmi_vendor) - { - case VENDOR_HP: -+ case VENDOR_HPE: - return dmi_decode_hp(h); - case VENDOR_ACER: - return dmi_decode_acer(h); --- -cgit v1.0-41-gc330 - diff --git a/user/dmidecode/hpe2.patch b/user/dmidecode/hpe2.patch deleted file mode 100644 index 9d9e660b6..000000000 --- a/user/dmidecode/hpe2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2ba4fab210e23cc97db57217af9a6f3b35a9b666 Mon Sep 17 00:00:00 2001 -From: Jerry Hoemann <jerry.hoemann@hpe.com> -Date: Wed, 11 Apr 2018 14:33:20 +0200 -Subject: dmioem: decode HPE UEFI type 219 Misc Features - -The incorrect "Misc Feature" bit in type 219 table was being used to -identify that the platform is capable of booting with UEFI. - -For corresponding kernel change please see: - - commit(c42cbe41727a) - -in linux. - -Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> -Signed-off-by: Jean Delvare <jdelvare@suse.de> ---- - dmioem.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dmioem.c b/dmioem.c -index 8a72ac9..1742330 100644 ---- a/dmioem.c -+++ b/dmioem.c -@@ -268,7 +268,7 @@ static int dmi_decode_hp(const struct dmi_header *h) - feat = DWORD(data + 0x10); - printf("\tMisc. Features: 0x%08x\n", feat); - printf("\t\tiCRU: %s\n", feat & 0x0001 ? "Yes" : "No"); -- printf("\t\tUEFI: %s\n", feat & 0x0408 ? "Yes" : "No"); -+ printf("\t\tUEFI: %s\n", feat & 0x1400 ? "Yes" : "No"); - break; - - default: --- -cgit v1.0-41-gc330 - diff --git a/user/dmidecode/security1.patch b/user/dmidecode/security1.patch deleted file mode 100644 index da4bc9815..000000000 --- a/user/dmidecode/security1.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8ff32018e8dd53c26d1f0daef118037fdae58c68 Mon Sep 17 00:00:00 2001 -From: Jean Delvare <jdelvare@suse.de> -Date: Wed, 1 Aug 2018 09:54:45 +0200 -Subject: dmidecode: Avoid OOB read on invalid entry point length - -Don't let the entry point checksum verification run beyond the end of -the buffer holding it (32 bytes). - -This bug was discovered by Lionel Debroux using the AFL fuzzer and -AddressSanitizer. - -Signed-off-by: Jean Delvare <jdelvare@suse.de> ---- - dmidecode.c | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/dmidecode.c b/dmidecode.c -index fa6ecf1..474ca7b 100644 ---- a/dmidecode.c -+++ b/dmidecode.c -@@ -4928,6 +4928,15 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) - u32 ver; - u64 offset; - -+ /* Don't let checksum run beyond the buffer */ -+ if (buf[0x06] > 0x20) -+ { -+ fprintf(stderr, -+ "Entry point length too large (%u bytes, expected %u).\n", -+ (unsigned int)buf[0x06], 0x18U); -+ return 0; -+ } -+ - if (!checksum(buf, buf[0x06])) - return 0; - -@@ -4966,6 +4975,15 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags) - { - u16 ver; - -+ /* Don't let checksum run beyond the buffer */ -+ if (buf[0x05] > 0x20) -+ { -+ fprintf(stderr, -+ "Entry point length too large (%u bytes, expected %u).\n", -+ (unsigned int)buf[0x05], 0x1FU); -+ return 0; -+ } -+ - if (!checksum(buf, buf[0x05]) - || memcmp(buf + 0x10, "_DMI_", 5) != 0 - || !checksum(buf + 0x10, 0x0F)) --- -cgit v1.0-41-gc330 - diff --git a/user/dmidecode/security2.patch b/user/dmidecode/security2.patch deleted file mode 100644 index c758f2ff3..000000000 --- a/user/dmidecode/security2.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 4cbba9a8e76ffc640eaf7dd25acbd3c1c6504669 Mon Sep 17 00:00:00 2001 -From: Jean Delvare <jdelvare@suse.de> -Date: Wed, 1 Aug 2018 09:54:51 +0200 -Subject: dmidecode: Validate structure completeness before decoding - -Ensure that the whole DMI structure fits in the announced table -length before performing any action on it. Otherwise we might end up -reading beyond the end of our memory buffer. - -This bug was discovered by Lionel Debroux using the AFL fuzzer and -AddressSanitizer. Its probability is very low, as it requires a DMI -table corrupted in one of two very specific ways to trigger. - -This bug exists since dmidecode version 2.9, although it is hard to -test because option --from-dump was only introduced in version 2.10. - -Signed-off-by: Jean Delvare <jdelvare@suse.de> ---- - dmidecode.c | 39 ++++++++++++++++++++++----------------- - 1 file changed, 22 insertions(+), 17 deletions(-) - -diff --git a/dmidecode.c b/dmidecode.c -index 474ca7b..76faed9 100644 ---- a/dmidecode.c -+++ b/dmidecode.c -@@ -4754,6 +4754,7 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) - } - break; - } -+ i++; - - /* In quiet mode, stop decoding at end of table marker */ - if ((opt.flags & FLAG_QUIET) && h.type == 127) -@@ -4764,6 +4765,22 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) - printf("Handle 0x%04X, DMI type %d, %d bytes\n", - h.handle, h.type, h.length); - -+ /* Look for the next handle */ -+ next = data + h.length; -+ while ((unsigned long)(next - buf + 1) < len -+ && (next[0] != 0 || next[1] != 0)) -+ next++; -+ next += 2; -+ -+ /* Make sure the whole structure fits in the table */ -+ if ((unsigned long)(next - buf) > len) -+ { -+ if (display && !(opt.flags & FLAG_QUIET)) -+ printf("\t<TRUNCATED>\n\n"); -+ data = next; -+ break; -+ } -+ - /* assign vendor for vendor-specific decodes later */ - if (h.type == 1 && h.length >= 5) - dmi_set_vendor(dmi_string(&h, data[0x04])); -@@ -4772,33 +4789,21 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) - if (h.type == 34) - dmi_fixup_type_34(&h, display); - -- /* look for the next handle */ -- next = data + h.length; -- while ((unsigned long)(next - buf + 1) < len -- && (next[0] != 0 || next[1] != 0)) -- next++; -- next += 2; - if (display) - { -- if ((unsigned long)(next - buf) <= len) -+ if (opt.flags & FLAG_DUMP) - { -- if (opt.flags & FLAG_DUMP) -- { -- dmi_dump(&h, "\t"); -- printf("\n"); -- } -- else -- dmi_decode(&h, ver); -+ dmi_dump(&h, "\t"); -+ printf("\n"); - } -- else if (!(opt.flags & FLAG_QUIET)) -- printf("\t<TRUNCATED>\n\n"); -+ else -+ dmi_decode(&h, ver); - } - else if (opt.string != NULL - && opt.string->type == h.type) - dmi_table_string(&h, data, ver); - - data = next; -- i++; - - /* SMBIOS v3 requires stopping at this marker */ - if (h.type == 127 && (flags & FLAG_STOP_AT_EOT)) --- -cgit v1.0-41-gc330 - diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index 5a9e91bd0..52876cc19 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdk-pixbuf -pkgver=2.36.12 +pkgver=2.38.0 pkgrel=0 pkgdesc="GTK+ image loading library" url="https://www.gtk.org/" @@ -8,9 +8,8 @@ arch="all" options="!check" # bug753605-atsize.jpg is missing from tarball. license="LGPL-2.0+" depends="shared-mime-info" -depends_dev="" -makedepends="$depends_dev tiff-dev libjpeg-turbo-dev gobject-introspection-dev - libpng-dev glib-dev" +makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev + meson ninja python3 tiff-dev xmlto" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -26,38 +25,20 @@ replaces="gtk+" build() { cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x11 \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-libjpeg \ - --with-libtiff \ - --enable-introspection - make + mkdir build + cd build + meson -Dprefix=/usr -Dinstalled_tests=false + ninja } check() { - cd "$builddir" - make check + cd "$builddir"/build + ninja test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -doc() { - replaces="gtk+-doc" - default_doc -} - -dev() { - replaces="gtk+-dev" - default_dev + cd "$builddir"/build + DESTDIR="$pkgdir" ninja install } -sha512sums="5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b gdk-pixbuf-2.36.12.tar.xz" +sha512sums="10fcd7999dcff48d6e965306e208cc8ca324ba98f3f4f56755d015e96938bcfbfaadc56ed75142c037e3df34b04283cd4fdf043b32e3e091b32115fccde229f4 gdk-pixbuf-2.38.0.tar.xz" diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index 93ae26013..8cb1a8019 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,11 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.56.1 -_maj=${pkgver%%.*} -_min=${pkgver#${_maj}.} -_min=${_min%%.*} -_ver=$_maj.$_min +pkgver=2.58.0 +_ver=2.58 pkgrel=0 pkgdesc="Networking support for GLib" url="https://www.gnome.org/" @@ -40,4 +37,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="474d3e334b901c7445a2ee38018a23bbf0a1f4f7403952bf0e1c882f5c9a518b11696d0c69695b3cb378e33e15f619414e46733172ff6564732b96f3c375003d glib-networking-2.56.1.tar.xz" +sha512sums="d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff glib-networking-2.58.0.tar.xz" diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index d3fe771bf..877f9bed9 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.22.30 +pkgver=3.24.1 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -10,39 +10,15 @@ options="!check" # Test suite is known to fail upstream license="LGPL-2.1+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="shared-mime-info gtk-update-icon-cache" - +makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev + fontconfig-dev gdk-pixbuf-dev glib-dev gnutls-dev + gobject-introspection-dev libepoxy-dev libice-dev libx11-dev + libxcomposite-dev libxcursor-dev libxdamage-dev libxext-dev + libxfixes-dev libxi-dev libxinerama-dev libxrandr-dev pango-dev + tiff-dev zlib-dev" replaces="gtk+" replaces_dev="gtk+-dev" replaces_doc="gtk+-doc" - -depends_dev=" - at-spi2-atk-dev - atk-dev - cairo-dev - fontconfig-dev - gdk-pixbuf-dev - glib-dev - libepoxy-dev - libx11-dev - libxcomposite-dev - libxcursor-dev - libxdamage-dev - libxext-dev - libxfixes-dev - libxi-dev - libxinerama-dev - libxrandr-dev - pango-dev - " -makedepends=" - $depends_dev - cups-dev - expat-dev - gnutls-dev - gobject-introspection-dev - libice-dev - tiff-dev - zlib-dev" source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz" builddir="$srcdir"/gtk+-$pkgver @@ -77,4 +53,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38 gtk+-3.22.30.tar.xz" +sha512sums="13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d gtk+-3.24.1.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 0db1561b7..605f4de3e 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.0429 +pkgver=8.1.0490 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="e9ece2616f56f6ef0a08a73e48c4a87f138e381ec24b960f5e634c2291d9aba2c2d11a7f80dbe60eb3ccaeb8ea45b7c07ec5ebd50f4f5f326ffd1aff3729a13b vim-8.1.0429.tar.gz" +sha512sums="1237ad835f65699ca095fbae4ac1039807638d4de7cc00ec83a56ba975ba224103740f6d6ee9e15b0135bc444eef747a5e15b88346e32f7ae4d436f183a44935 vim-8.1.0490.tar.gz" diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index 985342a51..b2860f006 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.45 +pkgver=3.47 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9650f000d85890fe6953e6b3e051cc29f8f734d76b95784e029fed19adc9bb2f3307456cf6be51bbd21da183bae2db814e1ef844d2950b97fde0e4edc46fdd92 highlight-3.45.tar.bz2" +sha512sums="286dcc0db33c8b250852f7b607eb313afbd83da7ead6bde8a35ed5b7f59438b0345725a31dd5969347af10aba0c981f6bf2ce5683b801c45ee27b2b3c6ed21ed highlight-3.47.tar.bz2" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index ad8952d8f..1048741da 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.12 +pkgver=7.0.8.13 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="b4b9d252e12fe60cb046e64558465eea5e635fd133053732810f0cbc7e68efb2d2b4a336b28b3e7e985e659bb07eabc4709ed437f0f20e57bcc5a9a13fa3cc31 ImageMagick-7.0.8-12.tar.xz" +sha512sums="9db05c92f666526918e5730b42b8555261c5a3226b86652f82f95701bb3534415dc6d6f9a4e6df5a124e3c72df6820ba1aca824ebe7316aa1bcf5f831166ba03 ImageMagick-7.0.8-13.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 2160e2c5c..394b92dbd 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education pkgver=18.08.2 -pkgrel=0 +pkgrel=1 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" # gcompris-qt is removed until it works with gettext-tiny. -depends="artikulate blinken kalgebra kalzium kanagram kbruch +depends="artikulate blinken cantor kalgebra kalzium kanagram kbruch kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz labplot marble minuet rocs step" makedepends="" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD new file mode 100644 index 000000000..33498606c --- /dev/null +++ b/user/kdewebkit/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdewebkit +pkgver=5.51.0 +pkgrel=0 +pkgdesc="KDE integration with WebKit" +url="https://www.kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="qt5-qtwebkit-dev" +makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev + kio-dev kparts-dev kwallet-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/frameworks/5.51/kdewebkit-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="166637e3e30b94822e9a10cde59012f04505f564e5a6d69b81dffd9b7d0584f70891eab640dcac3d5ae56bba2e96b8cb2bac5c31b42ac95996a37660e55b90ee kdewebkit-5.51.0.tar.xz" diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD new file mode 100644 index 000000000..8ff9614b0 --- /dev/null +++ b/user/kdiagram/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdiagram +pkgver=2.6.1 +pkgrel=0 +pkgdesc="Charting libraries used by KDE" +url="https://www.kde.org/" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128 kdiagram-2.6.1.tar.xz" diff --git a/user/kphotoalbum/0001-Process-Don-t-use-stdio-identifiers-for-methods.patch b/user/kphotoalbum/0001-Process-Don-t-use-stdio-identifiers-for-methods.patch deleted file mode 100644 index 99e82b80f..000000000 --- a/user/kphotoalbum/0001-Process-Don-t-use-stdio-identifiers-for-methods.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 6aca702d252e108801b99113149fec1e89434167 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Wed, 14 Mar 2018 23:25:31 -0500 -Subject: [PATCH] Process: Don't use stdio identifiers for methods - -`stdout` and `stderr` are already used by POSIX <stdio.h>. This has -already caused problems in the past as the (now removed) comment in -Process.cpp noted with compilation on Mac OS X. - -This also causes a problem compiling on the musl libc, which -specifically uses the preprocessor to avoid redefinition and changing of -stdin, stdout, and stderr. - -This patch changes the names to be stdErr and stdOut, which are -camel-cased like Qt methods typically are, and do not conflict with -identifiers defined in <stdio.h>. ---- - ImageManager/VideoLengthExtractor.cpp | 12 ++++++------ - Utilities/Process.cpp | 12 ++---------- - Utilities/Process.h | 4 ++-- - 3 files changed, 10 insertions(+), 18 deletions(-) - -diff --git a/ImageManager/VideoLengthExtractor.cpp b/ImageManager/VideoLengthExtractor.cpp -index e751655a..9b3e756c 100644 ---- a/ImageManager/VideoLengthExtractor.cpp -+++ b/ImageManager/VideoLengthExtractor.cpp -@@ -72,18 +72,18 @@ void ImageManager::VideoLengthExtractor::extract(const DB::FileName &fileName) - - void ImageManager::VideoLengthExtractor::processEnded() - { -- if ( !m_process->stderr().isEmpty() ) -- qCDebug(ImageManagerLog) << m_process->stderr(); -+ if ( !m_process->stdErr().isEmpty() ) -+ qCDebug(ImageManagerLog) << m_process->stdErr(); - - QString lenStr; - if (MainWindow::FeatureDialog::ffmpegBinary().isEmpty()) - { -- QStringList list = m_process->stdout().split(QChar::fromLatin1('\n')); -+ QStringList list = m_process->stdOut().split(QChar::fromLatin1('\n')); - list = list.filter(STR("ID_LENGTH=")); - if ( list.count() == 0 ) { - qCWarning(ImageManagerLog) << "Unable to find ID_LENGTH in output from MPlayer for file " << m_fileName.absolute() << "\n" - << "Output was:\n" -- << m_process->stdout(); -+ << m_process->stdOut(); - emit unableToDetermineLength(); - return; - } -@@ -99,12 +99,12 @@ void ImageManager::VideoLengthExtractor::processEnded() - - lenStr = regexp.cap(1); - } else { -- QStringList list = m_process->stdout().split(QChar::fromLatin1('\n')); -+ QStringList list = m_process->stdOut().split(QChar::fromLatin1('\n')); - // ffprobe -v 0 just prints one line, except if panicking - if ( list.count() < 1 ) { - qCWarning(ImageManagerLog) << "Unable to parse video length from ffprobe output!" - << "Output was:\n" -- << m_process->stdout(); -+ << m_process->stdOut(); - emit unableToDetermineLength(); - return; - } -diff --git a/Utilities/Process.cpp b/Utilities/Process.cpp -index d31699cc..49be0004 100644 ---- a/Utilities/Process.cpp -+++ b/Utilities/Process.cpp -@@ -17,14 +17,6 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - --// OS/X defines stdout and stderr as macros, which interfere with our code here: --#if defined(stdout) --#undef stdout --#endif --#if defined(stderr) --#undef stderr --#endif -- - #include <QTextStream> - - #include "Process.h" -@@ -41,12 +33,12 @@ Utilities::Process::Process(QObject *parent) : - connect( this, SIGNAL(readyReadStandardOutput()), this, SLOT(readStandardOutput())); - } - --QString Utilities::Process::stdout() const -+QString Utilities::Process::stdOut() const - { - return m_stdout; - } - --QString Utilities::Process::stderr() const -+QString Utilities::Process::stdErr() const - { - return m_stderr; - } -diff --git a/Utilities/Process.h b/Utilities/Process.h -index b936e684..6280166d 100644 ---- a/Utilities/Process.h -+++ b/Utilities/Process.h -@@ -30,8 +30,8 @@ class Process : public QProcess - Q_OBJECT - public: - explicit Process(QObject *parent = nullptr); -- QString stdout() const; -- QString stderr() const; -+ QString stdOut() const; -+ QString stdErr() const; - - private slots: - void readStandardError(); --- -2.15.0 - diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index 4efa28bd0..4eb23d07d 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum -pkgver=5.3 +pkgver=5.4 pkgrel=0 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" @@ -13,8 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev phonon-dev karchive-dev kiconthemes-dev kjobwidgets-dev kio-dev ktextwidgets-dev kxmlgui-dev kwidgetsaddons-dev libjpeg-turbo-dev exiv2-dev libkipi-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz - 0001-Process-Don-t-use-stdio-identifiers-for-methods.patch" +source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz" build() { cd "$builddir" @@ -42,5 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f kphotoalbum-5.3.tar.xz -94251fb366bd0250bba3d192a442fc2712941fa2612123849c7abea4c5138d28d12b155c673bbf2713dd43f3abcdc663044783f89206c3c19fad33871879c1c0 0001-Process-Don-t-use-stdio-identifiers-for-methods.patch" +sha512sums="d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba kphotoalbum-5.4.tar.xz" diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD index c3b4d0388..35cd3cfb2 100644 --- a/user/labplot/APKBUILD +++ b/user/labplot/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=labplot pkgver=2.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive tool for graphing and analysis of scientific data" url="https://www.kde.org/applications/education/labplot/" arch="all" @@ -12,7 +12,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev karchive-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kio-dev kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev - qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev" + qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev + cantor-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz liborigin-endian.patch diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD index 8d55a80f3..38116b74f 100644 --- a/user/libburn/APKBUILD +++ b/user/libburn/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libburn -pkgver=1.4.8 +pkgver=1.5.0 pkgrel=0 pkgdesc="Library for CD/DVD burning" url="https://dev.lovelyhq.com/libburnia/web/wikis/home" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c libburn-1.4.8.tar.gz" +sha512sums="c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2 libburn-1.5.0.tar.gz" diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD index 374a1e0ee..8bae4ffde 100644 --- a/user/libindicator/APKBUILD +++ b/user/libindicator/APKBUILD @@ -37,7 +37,7 @@ check() { package() { cd "$builddir" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -j1 install } sha512sums="d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af libindicator-12.10.1.tar.gz" diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD index ee07f002f..e754ad0fa 100644 --- a/user/libisofs/APKBUILD +++ b/user/libisofs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libisofs -pkgver=1.4.8 +pkgver=1.5.0 pkgrel=0 pkgdesc="Library for creating and managing iso9660-based filesystems" url="https://dev.lovelyhq.com/libburnia/web/wikis/home" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc libisofs-1.4.8.tar.gz" +sha512sums="1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8 libisofs-1.5.0.tar.gz" diff --git a/user/libqalculate/APKBUILD b/user/libqalculate/APKBUILD new file mode 100644 index 000000000..0daff3d35 --- /dev/null +++ b/user/libqalculate/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libqalculate +pkgver=2.6.2 +pkgrel=0 +pkgdesc="Library implementing a powerful, versatile desktop calculator" +url="https://qalculate.github.io/" +arch="all" +options="!check" # missing potfiles +license="GPL-2.0+" +depends="" +depends_dev="gmp-dev mpfr-dev" +makedepends="$depends_dev curl-dev icu-dev intltool libxml2-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang qalc" +source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz" + +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 +} + +qalc() { + pkgdesc="Powerful, versatile desktop calculator (terminal UI)" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +sha512sums="cf7acdfba786ec8c3b9c07a89e605b2f021d63d43dde3f36081e54a0a4826f5f2b0bf9092ec69a3a34ae5aca229d1330c84c786dfdf3869bde6e8d07457e8f93 libqalculate-2.6.2.tar.gz" diff --git a/user/libqmatrixclient/APKBUILD b/user/libqmatrixclient/APKBUILD index ddd5f3047..6d8a0ad5d 100644 --- a/user/libqmatrixclient/APKBUILD +++ b/user/libqmatrixclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libqmatrixclient -pkgver=0.3.0.2 +pkgver=0.4.0 pkgrel=0 pkgdesc="Library to interface with Matrix chat systems using Qt 5" url="https://matrix.org/docs/projects/sdk/libqmatrixclient.html" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f650f50185070ce7d37dbb173c27c46adc45eb18ac3219d37b6f3eb275f23afa7dd8cb583721cd03c4e50cb7a19345f8c747acce097ba81b5f3d14a700c9d7c2 libqmatrixclient-0.3.0.2.tar.gz" +sha512sums="552b866ef4adbde72518f96b42beb08dc99f80ff0388717e99c4287c463db21469d91e188b3d5c17850266ea313a36fed0cd01431f08632e3d1403f3b7725e40 libqmatrixclient-0.4.0.tar.gz" diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD index bc3c76754..b69b2ea55 100644 --- a/user/libsoup/APKBUILD +++ b/user/libsoup/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsoup -pkgver=2.64.1 +pkgver=2.64.2 pkgrel=0 pkgdesc="GObject-based HTTP library" url="https://wiki.gnome.org/Projects/libsoup" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="13d16457a443294020621df34205c570d25a6ff048ab68633cc504d70a8a1281a38dddb54110fd35a059bd69aebc3fd49b5ab0fc42abf4f4a19746a25050119d libsoup-2.64.1.tar.xz" +sha512sums="c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f libsoup-2.64.2.tar.xz" diff --git a/user/libva/APKBUILD b/user/libva/APKBUILD index 36540477b..af9058b37 100644 --- a/user/libva/APKBUILD +++ b/user/libva/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libva pkgver=2.2.0 pkgrel=0 diff --git a/user/libxkbcommon/APKBUILD b/user/libxkbcommon/APKBUILD index 64ad224f4..61e6c5a0d 100644 --- a/user/libxkbcommon/APKBUILD +++ b/user/libxkbcommon/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbcommon -pkgver=0.8.0 +pkgver=0.8.2 pkgrel=0 pkgdesc="Keyboard handling library" url="https://www.xkbcommon.org/" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163 libxkbcommon-0.8.0.tar.xz" +sha512sums="b714240ec6120bbe44b5da7a4f89b1c2f24cfd6e5ebbe81e5290d135c8f2e5a68f89ac256b73430a446167345f8db309b35dcf74f3d3840e20897cd91eccc172 libxkbcommon-0.8.2.tar.xz" diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD index 08b42891b..06bf46ea3 100644 --- a/user/live-media/APKBUILD +++ b/user/live-media/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=live-media -pkgver=2018.09.06 +pkgver=2018.10.17 pkgrel=0 pkgdesc="Libraries for multimedia streaming" url="http://live555.com/liveMedia" @@ -53,4 +53,4 @@ utils() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="ada3b4f0de25304d0d53aef19136beecc6c16d506562eea85709542f608be7dcf56977e3073722873fb03deafd56be945397db8804c252acd87192adaee1bdba live.2018.09.06.tar.gz" +sha512sums="df1880059505acc66f0b4b4e45a655da78888082b36635eb201970fb9dd79d5bc87ba2d251032be226604e59e59e31fe1ff229911b6410f18e4c65b01166dd54 live.2018.10.17.tar.gz" diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD index 6732105ef..e6fe5e684 100644 --- a/user/lua-sec/APKBUILD +++ b/user/lua-sec/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: pkgname=lua-sec pkgver=0.7 pkgrel=0 diff --git a/user/mednafen/APKBUILD b/user/mednafen/APKBUILD new file mode 100644 index 000000000..097454cad --- /dev/null +++ b/user/mednafen/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Horst Burkhardt <horst@adelielinux.org> +# Maintainer: Horst Burkhardt <horst@adelielinux.org> +pkgname=mednafen +pkgver=1.21.3 +pkgrel=0 +pkgdesc="an emulator for various home gaming consoles" +url="https://mednafen.github.io/" +arch="all !s390x" +options="!check !dbg" # mednafen does not ship actual tests +subpackages="$pkgname-lang" +license="GPL-2.0-only" +depends="" +makedepends="alsa-lib-dev flac-dev libogg-dev libsndfile-dev libvorbis-dev + lzo-dev sdl2-dev zlib-dev" +source="https://mednafen.github.io/releases/files/$pkgname-$pkgver.tar.xz" +builddir="$srcdir/$pkgname" + +build() { + cd "$builddir" + ./configure --prefix=/usr --enable-ss=no + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="987c14edae68901f8a693c9f7317063daf4274bb0b650ed05cd01cf4ceb38d76e6ff5446c324447f73727096c74d0bf7f545cdeadfb6291d67656d659de26715 mednafen-1.21.3.tar.xz" diff --git a/user/mednaffe/APKBUILD b/user/mednaffe/APKBUILD new file mode 100644 index 000000000..9770912b1 --- /dev/null +++ b/user/mednaffe/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: Horst Burkhardt <horst@adelielinux.org> +# Maintainer: Horst Burkhardt <horst@adelielinux.org> +pkgname=mednaffe +pkgver=0.8.7 +pkgrel=0 +pkgdesc="a front-end to the mednafen emulator" +url="https://github.com/AmatCoder/mednaffe" +arch="all !s390x" +options="!check" # mednaffe does not ship a test suite +subpackages="$pkgname-doc" +license="GPL-3.0-only" +depends="mednafen" +makedepends="mednafen gtk+2.0-dev glib-dev atk-dev pango-dev cairo-dev libxfixes-dev libx11-dev libxrender-dev libxi-dev libxext-dev libxdamage-dev libffi-dev pcre-dev freetype-dev harfbuzz-dev libxcb-dev expat-dev libxau-dev libxdmcp-dev graphite2-dev libuuid libbsd-dev" +source="https://github.com/AmatCoder/mednaffe/releases/download/$pkgver/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/$pkgname-$pkgver" + +build() { + cd "$builddir" + ./configure --prefix=/usr --disable-gtk3 + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3495ecd3b87f19ab65d8760ea8adfa830c4dc9fe959f2e2f349216b36f58d9623c9cfd0c7e40fe5e8b7b90846fe85d9808c2a5885f36d5d8b16659b25cf8a3a1 mednaffe-0.8.7.tar.gz" diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD index 75abbf733..ff5fbda6f 100644 --- a/user/muparser/APKBUILD +++ b/user/muparser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> pkgname=muparser -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=0 pkgdesc="Fast math parser library" url="http://beltoforion.de/article.php?a=muparser" @@ -11,8 +11,7 @@ license="MIT" depends="" makedepends="cmake" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/beltoforion/$pkgname/archive/v$pkgver.tar.gz - muparser-buildsystem.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/beltoforion/$pkgname/archive/v$pkgver.tar.gz" build() { cd "$builddir/build" @@ -33,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d89380ebdc0ce91d0ea38fe43419ab6ed06c47d352b9ee20e1edcce48337b464366153493e0241c373ba2880a8b419fb9541e56cda0d14915daf9b98136ee682 muparser-2.2.5.tar.gz -2acdf0bb2db7d11583ea4512d0422cc5ac577f074de7f0dbc28df879f821c6904a6bda5c9a68f2836459623544cb7af69a7fa664788d8cae98f83adaac3ae3a2 muparser-buildsystem.patch" +sha512sums="2b34e740a3d07767b2b97871d11f845afd74e4abe7ba5ceb5dd9bd8405aa45b8dcb2c5980535b05b92ba680cfc6f722948bf9e7f8858a335c9b63f7ac384107c muparser-2.2.6.tar.gz" diff --git a/user/muparser/muparser-buildsystem.patch b/user/muparser/muparser-buildsystem.patch deleted file mode 100644 index bd7faa991..000000000 --- a/user/muparser/muparser-buildsystem.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..3912058 ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,91 @@ -+# CMake based on work from @xantares -+cmake_minimum_required(VERSION 3.1) -+project(muParserProject) -+ -+include(CTest) -+enable_testing() -+ -+# Bump versions on release -+set(MUPARSER_VERSION_MAJOR 2) -+set(MUPARSER_VERSION_MINOR 2) -+set(MUPARSER_VERSION_PATCH 5) -+set(MUPARSER_VERSION ${MUPARSER_VERSION_MAJOR}.${MUPARSER_VERSION_MINOR}.${MUPARSER_VERSION_PATCH}) -+ -+# Build options -+option(ENABLE_SAMPLES "Build the samples" ON) -+option(ENABLE_OPENMP "Enable OpenMP for multithreading" OFF) -+ -+if(ENABLE_OPENMP) -+ find_package(OpenMP REQUIRED) -+ set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_CXX_FLAGS}") -+ set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}") -+endif() -+ -+include_directories("${CMAKE_SOURCE_DIR}/include") -+add_library(muparser -+ src/muParserBase.cpp -+ src/muParserBytecode.cpp -+ src/muParserCallback.cpp -+ src/muParser.cpp -+ src/muParserDLL.cpp -+ src/muParserError.cpp -+ src/muParserInt.cpp -+ src/muParserTest.cpp -+ src/muParserTokenReader.cpp -+) -+target_compile_definitions(muparser PRIVATE MUPARSERLIB_EXPORTS) -+if(ENABLE_OPENMP) -+ target_compile_definitions(muparser PRIVATE MUP_USE_OPENMP) -+endif() -+set_target_properties(muparser PROPERTIES -+ VERSION ${MUPARSER_VERSION} -+ SOVERSION ${MUPARSER_VERSION_MAJOR} -+) -+ -+# Install the export set for use with the install-tree -+export(TARGETS muparser FILE "${CMAKE_BINARY_DIR}/muparser-targets.cmake") -+ -+if(ENABLE_SAMPLES) -+ # the C example does not compile at the moment, because definitions must be -+ # inside external "C" { } to avoid name mangling. -+ #add_executable(example2 samples/example2/example2.c) -+ #target_link_libraries(example2 muparser) -+ -+ add_executable(example1 samples/example1/example1.cpp) -+ target_link_libraries(example1 muparser) -+ add_test(base example1) -+endif() -+ -+install(TARGETS muparser DESTINATION lib) -+install(FILES -+ include/muParserBase.h -+ include/muParserBytecode.h -+ include/muParserCallback.h -+ include/muParserDef.h -+ include/muParserDLL.h -+ include/muParserError.h -+ include/muParserFixes.h -+ include/muParser.h -+ include/muParserInt.h -+ include/muParserStack.h -+ include/muParserTemplateMagic.h -+ include/muParserTest.h -+ include/muParserToken.h -+ include/muParserTokenReader.h -+ DESTINATION include -+) -+ -+# Define variables for the pkg-config file -+# The GNUInstallDirs defines ${CMAKE_INSTALL_DATAROOTDIR} -+# See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html -+include(GNUInstallDirs) -+set(PACKAGE_NAME muparser) -+configure_file( -+ "${CMAKE_SOURCE_DIR}/build/autoconf/muparser.pc.cmakein" -+ "${CMAKE_BINARY_DIR}/muparser.pc" -+ @ONLY -+) -+install( -+ FILES "${CMAKE_BINARY_DIR}/muparser.pc" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" -+) -diff --git a/build/autoconf/muparser.pc.cmakein b/build/autoconf/muparser.pc.cmakein -new file mode 100644 -index 0000000..be535ff ---- /dev/null -+++ b/build/autoconf/muparser.pc.cmakein -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+Name: @PACKAGE_NAME@ -+Description: Mathematical expressions parser library -+Version: @MUPARSER_VERSION@ -+Requires: -+Libs: -L${libdir} -lmuparser -+Cflags: -I${includedir} diff --git a/user/openldap/APKBUILD b/user/openldap/APKBUILD index 84cbc1471..f1d84ba54 100644 --- a/user/openldap/APKBUILD +++ b/user/openldap/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> # Contributor: Jakub Jirutka <jakub@jirutka.cz> # # secfixes: diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD index 1afc13380..3066ad3bc 100644 --- a/user/pcsc-lite/APKBUILD +++ b/user/pcsc-lite/APKBUILD @@ -2,18 +2,18 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=pcsc-lite -pkgver=1.8.23 -pkgrel=2 +pkgver=1.8.24 +pkgrel=0 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" url="https://pcsclite.apdu.fr/" arch="all" -license="Custom" +license="BSD-3-Clause AND GPL-3.0+ AND BSD-2-Clause AND MIT" depends="" depends_dev="eudev-dev" makedepends="$depends_dev perl perl-dev libcap-ng-utils polkit-dev" -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc" install="pcsc-lite.pre-install pcsc-lite.pre-upgrade" -source="https://distfiles.gentoo.org/distfiles/pcsc-lite-1.8.23.tar.bz2 +source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2 pcscd.initd" build() { @@ -64,5 +64,5 @@ dev() { mv "$subpkgdir"/usr/lib/libpcsclite.so "$pkgdir"/usr/lib/libpcsclite.so } -sha512sums="fef9f40376660bc9de938608cfdbf12ca764be1ebb59c7a1065cb74a21ecc7333f86add25028bd47ec55b2227a9e2d15e1afcb6d0aeb510636d2aadef254bec4 pcsc-lite-1.8.23.tar.bz2 +sha512sums="df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c pcsc-lite-1.8.24.tar.bz2 6810ab357b5bcf07bf1ad76ed17ebb8e92be4599303a4e697b87a05d43b8d2bec5d3c29d44d8ddb5d031910ea62ca52a9868e6de9a255227eaeb29d1a7ee0041 pcscd.initd" diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD index 102d45097..d61534046 100644 --- a/user/perl-file-slurp/APKBUILD +++ b/user/perl-file-slurp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-slurp -pkgver=9999.22 +pkgver=9999.23 pkgrel=0 pkgdesc="Simple and efficient file manipulation in Perl" url="https://metacpan.org/release/File-Slurp" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="54a77ed58bb93547d3ff0b01ebe39c9daaa5d16c335e16922ea2964edb5716f662d512c9c505a09c63f4bd465fb3e5f0af365ad3734c98e5225d53a5c616ca4e File-Slurp-9999.22.tar.gz" +sha512sums="6f52b54100906791d9878a07f2190a725af717d52ed3349726c7c007c97902a9e643f45d539e40569a8ad2220cd7ae5de43b45049a1032f32cd04807de81b2fd File-Slurp-9999.23.tar.gz" diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD index e8547949a..4d1cdec4c 100644 --- a/user/perl-template-toolkit/APKBUILD +++ b/user/perl-template-toolkit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-template-toolkit -pkgver=2.27 +pkgver=2.28 pkgrel=0 pkgdesc="Comprehensive template processing system" url="https://metacpan.org/release/Template-Toolkit" @@ -11,7 +11,7 @@ depends="perl-appconfig" makedepends="perl-dev" checkdepends="perl-cgi perl-test-leaktrace" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/A/AB/ABW/Template-Toolkit-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/Template-Toolkit-$pkgver.tar.gz" builddir="$srcdir/Template-Toolkit-$pkgver" build() { @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="17f03a01a3d6ab0ef2247c77da15c46d9bbce3e0158172162da6abe47f53c5e7ca041a7c31506bb3a37f31c476ba747f5111c5b1b1d69614a4ce3352927fd4e6 Template-Toolkit-2.27.tar.gz" +sha512sums="8f18a411e05108cddc4f2c5560c76b663d6b913f101c6b294b584390cd76d79805afa8208e1dfaf01011ff7d6364844a24587b33d8a3d330fb6b410e75e78a1d Template-Toolkit-2.28.tar.gz" diff --git a/user/plib/APKBUILD b/user/plib/APKBUILD new file mode 100644 index 000000000..fe02621ac --- /dev/null +++ b/user/plib/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plib +pkgver=1.8.5 +pkgrel=0 +pkgdesc="Portable game libraries" +url="http://plib.sourceforge.net/" +arch="all" +options="!dbg" # No shared libraries +license="LGPL-2.0+" +depends="" +makedepends="libxi-dev libxmu-dev libxt-dev mesa-dev" +subpackages="$pkgname-dev" +source="http://plib.sourceforge.net/dist/plib-$pkgver.tar.gz + fix-openflight.patch + joystick.patch + plib-1.8.5-CVE-2011-4620.patch + plib-1.8.5-CVE-2012-4552.patch + shared.patch + " + +prepare() { + default_prepare + autoreconf -vif +} + +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="17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d plib-1.8.5.tar.gz +fac9c78a57a0c564c46d586ebf541b45cf7dc838387498f3263bac78f0f78c53c85000667d6dfd349e328b1cd4254ac0d786dd825aefbe957f94e6d3b91ec41b fix-openflight.patch +d9909c81fe2ed696c639623c532cb16a1378b0e2843ccbef00bb16bc6459cc7c708b2b0903dbdc89e6fb05522debd79f0f88b311bf12c3d415e303591033f0a8 joystick.patch +c046cf65e80629f238aaba724f522c31b434f5c9687ea02b019846ce3469c6b074bd014f81a7a4e6b43db7b084f4dcd9d4c04b557dbc1b8b8ca00f2d782fdf1c plib-1.8.5-CVE-2011-4620.patch +a09462ecb085703aae7cd3b77954cc800410aa37a9616255cca2f21456e6d5dcf8ead3f684c98236deb1455c6a034dc8ec874bafdbab003f7a63517ea1f8350d plib-1.8.5-CVE-2012-4552.patch +8f4fcbf3a07f64212b3ce891a4629fb45b1c62b251730a9d5f7da6e6fe65c39540f80519e97cf6a45c32f950f25e4d383ba891a6c0a92ae8a37089e51c0c5020 shared.patch" diff --git a/user/plib/fix-openflight.patch b/user/plib/fix-openflight.patch new file mode 100644 index 000000000..7c69c1cd1 --- /dev/null +++ b/user/plib/fix-openflight.patch @@ -0,0 +1,25 @@ +--- plib-1.8.5/src/ssg/ssgLoadFLT.cxx.old 2008-03-11 02:06:23.000000000 +0000 ++++ plib-1.8.5/src/ssg/ssgLoadFLT.cxx 2018-10-23 22:02:06.650000000 +0000 +@@ -103,9 +103,7 @@ + #include <string.h> + #include <fcntl.h> + #include <stdio.h> +-#ifdef UL_IRIX +-# include <sys/endian.h> +-#endif ++#include <endian.h> + #ifdef USE_POSIX_MMAP + # include <time.h> + # include <sys/time.h> /* Need both for Mandrake 8.0 !! */ +@@ -141,11 +139,8 @@ + #define template _template /* trams */ + + typedef unsigned char ubyte; +- +-#ifdef UL_WIN32 + typedef unsigned short ushort; + typedef unsigned int uint; +-#endif + + // 525 = negative identation, 539= did not expect positive identation + //lint -save -e525 -e539 diff --git a/user/plib/joystick.patch b/user/plib/joystick.patch new file mode 100644 index 000000000..febcc89e3 --- /dev/null +++ b/user/plib/joystick.patch @@ -0,0 +1,31 @@ +Description: Don't break system calibration settings when a joystick is opened + plib may do additional dead-band management on top of the OS joystick driver, + it should not break system settings for that reason! +Author: Florent Rougon <f.rougon@free.fr> +Bug: https://sourceforge.net/p/plib/bugs/47/ +Bug-Debian: http://bugs.debian.org/787464 +Last-Update: 2015-06-01 + +--- a/src/js/jsLinux.cxx ++++ b/src/js/jsLinux.cxx +@@ -79,20 +79,6 @@ + if ( num_axes > _JS_MAX_AXES ) + num_axes = _JS_MAX_AXES ; + +- // Remove any deadband value already done in the kernel. +- // Since we have our own deadband management this is save to do so. +- struct js_corr* corr = new js_corr[ all_axes ] ; +- ioctl ( os->fd, JSIOCGCORR, corr ); +- for ( int i = 0; i < num_axes ; ++i ) { +- if ( corr[ i ] . type == JS_CORR_BROKEN ) { +- int nodeadband = ( corr[ i ] . coef[ 0 ] + corr[ i ] . coef[ 1 ] ) / 2 ; +- corr[ i ] . coef[ 0 ] = nodeadband ; +- corr[ i ] . coef[ 1 ] = nodeadband ; +- } +- } +- ioctl ( os->fd, JSIOCSCORR, corr ); +- delete [] corr; +- + for ( int i = 0 ; i < _JS_MAX_AXES ; i++ ) + { + max [ i ] = 32767.0f ; diff --git a/user/plib/plib-1.8.5-CVE-2011-4620.patch b/user/plib/plib-1.8.5-CVE-2011-4620.patch new file mode 100644 index 000000000..41fac5fe4 --- /dev/null +++ b/user/plib/plib-1.8.5-CVE-2011-4620.patch @@ -0,0 +1,11 @@ +--- plib-1.8.5/src/util/ulError.cxx~ 2008-03-11 03:06:23.000000000 +0100 ++++ plib-1.8.5/src/util/ulError.cxx 2011-12-27 15:38:25.305676650 +0100 +@@ -39,7 +39,7 @@ void ulSetError ( enum ulSeverity severi + { + va_list argp; + va_start ( argp, fmt ) ; +- vsprintf ( _ulErrorBuffer, fmt, argp ) ; ++ vsnprintf ( _ulErrorBuffer, sizeof(_ulErrorBuffer), fmt, argp ) ; + va_end ( argp ) ; + + if ( _ulErrorCB ) diff --git a/user/plib/plib-1.8.5-CVE-2012-4552.patch b/user/plib/plib-1.8.5-CVE-2012-4552.patch new file mode 100644 index 000000000..78f1b22ae --- /dev/null +++ b/user/plib/plib-1.8.5-CVE-2012-4552.patch @@ -0,0 +1,54 @@ +--- plib-1.8.5/src/ssg/ssgParser.cxx~ ++++ plib-1.8.5/src/ssg/ssgParser.cxx +@@ -57,18 +57,16 @@ void _ssgParser::error( const char *form + char msgbuff[ 255 ]; + va_list argp; + +- char* msgptr = msgbuff; +- if (linenum) +- { +- msgptr += sprintf ( msgptr,"%s, line %d: ", +- path, linenum ); +- } +- + va_start( argp, format ); +- vsprintf( msgptr, format, argp ); ++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); + va_end( argp ); + +- ulSetError ( UL_WARNING, "%s", msgbuff ) ; ++ if (linenum) ++ { ++ ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ; ++ } else { ++ ulSetError ( UL_WARNING, "%s", msgbuff ) ; ++ } + } + + +@@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo + char msgbuff[ 255 ]; + va_list argp; + +- char* msgptr = msgbuff; +- if (linenum) +- { +- msgptr += sprintf ( msgptr,"%s, line %d: ", +- path, linenum ); +- } +- + va_start( argp, format ); +- vsprintf( msgptr, format, argp ); ++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); + va_end( argp ); + +- ulSetError ( UL_DEBUG, "%s", msgbuff ) ; ++ if (linenum) ++ { ++ ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ; ++ } else { ++ ulSetError ( UL_DEBUG, "%s", msgbuff ) ; ++ } + } + + // Opens the file and does a few internal calculations based on the spec. diff --git a/user/plib/shared.patch b/user/plib/shared.patch new file mode 100644 index 000000000..cb000310d --- /dev/null +++ b/user/plib/shared.patch @@ -0,0 +1,288 @@ +diff -Naur plib-1.8.5.orig/configure.in plib-1.8.5/configure.in +--- plib-1.8.5.orig/configure.in 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/configure.in 2008-04-17 13:47:10.000000000 +0100 +@@ -36,7 +36,7 @@ + AC_PROG_CXX + AC_PROG_CXXCPP + AC_PROG_INSTALL +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + + dnl Command line arguments + +diff -Naur plib-1.8.5.orig/src/fnt/Makefile.am plib-1.8.5/src/fnt/Makefile.am +--- plib-1.8.5.orig/src/fnt/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/fnt/Makefile.am 2008-04-17 13:52:53.000000000 +0100 +@@ -1,10 +1,12 @@ + if BUILD_FNT + +-lib_LIBRARIES = libplibfnt.a ++lib_LTLIBRARIES = libplibfnt.la + + include_HEADERS = fnt.h + +-libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx ++libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx ++libplibfnt_la_LIBADD = ../util/libplibul.la ++libplibfnt_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/js/Makefile.am plib-1.8.5/src/js/Makefile.am +--- plib-1.8.5.orig/src/js/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/js/Makefile.am 2008-04-17 13:53:33.000000000 +0100 +@@ -1,12 +1,15 @@ + if BUILD_JS + +-lib_LIBRARIES = libplibjs.a ++lib_LTLIBRARIES = libplibjs.la + + include_HEADERS = js.h + +-libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \ ++libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \ + jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \ + jsNone.cxx ++libplibjs_la_LIBADD = ../util/libplibul.la ++libplibjs_la_LDFLAGS = -version-info 9:5:8 ++ + + INCLUDES = -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/Makefile.am plib-1.8.5/src/Makefile.am +--- plib-1.8.5.orig/src/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/Makefile.am 2008-04-17 14:16:21.000000000 +0100 +@@ -1 +1 @@ +-SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw ++SUBDIRS = util fnt sg js sl pui puAux ssg ssgAux net psl pw +diff -Naur plib-1.8.5.orig/src/net/Makefile.am plib-1.8.5/src/net/Makefile.am +--- plib-1.8.5.orig/src/net/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/net/Makefile.am 2008-04-17 13:54:12.000000000 +0100 +@@ -1,12 +1,14 @@ + if BUILD_NET + +-lib_LIBRARIES = libplibnet.a ++lib_LTLIBRARIES = libplibnet.la + + include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \ + netMonitor.h netSocket.h net.h + +-libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \ ++libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \ + netMessage.cxx netMonitor.cxx netSocket.cxx ++libplibnet_la_LIBADD = ../util/libplibul.la ++libplibnet_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/psl/Makefile.am plib-1.8.5/src/psl/Makefile.am +--- plib-1.8.5.orig/src/psl/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/psl/Makefile.am 2008-04-17 14:13:43.000000000 +0100 +@@ -1,16 +1,18 @@ + + if BUILD_PSL + +-lib_LIBRARIES = libplibpsl.a ++lib_LTLIBRARIES = libplibpsl.la + + include_HEADERS = psl.h + +-libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \ ++libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \ + pslCompiler.cxx pslSymbols.cxx pslToken.cxx \ + pslExpression.cxx pslProgram.cxx pslDump.cxx \ + pslError.cxx pslFileIO.cxx pslCompiler.h \ + pslContext.h pslFileIO.h pslLocal.h \ + pslOpcodes.h pslSymbol.h ++libplibpsl_la_LIBADD = ../util/libplibul.la ++libplibpsl_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/puAux/Makefile.am plib-1.8.5/src/puAux/Makefile.am +--- plib-1.8.5.orig/src/puAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/puAux/Makefile.am 2008-04-17 14:08:34.000000000 +0100 +@@ -1,10 +1,10 @@ + if BUILD_PUAUX + +-lib_LIBRARIES = libplibpuaux.a ++lib_LTLIBRARIES = libplibpuaux.la + + include_HEADERS = puAux.h puAuxLocal.h + +-libplibpuaux_a_SOURCES = puAux.cxx \ ++libplibpuaux_la_SOURCES = puAux.cxx \ + puAuxBiSlider.cxx \ + puAuxBiSliderWithEnds.cxx \ + puAuxComboBox.cxx \ +@@ -19,6 +19,9 @@ + puAuxTriSlider.cxx \ + puAuxVerticalMenu.cxx \ + puAuxChooser.cxx ++libplibpuaux_la_LIBADD = ../util/libplibul.la ../pui/libplibpu.la \ ++ ../fnt/libplibfnt.la ../sg/libplibsg.la ++libplibpuaux_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/sg \ + -I$(top_srcdir)/src/pui \ +diff -Naur plib-1.8.5.orig/src/pui/Makefile.am plib-1.8.5/src/pui/Makefile.am +--- plib-1.8.5.orig/src/pui/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/pui/Makefile.am 2008-04-17 14:09:12.000000000 +0100 +@@ -1,10 +1,10 @@ + if BUILD_PUI + +-lib_LIBRARIES = libplibpu.a ++lib_LTLIBRARIES = libplibpu.la + + include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h + +-libplibpu_a_SOURCES = \ ++libplibpu_la_SOURCES = \ + pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \ + puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \ + puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \ +@@ -14,6 +14,8 @@ + puDial.cxx \ + puRange.cxx \ + puInputBase.cxx ++libplibpu_la_LIBADD = ../util/libplibul.la ../fnt/libplibfnt.la ++libplibpu_la_LDFLAGS = -version-info 9:5:8 + + AM_CPPFLAGS = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/fnt + AM_CPPFLAGS += -I$(top_srcdir)/src/util +diff -Naur plib-1.8.5.orig/src/pw/Makefile.am plib-1.8.5/src/pw/Makefile.am +--- plib-1.8.5.orig/src/pw/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/pw/Makefile.am 2008-04-17 14:13:46.000000000 +0100 +@@ -1,10 +1,11 @@ + if BUILD_PW + +-lib_LIBRARIES = libplibpw.a ++lib_LTLIBRARIES = libplibpw.la + + include_HEADERS = pw.h + +-libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx ++libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx ++libplibpw_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/sg/Makefile.am plib-1.8.5/src/sg/Makefile.am +--- plib-1.8.5.orig/src/sg/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/sg/Makefile.am 2008-04-17 14:14:23.000000000 +0100 +@@ -1,12 +1,14 @@ + if BUILD_SG + +-lib_LIBRARIES = libplibsg.a ++lib_LTLIBRARIES = libplibsg.la + + include_HEADERS = sg.h + +-libplibsg_a_SOURCES = sg.cxx sgd.cxx \ ++libplibsg_la_SOURCES = sg.cxx sgd.cxx \ + sgIsect.cxx sgdIsect.cxx \ + sgPerlinNoise.cxx ++libplibsg_la_LIBADD = ../util/libplibul.la ++libplibsg_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/sl/Makefile.am plib-1.8.5/src/sl/Makefile.am +--- plib-1.8.5.orig/src/sl/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/sl/Makefile.am 2008-04-17 14:12:02.000000000 +0100 +@@ -1,16 +1,19 @@ + if BUILD_SL + +-lib_LIBRARIES = libplibsl.a libplibsm.a ++lib_LTLIBRARIES = libplibsl.la libplibsm.la + + include_HEADERS = sl.h slPortability.h sm.h + +-libplibsl_a_SOURCES = \ ++libplibsl_la_SOURCES = \ + slDSP.cxx slSample.cxx slEnvelope.cxx \ + slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \ + slScheduler.cxx slMODdacio.cxx slMODfile.cxx \ + slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h ++libplibsl_la_LIBADD = ../util/libplibul.la ++libplibsl_la_LDFLAGS = -version-info 9:5:8 + +-libplibsm_a_SOURCES = slPortability.h smMixer.cxx ++libplibsm_la_SOURCES = slPortability.h smMixer.cxx ++libplibsm_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/ssg/Makefile.am plib-1.8.5/src/ssg/Makefile.am +--- plib-1.8.5.orig/src/ssg/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/ssg/Makefile.am 2008-04-17 14:15:18.000000000 +0100 +@@ -1,10 +1,10 @@ + if BUILD_SSG + +-lib_LIBRARIES = libplibssg.a ++lib_LTLIBRARIES = libplibssg.la + + include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h + +-libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \ ++libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \ + ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \ + ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \ + ssgLoadDOF.cxx ssgLoadAC.cxx \ +@@ -28,6 +28,8 @@ + ssgLoadMDL_BGLTexture.cxx ssgLoadXPlaneObj.cxx ssgLoadASC.cxx ssgSaveASC.cxx \ + ssgSaveIV.cxx ssgAnimTransform.cxx\ + ssgVertSplitter.h ssgVertSplitter.cxx ssgStatistics.cxx ++libplibssg_la_LIBADD = ../util/libplibul.la ../sg/libplibsg.la ++libplibssg_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util + +diff -Naur plib-1.8.5.orig/src/ssgAux/Makefile.am plib-1.8.5/src/ssgAux/Makefile.am +--- plib-1.8.5.orig/src/ssgAux/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/ssgAux/Makefile.am 2008-04-17 14:14:50.000000000 +0100 +@@ -1,6 +1,6 @@ + if BUILD_SSGAUX + +-lib_LIBRARIES = libplibssgaux.a ++lib_LTLIBRARIES = libplibssgaux.la + + include_HEADERS = ssgAux.h \ + ssgaShapes.h \ +@@ -13,7 +13,7 @@ + ssgaFire.h \ + ssgaBillboards.h + +-libplibssgaux_a_SOURCES = ssgAux.cxx \ ++libplibssgaux_la_SOURCES = ssgAux.cxx \ + ssgaShapes.cxx \ + ssgaPatch.cxx \ + ssgaParticleSystem.cxx \ +@@ -30,6 +30,9 @@ + ssgaSky.cxx \ + ssgaTeapot.cxx \ + ssgaBillboards.cxx ++libplibssgaux_la_LIBADD = ../util/libplibul.la ../ssg/libplibssg.la \ ++ ../sg/libplibsg.la ++libplibssgaux_la_LDFLAGS = -version-info 9:5:8 + + INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/ssg + INCLUDES += -I$(top_srcdir)/src/util +diff -Naur plib-1.8.5.orig/src/util/Makefile.am plib-1.8.5/src/util/Makefile.am +--- plib-1.8.5.orig/src/util/Makefile.am 2008-04-17 13:46:45.000000000 +0100 ++++ plib-1.8.5/src/util/Makefile.am 2008-04-17 14:13:41.000000000 +0100 +@@ -1,11 +1,12 @@ + if BUILD_UL + +-lib_LIBRARIES = libplibul.a ++lib_LTLIBRARIES = libplibul.la + + include_HEADERS = ul.h ulRTTI.h + +-libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \ ++libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \ + ulList.cxx ulLocal.h ulRTTI.cxx ++libplibul_la_LDFLAGS = -version-info 9:5:8 + + endif + diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD index a7337d03f..363e30f5c 100644 --- a/user/quaternion/APKBUILD +++ b/user/quaternion/APKBUILD @@ -1,19 +1,17 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=quaternion -pkgver=0.0.9.2 +pkgver=0.0.9.3 pkgrel=0 pkgdesc="Qt5-based Matrix chat client" url="https://matrix.org/docs/projects/client/quaternion.html" arch="all" license="GPL-3.0+" depends="qt5-qtquickcontrols" -makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev libqmatrixclient-dev" +makedepends="cmake libqmatrixclient-dev qt5-qtbase-dev qt5-qtdeclarative-dev + qt5-qttools-dev" subpackages="" -source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz - unbundle-lib1.patch - unbundle-lib2.patch - " +source="quaternion-$pkgver.tar.gz::https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz" builddir="$srcdir/Quaternion-$pkgver" build() { @@ -27,8 +25,6 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DUSE_DYNAMIC_LIB=True \ ${CMAKE_CROSSOPTS} make } @@ -43,6 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a72a39a8f353828d1322abce54f6ea5854346aa96c230684afee113142d1b5dfd521bf12dc29c397a39769b65e36c5b6c8b8de812011b4cd96c1570494803c5 quaternion-0.0.9.2.tar.gz -da88b919832a7d84375e7b698785941897e3f40c9afff1ced5a91b8f7f82f348b684cbd137232656ba66ba249ff8cd6a0952d13108131b98d28f98f616491a11 unbundle-lib1.patch -3573d21fb6170083f75c90eda599fd418c80f19b2127277a3df03cb74f6b7ff246dae67f50a04299c8953a12e163e28ff63a72f7ef30b988e39b5863a85c307e unbundle-lib2.patch" +sha512sums="3836338cddc674b3a8b6e7d8376f0136db5c548788a0e56f27023fe7b238e2c07d77bf5e5b50e49cdb011c61f05700818b6a22a394ee8d52015f5f32b3fe4d47 quaternion-0.0.9.3.tar.gz" diff --git a/user/quaternion/unbundle-lib1.patch b/user/quaternion/unbundle-lib1.patch deleted file mode 100644 index e109e86b7..000000000 --- a/user/quaternion/unbundle-lib1.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 5a6fbaa3738de2f22171e5ef511d0250cfe006b6 Mon Sep 17 00:00:00 2001 -From: Arun Isaac <arunisaac@systemreboot.net> -Date: Fri, 13 Jul 2018 16:25:23 +0530 -Subject: [PATCH] Remove references to lib in all #include headers. - ---- - client/chatroomwidget.cpp | 8 ++++---- - client/imageprovider.cpp | 4 ++-- - client/logindialog.cpp | 2 +- - client/main.cpp | 2 +- - client/mainwindow.cpp | 12 ++++++------ - client/models/messageeventmodel.cpp | 14 +++++++------- - client/models/roomlistmodel.cpp | 4 ++-- - client/models/roomlistmodel.h | 4 ++-- - client/models/userlistmodel.cpp | 6 +++--- - client/networkconfigdialog.cpp | 2 +- - client/quaternionconnection.h | 2 +- - client/quaternionroom.cpp | 4 ++-- - client/quaternionroom.h | 2 +- - client/roomdialogs.cpp | 8 ++++---- - client/roomlistdock.cpp | 2 +- - client/systemtrayicon.cpp | 2 +- - client/userlistdock.cpp | 6 +++--- - 17 files changed, 42 insertions(+), 42 deletions(-) - -diff --git a/client/chatroomwidget.cpp b/client/chatroomwidget.cpp -index e72a7ed..bcd8921 100644 ---- a/client/chatroomwidget.cpp -+++ b/client/chatroomwidget.cpp -@@ -36,10 +36,10 @@ - #include <QtCore/QRegularExpression> - #include <QtCore/QStringBuilder> - --#include "lib/events/roommessageevent.h" --#include "lib/user.h" --#include "lib/connection.h" --#include "lib/settings.h" -+#include <events/roommessageevent.h> -+#include <user.h> -+#include <connection.h> -+#include <settings.h> - #include "models/messageeventmodel.h" - #include "imageprovider.h" - #include "chatedit.h" -diff --git a/client/imageprovider.cpp b/client/imageprovider.cpp -index a627bf1..94f8a4f 100644 ---- a/client/imageprovider.cpp -+++ b/client/imageprovider.cpp -@@ -19,8 +19,8 @@ - - #include "imageprovider.h" - --#include "lib/connection.h" --#include "lib/jobs/mediathumbnailjob.h" -+#include <connection.h> -+#include <jobs/mediathumbnailjob.h> - - #include <QtCore/QWaitCondition> - #include <QtCore/QDebug> -diff --git a/client/logindialog.cpp b/client/logindialog.cpp -index f5d082b..633c6e0 100644 ---- a/client/logindialog.cpp -+++ b/client/logindialog.cpp -@@ -19,7 +19,7 @@ - - #include "logindialog.h" - --#include "lib/connection.h" -+#include <connection.h> - - #include <QtWidgets/QLineEdit> - #include <QtWidgets/QPushButton> -diff --git a/client/main.cpp b/client/main.cpp -index 547f1c7..08c7db6 100644 ---- a/client/main.cpp -+++ b/client/main.cpp -@@ -26,7 +26,7 @@ - #include "networksettings.h" - #include "mainwindow.h" - #include "activitydetector.h" --#include "lib/settings.h" -+#include <settings.h> - - int main( int argc, char* argv[] ) - { -diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp -index 4dd4879..1c22e9f 100644 ---- a/client/mainwindow.cpp -+++ b/client/mainwindow.cpp -@@ -27,11 +27,11 @@ - #include "roomdialogs.h" - #include "systemtrayicon.h" - --#include "lib/csapi/joining.h" --#include "lib/connection.h" --#include "lib/networkaccessmanager.h" --#include "lib/settings.h" --#include "lib/logging.h" -+#include <csapi/joining.h> -+#include <connection.h> -+#include <networkaccessmanager.h> -+#include <settings.h> -+#include <logging.h> - - #include <QtCore/QTimer> - #include <QtCore/QDebug> -diff --git a/client/models/messageeventmodel.cpp b/client/models/messageeventmodel.cpp -index 56d3452..1f18379 100644 ---- a/client/models/messageeventmodel.cpp -+++ b/client/models/messageeventmodel.cpp -@@ -24,12 +24,12 @@ - #include <QtQml> // for qmlRegisterType() - - #include "../quaternionroom.h" --#include "lib/connection.h" --#include "lib/user.h" --#include "lib/settings.h" --#include "lib/events/roommemberevent.h" --#include "lib/events/simplestateevents.h" --#include "lib/events/redactionevent.h" -+#include <connection.h> -+#include <user.h> -+#include <settings.h> -+#include <events/roommemberevent.h> -+#include <events/simplestateevents.h> -+#include <events/redactionevent.h> - - enum EventRoles { - EventTypeRole = Qt::UserRole + 1, -diff --git a/client/models/roomlistmodel.cpp b/client/models/roomlistmodel.cpp -index 39b045b..8e85d65 100644 ---- a/client/models/roomlistmodel.cpp -+++ b/client/models/roomlistmodel.cpp -@@ -21,8 +21,8 @@ - - #include "../quaternionroom.h" - --#include "lib/user.h" --#include "lib/connection.h" -+#include <user.h> -+#include <connection.h> - - #include <QtGui/QIcon> - -diff --git a/client/models/roomlistmodel.h b/client/models/roomlistmodel.h -index cdc3dd3..79f648f 100644 ---- a/client/models/roomlistmodel.h -+++ b/client/models/roomlistmodel.h -@@ -20,8 +20,8 @@ - #pragma once - - #include "../quaternionroom.h" --#include "lib/connection.h" --#include "lib/util.h" -+#include <connection.h> -+#include <util.h> - - #include <QtCore/QAbstractListModel> - -diff --git a/client/models/userlistmodel.cpp b/client/models/userlistmodel.cpp -index 54b7cf6..704b1f5 100644 ---- a/client/models/userlistmodel.cpp -+++ b/client/models/userlistmodel.cpp -@@ -23,9 +23,9 @@ - #include <QtCore/QDebug> - #include <QtGui/QPixmap> - --#include "lib/connection.h" --#include "lib/room.h" --#include "lib/user.h" -+#include <connection.h> -+#include <room.h> -+#include <user.h> - - - UserListModel::UserListModel(QObject* parent) -diff --git a/client/networkconfigdialog.cpp b/client/networkconfigdialog.cpp -index 64006db..2b32e28 100644 ---- a/client/networkconfigdialog.cpp -+++ b/client/networkconfigdialog.cpp -@@ -18,7 +18,7 @@ - - #include "networkconfigdialog.h" - --#include "lib/networksettings.h" -+#include <networksettings.h> - - #include <QtGui/QIntValidator> - #include <QtWidgets/QGroupBox> -diff --git a/client/quaternionconnection.h b/client/quaternionconnection.h -index 707790b..b421ef0 100644 ---- a/client/quaternionconnection.h -+++ b/client/quaternionconnection.h -@@ -19,7 +19,7 @@ - - #pragma once - --#include "lib/connection.h" -+#include <connection.h> - - class QuaternionConnection: public QMatrixClient::Connection - { -diff --git a/client/quaternionroom.cpp b/client/quaternionroom.cpp -index c156283..ae38009 100644 ---- a/client/quaternionroom.cpp -+++ b/client/quaternionroom.cpp -@@ -19,8 +19,8 @@ - - #include "quaternionroom.h" - --#include "lib/user.h" --#include "lib/events/roommessageevent.h" -+#include <user.h> -+#include <events/roommessageevent.h> - - using namespace QMatrixClient; - -diff --git a/client/quaternionroom.h b/client/quaternionroom.h -index f7ab255..46410cb 100644 ---- a/client/quaternionroom.h -+++ b/client/quaternionroom.h -@@ -19,7 +19,7 @@ - - #pragma once - --#include "lib/room.h" -+#include <room.h> - - class QuaternionRoom: public QMatrixClient::Room - { -diff --git a/client/roomdialogs.cpp b/client/roomdialogs.cpp -index 1de2d48..0d75ea9 100644 ---- a/client/roomdialogs.cpp -+++ b/client/roomdialogs.cpp -@@ -19,10 +19,10 @@ - #include "roomdialogs.h" - - #include "quaternionroom.h" --#include "lib/user.h" --#include "lib/connection.h" --#include "lib/csapi/create_room.h" --#include "lib/logging.h" -+#include <user.h> -+#include <connection.h> -+#include <csapi/create_room.h> -+#include <logging.h> - - #include <QtWidgets/QComboBox> - #include <QtWidgets/QLineEdit> -diff --git a/client/roomlistdock.cpp b/client/roomlistdock.cpp -index 3486382..6b61210 100644 ---- a/client/roomlistdock.cpp -+++ b/client/roomlistdock.cpp -@@ -26,7 +26,7 @@ - - #include "models/roomlistmodel.h" - #include "quaternionroom.h" --#include "lib/connection.h" -+#include <connection.h> - - class RoomListItemDelegate : public QStyledItemDelegate - { -diff --git a/client/systemtrayicon.cpp b/client/systemtrayicon.cpp -index 5da7684..deaaee7 100644 ---- a/client/systemtrayicon.cpp -+++ b/client/systemtrayicon.cpp -@@ -21,7 +21,7 @@ - - #include "mainwindow.h" - #include "quaternionroom.h" --#include "lib/settings.h" -+#include <settings.h> - - SystemTrayIcon::SystemTrayIcon(MainWindow* parent) - : QSystemTrayIcon(parent) -diff --git a/client/userlistdock.cpp b/client/userlistdock.cpp -index 76039ac..4cb0c32 100644 ---- a/client/userlistdock.cpp -+++ b/client/userlistdock.cpp -@@ -23,9 +23,9 @@ - #include <QtWidgets/QHeaderView> - #include <QtWidgets/QMenu> - --#include "lib/connection.h" --#include "lib/room.h" --#include "lib/user.h" -+#include <connection.h> -+#include <room.h> -+#include <user.h> - #include "models/userlistmodel.h" - - UserListDock::UserListDock(QWidget* parent) diff --git a/user/quaternion/unbundle-lib2.patch b/user/quaternion/unbundle-lib2.patch deleted file mode 100644 index 5b3b4d2f6..000000000 --- a/user/quaternion/unbundle-lib2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Quaternion-0.0.9.2/CMakeLists.txt.old 2018-06-17 01:05:02.000000000 +0000 -+++ Quaternion-0.0.9.2/CMakeLists.txt 2018-07-25 05:15:28.550000000 +0000 -@@ -43,8 +43,10 @@ - endif() - get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE) - --add_subdirectory(lib) --include_directories(lib) -+if (NOT USE_DYNAMIC_LIB) -+ add_subdirectory(lib) -+ include_directories(lib) -+endif() - - message( STATUS ) - message( STATUS "=============================================================================" ) diff --git a/user/r/APKBUILD b/user/r/APKBUILD new file mode 100644 index 000000000..e397a1598 --- /dev/null +++ b/user/r/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=r +pkgver=3.5.1 +pkgrel=0 +pkgdesc="Environment for statistical computing and graphics" +url="https://www.r-project.org/" +arch="all" +options="!check" # 20.482886 != 20.482887 +license="GPL-2.0-only" +depends="cmd:which" +makedepends="byacc bzip2-dev cairo-dev curl-dev gfortran icu-dev libice-dev + libtirpc-dev libx11-dev libxt-dev pango-dev pcre-dev pcre2-dev xz-dev + zlib-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://rweb.crmda.ku.edu/cran/src/base/R-3/R-$pkgver.tar.gz" +builddir="$srcdir/R-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --docdir=/usr/share/doc/R-$pkgver \ + --localstatedir=/var \ + --with-readline=no \ + --enable-R-shlib + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="382cc6e200469dd168799948edcf3a0b869d7ef3b3176fdfc60752f3f37e6ba356323c47d8815a4d9ab6ad3a21cd045d26ef5e75107c8685328e0ffcfd172f7f R-3.5.1.tar.gz" diff --git a/user/sbc/APKBUILD b/user/sbc/APKBUILD index b72f31a89..9a71331ac 100644 --- a/user/sbc/APKBUILD +++ b/user/sbc/APKBUILD @@ -1,24 +1,19 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=sbc -pkgver=1.3 +pkgver=1.4 pkgrel=0 pkgdesc="Bluetooth audio codec library" url="http://www.bluez.org/" arch="all" options="!check" # No tests. -license="LGPL" +license="LGPL-2.1+ AND GPL-2.0+" depends="" depends_dev="libsndfile-dev" makedepends="$depends_dev linux-headers" subpackages="$pkgname-dev $pkgname-utils" source="https://www.kernel.org/pub/linux/bluetooth/sbc-$pkgver.tar.xz" -prepare() { - default_prepare - update_config_sub -} - build() { cd "$builddir" ./configure \ @@ -44,4 +39,4 @@ utils() { "$subpkgdir"/usr/ } -sha512sums="c11cb1ede8abdb226d404ce34307d217b716b91cbe550ed90cb5387b062b7b97a6b7a81371de6f462d8c1429cb3299869a1bda347fa175e9d81cfa2bc2056c8b sbc-1.3.tar.xz" +sha512sums="f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f sbc-1.4.tar.xz" diff --git a/user/tigervnc/APKBUILD b/user/tigervnc/APKBUILD index eaf175005..9b88fe183 100644 --- a/user/tigervnc/APKBUILD +++ b/user/tigervnc/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tigervnc pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="High-performance, platform-neutral VNC remote desktop application" url="http://tigervnc.org/" arch="all" @@ -15,6 +15,7 @@ makedepends="cmake fltk-dev fontconfig-dev gnutls-dev intltool subpackages="$pkgname-lang $pkgname-doc" source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$pkgver.tar.gz use-intltool.patch + endian.patch " build() { @@ -40,4 +41,5 @@ package() { } sha512sums="333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d tigervnc-1.9.0.tar.gz -5c1cee98b7ba41c7cf121480fdfe16d5ef17c9562ff2ba3ea4e74235161fc63e2e3ed63e788c0aa999610b660b394c1269d6fdcc9716c5563651fd67d723f619 use-intltool.patch" +5c1cee98b7ba41c7cf121480fdfe16d5ef17c9562ff2ba3ea4e74235161fc63e2e3ed63e788c0aa999610b660b394c1269d6fdcc9716c5563651fd67d723f619 use-intltool.patch +189a51a542b368e4db22174d09f5b656848e94577bbf93b2388f54529f1c7c2d32e5b5283551b3fb067ba21f6464f60989e22d4cd11ed3d87d5c931301555b49 endian.patch" diff --git a/user/tigervnc/endian.patch b/user/tigervnc/endian.patch new file mode 100644 index 000000000..e09edf9c5 --- /dev/null +++ b/user/tigervnc/endian.patch @@ -0,0 +1,51 @@ +diff --git a/vncviewer/Surface_X11.cxx b/vncviewer/Surface_X11.cxx +index 3523da3d..6562634d 100644 +--- a/vncviewer/Surface_X11.cxx ++++ b/vncviewer/Surface_X11.cxx +@@ -109,6 +109,7 @@ void Surface::blend(Surface* dst, int src_x, int src_y, int x, int y, int w, int + + void Surface::alloc() + { ++ XRenderPictFormat templ; + XRenderPictFormat* format; + + // Might not be open at this point +@@ -117,7 +118,37 @@ void Surface::alloc() + pixmap = XCreatePixmap(fl_display, XDefaultRootWindow(fl_display), + width(), height(), 32); + +- format = XRenderFindStandardFormat(fl_display, PictStandardARGB32); ++ // Our code assumes a BGRA byte order, regardless of what the endian ++ // of the machine is or the native byte order of XImage, so make sure ++ // we find such a format ++ templ.type = PictTypeDirect; ++ templ.depth = 32; ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++ templ.direct.alpha = 0; ++ templ.direct.red = 8; ++ templ.direct.green = 16; ++ templ.direct.blue = 24; ++#else ++ templ.direct.alpha = 24; ++ templ.direct.red = 16; ++ templ.direct.green = 8; ++ templ.direct.blue = 0; ++#endif ++ templ.direct.alphaMask = 0xff; ++ templ.direct.redMask = 0xff; ++ templ.direct.greenMask = 0xff; ++ templ.direct.blueMask = 0xff; ++ ++ format = XRenderFindFormat(fl_display, PictFormatType | PictFormatDepth | ++ PictFormatRed | PictFormatRedMask | ++ PictFormatGreen | PictFormatGreenMask | ++ PictFormatBlue | PictFormatBlueMask | ++ PictFormatAlpha | PictFormatAlphaMask, ++ &templ, 0); ++ ++ if (!format) ++ throw rdr::Exception("XRenderFindFormat"); ++ + picture = XRenderCreatePicture(fl_display, pixmap, format, 0, NULL); + + visFormat = XRenderFindVisualFormat(fl_display, fl_visual->visual); diff --git a/user/torcs/APKBUILD b/user/torcs/APKBUILD new file mode 100644 index 000000000..9f4f24a38 --- /dev/null +++ b/user/torcs/APKBUILD @@ -0,0 +1,59 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=torcs +pkgver=1.3.7 +pkgrel=0 +pkgdesc="The Open Racing Car Simulator" +url="http://torcs.sourceforge.net/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="freealut-dev freeglut-dev libogg-dev libpng-dev libsm-dev + libvorbis-dev libxmu-dev libxrandr-dev libxrender-dev libxt-dev mesa-dev + openal-soft-dev plib-dev zlib-dev" +subpackages="$pkgname-data::noarch" +source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$pkgver.tar.bz2 + torcs-1.3.6-as-needed.patch + torcs-1.3.6-format.patch + torcs-1.3.6-gcc6.patch + torcs-1.3.6-no-automake.patch + define-uint.patch + " + +build() { + cd "$builddir" + autoreconf + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make -j1 +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +data() { + pkgdesc="Data files for TORCS" + cd "$builddir" + mkdir -p "$subpkgdir"/usr/share/games + chgrp games "$subpkgdir"/usr/share/games + make DESTDIR="$subpkgdir" datainstall +} + +sha512sums="14b88624803c746b2f356fa185aca5be56b7d7e5192fede11307474100328bfaa67eafa61e84987bbad04590ae5740127e015707723df6d2c3197bb867818101 torcs-1.3.7.tar.bz2 +8df4f57b470100c123de5868edc471e4233bf7c8e3d23f759a822536ab28e74403375ecdbcbc404ed442d6820260db97d6c76be7d4fabdef7015722600148b2c torcs-1.3.6-as-needed.patch +6368ab1df79005f5dede537b45db7ccc1943c2c53e0c696ff6b743680f2d48508e29b5ad56b10a373beddf28c82d5f123998d9e794b66ce49e0ea2226f2332aa torcs-1.3.6-format.patch +9c29c78c4a2f6d2ea187f80c4c10337556ec13cf7dbe4380af37bccd0fa09a67a6209caff319a50c65f9e831b7d07c1af2c1ba8c33d9a3addc55713988fc3e46 torcs-1.3.6-gcc6.patch +b1908224b82ca3de6694950770a1b70a4935b928b132bd352f67bc3c9b931699b579811f61909b98b28aba19eeb3df9e3d0c4ce8f85caaf4eff3306575efe212 torcs-1.3.6-no-automake.patch +cc4541cfa8440ba044576da18c0eb310ba8d68863a409de8dc8fe73f34828cd035f9995baf535d2e1e639cb17cd8a1d92b2addf7d24d7d79f5b1a746be046b5c define-uint.patch" diff --git a/user/torcs/define-uint.patch b/user/torcs/define-uint.patch new file mode 100644 index 000000000..74e3f7773 --- /dev/null +++ b/user/torcs/define-uint.patch @@ -0,0 +1,24 @@ +--- torcs-1.3.7/src/linux/osspec.h.old 2003-03-23 19:43:13.000000000 +0000 ++++ torcs-1.3.7/src/linux/osspec.h 2018-10-23 22:59:19.520000000 +0000 +@@ -26,6 +26,10 @@ + #define TRKEXT "xml" + #define PARAMEXT ".xml" + ++#ifndef __GLIBC__ ++typedef unsigned int uint; ++#endif ++ + #endif /* __OSSPEC__H__ */ + + +--- torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/C-api.cpp.old 2012-05-31 23:44:35.000000000 +0000 ++++ torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/C-api.cpp 2018-10-23 23:04:24.590000000 +0000 +@@ -59,7 +59,7 @@ + typedef map<DtObjectRef, Object *> ObjectList; + typedef set<Encounter> ProxList; + +-#ifdef WIN32 ++#if defined(WIN32) || (defined(__linux__) && !defined(__GLIBC__)) + #define uint unsigned int + #endif + diff --git a/user/torcs/torcs-1.3.6-as-needed.patch b/user/torcs/torcs-1.3.6-as-needed.patch new file mode 100644 index 000000000..d848538c0 --- /dev/null +++ b/user/torcs/torcs-1.3.6-as-needed.patch @@ -0,0 +1,96 @@ +--- torcs-1.3.6.orig/Make-default.mk ++++ torcs-1.3.6/Make-default.mk +@@ -402,7 +402,7 @@ + ifdef PROGRAM + + ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) +- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@ ++ ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} + + installprogram: ${PROGRAM} + @ createdir="${INSTLIBBASE}" ; \ +@@ -420,14 +420,14 @@ + ifdef LOCALTOOLS + + ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) +- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ ++ ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} + + endif + + ifdef TOOLS + + ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a}) +- ${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@ ++ ${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} + + installtools: ${TOOLS} + @createdir="${INSTBINBASE}/${TOOLSDIR}" ; \ +@@ -478,7 +478,7 @@ + ifdef SOLIBRARY + + ${SOLIBRARY}: ${OBJECTS} +- ${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS} ++ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} + @D=`pwd` ; \ + createdir="${EXPORTBASE}/lib" ; \ + $(mkinstalldirs) $$createdir ; \ +@@ -509,7 +509,7 @@ + ifdef MODULE + + ${MODULE}: ${OBJECTS} +- ${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ++ ${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS} + @D=`pwd` ; \ + createdir="${EXPORTBASE}/${MODULEDIR}" ; \ + $(mkinstalldirs) $$createdir ; \ +--- torcs-1.3.6.orig/configure.in ++++ torcs-1.3.6/configure.in +@@ -123,11 +123,11 @@ + AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) + AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) + AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) +-AC_CHECK_LIB(openal, alEnable, LDFLAGS="$LDFLAGS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) ++AC_CHECK_LIB(openal, alEnable, LIBS="$LIBS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/])) + AC_CHECK_LIB(alut, alutLoadWAVFile, +- LDFLAGS="$LDFLAGS -lalut", +- LDFLAGS="$LDFLAGS") +-AC_CHECK_LIB(vorbisfile, ov_fopen, LDFLAGS="$LDFLAGS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.])) ++ LIBS="$LIBS -lalut", ) ++AC_CHECK_LIB(vorbisfile, ov_fopen, LIBS="$LIBS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.])) ++ + + AC_CHECK_LIB(dl, dlopen) + AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"])) +--- torcs-1.3.6.orig/src/libs/Makefile ++++ torcs-1.3.6/src/libs/Makefile +@@ -23,7 +23,7 @@ + + TOOLSUBDIRS = txml + +-SUBDIRS = confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \ ++SUBDIRS = confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \ + portability math musicplayer + + PKGSUBDIRS = $(SUBDIRS) +--- torcs-1.3.6.orig/src/libs/client/Makefile ++++ torcs-1.3.6/src/libs/client/Makefile +@@ -23,6 +23,8 @@ + SOURCES = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \ + optionmenu.cpp + ++SOLIBS = -lconfscreens -lraceengine ++ + LIBS = -lplibssg -lplibsg -lplibul + + EXPDIR = include +--- torcs-1.3.6.orig/src/libs/tgf/Makefile ++++ torcs-1.3.6/src/libs/tgf/Makefile +@@ -29,6 +29,7 @@ + profiler.cpp \ + hash.cpp + ++SOLIBS = -ltxml + + EXPDIR = include + diff --git a/user/torcs/torcs-1.3.6-format.patch b/user/torcs/torcs-1.3.6-format.patch new file mode 100644 index 000000000..da59c4da4 --- /dev/null +++ b/user/torcs/torcs-1.3.6-format.patch @@ -0,0 +1,34 @@ +--- a/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:24.874102363 +0100 ++++ b/src/tools/texmapper/maintexmapper.cpp 2015-12-23 20:55:55.071553325 +0100 +@@ -103,7 +103,7 @@ + { + int i, j; + +- printf(title); ++ printf("%s", title); + for (j = 0; j < 4; j ++){ + for (i = 0; i < 4; i ++) { + printf("%.6f ", m[i][j]); +--- a/src/tools/trackgen/objects.cpp 2015-12-23 20:59:49.671287196 +0100 ++++ b/src/tools/trackgen/objects.cpp 2015-12-23 21:02:21.639523189 +0100 +@@ -234,9 +234,9 @@ +
+ ssgLeaf *vt = (ssgLeaf *)ent;
+ if (vt->getCullFace() == TRUE) {
+- surf = "SURF 0x10\n";
++ surf = "0x10";
+ } else {
+- surf = "SURF 0x30\n";
++ surf = "0x30";
+ }
+
+ int num_verts = vt->getNumVertices();
+@@ -304,7 +304,7 @@ + fprintf (save_fd, "numsurf %d\n", num_tris);
+
+ for (i = 0; i < num_tris; i++) {
+- fprintf (save_fd, surf);
++ fprintf (save_fd, "SURF %s\n", surf);
+ fprintf (save_fd, "mat 0\n");
+ fprintf (save_fd, "refs 3\n");
+ fprintf (save_fd, "%d %g %g\n",
diff --git a/user/torcs/torcs-1.3.6-gcc6.patch b/user/torcs/torcs-1.3.6-gcc6.patch new file mode 100644 index 000000000..6daf22a81 --- /dev/null +++ b/user/torcs/torcs-1.3.6-gcc6.patch @@ -0,0 +1,11 @@ +--- a/src/drivers/olethros/geometry.cpp ++++ b/src/drivers/olethros/geometry.cpp +@@ -27,6 +27,8 @@ + #ifdef WIN32 + #include <float.h> + #define isnan _isnan ++#elif __cplusplus >= 201103L ++using std::isnan; + #endif + + diff --git a/user/torcs/torcs-1.3.6-no-automake.patch b/user/torcs/torcs-1.3.6-no-automake.patch new file mode 100644 index 000000000..de57eeea0 --- /dev/null +++ b/user/torcs/torcs-1.3.6-no-automake.patch @@ -0,0 +1,21 @@ +torcs doesn't use automake, so it shouldn't be calling the macro + +http://bugs.gentoo.org/408473 + +--- torcs-1.3.7.orig/configure.in ++++ torcs-1.3.7/configure.in +@@ -15,9 +15,12 @@ + # + ############################################################################## + +-AC_INIT(Make-config.in) ++AC_INIT(torcs, 1.3.7) + AC_CONFIG_HEADERS(config.h) +-AM_INIT_AUTOMAKE(torcs, 1.3.7) ++dnl Workaround code using old VERSION instead of new PACKAGE_VERSION ++VERSION=$PACKAGE_VERSION ++AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround]) ++AC_SUBST(VERSION) + + dnl Checks for programs. + AC_PROG_CC diff --git a/user/ucpp/APKBUILD b/user/ucpp/APKBUILD index 60db06531..9d45b1d0a 100644 --- a/user/ucpp/APKBUILD +++ b/user/ucpp/APKBUILD @@ -1,29 +1,30 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=ucpp -pkgver=1.3.2 +pkgver=1.3.5 pkgrel=0 pkgdesc="Embeddable, quick, light and C99 compliant C preprocessor" -url="https://code.google.com/p/ucpp/" +url="https://gitlab.com/scarabeusiv/ucpp" arch="all" options="!check" # No test suite. license="BSD-3-Clause and Public-Domain" depends="" makedepends="" subpackages="$pkgname-doc" -source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.bz2" -builddir="$srcdir/$pkgname" +source="https://gitlab.com/scarabeusiv/ucpp/uploads/79f08e39c676f15ed8a59335f6c9b924/ucpp-1.3.5.tar.xz" build() { cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr make } package() { cd "$builddir" - install -Dm755 ucpp "$pkgdir"/usr/bin/ucpp - gzip ucpp.1 - install -Dm644 ucpp.1.gz "$pkgdir"/usr/share/man/man1/ucpp.1.gz + make DESTDIR="$pkgdir" install } -sha512sums="a8a22162c0e26bc8281928f921f4e531108ba02658fd9c7a1760ae2fe938c910215aa4db02e5c7f0c5ea1aa66d89157bc780f2f13c57fa603de6c2d0c48cfd32 ucpp-1.3.2.tar.bz2" +sha512sums="3ded8f7bc2b238adb6e7f4162aee48e039dfe7cee31b700c38e8f147634d47cd1ceaf39c343549b0d4a58358e6b9743f7e84f87b253dc19c05e543d68ade24ce ucpp-1.3.5.tar.xz" diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD index 69287b8ff..976016eab 100644 --- a/user/usbutils/APKBUILD +++ b/user/usbutils/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=usbutils pkgver=010 pkgrel=0 diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index 1ea8ea930..ae7151438 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: pkgname=v4l-utils -pkgver=1.14.2 +pkgver=1.16.1 pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" @@ -76,7 +76,7 @@ ir_keytable() { "$subpkgdir"/etc } -sha512sums="5c469479deb7065768e0254d1c80d9096caf05e445ceeabc7649f7158f02fb2d11ff2ad8c82debc1dbe6bbd7776cc5aa2febb52d5da0328d2b60b54af67c7a27 v4l-utils-1.14.2.tar.bz2 +sha512sums="5092e592e963ce7f174faedd03f5f2b4e262c648fea4f868ae9a8b40029a87412ca16566ce5f687e96588904cdb72b25349d9b26b81ce1285283195208f671b7 v4l-utils-1.16.1.tar.bz2 bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg 6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop 9a4f6d0a44d30bb7afe4db8b40074d362f240cae1f1b13feb0eb2b1b666479fc6f73ef27542f6f80fb1b922c9540feadc9ff8563890ff3041d3f7fc62e504e29 getsubopt.patch" diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD index d25e349b1..8aae39a17 100644 --- a/user/vte/APKBUILD +++ b/user/vte/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vte -pkgver=0.54.1 +pkgver=0.54.2 pkgrel=0 pkgdesc="Virtual terminal emulator library for Gnome" url="https://www.gnome.org" @@ -35,5 +35,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5cb866e75c35e1b5728d17b0433641ceb4837495d59185a04fde9dd8c9849ab905a6b2718a50b27cc70323c7a6c5db31a808816576c30d7f18ece889a329fb61 vte-0.54.1.tar.xz +sha512sums="214ec69110d6ad6caa9bc41fb741874bfcf27f20f34d3ae745b13903c574f9c854f7e0dadbae3dbc8ce04c5a6eb818a433c50569c1ef802501a9a078385f23fc vte-0.54.2.tar.xz 4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index 2a1a5d558..3cca9f41a 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=weechat -pkgver=2.2 +pkgver=2.3 pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" @@ -61,6 +61,6 @@ check() { ctest -V } -sha512sums="aa729ce8cd0e398d7f5f3155db3bff473885d64ad444ca7f10b2f9874e90e31205783119ec4c31fca65de0a7c636cd5fe605d40bbbd31cb09893f20cc4332375 weechat-2.2.tar.gz +sha512sums="3315eb672d099dec041a6ece268e3efac9f766fe8273b13810c9ed6bc9129ed0db9730a027db6cdf157338472caf99d60aaf3de9b096a3c395fdf889b106aaea weechat-2.3.tar.gz 95f6d1405141421fae70288ec560a6d61f0bde1ce0bfa6e522e24a9673e699099594e83511b39e413aff28010ea1f7f1672af051ac370b152c732d6ca36a9056 fix-python-linking.patch 59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" diff --git a/user/xcb-util/APKBUILD b/user/xcb-util/APKBUILD index 893a56655..90b9053bf 100644 --- a/user/xcb-util/APKBUILD +++ b/user/xcb-util/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xcb-util pkgver=0.4.0 pkgrel=2 diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD index 647ae8776..d1a8d21c7 100644 --- a/user/xf86-video-ati/APKBUILD +++ b/user/xf86-video-ati/APKBUILD @@ -1,4 +1,4 @@ -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xf86-video-ati pkgver=18.1.0 pkgrel=0 diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 21ef88d73..97f0d5de7 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-battery-plugin -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=0 pkgdesc="Battery monitor plugin for the XFCE panel" url="https://xfce.org" @@ -12,13 +12,6 @@ subpackages="$pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2" -prepare() { - cd "$builddir" - default_prepare - chmod a+w config.sub - update_config_sub -} - build() { cd "$builddir" ./configure \ @@ -41,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d3f5b6d3657abfba2c4c5cb3ab8ddc87f4862f24eb614cb91af48332b3082c3dce7f32eb2e3cb8a9d501ddb01c6259c4fbfbab8ed9c221633e47eb17c623cf09 xfce4-battery-plugin-1.1.0.tar.bz2" +sha512sums="15c0755f95cc03db95f8fe61faa87607dcdb24622c8de3a7941c254e15bf3d65b6683e5a0ff1fd96ca252afede6763f4440c8455665e346169b1107ad44d6651 xfce4-battery-plugin-1.1.1.tar.bz2" diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index d6d99b110..09144df61 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfconf -pkgver=4.13.5 +pkgver=4.13.6 pkgrel=0 pkgdesc="Configuration framework for the XFCE desktop environment" url="https://xfce.org" @@ -13,8 +13,6 @@ makedepends="intltool gtk+3.0-dev libxfce4util-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/xfconf/4.13/xfconf-$pkgver.tar.bz2" -sha512sums="34e6b99be0b288707f8632c5fe4f2e66e01ec3950f4d194a7007afb4bc1cfe8bea44f8f80873de2364680481921332c9860b23bca4ced94ecb95c9199df5315b xfconf-4.13.5.tar.bz2" -builddir="$srcdir/xfconf-$pkgver" build() { cd "$builddir" @@ -45,3 +43,4 @@ perl() { mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib } +sha512sums="0eaa1ad428be5bea97b891a6bf0488293064e31d4869b70389ded940a23f9d8cffd0801dd98932658a67e57d6a0da95998872202cf7756aa24caa8f9d2c5f755 xfconf-4.13.6.tar.bz2" diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD index ffadaa957..fb55ea436 100644 --- a/user/xmlsec/APKBUILD +++ b/user/xmlsec/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> -pkgname="xmlsec" -pkgver=1.2.26 +pkgname=xmlsec +pkgver=1.2.27 pkgrel=0 pkgdesc="C-based XML signature and encryption syntax and processing library" url="https://github.com/lsh123/$pkgname/" @@ -8,7 +8,7 @@ arch="all" options="libtool" license="MIT" depends="" -depends_dev="" +checkdepends="nss-tools" makedepends="$depends_dev libxml2-dev libxslt-dev nss-dev openssl-dev autoconf automake libtool" subpackages="$pkgname-nss $pkgname-dev $pkgname-doc" @@ -56,4 +56,4 @@ nss() { mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/ } -sha512sums="f685f513db0287bc4e5cc6d06b5ed9731cbc03c0e20e1f18da9251fce79f1c6966dc094277f0451e47fd2565018daf77b2126f06f1a56d85ff31f7d3ffa3e2a0 xmlsec-1_2_26.tar.gz" +sha512sums="261528086adc379942861b5950e5b34ffa52a49d0fedcb46bece50c920fd56af4f0472494419bfa5e3cb40abda335b3e9c11466c42273f125b50d204b4604798 xmlsec-1_2_27.tar.gz" diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 80d9692a0..928b86a42 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server -pkgver=1.20.2 +pkgver=1.20.3 pkgrel=0 pkgdesc="X.Org X11 server" url="https://www.X.Org/" @@ -30,6 +30,8 @@ source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 " # secfixes: +# 1.20.3-r0: +# - CVE-2018-14665 # 1.19.5-r0: # - CVE-2017-12176 # - CVE-2017-12177 @@ -143,6 +145,6 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7 xorg-server-1.20.2.tar.bz2 +sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" |