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 | 44 | ||||
| -rw-r--r-- | experimental/qt5-qtwebkit/js-py3.patch | 35 | ||||
| -rw-r--r-- | experimental/qt5-qtwebkit/jsc-port-to-musl.patch | 81 | ||||
| -rw-r--r-- | experimental/qt5-qtwebkit/musl-thread-stacksize.patch | 49 |
6 files changed, 164 insertions, 134 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 c6e8103ba..fb6c39631 100644 --- a/experimental/qt5-qtwebkit/APKBUILD +++ b/experimental/qt5-qtwebkit/APKBUILD @@ -15,18 +15,42 @@ makedepends="$depends_dev ninja sqlite-dev icu-dev ruby perl bison flex gperf libxml2-dev libxslt-dev libjpeg-turbo-dev libpng-dev zlib-dev glib-dev gstreamer-dev fontconfig-dev qt5-qtsensors-dev qt5-qtpositioning-dev qt5-qtdeclarative-dev qt5-qtwebchannel-dev libxcomposite-dev - libxrender-dev gst-plugins-base-dev" + 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 - js-py3.patch + jsc-port-to-musl.patch + musl-thread-stacksize.patch " builddir="$srcdir"/$_realname-$_realver +unpack() { + default_unpack + # just ripped from Firefox's APKBUILD... + [ -z $SKIP_PYTHON ] || return 0 + msg "Killing all remaining hope for humanity and building Python 2..." + cd "$srcdir" + [ -d python ] && rm -r python + mkdir python + cd python + # 19:39 <+solar> just make the firefox build process build its own py2 copy + curl -O https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz + tar xJf Python-2.7.15.tar.xz + cd Python-2.7.15 + # 20:03 <calvin> TheWilfox: there's always violence + ./configure --prefix="$srcdir/python" + make -j $JOBS + # 6 tests failed: + # test__locale test_os test_posix test_re test_strptime test_time + # make test + make -j $JOBS install +} + build() { cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi + export PATH="$srcdir/python/bin:$PATH" # We can enable the JIT when it is stable on all Tier 1 platforms: # pmmx (ensure no SSE) # ppc @@ -45,10 +69,14 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_JIT=OFF \ -DPORT=Qt \ - -DUSE_LIBHYPHEN=OFF \ -DUSE_SYSTEM_MALLOC=ON \ ${CMAKE_CROSSOPTS} - make + # too memory hungry + if [ -z "$JOBS" -o $JOBS -gt 32 ]; then + make -j32 + else + make + fi } check() { @@ -56,15 +84,11 @@ check() { CTEST_OUTPUT_ON_FAILURE=TRUE ctest } -check() { - cd "$builddir" - make check -} - package() { cd "$builddir" make DESTDIR="$pkgdir" install } sha512sums="b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758 qtwebkit-5.212.0-alpha2.tar.xz -cee23bc493e2b207119a8ae26691d9d75f91535a39780b9438539c8f3789d9b28377b135b64738a34cf10ebbb30e3bc29eb2f56988a7a0d0cf8ddc9bbca7c8ca js-py3.patch" +19efd97c5f628108d30cc0e5e53f689725cc480ffe1ea90577e5f961d7f35a6a434dda5a03c73c0fb74a30c46ced32bcf580340a2eaf4e72960e61c28ed34dba jsc-port-to-musl.patch +a8df6d20346882e49745dbdf9bdf2eddf2f3e1ac3301e9fd826397fa746d1d9228deaf2eab0316fa977a85032d6c091559cd5404b7a576e3adc0bec64a5a4ad9 musl-thread-stacksize.patch" diff --git a/experimental/qt5-qtwebkit/js-py3.patch b/experimental/qt5-qtwebkit/js-py3.patch deleted file mode 100644 index 44e77cde0..000000000 --- a/experimental/qt5-qtwebkit/js-py3.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/generate-bytecode-files (original) -+++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/generate-bytecode-files (refactored) -@@ -91,7 +91,7 @@ - try: - return open(path, mode) - except IOError as e: -- print "I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror) -+ print("I/O error opening {0}, ({1}): {2}".format(path, e.errno, e.strerror)) - exit(1) - - def hashFile(file): -@@ -165,7 +165,7 @@ - try: - bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") - except: -- print "Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()) -+ print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) - - if bytecodeHFilename: - bytecodeHFile.write(hFileHashString) ---- qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/generate-bytecode-files.old 2018-07-16 10:18:49.850000000 +0000 -+++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/generate-bytecode-files 2018-07-16 10:22:35.290000000 +0000 -@@ -157,10 +157,10 @@ - exit(0) - - if bytecodeHFilename: -- bytecodeHFile = openOrExit(bytecodeHFilename, "wb") -+ bytecodeHFile = openOrExit(bytecodeHFilename, "w") - - if initASMFileName: -- initBytecodesFile = openOrExit(initASMFileName, "wb") -+ initBytecodesFile = openOrExit(initASMFileName, "w") - - try: - bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") 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 new file mode 100644 index 000000000..e790222dc --- /dev/null +++ b/experimental/qt5-qtwebkit/musl-thread-stacksize.patch @@ -0,0 +1,49 @@ +--- qtwebkit-5.212.0-alpha2/Source/WTF/wtf/ThreadingPthreads.cpp.old 2017-06-04 15:16:06.000000000 -0500 ++++ qtwebkit-5.212.0-alpha2/Source/WTF/wtf/ThreadingPthreads.cpp 2018-09-05 02:29:45.980000000 +0000 +@@ -107,10 +107,11 @@ + void initializeThreading() + { + static bool isInitialized; ++ pthread_attr_t attr; + + if (isInitialized) + return; + + isInitialized = true; + + WTF::double_conversion::initialize(); +@@ -122,6 +122,11 @@ + ThreadIdentifierData::initializeOnce(); + wtfThreadData(); + initializeDates(); ++ ++ pthread_attr_init(&attr); ++ pthread_attr_setstacksize(&attr, 2097152); ++ pthread_setattr_default_np(&attr); ++ pthread_attr_destroy(&attr); + } + + static ThreadMap& threadMap() +@@ -171,6 +171,7 @@ + pthread_t threadHandle; + pthread_attr_t attr; + pthread_attr_init(&attr); ++ pthread_attr_setstacksize(&attr, 2097152); + #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 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, 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.)") \ |