diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-29 00:07:34 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-29 00:07:34 +0200 |
| commit | a41c7f26b5b0363fe6ae57617a7ad0abd986cea8 (patch) | |
| tree | 3f6fc3faaeeaa73252afb7f7413c71a65007eedd | |
| parent | 268fa737017e1dbda438a21f258c45818250cb88 (diff) | |
| download | aports-a41c7f26b5b0363fe6ae57617a7ad0abd986cea8.tar.bz2 aports-a41c7f26b5b0363fe6ae57617a7ad0abd986cea8.tar.xz | |
testing/logstalgia: build fix gcc6
| -rw-r--r-- | testing/logstalgia/APKBUILD | 13 | ||||
| -rw-r--r-- | testing/logstalgia/gcc6-fix.patch | 11 |
2 files changed, 20 insertions, 4 deletions
diff --git a/testing/logstalgia/APKBUILD b/testing/logstalgia/APKBUILD index 2075de53aa..8f675f37bf 100644 --- a/testing/logstalgia/APKBUILD +++ b/testing/logstalgia/APKBUILD @@ -13,7 +13,9 @@ depends_dev="pcre-dev sdl_image-dev sdl-dev ftgl-dev makedepends="$depends_dev" install="" subpackages="$pkgname-doc" -source="https://github.com/acaudwell/Logstalgia/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz" +source="https://github.com/acaudwell/Logstalgia/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz + gcc6-fix.patch" + builddir="$srcdir"/$pkgname-$pkgver build() { @@ -29,6 +31,9 @@ package() { make prefix=$pkgdir/usr install || return 1 } -md5sums="b2d1d10315e2415dc1d20bfc7e4538f1 logstalgia-1.0.7.tar.gz" -sha256sums="5553fd03fb7be564538fe56e871eac6e3caf56f40e8abc4602d2553964f8f0e1 logstalgia-1.0.7.tar.gz" -sha512sums="862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9 logstalgia-1.0.7.tar.gz" +md5sums="b2d1d10315e2415dc1d20bfc7e4538f1 logstalgia-1.0.7.tar.gz +ac92b98c96302f8d8d996ca9169dc5f1 gcc6-fix.patch" +sha256sums="5553fd03fb7be564538fe56e871eac6e3caf56f40e8abc4602d2553964f8f0e1 logstalgia-1.0.7.tar.gz +e926aa3b1b59612c93e94b81ec9198e0d036ff0a61d5cf026919551f2d882ef7 gcc6-fix.patch" +sha512sums="862950ec387e27d72fe127fcccd37d1e6a0ed8b77fb243c119ef8b48b5bc45092d1b6881b9afbc016969e80a427fa4e210aa5d35524baf191d0c4fad5f91e3a9 logstalgia-1.0.7.tar.gz +bd15c5f3cff76da2da2baf749a1aba1cd977e3f436048fe913c719e65bb2ef39bd247ac8c09c2c31d6fee782d6d73dc19f10c442b7d11890e98e63f8e41a939d gcc6-fix.patch" diff --git a/testing/logstalgia/gcc6-fix.patch b/testing/logstalgia/gcc6-fix.patch new file mode 100644 index 0000000000..1033af44a9 --- /dev/null +++ b/testing/logstalgia/gcc6-fix.patch @@ -0,0 +1,11 @@ +--- ./src/paddle.cpp.orig ++++ ./src/paddle.cpp +@@ -95,7 +95,7 @@ + + bool Paddle::mouseOver(TextArea& textarea, vec2& mouse) { + +- if(pos.x <= mouse.x && pos.x + width >= mouse.x && abs(pos.y - mouse.y) < height/2) { ++ if(pos.x <= mouse.x && pos.x + width >= mouse.x && abs(int(pos.y) - int(mouse.y)) < height/2) { + + std::vector<std::string> content; + |