From 987d9c735d16c2610d1ee5db11cbcdbf718562d5 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 6 Jul 2018 22:30:54 +0200 Subject: [PATCH] Move aports forked from Alpine to aports/temp Also remove the py-requests, as the version has been updated in Alpine. Close: #1603 --- temp/py-requests/APKBUILD | 52 ------------------- ...oad-PIE-executables-to-right-address.patch | 0 ...-user-fix-build-with-musl-on-aarch64.patch | 0 ...-user-fix-build-with-musl-on-ppc64le.patch | 0 ...se-QEMU_MODULE_PATH-as-a-search-path.patch | 0 .../0001-ui-add-x_keymap.o-to-modules.patch | 0 ...l.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 0 {main => temp}/qemu/80-kvm.rules | 0 {main => temp}/qemu/APKBUILD | 1 + {main => temp}/qemu/bridge.conf | 0 .../qemu/fix-sigevent-and-sigval_t.patch | 0 {main => temp}/qemu/fix-sockios-header.patch | 0 ...-33-and-64-to-allow-golang-emulation.patch | 0 .../qemu/musl-F_SHLCK-and-F_EXLCK.patch | 0 {main => temp}/qemu/ncurses.patch | 0 {main => temp}/qemu/qemu-guest-agent.confd | 0 {main => temp}/qemu/qemu-guest-agent.initd | 0 {main => temp}/qemu/qemu.post-install | 0 {main => temp}/qemu/qemu.pre-install | 0 .../qemu/test-crypto-ivgen-skip-essiv.patch | 0 {main => temp}/qemu/xattr_size_max.patch | 0 {main => temp}/qt5-qtbase/APKBUILD | 0 .../qt5-qtbase/hack-openssl_test.patch | 0 .../qt5-qtbase/libressl-compat.patch | 0 .../qt5-qtbase/qt-musl-iconv-no-bom.patch | 0 {main => temp}/qt5-qtdeclarative/APKBUILD | 0 ...or-fbdev-Added-parameter-pixman-type.patch | 0 ...ompositor-fbdev-Add-support-for-ABGR.patch | 0 ...-print-the-pixman-type-guessed-in-ca.patch | 0 .../weston/0004-musl-weston-launcher.patch | 0 {main => temp}/weston/0005-timespec.patch | 0 ...positor-fbdev-fix-start-up-assertion.patch | 0 ...dp-compilation-with-freerdp-2.0.0-rc.patch | 0 {main => temp}/weston/APKBUILD | 0 34 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 temp/py-requests/APKBUILD rename {main => temp}/qemu/0001-elfload-load-PIE-executables-to-right-address.patch (100%) rename {main => temp}/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch (100%) rename {main => temp}/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch (100%) rename {main => temp}/qemu/0001-module-Use-QEMU_MODULE_PATH-as-a-search-path.patch (100%) rename {main => temp}/qemu/0001-ui-add-x_keymap.o-to-modules.patch (100%) rename {main => temp}/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch (100%) rename {main => temp}/qemu/80-kvm.rules (100%) rename {main => temp}/qemu/APKBUILD (99%) rename {main => temp}/qemu/bridge.conf (100%) rename {main => temp}/qemu/fix-sigevent-and-sigval_t.patch (100%) rename {main => temp}/qemu/fix-sockios-header.patch (100%) rename {main => temp}/qemu/ignore-signals-33-and-64-to-allow-golang-emulation.patch (100%) rename {main => temp}/qemu/musl-F_SHLCK-and-F_EXLCK.patch (100%) rename {main => temp}/qemu/ncurses.patch (100%) rename {main => temp}/qemu/qemu-guest-agent.confd (100%) rename {main => temp}/qemu/qemu-guest-agent.initd (100%) rename {main => temp}/qemu/qemu.post-install (100%) rename {main => temp}/qemu/qemu.pre-install (100%) rename {main => temp}/qemu/test-crypto-ivgen-skip-essiv.patch (100%) rename {main => temp}/qemu/xattr_size_max.patch (100%) rename {main => temp}/qt5-qtbase/APKBUILD (100%) rename {main => temp}/qt5-qtbase/hack-openssl_test.patch (100%) rename {main => temp}/qt5-qtbase/libressl-compat.patch (100%) rename {main => temp}/qt5-qtbase/qt-musl-iconv-no-bom.patch (100%) rename {main => temp}/qt5-qtdeclarative/APKBUILD (100%) rename {main => temp}/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch (100%) rename {main => temp}/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch (100%) rename {main => temp}/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch (100%) rename {main => temp}/weston/0004-musl-weston-launcher.patch (100%) rename {main => temp}/weston/0005-timespec.patch (100%) rename {main => temp}/weston/0006-compositor-fbdev-fix-start-up-assertion.patch (100%) rename {main => temp}/weston/0007-Fix-compositor-rdp-compilation-with-freerdp-2.0.0-rc.patch (100%) rename {main => temp}/weston/APKBUILD (100%) diff --git a/temp/py-requests/APKBUILD b/temp/py-requests/APKBUILD deleted file mode 100644 index 62e958b9c..000000000 --- a/temp/py-requests/APKBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Forked from Alpine for update to 2.19.1. Without this, KDE's extra-cmake-modules -# currently does not compile. See https://github.com/alpinelinux/aports/pull/4533 -# for details. This aport can be removed, when that PR is merged. - -pkgname=py-requests -_pkgname=requests -pkgver=2.19.1 -pkgrel=0 -pkgdesc="A HTTP request library for Python" -url="http://www.python-requests.org/" -arch="noarch" -license="Apache-2.0" -# Requirements for tests are not available in main -options="!check" -depends="py-chardet py-idna py-certifi py-urllib3" -makedepends="python2-dev py-setuptools python3-dev" -subpackages="py3-${pkgname#py-}:_py3 py2-${pkgname#py-}:_py2" -source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" -builddir="$srcdir/$_pkgname-$pkgver" - -build() { - cd "$builddir" - python2 setup.py build - python3 setup.py build -} - -package() { - mkdir -p "$pkgdir" -} - -_py() { - local python="$1" - pkgdesc="$pkgdesc ${python#python}" - depends="$depends $python" - install_if="$pkgname=$pkgver-r$pkgrel $python" - - cd "$builddir" - $python setup.py install --prefix=/usr --root="$subpkgdir" -} - -_py2() { - replaces="$pkgname" - depends="${depends//py-/py2-}" - _py python2 -} - -_py3() { - depends="${depends//py-/py3-}" - _py python3 -} - -sha512sums="deef2662227497b472f6e7eb7f0ee468c772069fc66552f71d80e5a12af62a187f8bc6a8a78531915e824c7f277d0db61c1534c89d13d473f68504f0bd6edf47 requests-2.19.1.tar.gz" diff --git a/main/qemu/0001-elfload-load-PIE-executables-to-right-address.patch b/temp/qemu/0001-elfload-load-PIE-executables-to-right-address.patch similarity index 100% rename from main/qemu/0001-elfload-load-PIE-executables-to-right-address.patch rename to temp/qemu/0001-elfload-load-PIE-executables-to-right-address.patch diff --git a/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch b/temp/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch similarity index 100% rename from main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch rename to temp/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch diff --git a/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch b/temp/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch similarity index 100% rename from main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch rename to temp/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch diff --git a/main/qemu/0001-module-Use-QEMU_MODULE_PATH-as-a-search-path.patch b/temp/qemu/0001-module-Use-QEMU_MODULE_PATH-as-a-search-path.patch similarity index 100% rename from main/qemu/0001-module-Use-QEMU_MODULE_PATH-as-a-search-path.patch rename to temp/qemu/0001-module-Use-QEMU_MODULE_PATH-as-a-search-path.patch diff --git a/main/qemu/0001-ui-add-x_keymap.o-to-modules.patch b/temp/qemu/0001-ui-add-x_keymap.o-to-modules.patch similarity index 100% rename from main/qemu/0001-ui-add-x_keymap.o-to-modules.patch rename to temp/qemu/0001-ui-add-x_keymap.o-to-modules.patch diff --git a/main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/temp/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch similarity index 100% rename from main/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch rename to temp/qemu/0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch diff --git a/main/qemu/80-kvm.rules b/temp/qemu/80-kvm.rules similarity index 100% rename from main/qemu/80-kvm.rules rename to temp/qemu/80-kvm.rules diff --git a/main/qemu/APKBUILD b/temp/qemu/APKBUILD similarity index 99% rename from main/qemu/APKBUILD rename to temp/qemu/APKBUILD index 9642af12d..08e667c8c 100644 --- a/main/qemu/APKBUILD +++ b/temp/qemu/APKBUILD @@ -1,3 +1,4 @@ +# Forked from Alpine to enable virglrenderer and the QEMU_MODULE_PATH patch (!1612) pkgname=qemu pkgver=9999 _pkgver=2.12.0 diff --git a/main/qemu/bridge.conf b/temp/qemu/bridge.conf similarity index 100% rename from main/qemu/bridge.conf rename to temp/qemu/bridge.conf diff --git a/main/qemu/fix-sigevent-and-sigval_t.patch b/temp/qemu/fix-sigevent-and-sigval_t.patch similarity index 100% rename from main/qemu/fix-sigevent-and-sigval_t.patch rename to temp/qemu/fix-sigevent-and-sigval_t.patch diff --git a/main/qemu/fix-sockios-header.patch b/temp/qemu/fix-sockios-header.patch similarity index 100% rename from main/qemu/fix-sockios-header.patch rename to temp/qemu/fix-sockios-header.patch diff --git a/main/qemu/ignore-signals-33-and-64-to-allow-golang-emulation.patch b/temp/qemu/ignore-signals-33-and-64-to-allow-golang-emulation.patch similarity index 100% rename from main/qemu/ignore-signals-33-and-64-to-allow-golang-emulation.patch rename to temp/qemu/ignore-signals-33-and-64-to-allow-golang-emulation.patch diff --git a/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch b/temp/qemu/musl-F_SHLCK-and-F_EXLCK.patch similarity index 100% rename from main/qemu/musl-F_SHLCK-and-F_EXLCK.patch rename to temp/qemu/musl-F_SHLCK-and-F_EXLCK.patch diff --git a/main/qemu/ncurses.patch b/temp/qemu/ncurses.patch similarity index 100% rename from main/qemu/ncurses.patch rename to temp/qemu/ncurses.patch diff --git a/main/qemu/qemu-guest-agent.confd b/temp/qemu/qemu-guest-agent.confd similarity index 100% rename from main/qemu/qemu-guest-agent.confd rename to temp/qemu/qemu-guest-agent.confd diff --git a/main/qemu/qemu-guest-agent.initd b/temp/qemu/qemu-guest-agent.initd similarity index 100% rename from main/qemu/qemu-guest-agent.initd rename to temp/qemu/qemu-guest-agent.initd diff --git a/main/qemu/qemu.post-install b/temp/qemu/qemu.post-install similarity index 100% rename from main/qemu/qemu.post-install rename to temp/qemu/qemu.post-install diff --git a/main/qemu/qemu.pre-install b/temp/qemu/qemu.pre-install similarity index 100% rename from main/qemu/qemu.pre-install rename to temp/qemu/qemu.pre-install diff --git a/main/qemu/test-crypto-ivgen-skip-essiv.patch b/temp/qemu/test-crypto-ivgen-skip-essiv.patch similarity index 100% rename from main/qemu/test-crypto-ivgen-skip-essiv.patch rename to temp/qemu/test-crypto-ivgen-skip-essiv.patch diff --git a/main/qemu/xattr_size_max.patch b/temp/qemu/xattr_size_max.patch similarity index 100% rename from main/qemu/xattr_size_max.patch rename to temp/qemu/xattr_size_max.patch diff --git a/main/qt5-qtbase/APKBUILD b/temp/qt5-qtbase/APKBUILD similarity index 100% rename from main/qt5-qtbase/APKBUILD rename to temp/qt5-qtbase/APKBUILD diff --git a/main/qt5-qtbase/hack-openssl_test.patch b/temp/qt5-qtbase/hack-openssl_test.patch similarity index 100% rename from main/qt5-qtbase/hack-openssl_test.patch rename to temp/qt5-qtbase/hack-openssl_test.patch diff --git a/main/qt5-qtbase/libressl-compat.patch b/temp/qt5-qtbase/libressl-compat.patch similarity index 100% rename from main/qt5-qtbase/libressl-compat.patch rename to temp/qt5-qtbase/libressl-compat.patch diff --git a/main/qt5-qtbase/qt-musl-iconv-no-bom.patch b/temp/qt5-qtbase/qt-musl-iconv-no-bom.patch similarity index 100% rename from main/qt5-qtbase/qt-musl-iconv-no-bom.patch rename to temp/qt5-qtbase/qt-musl-iconv-no-bom.patch diff --git a/main/qt5-qtdeclarative/APKBUILD b/temp/qt5-qtdeclarative/APKBUILD similarity index 100% rename from main/qt5-qtdeclarative/APKBUILD rename to temp/qt5-qtdeclarative/APKBUILD diff --git a/main/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch b/temp/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch similarity index 100% rename from main/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch rename to temp/weston/0001-compositor-fbdev-Added-parameter-pixman-type.patch diff --git a/main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch b/temp/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch similarity index 100% rename from main/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch rename to temp/weston/0002-compositor-fbdev-Add-support-for-ABGR.patch diff --git a/main/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch b/temp/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch similarity index 100% rename from main/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch rename to temp/weston/0003-compositor-fbdev-print-the-pixman-type-guessed-in-ca.patch diff --git a/main/weston/0004-musl-weston-launcher.patch b/temp/weston/0004-musl-weston-launcher.patch similarity index 100% rename from main/weston/0004-musl-weston-launcher.patch rename to temp/weston/0004-musl-weston-launcher.patch diff --git a/main/weston/0005-timespec.patch b/temp/weston/0005-timespec.patch similarity index 100% rename from main/weston/0005-timespec.patch rename to temp/weston/0005-timespec.patch diff --git a/main/weston/0006-compositor-fbdev-fix-start-up-assertion.patch b/temp/weston/0006-compositor-fbdev-fix-start-up-assertion.patch similarity index 100% rename from main/weston/0006-compositor-fbdev-fix-start-up-assertion.patch rename to temp/weston/0006-compositor-fbdev-fix-start-up-assertion.patch diff --git a/main/weston/0007-Fix-compositor-rdp-compilation-with-freerdp-2.0.0-rc.patch b/temp/weston/0007-Fix-compositor-rdp-compilation-with-freerdp-2.0.0-rc.patch similarity index 100% rename from main/weston/0007-Fix-compositor-rdp-compilation-with-freerdp-2.0.0-rc.patch rename to temp/weston/0007-Fix-compositor-rdp-compilation-with-freerdp-2.0.0-rc.patch diff --git a/main/weston/APKBUILD b/temp/weston/APKBUILD similarity index 100% rename from main/weston/APKBUILD rename to temp/weston/APKBUILD