From 28349be469b940e31ba456af43c2733c4106c055 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Tue, 22 Apr 2014 17:31:44 +0700 Subject: games/openlierox: Downgraded to 0.58_rc3. Signed-off-by: Willy Sudiarto Raharjo --- games/openlierox/CMakeOlxCommon_boost.patch | 11 ----------- games/openlierox/CMakeOlxCommon_boost_x64.patch | 11 ----------- games/openlierox/http_curl.patch | 20 +++++++++++++++++++ games/openlierox/openlierox.SlackBuild | 26 +++++++++++++++---------- games/openlierox/openlierox.info | 8 ++++---- 5 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 games/openlierox/CMakeOlxCommon_boost.patch delete mode 100644 games/openlierox/CMakeOlxCommon_boost_x64.patch create mode 100644 games/openlierox/http_curl.patch (limited to 'games/openlierox') diff --git a/games/openlierox/CMakeOlxCommon_boost.patch b/games/openlierox/CMakeOlxCommon_boost.patch deleted file mode 100644 index 70a770cb97..0000000000 --- a/games/openlierox/CMakeOlxCommon_boost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openlierox-0.59/CMakeOlxCommon.original.cmake 2014-04-06 13:10:05.423413368 +0300 -+++ openlierox-0.59/CMakeOlxCommon.cmake 2014-04-07 04:15:14.367646916 +0300 -@@ -320,7 +320,7 @@ - SET(LIBS ${LIBS} ${Boost_signals_LIBRARIES}) - ELSE() - MESSAGE("boost-signals not found, trying just boost_signals-mt") -- SET(LIBS ${LIBS} boost_signals-mt) -+ SET(LIBS ${LIBS} "/usr/lib/libboost_signals.so.1.54.0" "/usr/lib/libboost_system.so.1.54.0") - ENDIF() - ENDIF(BOOST_LINK_STATIC) - diff --git a/games/openlierox/CMakeOlxCommon_boost_x64.patch b/games/openlierox/CMakeOlxCommon_boost_x64.patch deleted file mode 100644 index a643c27fd1..0000000000 --- a/games/openlierox/CMakeOlxCommon_boost_x64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openlierox-0.59/CMakeOlxCommon.original.cmake 2014-04-06 13:10:05.423413368 +0300 -+++ openlierox-0.59/CMakeOlxCommon.cmake 2014-04-07 00:01:06.134276066 +0300 -@@ -320,7 +320,7 @@ - SET(LIBS ${LIBS} ${Boost_signals_LIBRARIES}) - ELSE() - MESSAGE("boost-signals not found, trying just boost_signals-mt") -- SET(LIBS ${LIBS} boost_signals-mt) -+ SET(LIBS ${LIBS} "/usr/lib64/libboost_signals.so.1.54.0" "/usr/lib64/libboost_system.so.1.54.0") - ENDIF() - ENDIF(BOOST_LINK_STATIC) - diff --git a/games/openlierox/http_curl.patch b/games/openlierox/http_curl.patch new file mode 100644 index 0000000000..c74fcd3d22 --- /dev/null +++ b/games/openlierox/http_curl.patch @@ -0,0 +1,20 @@ +--- openlierox-0.58_rc3/include/HTTP.original.h 2014-04-19 19:58:09.213990582 +0300 ++++ openlierox-0.58_rc3/include/HTTP.h 2014-04-21 13:45:11.485876525 +0300 +@@ -21,7 +21,6 @@ + + #include + #include +-#include + #include + + #include "Networking.h" +--- openlierox-0.58_rc3/src/common/HTTP.original.cpp 2014-04-19 20:48:13.255434896 +0300 ++++ openlierox-0.58_rc3/src/common/HTTP.cpp 2014-04-21 13:48:08.493663623 +0300 +@@ -25,7 +25,6 @@ + #include + #endif + #include +-#include + #include + + #include "LieroX.h" diff --git a/games/openlierox/openlierox.SlackBuild b/games/openlierox/openlierox.SlackBuild index 613788013f..0fd7f26360 100644 --- a/games/openlierox/openlierox.SlackBuild +++ b/games/openlierox/openlierox.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openlierox -VERSION=${VERSION:-0.59} +VERSION=${VERSION:-0.58_rc3} +SRCVER=$(echo $VERSION | tr _ .) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,16 +42,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686 -ldl" + SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686 -ldl" + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC -ldl" + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2 -ldl" + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -60,7 +61,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/$VERSION.zip +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,18 +70,23 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# curl/types.h removed because not supported from new CURL versions +patch -p1 < $CWD/http_curl.patch + +# Google Breakpad is not supported on Linux 64bit if [ "$ARCH" = "x86_64" ]; then - patch -p1 < $CWD/CMakeOlxCommon_boost_x64.patch + BREAKPAD=${BREAKPAD:-off} else - patch -p1 < $CWD/CMakeOlxCommon_boost.patch + BREAKPAD=${BREAKPAD:-on} fi mkdir -p build cd build - cmake \ + cmake . \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DBREAKPAD=$BREAKPAD \ -DCMAKE_BUILD_TYPE=Release .. make cd .. @@ -100,7 +106,7 @@ mkdir -p $PKG/usr/share/pixmaps install -D -m644 share/OpenLieroX.svg $PKG/usr/share/pixmaps/OpenLieroX.svg mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md VERSION COPYING.LIB $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING.LIB VERSION doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/openlierox/openlierox.info b/games/openlierox/openlierox.info index c0e4796da5..8604adbf6a 100644 --- a/games/openlierox/openlierox.info +++ b/games/openlierox/openlierox.info @@ -1,10 +1,10 @@ PRGNAM="openlierox" -VERSION="0.59" +VERSION="0.58_rc3" HOMEPAGE="http://www.openlierox.net/" -DOWNLOAD="https://github.com/albertz/openlierox/archive/0.59.zip" -MD5SUM="70301537a4fc3e0846315c7052f6ea51" +DOWNLOAD="https://github.com/albertz/openlierox/archive/0.58_rc3.tar.gz" +MD5SUM="e28549d49714fb0af9a3f35031aad834" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="HawkNL freealut" +REQUIRES="HawkNL" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" -- cgit v1.2.3