summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-04-09 16:16:44 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-04-09 16:16:44 +0000
commit2ca11ad655718c5455eef5a8628df6f37859220d (patch)
tree7911c81b451aff426be7a2a863e33d6b92c08169
parent2aef9276762b9754830aa2e2114bc715233bd6c6 (diff)
downloadpackages-2ca11ad655718c5455eef5a8628df6f37859220d.tar.gz
packages-2ca11ad655718c5455eef5a8628df6f37859220d.tar.bz2
packages-2ca11ad655718c5455eef5a8628df6f37859220d.tar.xz
packages-2ca11ad655718c5455eef5a8628df6f37859220d.zip
user/xorg-gtest: remove atrocious hack so arm64 builds
-rw-r--r--user/xorg-gtest/APKBUILD7
-rw-r--r--user/xorg-gtest/remove-ridiculous-va_list-hacks.patch24
2 files changed, 29 insertions, 2 deletions
diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD
index 72effff40..572976147 100644
--- a/user/xorg-gtest/APKBUILD
+++ b/user/xorg-gtest/APKBUILD
@@ -11,7 +11,9 @@ license="MIT AND BSD-3-Clause"
depends=""
makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy"
subpackages="$pkgname-dev"
-source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest-$pkgver/xorg-gtest-xorg-gtest-$pkgver.tar.bz2"
+source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest-$pkgver/xorg-gtest-xorg-gtest-$pkgver.tar.bz2
+ remove-ridiculous-va_list-hacks.patch
+ "
builddir="$srcdir"/$pkgname-$pkgname-$pkgver
prepare() {
@@ -45,4 +47,5 @@ package() {
done
}
-sha512sums="100746225dd6b24f030893da7b960c2f2562fa9f5d02ee7fca3eb99c40e3ae17d408d5e3c4e99e05e3767984d48648d5a42473a9922d699cf1281290af1eb86c xorg-gtest-xorg-gtest-0.7.1.tar.bz2"
+sha512sums="100746225dd6b24f030893da7b960c2f2562fa9f5d02ee7fca3eb99c40e3ae17d408d5e3c4e99e05e3767984d48648d5a42473a9922d699cf1281290af1eb86c xorg-gtest-xorg-gtest-0.7.1.tar.bz2
+14055ccca54d083d231084acda63b0769946d1d2d8243752842c1043db6638ac3e581021bb61e6e2b97566b075ed345a2949646886281e58a1e3679d949d2f34 remove-ridiculous-va_list-hacks.patch"
diff --git a/user/xorg-gtest/remove-ridiculous-va_list-hacks.patch b/user/xorg-gtest/remove-ridiculous-va_list-hacks.patch
new file mode 100644
index 000000000..b26d6a888
--- /dev/null
+++ b/user/xorg-gtest/remove-ridiculous-va_list-hacks.patch
@@ -0,0 +1,24 @@
+--- xorg-gtest-xorg-gtest-0.7.1/src/process.cpp.old 2013-02-24 22:15:08.000000000 +0000
++++ xorg-gtest-xorg-gtest-0.7.1/src/process.cpp 2019-04-09 16:12:31.822094989 +0000
+@@ -126,15 +126,12 @@
+
+ void xorg::testing::Process::Start(const std::string& program, va_list args) {
+ std::vector<std::string> argv;
+-
+- if (args) {
+- char *arg;
+- do {
+- arg = va_arg(args, char*);
+- if (arg)
+- argv.push_back(std::string(arg));
+- } while (arg);
+- }
++ char *arg;
++ do {
++ arg = va_arg(args, char*);
++ if (arg)
++ argv.push_back(std::string(arg));
++ } while (arg);
+
+ Start(program, argv);
+ }