diff options
Diffstat (limited to 'user')
35 files changed, 1177 insertions, 64 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/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/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/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/py3-atomicwrites/APKBUILD b/user/py3-atomicwrites/APKBUILD new file mode 100644 index 000000000..06dc535c1 --- /dev/null +++ b/user/py3-atomicwrites/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=py3-atomicwrites +_pkgname=atomicwrites +pkgver=1.2.1 +pkgrel=0 +pkgdesc="Powerful Python library for atomic file writes" +url="https://pypi.org/project/atomicwrites/" +arch="noarch" +options="!check" # Cyclic dependency with py3-pytest. Passes on x86_64 +# Certified net clean +license="MIT" +depends="python3" +makedepends="python3-dev" +#checkdepends="py3-pytest" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/a/$_pkgname/$_pkgname-$pkgver.tar.gz" +builddir="$srcdir/$_pkgname-$pkgver" + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="4df7ee97e0817a80378b273ced310b8ad88eb6ced93a594a6e3dc38ad1e7208226fde01b6d282f85583c57a50859e82c85bacaae8a7c64fce55e6965f74b12c5 py3-atomicwrites-1.2.1.tar.gz" diff --git a/user/py3-attrs/APKBUILD b/user/py3-attrs/APKBUILD index fad246453..ec2bb62c3 100644 --- a/user/py3-attrs/APKBUILD +++ b/user/py3-attrs/APKBUILD @@ -7,11 +7,12 @@ pkgdesc="Python classes without boilerplate" url="https://www.attrs.org" arch="noarch" options="!check" # Circular dependency with py3-pytest. Passes on x86_64 +# Certified net clean license="MIT" depends="python3" makedepends="python3-dev" -#checkdepends="py3-tox" -source="py3-attrs-$pkgver.tar.gz::https://github.com/python-attrs/attrs/archive/$pkgver.tar.gz" +#checkdepends="py3-pytest py3-hypothesis py3-six" +source="$pkgname-$pkgver.tar.gz::https://github.com/python-attrs/attrs/archive/$pkgver.tar.gz" builddir="$srcdir/attrs-$pkgver" build() { @@ -21,7 +22,7 @@ build() { check() { cd "$builddir" - tox -e py36 + pytest } package() { diff --git a/user/py3-docutils/APKBUILD b/user/py3-docutils/APKBUILD index b2b29cced..febab9f74 100644 --- a/user/py3-docutils/APKBUILD +++ b/user/py3-docutils/APKBUILD @@ -7,6 +7,7 @@ pkgrel=0 pkgdesc="Documentation utilities for Python" url="https://pypi.python.org/pypi/docutils" arch="noarch" +# Certified net clean license="Custom" depends="python3 py3-pillow py3-roman" makedepends="python3-dev" diff --git a/user/py3-more-itertools/APKBUILD b/user/py3-more-itertools/APKBUILD index 46baffedb..203af18ec 100644 --- a/user/py3-more-itertools/APKBUILD +++ b/user/py3-more-itertools/APKBUILD @@ -6,12 +6,11 @@ pkgver=4.3.0 pkgrel=0 pkgdesc="More routines for operating on iterables, beyond itertools" url="https://pypi.org/project/more-itertools" -options="!check" # Circular dependency with py3-pytest. Passes on x86_64 arch="noarch" +# Certified net clean license="MIT" -depends="python3" +depends="python3 py3-six" makedepends="" -#checkdepends="py3-tox" source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/m/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" @@ -22,7 +21,7 @@ build() { check() { cd "$builddir" - tox -e py36 + python3 -m unittest discover -v } package() { diff --git a/user/py3-olefile/APKBUILD b/user/py3-olefile/APKBUILD index 0c1692192..c44ee5842 100644 --- a/user/py3-olefile/APKBUILD +++ b/user/py3-olefile/APKBUILD @@ -2,16 +2,15 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-olefile _pkgname=olefile -pkgver=0.45.1 +pkgver=0.46 pkgrel=0 pkgdesc="A Python module to read/write MS OLE2 files" -url="https://pypi.python.org/project/olefile" +url="https://pypi.org/project/olefile" arch="noarch" -license="BSD-2-Clause Custom" +# Certified net clean +license="BSD-2-Clause AND Custom" depends="python3" makedepends="python3-dev unzip" -install="" -giturl="https://github.com/decalage2/olefile" source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/o/$_pkgname/$_pkgname-$pkgver.zip" builddir="$srcdir/$_pkgname-$pkgver" @@ -31,4 +30,4 @@ package() { install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } -sha512sums="31f7584553304b186aad88f1988dfa12ceb34a50d546a38181280a816cfcda8dc54ff502afb31a928d647e6106c9e4878bfac8cec31d24018fdbab65c7007e49 py3-olefile-0.45.1.zip" +sha512sums="2a19c443c1e4519680027ff557b5f737e6d0e707c1932a759ea85105717f4f6393149e0eb04589fe2b2b7e0c474042cfe34801faad38517799483b711001b4ac py3-olefile-0.46.zip" diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD index 193936b41..e137a6b0f 100644 --- a/user/py3-pillow/APKBUILD +++ b/user/py3-pillow/APKBUILD @@ -2,18 +2,19 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pillow _pkgname=Pillow -pkgver=5.1.0 +pkgver=5.3.0 pkgrel=0 pkgdesc="A Python Imaging Library" -url="https://pypi.python.org/project/Pillow" +url="https://pypi.org/project/Pillow" arch="all" +# Certified net clean license="Custom" depends="py3-olefile python3" makedepends="python3-dev freetype-dev libjpeg-turbo-dev libwebp-dev tiff-dev libpng-dev lcms2-dev openjpeg-dev zlib-dev" subpackages="$pkgname-doc" _scripts_rev="f578e2c" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/P/$_pkgname/$_pkgname-$pkgver.tar.gz $pkgname-scripts-$_scripts_rev.tar.gz::https://github.com/python-pillow/pillow-scripts/archive/$_scripts_rev.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" @@ -50,5 +51,5 @@ doc() { install -Dm644 LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE" } -sha512sums="1e1d5f12054e2f3befa8dafef2551eb75dfefc06944a528638a1686ebc480b52edfc3eaa9964d687816caf003314ad1fc4891d7379cd92e41fbf4b3cbddd1cb9 py3-pillow-5.1.0.tar.gz +sha512sums="0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab py3-pillow-5.3.0.tar.gz 1a2e6dc45127b3f0b706d5be4fdc8ddeb09a9e046a182eb48239572e1bdc62d1b1f1a1f11ef1f1f23766aaac1b498556cc9a9cf11d3b943c9f2834c9b41612e0 py3-pillow-scripts-f578e2c.tar.gz" diff --git a/user/py3-pluggy/APKBUILD b/user/py3-pluggy/APKBUILD index a1e6d354b..552956797 100644 --- a/user/py3-pluggy/APKBUILD +++ b/user/py3-pluggy/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pluggy _pkgname=pluggy -pkgver=0.6.0 +pkgver=0.7.1 pkgrel=0 pkgdesc="Plugin management and hook calling for Python" url="https://pypi.python.org/pypi/pluggy" arch="noarch" -options="!check" # Cyclic dependency with py3-tox. Passes on x86_64 +options="!check" # Cyclic dependency with py3-pytest. Passes on x86_64 +# Certified net clean license="MIT" depends="python3" makedepends="python3-dev" -#checkdepends="py3-tox" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +#checkdepends="py3-pytest" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz + scm.patch" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -22,7 +24,7 @@ build() { check() { cd "$builddir" - tox -e py36-pytestrelease + PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest testing } package() { @@ -30,4 +32,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="dd58dabe2e65eee64d62c8748c2bbd99457288e99b819eb12312f2acdb0740ac46fd08f83522bc992297b9f14eec14c216c2c9688580f68393bf6fc609e65812 py3-pluggy-0.6.0.tar.gz" +sha512sums="e19f6c1b3f2e711df1c8b075a2b802751afd218f1b692f08b2434c01d71c402331ff8c937550fbdfece2098f6d6856422d485f193e188916b365ded2e4087697 py3-pluggy-0.7.1.tar.gz +6b805de27cf1255e0279e076fbcb94ef0494ab0d8bc73999ab45afdb026108d249b730932e28b723b9a0d63aba1746da6e72901cebb9ab6bd91ea3b5e9e64d3b scm.patch" diff --git a/user/py3-pluggy/scm.patch b/user/py3-pluggy/scm.patch new file mode 100644 index 000000000..5e42a72e4 --- /dev/null +++ b/user/py3-pluggy/scm.patch @@ -0,0 +1,14 @@ +--- pluggy-0.7.1/setup.py 2018-07-28 22:45:12.000000000 +0000 ++++ pluggy-0.7.1/setup.py 2018-10-11 04:54:18.590233336 +0000 +@@ -24,10 +24,7 @@ + name='pluggy', + description='plugin and hook calling mechanisms for python', + long_description=long_description, +- use_scm_version={ +- 'write_to': 'pluggy/_version.py', +- }, +- setup_requires=['setuptools-scm'], ++ version='0.7.1', + license='MIT license', + platforms=['unix', 'linux', 'osx', 'win32'], + author='Holger Krekel', diff --git a/user/py3-py/APKBUILD b/user/py3-py/APKBUILD index a17fe96d1..a38f90caf 100644 --- a/user/py3-py/APKBUILD +++ b/user/py3-py/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-py _pkgname=py -pkgver=1.5.3 +pkgver=1.7.0 pkgrel=0 pkgdesc="A python library with cross-python path, ini-parsing, io, code, log facilities" url="https://pypi.python.org/project/py" arch="noarch" -options="!check" # Circular dependency with py3-tox. Passes on x86_64 +options="!checkroot !check" # Circular dependency with py3-pytest. Passes on x86_64 +# Certified net clean license="MIT" depends="python3" makedepends="python3-dev" -#checkdepends="py3-tox" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +#checkdepends="py3-pytest" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz + scm.patch" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -21,10 +23,8 @@ build() { } check() { - # Can't use py3-pytest > 3.0 as of py3-py==1.5.3-r0 because some tests - # haven't been updated yet cd "$builddir" - tox -e py36-pytest30 + PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest } package() { @@ -32,4 +32,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="243c0da94c439163257c525ef00b30fd6d8add5897121ee0b1f19476b50f18823ce2b99a5ab27a9cf47598b538758d0534060123dce0820d2a65d98046548c96 py3-py-1.5.3.tar.gz" +sha512sums="c522be926c5716d866cb800eaa398a55518889da207a00575212254642eda2107e68c286e72b99cf94ecec1c8dcde1f763e2d8f296ab7e7673ae2671e70d5548 py3-py-1.7.0.tar.gz +08a1645832d46ffab5b1fb2e7ef480c55a0d4ac266d53857d9ddae5c46ba11232b04bc0cb035bb9e3d08f9d439e844a623340882080555206811fe0624c61bc1 scm.patch" diff --git a/user/py3-py/scm.patch b/user/py3-py/scm.patch new file mode 100644 index 000000000..44665748f --- /dev/null +++ b/user/py3-py/scm.patch @@ -0,0 +1,12 @@ +--- py-1.7.0/setup.py 2018-08-27 20:39:51.000000000 +0000 ++++ py-1.7.0/setup.py 2018-10-11 05:07:12.560247181 +0000 +@@ -6,8 +6,7 @@ def main(): + name='py', + description='library with cross-python path, ini-parsing, io, code, log facilities', + long_description=open('README.rst').read(), +- use_scm_version={"write_to": "py/_version.py"}, +- setup_requires=["setuptools-scm"], ++ version='1.7.0', + url='http://py.readthedocs.io/', + license='MIT license', + platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], diff --git a/user/py3-pytest/APKBUILD b/user/py3-pytest/APKBUILD index 8d720971e..6965bf73a 100644 --- a/user/py3-pytest/APKBUILD +++ b/user/py3-pytest/APKBUILD @@ -2,17 +2,20 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-pytest _pkgname=pytest -pkgver=3.5.1 -pkgrel=1 +pkgver=3.9.1 +pkgrel=0 pkgdesc="A python test library" url="https://pypi.python.org/pypi/pytest" arch="noarch" -options="net !check" # Circular dependency with py3-tox. Passes on x86_64 +options="!checkroot !check" # Cyclic dependency with itself. Passes on x86_64 +# Certified net clean license="MIT" -depends="python3 py3-py py3-more-itertools py3-six py3-pluggy py3-attrs" +depends="python3 py3-atomicwrites py3-attrs py3-more-itertools + py3-pluggy py3-py py3-six" makedepends="python3-dev" -#checkdepends="py3-tox" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" +#checkdepends="py3-pytest py3-hypothesis" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz + scm.patch" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -22,7 +25,8 @@ build() { check() { cd "$builddir" - tox -e py36 + # You would think you could get away with "python3 -m pytest" but no... + PYTHONPATH="$builddir/build/lib:$PYTHONPATH" pytest } package() { @@ -30,4 +34,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="5f54251b197b4bebadb06536054b4f79e16c5cec2cdfd7d95fd74548b8ecfaddaafeb635eb90d085fe4d4bea1108f951fe500d0e548cc8b797b0d23e0c2693a0 py3-pytest-3.5.1.tar.gz" +sha512sums="0a3a6842fb549c8223f0ddf56ca28eb200a21a4cadf382fbcd2ab930c58d57c55c77d5869e84bd79bf611d959cba6d363ace3b5fd33d5ce44259fd580b1a9369 py3-pytest-3.9.1.tar.gz +7fc2cd75f55caa661fb4bed578955511ee38cd28a25fcb405c29eb7227a382c33c0fc52a4eeb8950315793dfc0eb02235b140415deebd113f24df1a320b25959 scm.patch" diff --git a/user/py3-pytest/scm.patch b/user/py3-pytest/scm.patch new file mode 100644 index 000000000..799eefac0 --- /dev/null +++ b/user/py3-pytest/scm.patch @@ -0,0 +1,13 @@ +--- pytest-3.9.1/setup.py 2018-10-16 15:46:37.000000000 -0400 ++++ pytest-3.9.1/setup.py 2018-10-22 19:32:49.261592294 -0400 +@@ -25,8 +25,8 @@ if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not i + + def main(): + setup( +- use_scm_version={"write_to": "src/_pytest/_version.py"}, +- setup_requires=["setuptools-scm", "setuptools>=30.3"], ++ setup_requires=["setuptools>=30.3"], ++ version="3.9.1", + package_dir={"": "src"}, + install_requires=INSTALL_REQUIRES, + ) diff --git a/user/py3-roman/APKBUILD b/user/py3-roman/APKBUILD index cdf338ae3..0105c986a 100644 --- a/user/py3-roman/APKBUILD +++ b/user/py3-roman/APKBUILD @@ -2,17 +2,16 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=py3-roman _pkgname=roman -pkgver=2.0.0 -pkgrel=2 +pkgver=3.0 +pkgrel=0 pkgdesc="Python library to convert integers to Roman numerals" -url="http://pypi.python.org/pypi/roman" +url="https://pypi.org/project/roman/" arch="noarch" +# Certified net clean license="Python-2.1.1" # not SPDX depends="python3" -makedepends="python3-dev unzip" -checkdepends="py3-tox" -source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.zip - py36.patch" +makedepends="python3-dev" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/r/$_pkgname/$_pkgname-$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -23,7 +22,7 @@ build() { check() { cd "$builddir" - tox -e py36 + python3 setup.py test } package() { @@ -31,5 +30,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c py3-roman-2.0.0.zip -8f6bfe0f7259db6091b71c8744592de34ca305a30b5ac44cb366fd3e71ebbead21b892939a15b19cd0e344445f981f16ae493bb70ade171b2ba1d92daa431931 py36.patch" +sha512sums="468a4ac7188cdf3155698f260de5ecc5bb2072c120c79d046618ac07b6de6f777cfc69661f2e0df4ca66359bb20169d22599b3f342edaa48f8575bdc17b40c08 py3-roman-3.0.tar.gz" diff --git a/user/py3-roman/py36.patch b/user/py3-roman/py36.patch deleted file mode 100644 index fc74674a7..000000000 --- a/user/py3-roman/py36.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- roman-2.0.0/tox.ini 2013-02-25 10:15:52.000000000 +0000 -+++ roman-2.0.0/tox.ini 2018-01-11 02:04:11.950000000 +0000 -@@ -1,6 +1,6 @@ - [tox] - envlist = -- py26,py27,py33,pypy -+ py26,py27,py33,pypy,py36 - - [testenv] - commands = diff --git a/user/py3-virtualenv/APKBUILD b/user/py3-virtualenv/APKBUILD index 3b699448c..d78f6e7e7 100644 --- a/user/py3-virtualenv/APKBUILD +++ b/user/py3-virtualenv/APKBUILD @@ -7,12 +7,13 @@ pkgrel=0 pkgdesc="Virtual Python Environment builder" url="https://pypi.org/project/virtualenv" arch="noarch" +options="net" license="MIT" depends="python3" makedepends="python3-dev" checkdepends="py3-pytest cmd:which" -source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - test-python3.patch" +source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/v/$_pkgname/$_pkgname-$pkgver.tar.gz + test-python3.6.patch" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -34,4 +35,4 @@ package() { } sha512sums="43bc37f1da1b65e9a2df5a8813a801f27f5783b7211219d441d1c2132789917df42fdc0aba1d5ec51e3d6f7583af9474d59c1f532d8880c8c325ccc96e73b3df py3-virtualenv-16.0.0.tar.gz -8e022416eb10289fd5215f3810203eefb450ce2fca7bdc581b5cd1892f41f34815beec35fc6c744991536c1f2edebd58ab934a4414c6fe2ae6387aea02787ef8 test-python3.patch" +9c68dcda515dfc974433c9a68d81be0b028a7967eebb1b6d1d912c3859c7925fe970f1668ac9e406768de91ed32b27b3b8ea7a4939f8adc7a09e1bf904df10b9 test-python3.6.patch" diff --git a/user/py3-virtualenv/test-python3.patch b/user/py3-virtualenv/test-python3.6.patch index 8b4a99b51..782aca2c5 100644 --- a/user/py3-virtualenv/test-python3.patch +++ b/user/py3-virtualenv/test-python3.6.patch @@ -72,3 +72,25 @@ import os, sys expected_site_packages = os.path.join(os.environ['TESTENV'], 'lib','python%s' % sys.version[:3], 'site-packages') +--- virtualenv-16.0.0/setup.py 2018-05-16 19:36:07.000000000 -0400 ++++ virtualenv-16.0.0/setup.py 2018-10-22 20:56:04.691681656 -0400 +@@ -33,7 +33,7 @@ try: + }, + 'zip_safe': False, + 'cmdclass': {'test': PyTest}, +- 'tests_require': ['pytest', 'mock'], ++ 'tests_require': ['pytest'], + } + except ImportError: + from distutils.core import setup +--- virtualenv-16.0.0/tests/test_virtualenv.py 2018-05-16 19:36:07.000000000 -0400 ++++ virtualenv-16.0.0/tests/test_virtualenv.py 2018-10-22 20:56:38.771682266 -0400 +@@ -7,7 +7,7 @@ import tempfile + import pytest + import platform # noqa + +-from mock import patch, Mock ++from unittest.mock import patch, Mock + + + def test_version(): 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/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" |