aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-11-13 07:54:31 +0000
committerTimo Teräs <timo.teras@iki.fi>2018-11-13 07:54:31 +0000
commit7bec45ec09c617b83c9f1e3f14a67ffc90e9d4e1 (patch)
tree7c33c745efc6114319b811950d6a93c63f9909a0
parent3dcac3bd0776a47c377ff040bff88f0fc0e61a03 (diff)
downloadaports-7bec45ec09c617b83c9f1e3f14a67ffc90e9d4e1.tar.gz
aports-7bec45ec09c617b83c9f1e3f14a67ffc90e9d4e1.tar.bz2
aports-7bec45ec09c617b83c9f1e3f14a67ffc90e9d4e1.tar.xz
main/cegui06: fix build, modernize
-rw-r--r--main/cegui06/APKBUILD29
-rw-r--r--main/cegui06/cegui-gcc8.patch12
2 files changed, 24 insertions, 17 deletions
diff --git a/main/cegui06/APKBUILD b/main/cegui06/APKBUILD
index 2d85b0189c..c46889a3ab 100644
--- a/main/cegui06/APKBUILD
+++ b/main/cegui06/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cegui06
pkgver=0.6.2b
-pkgrel=14
+pkgrel=15
pkgdesc="CEGUI library 0.6 for apps which need this specific version"
url="http://www.cegui.org.uk"
arch="all"
@@ -16,22 +16,17 @@ source="https://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz
cegui-0.6.2-gcc46.patch
cegui-0.6.0-release-as-so-ver.patch
cegui-0.6.0-userverso.patch
+ cegui-gcc8.patch
"
-_builddir="$srcdir"/CEGUI-0.6.2
+builddir="$srcdir"/CEGUI-0.6.2
prepare() {
- local i
- cd "$_builddir"
- update_config_sub || return 1
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
+ default_prepare
+ update_config_sub
}
build() {
- cd "$_builddir"
+ cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -42,17 +37,17 @@ build() {
--localstatedir=/var \
--disable-samples \
--with-pic \
- --with-default-xml-parser=ExpatParser \
- || return 1
- make || return 1
+ --with-default-xml-parser=ExpatParser
+ make
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ cd "$builddir"
+ make DESTDIR="$pkgdir" install
}
sha512sums="52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20 CEGUI-0.6.2b.tar.gz
83aa24c69e282473fb1dbf250bd4c80ed03f484633cf5fc26a87ae1c133b9938e3c1626b1d6f1a65e95275998b17307a1c94b36b291f4d8dd9c04ca15b67f8d9 cegui-0.6.2-gcc46.patch
c5899a7fc18339c8d03c27f96e246192c616328bb3b20a88a6bdef30d0efd840608afe6fb96b256712e950c2095784c03e71a1a96d8cd13e93a0da402c9de6c6 cegui-0.6.0-release-as-so-ver.patch
-6d560f6550c83186c434e1e572f25d45ec1ef0f02ed8066331d35116a775c71f28122ef0d64a77cfdb4de4d2e3929716c36616d2e1ec7d68ac09b5c07053b95e cegui-0.6.0-userverso.patch"
+6d560f6550c83186c434e1e572f25d45ec1ef0f02ed8066331d35116a775c71f28122ef0d64a77cfdb4de4d2e3929716c36616d2e1ec7d68ac09b5c07053b95e cegui-0.6.0-userverso.patch
+b34301311d198034369e0f093b40da7d0e7a9bf46e088a47d5dbffa594004a6541b84d41c16ea7ca43e97407c684f9275f7218b046663b90ab658d374dbf5e30 cegui-gcc8.patch"
diff --git a/main/cegui06/cegui-gcc8.patch b/main/cegui06/cegui-gcc8.patch
new file mode 100644
index 0000000000..c7e0726008
--- /dev/null
+++ b/main/cegui06/cegui-gcc8.patch
@@ -0,0 +1,12 @@
+diff -ru CEGUI-0.6.2.orig/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
+--- CEGUI-0.6.2.orig/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp 2008-11-27 13:39:04.000000000 +0000
++++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp 2018-11-13 07:48:53.228671317 +0000
+@@ -135,7 +135,7 @@
+ processElement(childNode->ToElement());
+ break;
+ case CEGUI_TINYXML_NAMESPACE::TiXmlNode::TEXT:
+- if (childNode->ToText()->Value() != '\0')
++ if (childNode->ToText()->Value() != NULL)
+ d_handler->text((utf8*)childNode->ToText()->Value());
+ break;
+