diff --git a/games/pinball/pinball-0.3.1-cstddef.patch b/games/pinball/pinball-0.3.1-cstddef.patch deleted file mode 100644 index 0be44d1eea..0000000000 --- a/games/pinball/pinball-0.3.1-cstddef.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- base/Behavior.cpp~ 2003-11-20 10:46:16.000000000 -0600 -+++ base/Behavior.cpp 2011-02-09 13:19:13.651559002 -0600 -@@ -6,6 +6,7 @@ - email : henqvist@excite.com - ***************************************************************************/ - -+#include - #include "Private.h" - #include "Behavior.h" - #include "Group.h" ---- base/BehaviorVisitor.cpp~ 2003-11-20 10:46:16.000000000 -0600 -+++ base/BehaviorVisitor.cpp 2011-02-09 13:26:17.561558995 -0600 -@@ -6,6 +6,7 @@ - email : henqvist@excite.com - ***************************************************************************/ - -+#include - #include "BehaviorVisitor.h" - #include "Behavior.h" - #include "Group.h" ---- base/SignalSender.cpp~ 2003-11-20 10:46:16.000000000 -0600 -+++ base/SignalSender.cpp 2011-02-09 13:35:29.151558926 -0600 -@@ -7,6 +7,7 @@ - ***************************************************************************/ - - -+#include - #include "Private.h" - #include "SignalSender.h" - #include "Group.h" diff --git a/games/pinball/pinball-0.3.1-hiscore.patch b/games/pinball/pinball-0.3.1-hiscore.patch deleted file mode 100644 index bf40674097..0000000000 --- a/games/pinball/pinball-0.3.1-hiscore.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- pinball-0.3.1/src/Table.cpp~ 2006-08-03 14:59:16.000000000 +0200 -+++ pinball-0.3.1/src/Table.cpp 2006-08-03 14:59:16.000000000 +0200 -@@ -247,14 +247,9 @@ - // Clear old high scores - m_mapHighScores.clear(); - -- //!rzr+ : fix w32 -- string sFileName = m_sTableName + "/" + HIGH_SCORES_FILENAME; --#ifdef RZR_PATHRELATIVE -- sFileName = string( Config::getInstance()->getExeDir() ) -- +"/"+ m_sTableName +".cfg"; --#else -- sFileName = string(EM_HIGHSCORE_DIR) + "/" + sFileName; --#endif //!rzr- -+ char *home = getenv("HOME"); -+ string sFileName = string(home? home:".") + "/.emilia/" + m_sTableName + -+ ".hiscore"; - - ifstream file(sFileName.c_str()); - if (!file) { -@@ -308,14 +303,10 @@ - cerr << "No current table name! (the first time is normal...)" << endl; - return false; - } -- //!rzr+ : fix w32 -- string sFileName = m_sTableName + "/" + HIGH_SCORES_FILENAME; --#ifdef RZR_PATHRELATIVE -- sFileName = string( Config::getInstance()->getExeDir() ) -- +"/"+ m_sTableName +".cfg"; --#else -- sFileName = string(EM_HIGHSCORE_DIR) + "/" + sFileName; --#endif //!rzr- -+ -+ char *home = getenv("HOME"); -+ string sFileName = string(home? home:".") + "/.emilia/" + m_sTableName + -+ ".hiscore"; - - ofstream file(sFileName.c_str());//, ios_base::out | ios_base::trunc); - if (!file) { diff --git a/games/pinball/pinball-0.3.1-lacomment.patch b/games/pinball/pinball-0.3.1-lacomment.patch deleted file mode 100644 index 60a93bc548..0000000000 --- a/games/pinball/pinball-0.3.1-lacomment.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/Makefile.in~ 2010-11-15 10:55:51.000000000 -0600 -+++ src/Makefile.in 2010-11-15 11:07:27.427255000 -0600 -@@ -505,7 +505,7 @@ - uninstall-pinincludeHEADERS uninstall-pinlibLIBRARIES - - --dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) -+#dnl libemilia_pin_la_SOURCES = $(libemilia_pin_a_SOURCES) - - # !+rzr : This trick workaround a bad generated rule (under Linux mingw32) - # src/ litool returns: -L/usr/local//lib /usr/lib/libjpeg.so ---- test/Makefile.in~ 2010-11-15 11:11:07.000000000 -0600 -+++ test/Makefile.in 2010-11-15 11:12:46.119254852 -0600 -@@ -621,7 +621,7 @@ - mostlyclean-generic mostlyclean-libtool tags uninstall \ - uninstall-am uninstall-info-am uninstall-testlibLTLIBRARIES - --dnl noinst_PROGRAMS = unittest -+#dnl noinst_PROGRAMS = unittest - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/games/pinball/pinball-0.3.1-strictproto.patch b/games/pinball/pinball-0.3.1-strictproto.patch deleted file mode 100644 index 89a7fe9fa3..0000000000 --- a/games/pinball/pinball-0.3.1-strictproto.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- base/Config.cpp.orig 2009-03-02 10:46:40.000000000 -0600 -+++ base/Config.cpp 2009-03-02 10:46:40.000000000 -0600 -@@ -426,2 +426,2 @@ -- char* ptr=0; -- char* ptrw = 0; -+ const char* ptr=0; -+ const char* ptrw = 0; diff --git a/games/pinball/pinball-0.3.1-sys-ltdl.patch b/games/pinball/pinball-0.3.1-sys-ltdl.patch deleted file mode 100644 index 19ecad5afb..0000000000 --- a/games/pinball/pinball-0.3.1-sys-ltdl.patch +++ /dev/null @@ -1,152 +0,0 @@ ---- pinball-0.3.1/Makefile.in~ 2006-08-03 12:18:40.000000000 +0200 -+++ pinball-0.3.1/Makefile.in 2006-08-03 12:18:40.000000000 +0200 -@@ -107,7 +107,7 @@ - install_sh = @install_sh@ - AUTOMAKE_OPTIONS = gnu - --SUBDIRS = libltdl addon base data src test -+SUBDIRS = addon base data src test - - EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop - ---- pinball-0.3.1/src/Makefile.in~ 2006-08-03 12:20:12.000000000 +0200 -+++ pinball-0.3.1/src/Makefile.in 2006-08-03 12:20:12.000000000 +0200 -@@ -114,9 +114,9 @@ - - pinlib_LIBRARIES = libemilia_pin.a - --INCLUDES = -I../base -I../addon @INCLTDL@ -+INCLUDES = -I../base -I../addon - --pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ -+pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl - pinball_LDFLAGS = -export-dynamic - - pinball_SOURCES = Pinball.cpp ---- pinball-0.3.1/src/Makefile.am~ 2006-08-03 12:20:35.000000000 +0200 -+++ pinball-0.3.1/src/Makefile.am 2006-08-03 12:20:35.000000000 +0200 -@@ -7,9 +7,9 @@ - - pinlib_LIBRARIES = libemilia_pin.a - --INCLUDES = -I../base -I../addon @INCLTDL@ -+INCLUDES = -I../base -I../addon - --pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ -+pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl - pinball_LDFLAGS = -export-dynamic - - pinball_SOURCES = Pinball.cpp ---- pinball-0.3.1/Makefile.am~ 2006-08-03 12:18:12.000000000 +0200 -+++ pinball-0.3.1/Makefile.am 2006-08-03 12:18:12.000000000 +0200 -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = gnu - --SUBDIRS = libltdl addon base data src test -+SUBDIRS = addon base data src test - - EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop - ---- pinball-0.3.1/configure.ac~ 2006-08-03 12:17:50.000000000 +0200 -+++ pinball-0.3.1/configure.ac 2006-08-03 12:17:50.000000000 +0200 -@@ -14,19 +14,13 @@ - CFLAGS="-g -W -Wall -O2" - CXXFLAGS="-g -W -Wall -O2" - --AC_CONFIG_SUBDIRS(libltdl) -- - dnl Checks for programs. - AC_PROG_CC - AC_PROG_CXX - AC_PROG_INSTALL - AC_LIBTOOL_DLOPEN --AC_LIBLTDL_CONVENIENCE - AC_PROG_LIBTOOL - --AC_SUBST(INCLTDL) --AC_SUBST(LIBLTDL) -- - dnl ******************************************* - dnl PATHS AND DIRS **************************** - dnl data dirs, fuck I hate autoconf, spent 4 hours getting this right, had to ---- pinball-0.3.1/test/Makefile.in~ 2006-08-03 12:21:11.000000000 +0200 -+++ pinball-0.3.1/test/Makefile.in 2006-08-03 12:21:11.000000000 +0200 -@@ -112,8 +112,8 @@ - - noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest - --INCLUDES = -I../base -I../addon -I../src @INCLTDL@ --LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ -+INCLUDES = -I../base -I../addon -I../src -+LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl - - testlib_LTLIBRARIES = libModuleTest.la - ---- pinball-0.3.1/test/Makefile.am~ 2006-08-03 12:20:53.000000000 +0200 -+++ pinball-0.3.1/test/Makefile.am 2006-08-03 12:20:53.000000000 +0200 -@@ -6,8 +6,8 @@ - noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest - dnl noinst_PROGRAMS = unittest - --INCLUDES = -I../base -I../addon -I../src @INCLTDL@ --LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ -+INCLUDES = -I../base -I../addon -I../src -+LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl - - testlib_LTLIBRARIES = libModuleTest.la - ---- pinball-0.3.1/configure~ 2006-08-03 12:16:59.000000000 +0200 -+++ pinball-0.3.1/configure 2006-08-03 12:16:59.000000000 +0200 -@@ -431,7 +431,6 @@ - PACKAGE_STRING='pinball 0.3.1' - PACKAGE_BUGREPORT='henqvist@users.sourceforge.net' - --ac_subdirs_all="$ac_subdirs_all libltdl" - # Factoring default headers for most tests. - ac_includes_default="\ - #include -@@ -469,7 +468,7 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE subdirs CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL INCLTDL LIBLTDL EM_DATADIR EM_LIBDIR EM_BUILD_ROOT EM_HIGHSCORE_DIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS MATHLIB GL_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS ALLEGRO_CONFIG ALLEGRO_CFLAGS ALLEGRO_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE subdirs CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL EM_DATADIR EM_LIBDIR EM_BUILD_ROOT EM_HIGHSCORE_DIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS MATHLIB GL_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS ALLEGRO_CONFIG ALLEGRO_CFLAGS ALLEGRO_LIBS CPPUNIT_CONFIG CPPUNIT_CFLAGS CPPUNIT_LIBS LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -1959,7 +1958,6 @@ - - - --subdirs="$subdirs libltdl" - - - ac_ext=c -@@ -3439,18 +3437,6 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -- case $enable_ltdl_convenience in -- no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5 --echo "$as_me: error: this package needs a convenience libltdl" >&2;} -- { (exit 1); exit 1; }; } ;; -- "") enable_ltdl_convenience=yes -- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; -- esac -- LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la -- LTDLINCL='-I${top_srcdir}/''libltdl' -- # For backwards non-gettext consistent compatibility... -- INCLTDL="$LTDLINCL" -- - # Check whether --enable-shared or --disable-shared was given. - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" -@@ -11788,8 +11774,6 @@ - s,@CPP@,$CPP,;t t - s,@EGREP@,$EGREP,;t t - s,@LIBTOOL@,$LIBTOOL,;t t --s,@INCLTDL@,$INCLTDL,;t t --s,@LIBLTDL@,$LIBLTDL,;t t - s,@EM_DATADIR@,$EM_DATADIR,;t t - s,@EM_LIBDIR@,$EM_LIBDIR,;t t - s,@EM_BUILD_ROOT@,$EM_BUILD_ROOT,;t t diff --git a/games/pinball/pinball-0.3.4-sys-ltdl.patch b/games/pinball/pinball-0.3.4-sys-ltdl.patch new file mode 100644 index 0000000000..3dd5ed4c10 --- /dev/null +++ b/games/pinball/pinball-0.3.4-sys-ltdl.patch @@ -0,0 +1,69 @@ +diff -ur pinball-0.3.4/Makefile.am pinball-0.3.4/Makefile.am +--- pinball-0.3.4/Makefile.am 2018-03-24 16:40:31.000000000 -0700 ++++ pinball-0.3.4/Makefile.am 2018-04-04 23:11:27.780673376 -0700 +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = gnu + +-SUBDIRS = libltdl addon base data src test ++SUBDIRS = addon base data src test + + EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop + +@@ -10,4 +10,4 @@ + + bin_SCRIPTS = pinball-config + +-ACLOCAL_AMFLAGS = -I libltdl/m4 ++ACLOCAL_AMFLAGS = +diff -ur pinball-0.3.4/configure.ac pinball-0.3.4/configure.ac +--- pinball-0.3.4/configure.ac 2018-03-24 16:40:31.000000000 -0700 ++++ pinball-0.3.4/configure.ac 2018-04-04 23:07:50.882589216 -0700 +@@ -4,10 +4,6 @@ + AC_INIT(pinball, 0.3.4.1) + + AC_CONFIG_HEADERS(pinconfig.h) +-LT_CONFIG_LTDL_DIR([libltdl]) +-AC_CONFIG_AUX_DIR([libltdl/config]) +-AC_CONFIG_MACRO_DIR([libltdl/m4]) +- + AC_CANONICAL_HOST + AC_CANONICAL_TARGET + +@@ -37,7 +33,6 @@ + [CXXFLAGS=$with_cxxflags; export CXXFLAGS]) + + AC_LIBTOOL_DLOPEN +-LTDL_INIT + + dnl ******************************************* + dnl PATHS AND DIRS **************************** +diff -ur pinball-0.3.4/src/Makefile.am pinball-0.3.4/src/Makefile.am +--- pinball-0.3.4/src/Makefile.am 2018-03-24 16:40:31.000000000 -0700 ++++ pinball-0.3.4/src/Makefile.am 2018-04-04 23:09:07.672325490 -0700 +@@ -7,10 +7,10 @@ + + bin_PROGRAMS = pinball + +-AM_CPPFLAGS = -I../base -I../addon @INCLTDL@ ++AM_CPPFLAGS = -I../base -I../addon + + pinball_LDADD = \ +- libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ ++ libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl + + pinball_LDFLAGS = -export-dynamic + +diff -ur pinball-0.3.4/test/Makefile.am pinball-0.3.4/test/Makefile.am +--- pinball-0.3.4/test/Makefile.am 2018-03-24 16:40:31.000000000 -0700 ++++ pinball-0.3.4/test/Makefile.am 2018-04-04 23:09:36.731605043 -0700 +@@ -5,8 +5,8 @@ + + noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest + +-AM_CPPFLAGS = -I../base -I../addon -I../src @INCLTDL@ +-LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ ++AM_CPPFLAGS = -I../base -I../addon -I../src ++LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl + + testlib_LTLIBRARIES = libModuleTest.la + diff --git a/games/pinball/pinball.SlackBuild b/games/pinball/pinball.SlackBuild index e75b5581f3..88b4f35896 100644 --- a/games/pinball/pinball.SlackBuild +++ b/games/pinball/pinball.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pinball -# Copyright 2015-2016 Hunter Sezen California, USA +# Copyright 2015-2016, 2018 Hunter Sezen California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pinball -VERSION=${VERSION:-0.3.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.3.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -69,35 +69,30 @@ 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 {} \; -patch -Np0 -i $CWD/pinball-0.3.1-cstddef.patch -patch -Np1 -i $CWD/pinball-0.3.1-hiscore.patch -patch -Np0 -i $CWD/pinball-0.3.1-lacomment.patch -patch -Np0 -i $CWD/pinball-0.3.1-strictproto.patch -patch -Np1 -i $CWD/pinball-0.3.1-sys-ltdl.patch +patch -p1 < $CWD/pinball-0.3.4-sys-ltdl.patch +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --bindir=/usr/games \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ + --datadir=/usr/share/games \ --disable-sdltest \ --with-x \ --enable-static=no \ --build=$ARCH-slackware-linux -make -j1 +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION - -# Remove executable flag from some docs -find $PKG/usr/doc -type f -exec chmod -x {} \; +cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL License.txt README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/pinball/pinball.info b/games/pinball/pinball.info index 4272df3120..ee2e593486 100644 --- a/games/pinball/pinball.info +++ b/games/pinball/pinball.info @@ -1,8 +1,8 @@ PRGNAM="pinball" -VERSION="0.3.1" -HOMEPAGE="http://pinball.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/pinball/files/pinball/pinball-0.3.1/pinball-0.3.1.tar.gz" -MD5SUM="f28e8f49e0db8e9491e4d9f0c13c36c6" +VERSION="0.3.4" +HOMEPAGE="https://github.com/sergiomb2/pinball" +DOWNLOAD="https://github.com/sergiomb2/pinball/archive/0.3.4/pinball-0.3.4.tar.gz" +MD5SUM="a3dea5d98a643fd5be07564d1cf5f3cf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""