diff options
Diffstat (limited to 'experimental')
-rw-r--r-- | experimental/freecell-solver/APKBUILD | 43 | ||||
-rw-r--r-- | experimental/perl-task-freecellsolver-testing/APKBUILD | 46 | ||||
-rw-r--r-- | experimental/qt5-qtwebkit/APKBUILD | 4 | ||||
-rw-r--r-- | experimental/qt5-qtwebkit/jsc-port-to-musl.patch | 81 | ||||
-rw-r--r-- | experimental/qt5-qtwebkit/musl-thread-stacksize.patch | 12 |
5 files changed, 91 insertions, 95 deletions
diff --git a/experimental/freecell-solver/APKBUILD b/experimental/freecell-solver/APKBUILD deleted file mode 100644 index 4263870e5..000000000 --- a/experimental/freecell-solver/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=freecell-solver -pkgver=4.18.0 -pkgrel=0 -pkgdesc="Library for solving card games" -url="http://fc-solve.shlomifish.org/" -arch="all" -license="MIT" -depends="" -depends_dev="" -makedepends="$depends_dev perl gperf python3 py3-random2" -install="" -subpackages="$pkgname-dev $pkgname-doc" -source="http://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-$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="aa6ba724ade171c5b69517136ba97b46e811d330903a4735ef7ff4e44c905c4a91260ac73b76b90e6406ba7dacc1083c422c16f98ba7b647ae891a50732087a4 freecell-solver-4.18.0.tar.xz" diff --git a/experimental/perl-task-freecellsolver-testing/APKBUILD b/experimental/perl-task-freecellsolver-testing/APKBUILD deleted file mode 100644 index 5176d50b0..000000000 --- a/experimental/perl-task-freecellsolver-testing/APKBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Automatically generated by apkbuild-cpan, template 1 -# Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> -pkgname=perl-task-freecellsolver-testing -_pkgreal=Task-FreecellSolver-Testing -pkgver=0.0.11 -pkgrel=0 -pkgdesc="Perl module for testing the Freecell Solver package" -url="http://search.cpan.org/dist/Task-FreecellSolver-Testing/" -arch="noarch" -license="MIT" -cpandepends="" -cpanmakedepends="perl-module-build" -depends="$cpandepends" -makedepends="perl-dev $cpanmakedepends" -subpackages="$pkgname-doc" -source="http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/$_pkgreal-v$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-v$pkgver" - -prepare() { - cd "$builddir" - if [ -e Build.PL ]; then - perl Build.PL installdirs=vendor - else - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - fi -} - -build() { - cd "$builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` - ./Build -} - -check() { - cd "$builddir" - ./Build test -} - -package() { - cd "$builddir" - ./Build install destdir="$pkgdir" - find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete -} - -sha512sums="85c3d7e68e0fa14abac2442ec7b6e90cc4df9f6733fbd87e5a872043a03a71d8cd3a262c816d861a1c729646ff379665c1d5d6e0bc80ae476db089d9d3793b82 Task-FreecellSolver-Testing-v0.0.11.tar.gz" diff --git a/experimental/qt5-qtwebkit/APKBUILD b/experimental/qt5-qtwebkit/APKBUILD index 440956b14..fb6c39631 100644 --- a/experimental/qt5-qtwebkit/APKBUILD +++ b/experimental/qt5-qtwebkit/APKBUILD @@ -18,6 +18,7 @@ makedepends="$depends_dev ninja sqlite-dev icu-dev ruby perl bison flex gperf libxrender-dev gst-plugins-base-dev hyphen-dev libexecinfo-dev" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/annulen/webkit/releases/download/$_realname-$_realver/$_realname-$_realver.tar.xz + jsc-port-to-musl.patch musl-thread-stacksize.patch " builddir="$srcdir"/$_realname-$_realver @@ -89,4 +90,5 @@ package() { } sha512sums="b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758 qtwebkit-5.212.0-alpha2.tar.xz -2b778d55a00107f226231d00f13efb3064f539e2b9b690e3c542ee8b6be975b06b673efa27ececf09e0707c8319cb00f72177d9487ca1c36be5a98ab9eb33124 musl-thread-stacksize.patch" +19efd97c5f628108d30cc0e5e53f689725cc480ffe1ea90577e5f961d7f35a6a434dda5a03c73c0fb74a30c46ced32bcf580340a2eaf4e72960e61c28ed34dba jsc-port-to-musl.patch +a8df6d20346882e49745dbdf9bdf2eddf2f3e1ac3301e9fd826397fa746d1d9228deaf2eab0316fa977a85032d6c091559cd5404b7a576e3adc0bec64a5a4ad9 musl-thread-stacksize.patch" diff --git a/experimental/qt5-qtwebkit/jsc-port-to-musl.patch b/experimental/qt5-qtwebkit/jsc-port-to-musl.patch new file mode 100644 index 000000000..0b2d7dfce --- /dev/null +++ b/experimental/qt5-qtwebkit/jsc-port-to-musl.patch @@ -0,0 +1,81 @@ +diff -Naur qtwebkit-5.212.0-alpha2-original/Source/JavaScriptCore/heap/MachineStackMarker.cpp qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/heap/MachineStackMarker.cpp +--- qtwebkit-5.212.0-alpha2-original/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-06-04 20:16:05.000000000 +0000 ++++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2018-09-26 02:13:44.660000000 +0000 +@@ -566,7 +566,7 @@ + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) && ENABLE(JIT) ++#elif defined(__linux__) && ENABLE(JIT) + + #if CPU(X86) + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); +@@ -665,7 +665,7 @@ + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -747,7 +747,7 @@ + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -838,7 +838,7 @@ + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +diff -Naur qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp +--- qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2017-06-04 20:16:06.000000000 +0000 ++++ qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2018-09-26 02:12:36.770000000 +0000 +@@ -828,7 +828,7 @@ + #if YYERROR_VERBOSE + + # ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H ++# if defined __linux__ && defined _STRING_H + # define yystrlen strlen + # else + /* Return the length of YYSTR. */ +@@ -844,7 +844,7 @@ + # endif + + # ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE + # define yystpcpy stpcpy + # else + /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in +diff -Naur qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp +--- qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2017-06-04 20:16:06.000000000 +0000 ++++ qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2018-09-26 02:12:54.740000000 +0000 +@@ -1835,7 +1835,7 @@ + #if YYERROR_VERBOSE + + # ifndef yystrlen +-# if defined __GLIBC__ && defined _STRING_H ++# if defined __linux__ && defined _STRING_H + # define yystrlen strlen + # else + /* Return the length of YYSTR. */ +@@ -1851,7 +1851,7 @@ + # endif + + # ifndef yystpcpy +-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE ++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE + # define yystpcpy stpcpy + # else + /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in diff --git a/experimental/qt5-qtwebkit/musl-thread-stacksize.patch b/experimental/qt5-qtwebkit/musl-thread-stacksize.patch index b1e42b7d0..e790222dc 100644 --- a/experimental/qt5-qtwebkit/musl-thread-stacksize.patch +++ b/experimental/qt5-qtwebkit/musl-thread-stacksize.patch @@ -32,16 +32,18 @@ #if HAVE(QOS_CLASSES) pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INITIATED, 0); #endif ---- qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/runtime/Options.h.old 2017-06-04 15:16:05.000000000 -0500 -+++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/runtime/Options.h 2018-09-04 22:29:51.050000000 -0500 +--- qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/runtime/Options.h.old 2017-06-04 20:16:05.000000000 +0000 ++++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/runtime/Options.h 2018-09-26 03:02:39.700000000 +0000 @@ -112,9 +112,9 @@ \ v(bool, reportMustSucceedExecutableAllocations, false, nullptr) \ \ - v(unsigned, maxPerThreadStackUsage, 4 * MB, nullptr) \ -+ v(unsigned, maxPerThreadStackUsage, 1 * MB, nullptr) \ - v(unsigned, reservedZoneSize, 128 * KB, nullptr) \ - v(unsigned, errorModeReservedZoneSize, 64 * KB, nullptr) \ +- v(unsigned, reservedZoneSize, 128 * KB, nullptr) \ +- v(unsigned, errorModeReservedZoneSize, 64 * KB, nullptr) \ ++ v(unsigned, maxPerThreadStackUsage, 512 * KB, nullptr) \ ++ v(unsigned, reservedZoneSize, 32 * KB, nullptr) \ ++ v(unsigned, errorModeReservedZoneSize, 16 * KB, nullptr) \ \ v(bool, crashIfCantAllocateJITMemory, false, nullptr) \ v(unsigned, jitMemoryReservationSize, 0, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |