diff options
Diffstat (limited to 'games')
66 files changed, 1454 insertions, 239 deletions
diff --git a/games/0ad-data/0ad-data.SlackBuild b/games/0ad-data/0ad-data.SlackBuild index f0e3c22489..c9a70929ef 100644 --- a/games/0ad-data/0ad-data.SlackBuild +++ b/games/0ad-data/0ad-data.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad-data DATANAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} ARCH=noarch BUILD=${BUILD:-1} diff --git a/games/0ad-data/0ad-data.info b/games/0ad-data/0ad-data.info index 6f9a2ab55c..6065c561ab 100644 --- a/games/0ad-data/0ad-data.info +++ b/games/0ad-data/0ad-data.info @@ -1,8 +1,8 @@ PRGNAM="0ad-data" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-data.tar.xz" -MD5SUM="b023f0f7045dc020f97be6c0df9f9a7e" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-data.tar.xz" +MD5SUM="103758c3fdd8df505d40f8d7eb3b039f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index b6c52e7c61..d79e586be8 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -29,9 +29,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad -VERSION=${VERSION:-0.0.26} +VERSION=${VERSION:-r28035} RELEASE=${RELEASE:-alpha} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} TMP=${TMP:-/tmp/SBo} @@ -93,10 +93,6 @@ export SDL2_CONFIG="/usr/bin/sdl2-config" mkdir -p cargoh export CARGO_HOME="$TMP/$PRGNAM-$VERSION-$RELEASE/cargoh" -#add patches for fmt>9.1.0 ie. 10.1.1 -sed -i 's/, header.GetType()/, static_cast<int>(header.GetType())/g' source/network/NetMessage.cpp -sed -i 's/, arrayType/, static_cast<int>(arrayType)/g' source/simulation2/serialization/BinarySerializer.cpp - # Fix boost names, include paths and remove isystem. commented stuff is fixed upstream already sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1 #sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 @@ -113,6 +109,9 @@ sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/t # have a root check, let's disable it. patch -p1 < $CWD/disable-root-check.patch +sed -i '/Pyrogenesis/i #include <iomanip>' source/ps/Util.cpp + +CXX=clang++ \ build/workspaces/update-workspaces.sh \ --without-pch \ --bindir=/usr/games \ diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 59eb4a4fdf..f1aaf3606a 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.26" +VERSION="r28035" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-build.tar.xz" -MD5SUM="d0d3ed10769dee2254aa196a9619bd57" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/0ad-r28035-alpha-unix-build.tar.xz" +MD5SUM="45c9ebe38e0578c6eade09da81b10105" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data enet fmt gloox miniupnpc wxGTK3" +REQUIRES="0ad-data enet fmt gloox miniupnpc wxWidgets" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" diff --git a/games/LucasChess/Configuration.py b/games/LucasChess/Configuration.py index 49fd4f2df3..3823da6172 100644 --- a/games/LucasChess/Configuration.py +++ b/games/LucasChess/Configuration.py @@ -61,7 +61,7 @@ def change_folder(nueva): class BoxRooms: def __init__(self, configuration): - self.file = Util.opj(configuration.carpeta_config, "boxrooms.pk") + self.file = Util.opj(configuration.folder_config, "boxrooms.pk") self._list = self.read() def read(self): @@ -102,11 +102,11 @@ class Configuration: self.first_run = Util.create_folder(self.carpetaBase) self.carpeta = self.carpetaBase - self.carpeta_config = Util.opj(self.carpeta, "__Config__") - Util.create_folder(self.carpeta_config) + self.folder_config = Util.opj(self.carpeta, "__Config__") + Util.create_folder(self.folder_config) - self.carpeta_results = Util.opj(self.carpeta, "Results") - Util.create_folder(self.carpeta_results) + self.folder_results = Util.opj(self.carpeta, "Results") + Util.create_folder(self.folder_results) self.user = user self.set_folders() @@ -201,6 +201,7 @@ class Configuration: self.x_analyzer_mstime = 3000 self.x_analyzer_depth = 0 self.x_analyzer_priority = Priorities.priorities.low + self.x_analyzer_depth_ab = 24 self.x_analyzer_mstime_ab = 0 self.x_analyzer_autorotate_ab = True @@ -264,7 +265,7 @@ class Configuration: self.x_translation_mode = False - self.x_style = "windowsvista" if Code.is_windows else "Fusion" + self.x_style = "Fusion" self.x_style_mode = "By default" self.x_style_icons = IconosBase.icons.NORMAL self.style_sheet_default = None # temporary var @@ -342,7 +343,7 @@ class Configuration: Util.create_folder(folder) return folder - def carpeta_sounds(self): + def folder_sounds(self): return Util.opj(self.carpeta, "Sounds") def relee_engines(self): @@ -418,7 +419,7 @@ class Configuration: return folder def file_competition_with_tutor(self): - return Util.opj(self.carpeta_results, "CompetitionWithTutor.db") + return Util.opj(self.folder_results, "CompetitionWithTutor.db") def folder_userdata(self): return self.carpeta @@ -447,37 +448,37 @@ class Configuration: self.write_variables("OPENING_LINES", dic) def file_mate(self, mate): - return Util.opj(self.carpeta_results, "Mate%d.pk" % mate) + return Util.opj(self.folder_results, "Mate%d.pk" % mate) def file_endings_gtb(self): - return Util.opj(self.carpeta_results, "EndingsGTB.db") + return Util.opj(self.folder_results, "EndingsGTB.db") def file_external_engines(self): - return Util.opj(self.carpeta_config, "ExtEngines.pk") + return Util.opj(self.folder_config, "ExtEngines.pk") def file_kibitzers(self): - return Util.opj(self.carpeta_config, "kibitzers.pk") + return Util.opj(self.folder_config, "kibitzers.pk") def file_adjournments(self): - return Util.opj(self.carpeta_config, "Adjournments.ddb") + return Util.opj(self.folder_config, "Adjournments.ddb") def file_index_polyglots(self): - return Util.opj(self.carpeta_config, "index_polyglots.pk") + return Util.opj(self.folder_config, "index_polyglots.pk") def file_pers_openings(self): - return Util.opj(self.carpeta_config, "persaperturas.pkd") + return Util.opj(self.folder_config, "persaperturas.pkd") def file_captures(self): - return Util.opj(self.carpeta_results, "Captures.db") + return Util.opj(self.folder_results, "Captures.db") def file_counts(self): - return Util.opj(self.carpeta_results, "Counts.db") + return Util.opj(self.folder_results, "Counts.db") def file_mate15(self): - return Util.opj(self.carpeta_results, "Mate15.db") + return Util.opj(self.folder_results, "Mate15.db") def file_coordinates(self): - return Util.opj(self.carpeta_results, "Coordinates.db") + return Util.opj(self.folder_results, "Coordinates.db") def folder_tactics(self): return self.create_base_folder("Tactics") @@ -490,6 +491,9 @@ class Configuration: def file_selected_positions(self): return Util.opj(self.folder_databases(), "__Selected Positions__.lcdb") + + def file_prompts(self): + return Util.opj(self.folder_config, "Prompts.db") def folder_databases_pgn(self): return self.create_base_folder("TemporaryDatabases") @@ -498,7 +502,7 @@ class Configuration: return self.create_base_folder("PolyglotsFactory") def opj_config(self, file): - return Util.opj(self.carpeta_config, file) + return Util.opj(self.folder_config, file) def file_video(self): return self.opj_config("confvid.pkd") @@ -513,63 +517,63 @@ class Configuration: return self.opj_config("analisis.db") def file_play_game(self): - return "%s/PlayGame.db" % self.carpeta_results + return "%s/PlayGame.db" % self.folder_results def file_learn_game(self): - return "%s/LearnPGN.db" % self.carpeta_results + return "%s/LearnPGN.db" % self.folder_results def file_train_books_ol(self): - return "%s/booksTrainOL.liobj" % self.carpeta_results + return "%s/booksTrainOL.liobj" % self.folder_results def file_gms(self): - return "%s/gm.pke" % self.carpeta_config + return "%s/gm.pke" % self.folder_config def set_folders(self): - self.file = Util.opj(self.carpeta_config, "lk.pk2") + self.file = Util.opj(self.folder_config, "lk.pk2") self.is_first_time = not Util.exist_file(self.file) - self.fichEstadElo = "%s/estad.pkli" % self.carpeta_results - self.fichEstadMicElo = "%s/estadMic.pkli" % self.carpeta_results - self.fichEstadWicker = "%s/estadWicker.pkli" % self.carpeta_results - self.fichEstadFicsElo = "%s/estadFics.pkli" % self.carpeta_results - self.fichEstadFideElo = "%s/estadFide.pkli" % self.carpeta_results - self.fichEstadLichessElo = "%s/estadLichess.pkli" % self.carpeta_results - self.file_books = "%s/books.lkv" % self.carpeta_config - self.file_train_books = "%s/booksTrain.lkv" % self.carpeta_results - self.file_memory = "%s/memo.pk" % self.carpeta_results - self.ficheroEntMaquina = "%s/entmaquina.pke" % self.carpeta_results - self.ficheroEntMaquinaPlay = "%s/entmaquinaplay.pke" % self.carpeta_results - self.ficheroEntMaquinaConf = "%s/entmaquinaconf.pkd" % self.carpeta_config - self.ficheroGMhisto = "%s/gmh.db" % self.carpeta_results - self.ficheroPuntuacion = "%s/punt.pke" % self.carpeta_results - self.ficheroDirSound = "%s/direc.pkv" % self.carpeta_config + self.fichEstadElo = "%s/estad.pkli" % self.folder_results + self.fichEstadMicElo = "%s/estadMic.pkli" % self.folder_results + self.fichEstadWicker = "%s/estadWicker.pkli" % self.folder_results + self.fichEstadFicsElo = "%s/estadFics.pkli" % self.folder_results + self.fichEstadFideElo = "%s/estadFide.pkli" % self.folder_results + self.fichEstadLichessElo = "%s/estadLichess.pkli" % self.folder_results + self.file_books = "%s/books.lkv" % self.folder_config + self.file_train_books = "%s/booksTrain.lkv" % self.folder_results + self.file_memory = "%s/memo.pk" % self.folder_results + self.ficheroEntMaquina = "%s/entmaquina.pke" % self.folder_results + self.ficheroEntMaquinaPlay = "%s/entmaquinaplay.pke" % self.folder_results + self.ficheroEntMaquinaConf = "%s/entmaquinaconf.pkd" % self.folder_config + self.ficheroGMhisto = "%s/gmh.db" % self.folder_results + self.ficheroPuntuacion = "%s/punt.pke" % self.folder_results + self.ficheroDirSound = "%s/direc.pkv" % self.folder_config self.ficheroEntOpenings = "%s/entaperturas.pkd" % self.carpeta self.ficheroEntOpeningsPar = "%s/entaperturaspar.pkd" % self.carpeta - self.ficheroDailyTest = "%s/nivel.pkd" % self.carpeta_results - self.ficheroTemas = "%s/themes.pkd" % self.carpeta_config + self.ficheroDailyTest = "%s/nivel.pkd" % self.folder_results + self.ficheroTemas = "%s/themes.pkd" % self.folder_config self.personal_training_folder = "%s/Personal Training" % self.carpeta - self.ficheroBMT = "%s/lucas.bmt" % self.carpeta_results - self.ficheroPotencia = "%s/power.db" % self.carpeta_results - self.ficheroPuente = "%s/bridge.db" % self.carpeta_results - self.ficheroMoves = "%s/moves.dbl" % self.carpeta_results - self.ficheroRecursos = "%s/recursos.dbl" % self.carpeta_config + self.ficheroBMT = "%s/lucas.bmt" % self.folder_results + self.ficheroPotencia = "%s/power.db" % self.folder_results + self.ficheroPuente = "%s/bridge.db" % self.folder_results + self.ficheroMoves = "%s/moves.dbl" % self.folder_results + self.ficheroRecursos = "%s/recursos.dbl" % self.folder_config self.ficheroFEN = self.ficheroRecursos - self.ficheroConfBoards = "%s/confBoards.pk" % self.carpeta_config - self.ficheroBoxing = "%s/boxing.pk" % self.carpeta_results - self.file_trainings = "%s/trainings.pk" % self.carpeta_results - self.ficheroHorses = "%s/horses.db" % self.carpeta_results - self.ficheroAlbumes = "%s/albumes.pkd" % self.carpeta_results - self.ficheroPuntuaciones = "%s/hpoints.pkd" % self.carpeta_results - self.ficheroAnotar = "%s/anotar.db" % self.carpeta_config + self.ficheroConfBoards = "%s/confBoards.pk" % self.folder_config + self.ficheroBoxing = "%s/boxing.pk" % self.folder_results + self.file_trainings = "%s/trainings.pk" % self.folder_results + self.ficheroHorses = "%s/horses.db" % self.folder_results + self.ficheroAlbumes = "%s/albumes.pkd" % self.folder_results + self.ficheroPuntuaciones = "%s/hpoints.pkd" % self.folder_results + self.ficheroAnotar = "%s/anotar.db" % self.folder_config self.ficheroSelectedPositions = "%s/Selected positions.fns" % self.personal_training_folder self.ficheroPresentationPositions = "%s/Challenge 101.fns" % self.personal_training_folder - self.ficheroVariables = "%s/Variables.pk" % self.carpeta_config + self.ficheroVariables = "%s/Variables.pk" % self.folder_config - self.ficheroFiltrosPGN = "%s/pgnFilters.db" % self.carpeta_config + self.ficheroFiltrosPGN = "%s/pgnFilters.db" % self.folder_config Util.create_folder(self.personal_training_folder) @@ -578,8 +582,8 @@ class Configuration: self.carpetaScanners = "%s/%s" % (self.carpeta, "Scanners") Util.create_folder(self.carpetaScanners) - self.ficheroExpeditions = "%s/Expeditions.db" % self.carpeta_results - self.ficheroSingularMoves = "%s/SingularMoves.db" % self.carpeta_results + self.ficheroExpeditions = "%s/Expeditions.db" % self.folder_results + self.ficheroSingularMoves = "%s/SingularMoves.db" % self.folder_results if not Util.exist_file(self.ficheroRecursos): Util.file_copy(Code.path_resource("IntFiles", "recursos.dbl"), self.ficheroRecursos) @@ -591,11 +595,11 @@ class Configuration: Util.create_folder(self.folder_base_openings) def file_colors(self): - return Util.opj(self.carpeta_config, "personal.colors") + return Util.opj(self.folder_config, "personal.colors") def compruebaBMT(self): if not Util.exist_file(self.ficheroBMT): - self.ficheroBMT = "%s/lucas.bmt" % self.carpeta_results + self.ficheroBMT = "%s/lucas.bmt" % self.folder_results def limpia(self, name): self.elo = 0 @@ -641,17 +645,18 @@ class Configuration: def formlayout_combo_analyzer(self, only_multipv): li = [] for key, cm in self.dic_engines.items(): - if not only_multipv or cm.can_be_tutor(): + if not only_multipv or cm.can_be_analyzer(): li.append((key, cm.nombre_ext())) li = sorted(li, key=operator.itemgetter(1)) li.insert(0, ("default", _("Default analyzer"))) li.insert(0, "default") return li - def help_multipv_engines(self): + def help_multipv_engines(self, is_tutor): li = [] for key, cm in self.dic_engines.items(): - if cm.can_be_tutor(): + ok = cm.can_be_tutor() if is_tutor else cm.can_be_analyzer() + if ok: li.append((cm.nombre_ext(), key)) li.sort(key=operator.itemgetter(1)) return li @@ -722,7 +727,7 @@ class Configuration: def get_favoritos(self): if self.li_favoritos is None: - file = Util.opj(self.carpeta_config, "Favoritos.pkd") + file = Util.opj(self.folder_config, "Favoritos.pkd") lista = Util.restore_pickle(file) if lista is None: lista = [] @@ -731,7 +736,7 @@ class Configuration: def save_favoritos(self, lista): self.li_favoritos = lista - file = Util.opj(self.carpeta_config, "Favoritos.pkd") + file = Util.opj(self.folder_config, "Favoritos.pkd") Util.save_pickle(file, lista) def load_translation(self): @@ -750,9 +755,9 @@ class Configuration: if os.path.isfile(fini): dic = Util.ini_dic(fini) if others: - li.append((uno.name, dic["NAME"], int(dic["%"]), dic["AUTHOR"], dic.get("OTHERS", ""))) + li.append((uno.name, dic["NAME"], int(dic["%"]), dic.get("AUTHOR", ""), dic.get("PREVIOUS", ""))) else: - li.append((uno.name, dic["NAME"], int(dic["%"]), dic["AUTHOR"])) + li.append((uno.name, dic["NAME"], int(dic["%"]), dic.get("AUTHOR", ""))) li = sorted(li, key=lambda lng: "AAA" + lng[0] if lng[1] > "Z" else lng[1]) return li @@ -870,6 +875,22 @@ class Configuration: self.x_tutor_clave = self.tutor_default return self.engine_tutor() + def engine_supertutor(self): + key_engine = self.x_tutor_clave + if key_engine not in self.dic_engines: + key_engine = self.tutor_default + eng = self.dic_engines[key_engine] + if not (eng.can_be_supertutor() and Util.exist_file(eng.path_exe)): + key_engine = self.tutor_default + eng = self.dic_engines[key_engine] + eng.reset_uci_options() + dic = self.read_variables("TUTOR_ANALYZER") + for key, value in dic.get("TUTOR", []): + if key != "MultiPV": + eng.set_uci_option(key, value) + eng.multiPV = eng.maxMultiPV + return eng + def engine_analyzer(self): if self.x_analyzer_clave in self.dic_engines: eng = self.dic_engines[self.x_analyzer_clave] @@ -909,6 +930,18 @@ class Configuration: except: pass + def log_engines_set(self, ok): + path_log = Util.opj(self.carpeta, "active_logs.engines") + if ok: + with open(path_log, "wt") as q: + q.write("x") + else: + Util.remove_file(path_log) + + def log_engines_check_active(self): + path_log = Util.opj(self.carpeta, "active_logs.engines") + return Util.exist_file(path_log) + def read_variables(self, nomVar): with UtilSQL.DictSQL(self.ficheroVariables) as db: resp = db[nomVar] @@ -972,9 +1005,9 @@ class Configuration: # PATH_PO_OPENINGS # PATH_PO_OPENINGS_IMPORT - def write_variables(self, nomVar, dicValores): + def write_variables(self, nom_var, dic_valores): with UtilSQL.DictSQL(self.ficheroVariables) as db: - db[nomVar] = dicValores + db[nom_var] = dic_valores def change_theme_num(self, num): self.__theme_num = num @@ -1005,7 +1038,7 @@ class Configuration: var["x_anchoPieza"] = ancho_pieza db["BASE"] = self.dic_conf_boards_pk["BASE"] = var # Para cambiar el tema por defecto por el actual - # with open("../resources/IntFiles/basepk2.board", "wb") as f: + # with open("../resources/IntFiles/basepk3.board", "wb") as f: # f.write(pickle.dumps(db["BASE"])) def size_base(self): @@ -1019,7 +1052,7 @@ class Configuration: return self.config_board(key, tamDef) def cambiaConfBoard(self, config_board): - xid = config_board._id + xid = config_board.id() if xid: db = UtilSQL.DictSQL(self.ficheroConfBoards) self.dic_conf_boards_pk[xid] = db[xid] = config_board.graba() diff --git a/games/LucasChess/LucasChess.SlackBuild b/games/LucasChess/LucasChess.SlackBuild index 56d316f738..a0c10cdb0f 100644 --- a/games/LucasChess/LucasChess.SlackBuild +++ b/games/LucasChess/LucasChess.SlackBuild @@ -30,11 +30,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=LucasChess -VERSION=${VERSION:-R2.14g} +VERSION=${VERSION:-R2.15a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -SRCNAM=${SRCNAM:-LucasChessR2_14g_LINUX.sh} +SRCNAM=${SRCNAM:-LucasChessR2_15a_LINUX.sh} ARCHIVELINE=716 if [ -z "$ARCH" ]; then @@ -122,6 +122,9 @@ cat $CWD/Configuration.py > $PKG/opt/$PRGNAM-$VERSION/bin/Code/Config/Configurat chgrp -R ${LUCASGRP} $PKG/opt/$PRGNAM-$VERSION chmod g+w $PKG/opt/$PRGNAM-$VERSION/bin/OS/linux/Engines/stockfish +# Similarly for the alouette directory +chmod g+w $PKG/opt/$PRGNAM-$VERSION/bin/OS/linux/Engines/alouette + # Install desktop launcher sed "s/VERSION/${VERSION}/g" $CWD/LucasChessR.desktop.in \ > $PKG/usr/share/applications/LucasChessR.desktop diff --git a/games/LucasChess/LucasChess.info b/games/LucasChess/LucasChess.info index 7077fdde0c..3f448a48be 100644 --- a/games/LucasChess/LucasChess.info +++ b/games/LucasChess/LucasChess.info @@ -1,10 +1,10 @@ PRGNAM="LucasChess" -VERSION="R2.14g" +VERSION="R2.15a" HOMEPAGE="https://lucaschess.pythonanywhere.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://psychz.dl.sourceforge.net/project/lucaschessr/Version_R2/LucasChessR2_14g_LINUX.sh" -MD5SUM_x86_64="d7bbe8f59043244790ea380b246242e9" +DOWNLOAD_x86_64="https://sourceforge.net/projects/slackbuildsdirectlinks/files/LucasChess/LucasChessR2_15a_LINUX.sh" +MD5SUM_x86_64="19c200e7faab1b89df75c3cd95a60dfd" REQUIRES="" MAINTAINER="Daniel Prosser" EMAIL="dpross1100@msn.com" diff --git a/games/ZEsarUX/README b/games/ZEsarUX/README index e7e79030ce..bfd53a8897 100644 --- a/games/ZEsarUX/README +++ b/games/ZEsarUX/README @@ -1,21 +1,46 @@ ZEsarUX - ZX Second-Emulator And Released for UniX -It's a ZX Machines Emulator for Unix, including all the -Sinclair computers: MK14, ZX80, ZX81, ZX Spectrum, QL, Z88 and also: --Timex TS 2068 --Sam Coupe --Pentagon --Chloe 140 SE, 280 SE --Chrome --Prism --ZX-Uno --ZX-Evolution TS-Conf --TBBlue/ZX Spectrum Next --Jupiter Ace --Amstrad CPC 464 +It's a ZX Machines Emulator for UNIX based operating systems +(and Windows), including all the Sinclair computers: + +- MK14 +- ZX80 +- ZX81 +- ZX Spectrum +- QL +- Z88 + +And also: + +- Microdigital TK80, TK82, TK82C, TK83, TK85, + TK90X (Portuguese and Spanish), TK95 (Portuguese and Spanish) +- Timex Sinclair 1000, 1500, 2068 +- Timex Computer 2048, 2068 +- Inves Spectrum + +- Sam Coupe +- Pentagon +- Chloe 140 SE, 280 SE +- Chrome +- Prism +- ZX-Uno +- ZX-Evolution BaseConf (beta) +- ZX-Evolution TS-Conf +- ZX Spectrum Next +- Jupiter Ace +- Amstrad CPC 464, CPC 4128, CPC 664, CPC 6128 +- Amstrad PCW 8256, PCW 8512 +- MSX1 +- Spectravideo 318/328 +- Colecovision +- Sega SG1000 +- Sega Master System ZEsarUX source code and binaries are distributed under GNU GPL license. -ZEsarUX also includes third-party roms, media, programs and -games NOT covered by this license +ZEsarUX also includes a folder, "my_soft", which has some programs and +data made by me. The entire folder is also covered by the +GNU GPL license. + +ZEsarUX also includes third-party roms, media, programs and games NOT +covered by this license. This package installs to /opt/ZEsarUX diff --git a/games/ZEsarUX/ZEsarUX.SlackBuild b/games/ZEsarUX/ZEsarUX.SlackBuild index 31f5b1cba6..dd837997a7 100644 --- a/games/ZEsarUX/ZEsarUX.SlackBuild +++ b/games/ZEsarUX/ZEsarUX.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ZEsarUX -# Copyright 2023 Antonio Leal, Porto Salvo, Oeiras, Portugal +# Copyright 2023-2024 Antonio Leal, Porto Salvo, Oeiras, Portugal # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ZEsarUX -VERSION=${VERSION:-10.10} +VERSION=${VERSION:-11.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,12 +67,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -# { -# Temporary fix until normal versioning scheme resumes -#tar xvfz $CWD/$PRGNAM\_src-$VERSION.tar.gz -tar xvfz $CWD/ZEsarUX_src-X.tar.gz -mv ZEsarUX-X ZEsarUX-10.10 -# } +tar xvfz $CWD/$PRGNAM\_src-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . diff --git a/games/ZEsarUX/ZEsarUX.info b/games/ZEsarUX/ZEsarUX.info index 064e6590a4..b4da0dc31e 100644 --- a/games/ZEsarUX/ZEsarUX.info +++ b/games/ZEsarUX/ZEsarUX.info @@ -1,8 +1,8 @@ PRGNAM="ZEsarUX" -VERSION="10.10" +VERSION="11.0" HOMEPAGE="https://github.com/chernandezba/zesarux" -DOWNLOAD="https://github.com/chernandezba/zesarux/releases/download/ZEsarUX-X/ZEsarUX_src-X.tar.gz" -MD5SUM="d6a8a847b6a3a19258898bd8a57d6312" +DOWNLOAD="https://github.com/chernandezba/zesarux/releases/download/ZEsarUX-11.0/ZEsarUX_src-11.0.tar.gz" +MD5SUM="916f3d4c036200f4d993454606bf340d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/ZEsarUX/slack-desc b/games/ZEsarUX/slack-desc index 9de6c24393..95cf483098 100644 --- a/games/ZEsarUX/slack-desc +++ b/games/ZEsarUX/slack-desc @@ -16,4 +16,4 @@ ZEsarUX: TBBlue/ZX Spectrum Next, Jupiter Ace and Amstrad CPC 464 ZEsarUX: ZEsarUX: ZEsarUX also includes third-party roms, media, programs and ZEsarUX: games NOT covered by the GNU GPL license. -ZEsarUX: +ZEsarUX: Homepage at https://github.com/chernandezba/zesarux diff --git a/games/ZEsarUX/tar.sh b/games/ZEsarUX/tar.sh new file mode 100644 index 0000000000..7b07c71f38 --- /dev/null +++ b/games/ZEsarUX/tar.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +cd .. +sboname=${PWD##*/} +echo $sboname +cd updater/slackbuild + +tar -z -c -f $sboname.tar.gz -v \ + --exclude='updater' \ + --exclude='*.tar.gz' \ + --exclude='*.tar' \ + --exclude='*.zip' \ + --exclude='*.md' \ + --exclude='*.sf3' \ + --exclude='*.deb' \ + --exclude='*.rpm' \ + ../../../$sboname diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild index 111003453d..e1efecf581 100644 --- a/games/astromenace/astromenace.SlackBuild +++ b/games/astromenace/astromenace.SlackBuild @@ -79,6 +79,8 @@ 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 {} \; +sed -i s/\#include\ \<cmath\>/\#include\ \<cmath\>\\n\#include\ \<cstdint\>/ ./src/core/model3d/model3d.cpp + cmake ./ # create Makefile make # build game diff --git a/games/d1x-rebirth/d1x-rebirth.SlackBuild b/games/d1x-rebirth/d1x-rebirth.SlackBuild index f9b3e8f86c..f917151022 100644 --- a/games/d1x-rebirth/d1x-rebirth.SlackBuild +++ b/games/d1x-rebirth/d1x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d1x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d1x-rebirth/d1x-rebirth.info b/games/d1x-rebirth/d1x-rebirth.info index f20bb59a15..488e219d16 100644 --- a/games/d1x-rebirth/d1x-rebirth.info +++ b/games/d1x-rebirth/d1x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d1x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild index 0cafd4fd74..1145e2fe58 100644 --- a/games/d2x-rebirth/d2x-rebirth.SlackBuild +++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=d2x-rebirth SRCNAM=dxx-rebirth -VERSION=${VERSION:-20220130_7258b7f} +VERSION=${VERSION:-20230520_695e8b9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info index 4c1f7a9b2e..a35c67c150 100644 --- a/games/d2x-rebirth/d2x-rebirth.info +++ b/games/d2x-rebirth/d2x-rebirth.info @@ -1,8 +1,8 @@ PRGNAM="d2x-rebirth" -VERSION="20220130_7258b7f" +VERSION="20230520_695e8b9" HOMEPAGE="https://www.dxx-rebirth.com/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz" -MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20230520_695e8b9.tar.xz" +MD5SUM="20daa2377b7cd13ada79b12da2b762d4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="physfs" diff --git a/games/ddnet/ddnet.SlackBuild b/games/ddnet/ddnet.SlackBuild index 4f29fbef88..8b0a2154ff 100644 --- a/games/ddnet/ddnet.SlackBuild +++ b/games/ddnet/ddnet.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ddnet SRCNAM=DDNet -VERSION=${VERSION:-18.2} +VERSION=${VERSION:-18.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/ddnet/ddnet.info b/games/ddnet/ddnet.info index 069312d0bb..861a448b2f 100644 --- a/games/ddnet/ddnet.info +++ b/games/ddnet/ddnet.info @@ -1,7 +1,7 @@ PRGNAM="ddnet" -VERSION="18.2" +VERSION="18.3" HOMEPAGE="https://ddnet.org/" -DOWNLOAD="https://ddnet.org/downloads/DDNet-18.2.tar.xz \ +DOWNLOAD="https://ddnet.org/downloads/DDNet-18.3.tar.xz \ https://static.crates.io/crates/cc/cc-1.0.73.crate \ https://static.crates.io/crates/cxx/cxx-1.0.71.crate \ https://static.crates.io/crates/cxxbridge-flags/cxxbridge-flags-1.0.71.crate \ @@ -11,7 +11,7 @@ DOWNLOAD="https://ddnet.org/downloads/DDNet-18.2.tar.xz \ https://static.crates.io/crates/quote/quote-1.0.20.crate \ https://static.crates.io/crates/syn/syn-1.0.98.crate \ https://static.crates.io/crates/unicode-ident/unicode-ident-1.0.1.crate" -MD5SUM="4da22b3f95ba0c01b0b85e36dd03d604 \ +MD5SUM="9dd12fa9b97029b271acfc610211c5ec \ 8e3a4d0980acef2c4e74485a45de29a9 \ fda5c633e604f175e07829961763f18f \ a8b59a9c52b44b92ec73248f3c85c608 \ diff --git a/games/eduke32_shareware_data/eduke32_shareware_data.SlackBuild b/games/eduke32_shareware_data/eduke32_shareware_data.SlackBuild index bafb1465b4..67149499a9 100644 --- a/games/eduke32_shareware_data/eduke32_shareware_data.SlackBuild +++ b/games/eduke32_shareware_data/eduke32_shareware_data.SlackBuild @@ -6,6 +6,10 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20240520 bkw: old homepage and download URLs no longer work, thanks to +# Maik Wagner for pointing this out. New download URL has a different +# filename, but same md5sum. Not bumping BUILD for this. + # 20211108 bkw: BUILD=2 # - fix typo in README, slack-desc. # - fix the text files: get rid of CRLFs, rename to lowercase, .doc => .txt. @@ -36,7 +40,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION cd $PRGNAM-$VERSION -unzip $CWD/3dduke13.zip DN3DSW13.SHR +unzip $CWD/3dduke13SW.zip DN3DSW13.SHR unzip DN3DSW13.SHR chmod 0644 * diff --git a/games/eduke32_shareware_data/eduke32_shareware_data.info b/games/eduke32_shareware_data/eduke32_shareware_data.info index 117113296c..15a3863ca3 100644 --- a/games/eduke32_shareware_data/eduke32_shareware_data.info +++ b/games/eduke32_shareware_data/eduke32_shareware_data.info @@ -1,7 +1,7 @@ PRGNAM="eduke32_shareware_data" VERSION="1.3" -HOMEPAGE="https://3drealms.com/catalog/duke-nukem-3d_27/" -DOWNLOAD="ftp://ftp.3drealms.com/share/3dduke13.zip" +HOMEPAGE="https://legacy.3drealms.com/duke3d/" +DOWNLOAD="http://dukertcm.com/knowledge-base/downloads-rtcm/duke3d-shareware/3dduke13SW.zip" MD5SUM="04e4ca70b8a2d59ed56c451c5c1d5d39" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/games/endless-sky/endless-sky.SlackBuild b/games/endless-sky/endless-sky.SlackBuild index 0a7f749c64..74a3bb0a71 100644 --- a/games/endless-sky/endless-sky.SlackBuild +++ b/games/endless-sky/endless-sky.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=endless-sky -VERSION=${VERSION:-0.10.6} +VERSION=${VERSION:-0.10.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/endless-sky/endless-sky.info b/games/endless-sky/endless-sky.info index 3e794b19b9..e4a0df773b 100644 --- a/games/endless-sky/endless-sky.info +++ b/games/endless-sky/endless-sky.info @@ -1,8 +1,8 @@ PRGNAM="endless-sky" -VERSION="0.10.6" +VERSION="0.10.7" HOMEPAGE="http://endless-sky.github.io/" -DOWNLOAD="https://github.com/endless-sky/endless-sky/archive/v0.10.6/endless-sky-0.10.6.tar.gz" -MD5SUM="dcde25d21eeb9763f5a92ca7f77e6181" +DOWNLOAD="https://github.com/endless-sky/endless-sky/archive/v0.10.7/endless-sky-0.10.7.tar.gz" +MD5SUM="f959dd5357db2af389b72e3848a9b2d3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/etlegacy/etlegacy.SlackBuild b/games/etlegacy/etlegacy.SlackBuild index 8e6f118c35..5320f26836 100644 --- a/games/etlegacy/etlegacy.SlackBuild +++ b/games/etlegacy/etlegacy.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for etlegacy -# Copyright 2013-2023 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2024 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=etlegacy -VERSION=${VERSION:-2.81.1} +VERSION=${VERSION:-2.82.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/etlegacy/etlegacy.info b/games/etlegacy/etlegacy.info index abc9dc421a..83415083af 100644 --- a/games/etlegacy/etlegacy.info +++ b/games/etlegacy/etlegacy.info @@ -1,10 +1,10 @@ PRGNAM="etlegacy" -VERSION="2.81.1" +VERSION="2.82.0" HOMEPAGE="https://www.etlegacy.com" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.81.1-i386.tar.gz" -MD5SUM="0770c036845a6aae69e984d5403785c6" -DOWNLOAD_x86_64="http://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.81.1-x86_64.tar.gz" -MD5SUM_x86_64="4ccc5fde6b993dc2a4387fd62dba204b" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.82.0-i386.tar.gz" +MD5SUM="0b1a73b1d0b30805d4990aff6067385b" +DOWNLOAD_x86_64="https://ponce.cc/slackware/sources/repo/etlegacy/etlegacy-v2.82.0-x86_64.tar.gz" +MD5SUM_x86_64="18fe1febf6fe32954a6d504b56b35d4a" REQUIRES="%README% etlegacy-data" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/games/galaxyv2/galaxyv2.info b/games/galaxyv2/galaxyv2.info index 4841b34ca8..b127f317d8 100644 --- a/games/galaxyv2/galaxyv2.info +++ b/games/galaxyv2/galaxyv2.info @@ -2,9 +2,9 @@ PRGNAM="galaxyv2" VERSION="1.86" HOMEPAGE="http://www.galaxy-forces.com/" DOWNLOAD="UNSUPPORTED" -MD5SUM="60bd8c4993c513eb91bffe221734a1a1" +MD5SUM="" DOWNLOAD_x86_64="https://downloads.sourceforge.net/project/galaxyv2/galaxyv2/galaxyv2_1.86/galaxyv2_1.86_src.zip" -MD5SUM_x86_64=""60bd8c4993c513eb91bffe221734a1a1" +MD5SUM_x86_64="60bd8c4993c513eb91bffe221734a1a1" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" EMAIL="d.zlatanidis@gmail.com" diff --git a/games/higan/higan.SlackBuild b/games/higan/higan.SlackBuild index 39d9901f01..31cd37b92a 100644 --- a/games/higan/higan.SlackBuild +++ b/games/higan/higan.SlackBuild @@ -116,6 +116,8 @@ chown -R root:root . # for its support files if they're not found in ~/.local/share/higan. patch -p1 -i $CWD/higan-flags.diff patch -p1 -i $CWD/higan-paths.diff +# 20240131 KEC: gcc-13.x compatibility +patch -p1 -i $CWD/includes.diff # 20181212 bkw: audio system stuff. Upstream doesn't give us a way to # disable these on the make command line, but hacking this file works: diff --git a/games/higan/includes.diff b/games/higan/includes.diff new file mode 100644 index 0000000000..09b1a5bc2b --- /dev/null +++ b/games/higan/includes.diff @@ -0,0 +1,8 @@ +--- higan-106.orig/nall/arithmetic/natural.hpp 2024-01-31 09:12:37.166634947 +0900 ++++ higan-106/nall/arithmetic/natural.hpp 2024-01-31 09:12:58.147526383 +0900 +@@ -1,3 +1,5 @@ ++#include <stdexcept> ++ + #define ConcatenateType(Size) uint##Size##_t + #define DeclareType(Size) ConcatenateType(Size) + diff --git a/games/lgogdownloader/lgogdownloader.SlackBuild b/games/lgogdownloader/lgogdownloader.SlackBuild index 23ac536b3f..67cf0dd47f 100644 --- a/games/lgogdownloader/lgogdownloader.SlackBuild +++ b/games/lgogdownloader/lgogdownloader.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=lgogdownloader -VERSION=${VERSION:-3.12} +VERSION=${VERSION:-3.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/lgogdownloader/lgogdownloader.info b/games/lgogdownloader/lgogdownloader.info index 8045dabb70..b782891c03 100644 --- a/games/lgogdownloader/lgogdownloader.info +++ b/games/lgogdownloader/lgogdownloader.info @@ -1,8 +1,8 @@ PRGNAM="lgogdownloader" -VERSION="3.12" +VERSION="3.14" HOMEPAGE="https://sites.google.com/site/gogdownloader/home/" -DOWNLOAD="https://github.com/Sude-/lgogdownloader/archive/v3.12/lgogdownloader-3.12.tar.gz" -MD5SUM="f9814fb3a49b6e0dcc2d818419c866b0" +DOWNLOAD="https://github.com/Sude-/lgogdownloader/archive/v3.14/lgogdownloader-3.14.tar.gz" +MD5SUM="6f638d9a9f8730ccf98ffc0f2239e124" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="htmlcxx jsoncpp rhash tinyxml2" diff --git a/games/maelstrom/maelstrom.SlackBuild b/games/maelstrom/maelstrom.SlackBuild index 88cddc94c8..2a0fc29553 100644 --- a/games/maelstrom/maelstrom.SlackBuild +++ b/games/maelstrom/maelstrom.SlackBuild @@ -80,7 +80,7 @@ sed -i '/GAME_INSTALLDIR=.*games/s,/games,/share/games,' configure # on -current (and it does no harm on 14.2 either): sed -i 's,struct *button,struct b_utton,g' buttonlist.h -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -fpermissive" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/games/micropolis/micropolis.SlackBuild b/games/micropolis/micropolis.SlackBuild index bd09100122..b964a874b9 100644 --- a/games/micropolis/micropolis.SlackBuild +++ b/games/micropolis/micropolis.SlackBuild @@ -93,7 +93,7 @@ run_make() { DOCDIR=$DOCDIR \ DATADIR=/usr/share/games/$PRGNAM \ BINDIR=/usr/games \ - SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH" \ + SLKCFLAGS="$SLKCFLAGS -DTCL_IEEE_FP_MATH -fpermissive" \ DESTDIR=$PKG \ "$@" } diff --git a/games/pioneer/gcc-14.diff b/games/pioneer/gcc-14.diff new file mode 100644 index 0000000000..f71de6c62b --- /dev/null +++ b/games/pioneer/gcc-14.diff @@ -0,0 +1,10 @@ +--- src/Input.h.orig 2024-05-18 09:08:26.973952781 +0900 ++++ src/Input.h 2024-05-18 09:08:44.313951316 +0900 +@@ -12,6 +12,7 @@ + #include <vector> + #include <map> + #include <string> ++#include <algorithm> + + class IniConfig; + diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild index d7d399338f..3162d6de45 100644 --- a/games/pioneer/pioneer.SlackBuild +++ b/games/pioneer/pioneer.SlackBuild @@ -85,6 +85,8 @@ fi # Fix save compatibility (#5798). patch -p0 < $CWD/save-compat.diff +# GCC 14 compatibility. +patch -p0 < $CWD/gcc-14.diff GLEW=OFF LUA=OFF diff --git a/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch new file mode 100644 index 0000000000..9f8a1111e4 --- /dev/null +++ b/games/pokerth/patches/pokerth-1.1.2-boost-1.85.patch @@ -0,0 +1,374 @@ +From f42fa9a604f9f4faa1addd1b02c491cd0fe59736 Mon Sep 17 00:00:00 2001 +From: "grover92000@gmail.com" <grover92000@gmail.com> +Date: Sat, 20 Apr 2024 13:29:24 -0400 +Subject: [PATCH] Changes for boost-1.85 + +--- + src/core/common/avatarmanager.cpp | 49 +++++++++++++++++++ + src/core/common/loghelper_server.cpp | 4 ++ + src/engine/log.cpp | 4 ++ + src/engine/log.h | 4 ++ + .../qt/qttools/nonqthelper/nonqthelper.cpp | 8 +++ + src/net/common/clientstate.cpp | 19 +++++++ + src/net/common/clientthread.cpp | 4 ++ + src/net/common/downloaderthread.cpp | 8 +++ + src/net/common/serverlobbythread.cpp | 8 +++ + src/net/common/uploaderthread.cpp | 4 ++ + src/pokerth_server.cpp | 4 ++ + 11 files changed, 116 insertions(+) + +diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +index d137a5c44..9b2f4abaa 100644 +--- a/src/core/common/avatarmanager.cpp ++++ b/src/core/common/avatarmanager.cpp +@@ -87,20 +87,36 @@ AvatarManager::Init(const string &dataDir, const string &cacheDir) + path tmpDataPath(dataDir); + { + boost::mutex::scoped_lock lock(m_cacheDirMutex); ++#if BOOST_VERSION < 108500 + m_cacheDir = tmpCachePath.directory_string(); ++#else ++ m_cacheDir = tmpCachePath.string(); ++#endif + } + { + boost::mutex::scoped_lock lock(m_avatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars); ++#else ++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars); ++#endif + retVal = retVal && tmpRet; + } + if (cacheDir.empty() || tmpCachePath.empty()) + LOG_ERROR("Cache directory was not set!"); + else { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); ++#if BOOST_VERSION < 108500 + tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars); ++#else ++ tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars); ++#endif + retVal = retVal && tmpRet; + } + +@@ -113,7 +129,11 @@ AvatarManager::AddSingleAvatar(const std::string &fileName) + { + bool retVal = false; + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string tmpFileName(filePath.file_string()); ++#else ++ string tmpFileName(filePath.string()); ++#endif + + if (!fileName.empty() && !tmpFileName.empty()) { + unsigned outFileSize = 0; +@@ -240,7 +260,11 @@ AvatarManager::GetAvatarFileType(const string &fileName) + AvatarFileType fileType; + + path filePath(fileName); ++#if BOOST_VERSION < 108500 + string ext(extension(filePath)); ++#else ++ string ext(filePath.extension().string()); ++#endif + if (boost::algorithm::iequals(ext, ".png")) + fileType = AVATAR_FILE_TYPE_PNG; + else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg")) +@@ -362,7 +386,11 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil + if (IsValidAvatarFileType(avatarFileType, data, size)) { + path tmpPath(cacheDir); + tmpPath /= (md5buf.ToString() + ext); ++#if BOOST_VERSION < 108500 + string fileName(tmpPath.file_string()); ++#else ++ string fileName(tmpPath.string()); ++#endif + std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); + if (!o.fail()) { + o.write((const char *)data, size); +@@ -426,7 +454,11 @@ AvatarManager::RemoveOldAvatarCacheEntries() + } + try { + path cachePath(cacheDir); ++#if BOOST_VERSION < 108500 + cacheDir = cachePath.directory_string(); ++#else ++ cacheDir = cachePath.string(); ++#endif + // Never delete anything if we do not have a special cache dir set. + if (!cacheDir.empty()) { + boost::mutex::scoped_lock lock(m_cachedAvatarsMutex); +@@ -441,12 +473,20 @@ AvatarManager::RemoveOldAvatarCacheEntries() + while (i != end) { + bool keepFile = false; + path filePath(i->second); ++#if BOOST_VERSION < 108500 + string fileString(filePath.file_string()); ++#else ++ string fileString(filePath.string()); ++#endif + // Only consider files which are definitely in the cache dir. + if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir) { + // Only consider files with MD5 as file name. + MD5Buf tmpBuf; ++#if BOOST_VERSION < 108500 + if (exists(filePath) && tmpBuf.FromString(basename(filePath))) { ++#else ++ if (exists(filePath) && tmpBuf.FromString(filePath.stem().string())) { ++#endif + timeMap.insert(TimeAvatarMap::value_type(last_write_time(filePath), i->first)); + keepFile = true; + } +@@ -520,10 +560,19 @@ AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars) + directory_iterator end; + + while (i != end) { ++#if BOOST_VERSION < 108500 + if (is_regular(i->status())) { + string md5sum(basename(i->path())); ++#else ++ if (is_regular_file(i->status())) { ++ string md5sum(i->path().stem().string()); ++#endif + MD5Buf md5buf; ++#if BOOST_VERSION < 108500 + string fileName(i->path().file_string()); ++#else ++ string fileName(i->path().string()); ++#endif + if (md5buf.FromString(md5sum)) { + // Only consider files with md5sum as name. + avatars.insert(AvatarMap::value_type(md5buf, fileName)); +diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +index a0d0350ed..f3e8366b2 100644 +--- a/src/core/common/loghelper_server.cpp ++++ b/src/core/common/loghelper_server.cpp +@@ -59,7 +59,11 @@ loghelper_init(const string &logDir, int logLevel) + path tmpLogFile(logDir); + tmpLogFile /= SERVER_MSG_LOG_FILE_NAME; + ++#if BOOST_VERSION < 108500 + g_logFile = tmpLogFile.directory_string(); ++#else ++ g_logFile = tmpLogFile.string(); ++#endif + g_logLevel = logLevel; + } + +diff --git a/src/engine/log.cpp b/src/engine/log.cpp +index 1f50fde2e..c6fe7f8e1 100644 +--- a/src/engine/log.cpp ++++ b/src/engine/log.cpp +@@ -84,7 +84,11 @@ Log::init() + mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb"; + + // open sqlite-db ++#if BOOST_VERSION < 108500 + sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb); ++#else ++ sqlite3_open(mySqliteLogFileName.string().c_str(), &mySqliteLogDb); ++#endif + if( mySqliteLogDb != 0 ) { + + int i; +diff --git a/src/engine/log.h b/src/engine/log.h +index 7dbf2514d..0a79c5377 100644 +--- a/src/engine/log.h ++++ b/src/engine/log.h +@@ -73,7 +73,11 @@ class Log + + std::string getMySqliteLogFileName() + { ++#if BOOST_VERSION < 108500 + return mySqliteLogFileName.directory_string(); ++#else ++ return mySqliteLogFileName.string(); ++#endif + } + + private: +diff --git a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +index 2acfeeb45..bdc625b4a 100644 +--- a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp ++++ b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp +@@ -65,7 +65,15 @@ std::string + NonQtHelper::getDataPathStdString(const char *argv0) + { + boost::filesystem::path startPath(argv0); ++#if BOOST_VERSION < 108500 + startPath = startPath.remove_leaf(); ++#else ++ startPath = startPath.remove_filename(); ++#endif + startPath /= "data"; ++#if BOOST_VERSION < 108500 + return stringToUtf8(startPath.directory_string()); ++#else ++ return stringToUtf8(startPath.string()); ++#endif + } +diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +index d7fc7285a..9d35e99ff 100644 +--- a/src/net/common/clientstate.cpp ++++ b/src/net/common/clientstate.cpp +@@ -211,7 +211,11 @@ ClientStateStartServerListDownload::Enter(boost::shared_ptr<ClientThread> client + } else { + // Download the server list. + boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper); ++#if BOOST_VERSION < 108500 + downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.directory_string()); ++#else ++ downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.string()); ++#endif + ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader); + client->SetState(ClientStateDownloadingServerList::Instance()); + } +@@ -303,13 +307,24 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) + path zippedServerListPath(context.GetCacheDir()); + zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1); + path xmlServerListPath; ++#if BOOST_VERSION < 108500 + if (extension(zippedServerListPath) == ".z") { + xmlServerListPath = change_extension(zippedServerListPath, ""); ++#else ++ if (zippedServerListPath.extension().string() == ".z") { ++ xmlServerListPath = zippedServerListPath; ++ xmlServerListPath.replace_extension(""); ++#endif + + // Unzip the file using zlib. + try { ++#if BOOST_VERSION < 108500 + std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); + std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc); ++#else ++ std::ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary); ++ std::ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out | ios_base::trunc); ++#endif + boost::iostreams::filtering_streambuf<boost::iostreams::input> in; + in.push(boost::iostreams::zlib_decompressor()); + in.push(inFile); +@@ -321,7 +336,11 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client) + xmlServerListPath = zippedServerListPath; + + // Parse the server address. ++#if BOOST_VERSION < 108500 + TiXmlDocument doc(xmlServerListPath.directory_string()); ++#else ++ TiXmlDocument doc(xmlServerListPath.string()); ++#endif + + if (doc.LoadFile()) { + client->ClearServerInfoMap(); +diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp +index dee5daf68..e24413d14 100644 +--- a/src/net/common/clientthread.cpp ++++ b/src/net/common/clientthread.cpp +@@ -977,7 +977,11 @@ ClientThread::GetCacheServerListFileName() + size_t pos = serverListUrl.find_last_of('/'); + if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) { + tmpServerListPath /= serverListUrl.substr(pos); ++#if BOOST_VERSION < 108500 + fileName = tmpServerListPath.directory_string(); ++#else ++ fileName = tmpServerListPath.string(); ++#endif + } + return fileName; + } +diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp +index 56a9526ec..7984cb410 100644 +--- a/src/net/common/downloaderthread.cpp ++++ b/src/net/common/downloaderthread.cpp +@@ -96,7 +96,11 @@ DownloaderThread::Main() + // Previous download was finished. + if (m_curDownloadData) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary); ++#else ++ std::ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary); ++#endif + // Find out file size. + // Not fully portable, but works on win/linux/mac. + instream.seekg(0, ios_base::beg); +@@ -132,7 +136,11 @@ DownloaderThread::Main() + } + if (m_curDownloadData && !m_curDownloadData->filename.empty()) { + path filepath(m_curDownloadData->filename); ++#if BOOST_VERSION < 108500 + m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string()); ++#else ++ m_downloadHelper->Init(m_curDownloadData->address, filepath.string()); ++#endif + m_downloadInProgress = true; + } + } +diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp +index 1cb341eaa..d3964895d 100644 +--- a/src/net/common/serverlobbythread.cpp ++++ b/src/net/common/serverlobbythread.cpp +@@ -277,7 +277,11 @@ ServerLobbyThread::Init(const string &logDir) + boost::filesystem::path logPath(logDir); + if (!logDir.empty()) { + logPath /= SERVER_STATISTICS_FILE_NAME; ++#if BOOST_VERSION < 108500 + m_statisticsFileName = logPath.directory_string(); ++#else ++ m_statisticsFileName = logPath.string(); ++#endif + ReadStatisticsFile(); + } + } +@@ -1264,7 +1268,11 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(boost::shared_ptr<SessionData> sessi + // Init finished - start session. + EstablishSession(session); + LOG_MSG("Client \"" << session->GetClientAddr() << "\" uploaded avatar \"" ++#if BOOST_VERSION < 108500 + << boost::filesystem::path(avatarFileName).file_string() << "\"."); ++#else ++ << boost::filesystem::path(avatarFileName).string() << "\"."); ++#endif + } else + SessionError(session, ERR_NET_WRONG_AVATAR_SIZE); + } +diff --git a/src/net/common/uploaderthread.cpp b/src/net/common/uploaderthread.cpp +index f1eefea6c..ecf1436d9 100644 +--- a/src/net/common/uploaderthread.cpp ++++ b/src/net/common/uploaderthread.cpp +@@ -94,7 +94,11 @@ UploaderThread::Main() + url += filepath.filename().string(); + #endif + } ++#if BOOST_VERSION < 108500 + m_uploadHelper->Init(url, filepath.file_string(), data.user, data.pwd, data.filesize, data.httpPost); ++#else ++ m_uploadHelper->Init(url, filepath.string(), data.user, data.pwd, data.filesize, data.httpPost); ++#endif + m_uploadInProgress = true; + } + } +diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp +index 450a47e9d..1ee0db80e 100644 +--- a/src/pokerth_server.cpp ++++ b/src/pokerth_server.cpp +@@ -158,7 +158,11 @@ main(int argc, char *argv[]) + if (pidFile.empty()) { + path tmpPidPath(myConfig->readConfigString("LogDir")); + tmpPidPath /= "pokerth.pid"; ++#if BOOST_VERSION < 108500 + pidFile = tmpPidPath.directory_string(); ++#else ++ pidFile = tmpPidPath.string(); ++#endif + } + { + std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 338635b115..456fff3fc5 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -88,6 +88,7 @@ find -L . \ patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.70-websocket-fix2.patch ) patch -p1 < $CWD/patches/pokerth-1.1.2-newer-protobuf.patch +patch -p1 < $CWD/patches/pokerth-1.1.2-boost-1.85.patch qmake-qt5 QMAKE_CFLAGS_ISYSTEM= -spec linux-g++ pokerth.pro make diff --git a/games/ppsspp/ppsspp.SlackBuild b/games/ppsspp/ppsspp.SlackBuild index cda92afb6c..7282983268 100644 --- a/games/ppsspp/ppsspp.SlackBuild +++ b/games/ppsspp/ppsspp.SlackBuild @@ -87,6 +87,10 @@ sed -i -e '/include(ccache)/d' CMakeLists.txt # set git-version sed -i "s/unknown/${VERSION}/" git-version.cmake +# Build the internal ffmpeg (it's the only one supported by upstream) +( cd ffmpeg + ./linux_x86-64.sh ) + if [ "${QT:-OFF}" = "ON" ]; then cmake -B build-qt \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -95,7 +99,6 @@ if [ "${QT:-OFF}" = "ON" ]; then -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=ON \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release @@ -111,7 +114,6 @@ cmake -B build-sdl \ -DCMAKE_SKIP_RPATH=TRUE \ -DUSING_QT_UI=OFF \ -DUSE_SYSTEM_LIBZIP=ON \ - -DUSE_SYSTEM_FFMPEG=ON \ -DUSE_DISCORD=OFF \ -DUSE_SYSTEM_ZSTD=ON \ -DCMAKE_BUILD_TYPE=Release diff --git a/games/scid_vs_pc/scid_vs_pc.SlackBuild b/games/scid_vs_pc/scid_vs_pc.SlackBuild index c218dabe8b..ed84f15dc2 100644 --- a/games/scid_vs_pc/scid_vs_pc.SlackBuild +++ b/games/scid_vs_pc/scid_vs_pc.SlackBuild @@ -34,7 +34,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=scid_vs_pc -VERSION=${VERSION:-4.24} +VERSION=${VERSION:-4.25} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/games/scid_vs_pc/scid_vs_pc.info b/games/scid_vs_pc/scid_vs_pc.info index 2639301ee6..db38b986f2 100644 --- a/games/scid_vs_pc/scid_vs_pc.info +++ b/games/scid_vs_pc/scid_vs_pc.info @@ -1,8 +1,8 @@ PRGNAM="scid_vs_pc" -VERSION="4.24" +VERSION="4.25" HOMEPAGE="https://scidvspc.sourceforge.net/" -DOWNLOAD="https://downloads.sourceforge.net/project/scidvspc/source/scid_vs_pc-4.24.tgz" -MD5SUM="8fbb32863f06beb1fe1e16edb4413089" +DOWNLOAD="https://downloads.sourceforge.net/project/scidvspc/source/scid_vs_pc-4.25.tgz" +MD5SUM="e1a6af32995a6394f740664e478e87d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch b/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch new file mode 100644 index 0000000000..cb08f0d87a --- /dev/null +++ b/games/snes9x/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch @@ -0,0 +1,29 @@ +From 2afe4a11d43e8767cbeb90372177d4b580384e9a Mon Sep 17 00:00:00 2001 +From: BearOso <bearoso@gmail.com> +Date: Mon, 1 May 2023 11:38:54 -0500 +Subject: [PATCH] CI acting funky. See if this fixes it. + +--- + vulkan/vulkan_context.hpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/vulkan/vulkan_context.hpp b/vulkan/vulkan_context.hpp +index cfc29eda2..33ec20c5f 100644 +--- a/vulkan/vulkan_context.hpp ++++ b/vulkan/vulkan_context.hpp +@@ -7,6 +7,8 @@ + #undef WINVER + #define WINVER 0x599 + #endif ++#include <cstdio> ++#include <cstdint> + #include "vk_mem_alloc.hpp" + #include "vulkan/vulkan.hpp" + #include "vulkan_swapchain.hpp" +@@ -64,4 +66,4 @@ class Context + vk::CommandBuffer one_time_use_cmd; + }; + +-} // namespace Vulkan +\ No newline at end of file ++} // namespace Vulkan diff --git a/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch b/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch new file mode 100644 index 0000000000..af1866533e --- /dev/null +++ b/games/snes9x/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch @@ -0,0 +1,28 @@ +From b383b94c8c94e3a28b09e7dd3d72cac2a783ba55 Mon Sep 17 00:00:00 2001 +From: BearOso <bearoso@gmail.com> +Date: Sun, 30 Apr 2023 17:18:39 -0500 +Subject: [PATCH] slang: Fix CI build. + +--- + vulkan/slang_shader.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/vulkan/slang_shader.hpp b/vulkan/slang_shader.hpp +index 8af9f48d9..6e24bcd8d 100644 +--- a/vulkan/slang_shader.hpp ++++ b/vulkan/slang_shader.hpp +@@ -1,6 +1,7 @@ + #pragma once + #include <string> + #include <vector> ++#include <cstdint> + + struct SlangShader + { +@@ -101,4 +102,4 @@ struct SlangShader + int ubo_binding; + std::vector<Uniform> uniforms; + std::vector<Sampler> samplers; +-}; +\ No newline at end of file ++}; diff --git a/games/snes9x/snes9x.SlackBuild b/games/snes9x/snes9x.SlackBuild index ad26551806..a48e38a0a1 100644 --- a/games/snes9x/snes9x.SlackBuild +++ b/games/snes9x/snes9x.SlackBuild @@ -84,6 +84,9 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +patch -p1 < $CWD/2afe4a11d43e8767cbeb90372177d4b580384e9a.patch +patch -p1 < $CWD/b383b94c8c94e3a28b09e7dd3d72cac2a783ba55.patch + WITHPULSE=yes if [ "$PULSE" = "no" ] || ! pkg-config --exists libpulse; then PULSEOPT="-DUSE_PULSEAUDIO=OFF" diff --git a/games/supertux/gcc12.patch b/games/supertux/gcc12.patch new file mode 100644 index 0000000000..f5e7392c3c --- /dev/null +++ b/games/supertux/gcc12.patch @@ -0,0 +1,11 @@ +diff -upr SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp +--- SuperTux-v0.6.3-Source.orig/external/partio_zip/zip_manager.cpp 2021-12-23 01:01:58.000000000 +0200 ++++ SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.cpp 2022-06-13 15:20:45.305976668 +0300 +@@ -47,6 +47,7 @@ extern "C"{ + #include <stdexcept> + #include <cstring> + #include <string> ++#include <memory> + + #include "zip_manager.hpp" + diff --git a/games/supertux/missing-include-for-FLT_EPSILON.patch b/games/supertux/missing-include-for-FLT_EPSILON.patch new file mode 100644 index 0000000000..44bc370a74 --- /dev/null +++ b/games/supertux/missing-include-for-FLT_EPSILON.patch @@ -0,0 +1,13 @@ +diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp +index 41de52e..a8ebfc9 100644 +--- a/src/supertux/game_session.cpp ++++ b/src/supertux/game_session.cpp +@@ -14,6 +14,8 @@ + // You should have received a copy of the GNU General Public License + // along with this program. If not, see <http://www.gnu.org/licenses/>. + ++#include <cfloat> ++ + #include "supertux/game_session.hpp" + + #include "audio/sound_manager.hpp" diff --git a/games/supertux/supertux.SlackBuild b/games/supertux/supertux.SlackBuild index a492e216aa..26795a4bbd 100644 --- a/games/supertux/supertux.SlackBuild +++ b/games/supertux/supertux.SlackBuild @@ -84,6 +84,9 @@ 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 -p1 < $CWD/gcc12.patch +patch -p1 < $CWD/missing-include-for-FLT_EPSILON.patch + mkdir -p build cd build cmake \ diff --git a/games/term2048/README b/games/term2048/README deleted file mode 100644 index c7315554d8..0000000000 --- a/games/term2048/README +++ /dev/null @@ -1,2 +0,0 @@ -2048 in your terminal. -Join the numbers and get to the 2048 tile! diff --git a/games/term2048/doinst.sh b/games/term2048/doinst.sh deleted file mode 100644 index 5fb28930db..0000000000 --- a/games/term2048/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi diff --git a/games/term2048/slack-desc b/games/term2048/slack-desc deleted file mode 100644 index 51299727ef..0000000000 --- a/games/term2048/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -term2048: term2048 (2048 in your terminal) -term2048: -term2048: Join the numbers and get to the 2048 tile! -term2048: -term2048: Homepage: https://github.com/bfontaine/term2048 -term2048: -term2048: -term2048: -term2048: -term2048: -term2048: diff --git a/games/term2048/term2048.info b/games/term2048/term2048.info deleted file mode 100644 index 72361790be..0000000000 --- a/games/term2048/term2048.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="term2048" -VERSION="0.2.5" -HOMEPAGE="https://github.com/bfontaine/term2048" -DOWNLOAD="https://github.com/bfontaine/term2048/archive/0.2.5/term2048-0.2.5.tar.gz" -MD5SUM="e74772b2b92f7a8ce4b8afa9c0f8b9f1" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="colorama" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/games/tome/aur-tome4.patch b/games/tome/aur-tome4.patch new file mode 100644 index 0000000000..7c24269af3 --- /dev/null +++ b/games/tome/aur-tome4.patch @@ -0,0 +1,457 @@ +diff -Naur orig/build/runner.lua new/build/runner.lua +--- orig/build/runner.lua 2014-05-19 10:42:12.000000000 +0200 ++++ new/build/runner.lua 2020-10-30 23:01:51.861023690 +0100 +@@ -24,28 +24,28 @@ + files { "../src/runner/main.c", "../src/getself.c" } + links { "m" } + +- configuration "linux" ++ filter "system:linux" + links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + +- configuration "bsd" ++ filter "system:bsd" + links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + linkoptions { "../src/windows/icon.res" } + +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" } + links { "IOKit" } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/t-engine ../t-engine", } + + project "te4runner" +@@ -58,19 +58,19 @@ + files { "../src/runner/runner.c", "../src/physfs.c", "../src/auxiliar.c" } + links { "runner-physfs", "runner-lua", "m" } + +- configuration "linux" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } +- configuration "bsd" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } +- +- configuration "windows" +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:linux" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } ++ filter "system:bsd" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } ++ ++ filter "system:windows" ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/te4runner.tec ../", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/te4runner.tec ../", } + + project "runner-physfs" +@@ -83,13 +83,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL.framework/Headers" } + +diff -Naur orig/build/te4core.lua new/build/te4core.lua +--- orig/build/te4core.lua 2019-10-03 15:35:43.000000000 +0200 ++++ new/build/te4core.lua 2020-10-30 23:05:15.066698600 +0100 +@@ -40,11 +40,11 @@ + links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" } + if _OPTIONS.discord then defines { "DISCORD_TE4" } end + defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "TE4CORE_VERSION="..TE4CORE_VERSION } + buildoptions { "-O3" } + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + + if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end + if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end +@@ -63,7 +63,7 @@ + prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" } + end + +- configuration "macosx" ++ filter "system:macosx" + files { "../src/mac/SDL*" } + includedirs { + "/System/Library/Frameworks/OpenGL.framework/Headers", +@@ -84,7 +84,7 @@ + "/usr/local/include", + "/usr/local/opt/libpng12/include", + } +- defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']] } ++ defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH="/Library/Application Support/T-Engine/"]] } + linkoptions { + "-framework Cocoa", + "-framework OpenGL", +@@ -108,9 +108,9 @@ + targetdir "." + links { "IOKit" } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + if _OPTIONS.wincross then + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + else +@@ -118,33 +118,33 @@ + end + linkoptions { "../src/windows/icon.res" } + linkoptions { "-mwindows" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + libdirs {"/opt/SDL-2.0/lib/"} + links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } + linkoptions { "-Wl,-E" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + if steamlin64 then steamlin64() end + +- configuration "bsd" ++ filter "system:bsd" + libdirs {"/usr/local/lib/"} + links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Release/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +@@ -165,13 +165,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL2.framework/Headers" } + +@@ -230,7 +230,7 @@ + defines { "LJ_ABI_SOFTFP=0" } + end + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -238,7 +238,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"', +@@ -332,7 +332,7 @@ + + files { "../src/luajit2/src/host/buildvm*.c" } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -344,7 +344,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", } +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { + 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"', +@@ -367,7 +367,7 @@ + files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" } + excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c", "../src/luajit2/src/ljamalg.c" } + +- configuration "linux" ++ filter "system:linux" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -381,7 +381,7 @@ + } + end + +- configuration "bsd" ++ filter "system:bsd" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -395,7 +395,7 @@ + } + end + +- configuration "macosx" ++ filter "system:macosx" + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ + "../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s", +@@ -407,7 +407,7 @@ + "../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c", + } + +- configuration "windows" ++ filter "system:windows" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -429,7 +429,7 @@ + targetname "luasocket" + buildoptions { "-O2" } + +- configuration "not windows" ++ filter "system:not windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -445,7 +445,7 @@ + "../src/luasocket/usocket.c", + "../src/luasocket/mime.c", + } +- configuration "windows" ++ filter "system:windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -583,21 +583,21 @@ + buildoptions { "-O3", "-std=c++11" } + cppconfig("web") + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end + + files { "../src/web-cef3/*.cpp", } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "windows" ++ filter "system:windows" + defines { 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} +@@ -619,19 +619,19 @@ + "../src/web-cef3/spawn.cpp", + } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "linux" ++ filter "system:linux" + buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"} + libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"} + includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"} + links { "cef", "cef_dll_wrapper" } +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + defines { 'SELFEXE_LINUX' } + end + +@@ -641,7 +641,7 @@ + + if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then + project "te4-discord" +- configuration "linux" ++ filter "system:linux" + kind "SharedLib" + language "C++" + targetname "discord-rpc" +@@ -654,11 +654,11 @@ + files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", } + files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", } + +- configuration "windows" ++ filter "system:windows" + kind "SharedLib" + -- Empty + +- configuration "macosx" ++ filter "system:macosx" + kind "SharedLib" + -- Empty + end +diff -Naur orig/premake5.lua new/premake5.lua +--- orig/premake5.lua 2019-09-13 11:46:14.000000000 +0200 ++++ new/premake5.lua 2020-10-30 23:04:41.500196031 +0100 +@@ -1,6 +1,6 @@ + dofile("build/options.lua") + +-solution "TEngine" ++workspace "TEngine" + configurations { "Debug", "Release" } + objdir "obj" + defines {"GLEW_STATIC"} +@@ -30,7 +30,7 @@ + } + else + includedirs { +- "/opt/SDL-2.0/include/SDL2", ++ "/usr/include/SDL2", + "/usr/include/GL", + } + end +@@ -42,7 +42,7 @@ + dofile("steamworks/build/steam-def.lua") + end + +-configuration "bsd" ++filter "system:bsd" + libdirs { + "/usr/local/lib", + } +@@ -51,7 +51,7 @@ + } + + if _OPTIONS.wincross then +-configuration "windows" ++filter "system:windows" + libdirs { + "/Test/xcompile/local//lib", + } +@@ -60,7 +60,7 @@ + "/Test/xcompile/local/include", + } + else +-configuration "windows" ++filter "system:windows" + libdirs { + "/c/code/SDL/lib", + } +@@ -72,7 +72,7 @@ + end + + cppconfig = function(what) +- if os.get() == "macosx" then ++ if os.target() == "macosx" then + if what == "web" then + buildoptions { "-stdlib=libstdc++" } + linkoptions { "-stdlib=libstdc++" } +@@ -84,9 +84,8 @@ + -- links { "stdc++" } + end + +-configuration "macosx" +- premake.gcc.cc = 'clang' +- premake.gcc.cxx = 'clang++' ++filter "system:macosx" ++ toolset("clang") + + buildoptions { "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk", "-mmacosx-version-min=10.7" } + includedirs { +@@ -95,9 +94,9 @@ + "/Library/Frameworks/SDL2_ttf.framework/Headers", + } + +-configuration "Debug" ++filter "Debug" + defines { } +- flags { "Symbols" } ++ symbols "On" + buildoptions { "-ggdb" } + -- buildoptions { "-O3" } + targetdir "bin/Debug" +@@ -105,9 +104,10 @@ + if _OPTIONS.pedantic then buildoptions { "-Wall" } end + defines {"TE4_LUA_ALLOW_GENERIC_IO"} + +-configuration "Release" ++filter "Release" + defines { "NDEBUG=1" } +- flags { "Optimize", "NoFramePointer" } ++ optimize "On" ++ omitframepointer "On" + buildoptions { "-O2" } + targetdir "bin/Release" + diff --git a/games/tome/tome.SlackBuild b/games/tome/tome.SlackBuild index 403559c078..b31b3aa0b6 100644 --- a/games/tome/tome.SlackBuild +++ b/games/tome/tome.SlackBuild @@ -79,11 +79,11 @@ 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 {} \+ -# correction of SDL2 headers directory -sed -i "s/opt\/SDL-2.0/usr/" premake4.lua +cp premake4.lua premake5.lua +patch -p1 < $CWD/aur-tome4.patch # build game -premake4 gmake +premake5 gmake env -u ARCH make find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/games/tome/tome.info b/games/tome/tome.info index 0c38f5245c..506961c8cf 100644 --- a/games/tome/tome.info +++ b/games/tome/tome.info @@ -5,6 +5,6 @@ DOWNLOAD="https://te4.org/dl/t-engine/t-engine4-src-1.7.6.tar.bz2" MD5SUM="31e78cd88b383a3a8667e2fd90abfd2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="premake" +REQUIRES="premake5" MAINTAINER="Dimitris Zlatanidis" EMAIL="dslackw@gmail.com" diff --git a/games/tty-solitaire/tty-solitaire.SlackBuild b/games/tty-solitaire/tty-solitaire.SlackBuild index f85739727e..fd762bce2c 100644 --- a/games/tty-solitaire/tty-solitaire.SlackBuild +++ b/games/tty-solitaire/tty-solitaire.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tty-solitaire -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tty-solitaire -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -89,7 +89,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README.md TODO.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README TODO.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/tty-solitaire/tty-solitaire.info b/games/tty-solitaire/tty-solitaire.info index efc07d4cea..385adc8862 100644 --- a/games/tty-solitaire/tty-solitaire.info +++ b/games/tty-solitaire/tty-solitaire.info @@ -1,8 +1,8 @@ PRGNAM="tty-solitaire" -VERSION="1.1.0" +VERSION="1.3.1" HOMEPAGE="https://github.com/mpereira/tty-solitaire" -DOWNLOAD="https://github.com/mpereira/tty-solitaire/archive/v1.1.0/tty-solitaire-1.1.0.tar.gz" -MD5SUM="708bfc6032843fb1af0d35900f481f58" +DOWNLOAD="https://github.com/mpereira/tty-solitaire/archive/v1.3.1/tty-solitaire-1.3.1.tar.gz" +MD5SUM="ad993ea572af98ca9d2efdbf82233fa2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/vcmi/vcmi.SlackBuild b/games/vcmi/vcmi.SlackBuild index ac152b82d8..e6f2edf5d9 100644 --- a/games/vcmi/vcmi.SlackBuild +++ b/games/vcmi/vcmi.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vcmi -VERSION=${VERSION:-1.4.5} +VERSION=${VERSION:-1.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -94,6 +94,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_DIR=lib${LIBDIRSUFFIX} \ -DFORCE_BUNDLED_FL=FALSE \ + -DENABLE_INNOEXTRACT=OFF \ -DENABLE_TEST=OFF \ -Wno-dev \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/games/vcmi/vcmi.info b/games/vcmi/vcmi.info index 81c72b2fb7..75bd23a18a 100644 --- a/games/vcmi/vcmi.info +++ b/games/vcmi/vcmi.info @@ -1,8 +1,8 @@ PRGNAM="vcmi" -VERSION="1.4.5" +VERSION="1.5.2" HOMEPAGE="http://forum.vcmi.eu/portal.php" -DOWNLOAD="https://github.com/vcmi/vcmi/archive/1.4.5/vcmi-1.4.5.tar.gz" -MD5SUM="55d49469a2630abcb93c26ea3a97141b" +DOWNLOAD="https://github.com/vcmi/vcmi/archive/1.5.2/vcmi-1.5.2.tar.gz" +MD5SUM="b15988511eba5e2f3bd6d21330bf8c16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fuzzylite libminizip tbb luajit" diff --git a/games/vms-empire/vms-empire.SlackBuild b/games/vms-empire/vms-empire.SlackBuild index 643d4e9401..8cf8478c5b 100644 --- a/games/vms-empire/vms-empire.SlackBuild +++ b/games/vms-empire/vms-empire.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for vms-empire -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2014-2024 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,17 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# 20220221 bkw: Modified by SlackBuilds.org, BUILD=2: -# - fix build on 15.0. -# - binary in /usr/games. -# - symlink so man page name matches binary name. -# - fix .desktop file (abs paths). - cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vms-empire -VERSION=${VERSION:-1.14} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.17} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -96,10 +90,6 @@ sed -e '/^Icon/s,=.*,=/usr/share/pixmaps/vms-empire.png,' \ mkdir -p $PKG/usr/share/pixmaps/ install -m644 $PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png -mkdir -p $PKG/usr/man/man6 -gzip -9c < empire.6 > $PKG/usr/man/man6/empire.6.gz -ln -s empire.6.gz $PKG/usr/man/man6/$PRGNAM.6.gz - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS BUGS COPYING HACKING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/games/vms-empire/vms-empire.info b/games/vms-empire/vms-empire.info index c04f683ef3..a73eef1e90 100644 --- a/games/vms-empire/vms-empire.info +++ b/games/vms-empire/vms-empire.info @@ -1,10 +1,10 @@ PRGNAM="vms-empire" -VERSION="1.14" +VERSION="1.17" HOMEPAGE="http://catb.org/~esr/vms-empire/" -DOWNLOAD="http://www.catb.org/~esr/vms-empire/vms-empire-1.14.tar.gz" -MD5SUM="9defc2be52380171f293b5bfb4c5fa28" +DOWNLOAD="https://gitlab.com/esr/vms-empire/-/archive/1.17/vms-empire-1.17.tar.gz" +MD5SUM="bda055731de0b98db3b805a983148fb4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" +EMAIL="dslackw@gmail.com" diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild index 5cf5a0cef6..f02e429b68 100644 --- a/games/warzone2100/warzone2100.SlackBuild +++ b/games/warzone2100/warzone2100.SlackBuild @@ -101,6 +101,7 @@ cd build -DCMAKE_INSTALL_MANDIR=/usr/man \ -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ -DCMAKE_INSTALL_BINDIR=games \ + -DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF \ .. DESTDIR=$PKG cmake --build . --target install cd .. diff --git a/games/xconq/README b/games/xconq/README new file mode 100644 index 0000000000..3cec4cadc9 --- /dev/null +++ b/games/xconq/README @@ -0,0 +1,15 @@ + +xconq, a classic X-based strategic wargame. + +Save the world from the evil empires attempting to take +over. Multi-player over a network or single-player against the +machine. This is xconq v. 5.5.1a, the last stable version of xconq +version 5, from July of 1992. (Later versions through v. 7.5 are +available with revamped interface.) + +Options are available to set numbers and kinds of players, as well +as the map used. In addition, xconq has extensive and elaborate +facilities for building maps, scenarios, and historical periods, +resulting in a wide variety of games. This SlackBuild builds only +the "standard" period, corresponding roughly to the mid-to late +20th century. diff --git a/games/xconq/doinst.sh b/games/xconq/doinst.sh new file mode 100644 index 0000000000..2989e06f31 --- /dev/null +++ b/games/xconq/doinst.sh @@ -0,0 +1,13 @@ +# Update mkfontscale and mkfontdir: +if [ -x /usr/bin/mkfontdir ]; then + ( cd /usr/share/fonts/misc + mkfontscale . + mkfontdir . + ) +fi + +xset fp rehash + +# sbopkglint complains if we don't mention fc-cache. +# There. Happy now? + diff --git a/games/xconq/slack-desc b/games/xconq/slack-desc new file mode 100644 index 0000000000..f29f427b4a --- /dev/null +++ b/games/xconq/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xconq: xconq (X-based strategic wargame) +xconq: +xconq: Multi-player or single-player against the machine. Save the world +xconq: from the evil empires attempting to take over. Extensive and +xconq: elaborate facilities for building maps, scenarios, and historical +xconq: periods, resulting in a wide variety of games. +xconq: +xconq: Home page: https://sourceware.org/xconq/ +xconq: +xconq: +xconq: diff --git a/games/term2048/term2048.SlackBuild b/games/xconq/xconq.SlackBuild index cceb3d64dc..677ec3979f 100644 --- a/games/term2048/term2048.SlackBuild +++ b/games/xconq/xconq.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for term2048 +# Slackware build script for xconq -# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2024 Judah Milgram, Washington DC # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,15 @@ cd $(dirname $0) ; CWD=$(pwd) -PRGNAM=term2048 -VERSION=${VERSION:-0.2.5} +PRGNAM=xconq +VERSION=${VERSION:-5.5.1a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +# Fix tarball name: +ln -s xc${VERSION}.tar.gz ${PRGNAM}-${VERSION}.tar.gz + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -38,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -52,16 +52,14 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -70,28 +68,57 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz - +tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz +mv xc5.5.1 $PRGNAM-$VERSION cd $PRGNAM-$VERSION + chown -R root:root . + +# Patch +patch < $CWD/xconq.patch + find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG - +CCOPTIONS="${SLKCFLAGS} -w -fcompare-debug-second" +xmkmf +make CCOPTIONS="${CCOPTIONS}" per2c +make CCOPTIONS="${CCOPTIONS}" standard.c +make depend +make CCOPTIONS="${CCOPTIONS}" all +make install DESTDIR=$PKG +install XConq.ad $PKG/etc/X11/app-defaults +make install.man DESTDIR=$PKG +make docs + +# let doinst.sh make fonts.dir and fonts.scale +for f in fonts.dir fonts.scale; do + rm $PKG/usr/share/fonts/misc/$f +done + +# Strip 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 +# Compress +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +# Docs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES.txt LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + CHANGES README TODO custom.pdf period.pdf xconq.pdf xconq2.pdf lib/xconq.doc lib/custom.doc \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# slack-desc and doinst.sh mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Make the package cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/games/xconq/xconq.info b/games/xconq/xconq.info new file mode 100644 index 0000000000..3fcf182bcc --- /dev/null +++ b/games/xconq/xconq.info @@ -0,0 +1,10 @@ +PRGNAM="xconq" +VERSION="5.5.1a" +HOMEPAGE="https://xconq.sourceforge.net/" +DOWNLOAD="https://sourceforge.net/projects/xconq/files/xconq-unsupported/archeological-findings/xc5.5.1a.tar.gz" +MD5SUM="7d3f884eb36a31c183c6b7cb5e2a0368" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Judah Milgram" +EMAIL="milgram cgpp com" diff --git a/games/xconq/xconq.patch b/games/xconq/xconq.patch new file mode 100644 index 0000000000..5065bb0dd5 --- /dev/null +++ b/games/xconq/xconq.patch @@ -0,0 +1,152 @@ +--- xc5.5.1/Imakefile 1992-07-18 19:57:53.000000000 -0400 ++++ patch/Imakefile 2024-06-14 07:26:46.131400787 -0400 +@@ -31,7 +31,7 @@ + ## The {n,t,g,sq}roff command you use to generate ASCII docs + ## from manuscript (ms) format. + +-NROFF=nroff -ms ++NROFF=groff -T pdf -ms + + + ## If you want to change any of the names, do so here +@@ -44,7 +44,7 @@ + ## XCONQLIB is where the period/map/scenario files will be installed. + ## The default is amongst other X applications libraries. + +-XCONQLIB=/tmp/judd/xconq/xconq/lib ++XCONQLIB=/usr/lib/xconq + + + ## XAPPLRESDIR is where the application resource defaults are installed. +@@ -66,12 +66,12 @@ + ## Normally this is (should be) the standard X bin directory. Modify + ## if necessary. + +-XCONQBIN=/usr/local/games/ ++XCONQBIN=/usr/bin + + + ## If your system uses different curses libs, change them here + +-CURSESLIB=-lcurses -ltermlib ++CURSESLIB=-lcurses + + + ## If your system needs strcasecmp, uncomment the definitions below. +@@ -116,7 +116,7 @@ + $(XFONTDIR) $(CRMODE) $(BCOPY) $(SELECT) $(IS_UNIX) $(USESNF) + + ## Additional make suffixes supported by this file +-.SUFFIXES: $(SUFFIXES) .ms .doc .per ++.SUFFIXES: $(SUFFIXES) .ms .pdf .per + + + ## ******* THE MAIN PROGRAM *********************** +@@ -152,13 +152,13 @@ + ## ******* DOCS *********************** + + +-.ms.doc: ++.ms.pdf: + $(NROFF) $< > $@ + +-docs: xconq.doc xconq2.doc custom.doc period.doc ++docs: xconq.pdf xconq2.pdf custom.pdf period.pdf + + clean:: +- $(RM) *.doc ++ $(RM) *.pdf + + + ## ******* PERIODS *********************** +@@ -169,7 +169,7 @@ + + .per.c: + $(RM) $@ +- per2c < $< > $@ ++ ./per2c < $< > $@ + + standard.c: per2c lib/$(PERIOD).c + $(RM) $@ +@@ -182,9 +182,9 @@ + ## ******* THE LIBRARY *********************** + + install:: ./lib +- MakeDir($(XCONQLIB)) +- for i in `ls lib`; do (set -x; \ +- $(INSTALL) -c $(INSTDATFLAGS) ./lib/$$i $(XCONQLIB)); done ++ MakeDir($(DESTDIR)$(XCONQLIB)) ++ for i in `ls lib`; do (set -x; \ ++ $(INSTALL) -c $(INSTDATFLAGS) ./lib/$$i $(DESTDIR)$(XCONQLIB)); done + + + ## ******* FONTS *********************** +@@ -205,13 +205,13 @@ + ##ifdef SnfFonts + OBJS=xconq.snf standard.snf + ##else +-OBJS=xconq.pcf standard.pcf ++OBJS=xconq.pcf.gz standard.pcf.gz + ##endif + + FontTarget(xconq) + FontTarget(standard) + MakeFonts() +-InstallFonts($(FONTDIR)/misc/xconq) ++InstallFonts($(FONTDIR)/misc) + + + ## ******** MISCELLANEOUS *********************** +--- xc5.5.1/X11.c 1992-08-15 01:15:13.000000000 -0400 ++++ patch/X11.c 2024-05-31 00:22:27.258096071 -0400 +@@ -4,6 +4,8 @@ + /* This program may be used, copied, modified, and redistributed freely */ + /* for noncommercial purposes, so long as this notice remains intact. */ + ++#include <stdlib.h> ++ + /* Interface implementations for the X11 version of xconq. */ + + #include "config.h" +@@ -310,7 +312,7 @@ + already_been_here = TRUE; + write_savefile("emergency.save.xconq"); + if (sig != 2) +- abort(1); ++ abort(); + else exit(1); + } + } +--- xc5.5.1/curses.c 1992-07-18 19:57:59.000000000 -0400 ++++ patch/curses.c 2024-06-02 00:21:45.142002331 -0400 +@@ -500,8 +500,7 @@ + + /* Beep the beeper! */ + +-beep(side) +-Side *side; ++beep(void) + { + putchar('\007'); + } +--- xc5.5.1/misc.h 1992-07-26 22:17:48.000000000 -0400 ++++ patch/misc.h 2024-06-04 00:20:00.690228027 -0400 +@@ -56,7 +56,6 @@ + #endif + void recenter(); + #ifdef UNIX +-extern char *malloc(); + extern char *getenv(); + #endif UNIX + extern int unwrap(); +--- xc5.5.1/util.c 1992-07-26 22:17:25.000000000 -0400 ++++ patch/util.c 2024-06-04 00:20:52.225579207 -0400 +@@ -10,7 +10,7 @@ + #include "map.h" + + #ifndef DEBUG +-char *procedure_executing[PROCSTACKSIZE], *routine_executing; ++char *procedure_executing[PROCSTACKSIZE]; + int procedure_stack_ptr = -1; + #endif + diff --git a/games/xemu/xemu.info b/games/xemu/xemu.info index a2cbec71ae..bda2968318 100644 --- a/games/xemu/xemu.info +++ b/games/xemu/xemu.info @@ -17,7 +17,7 @@ MD5SUM_x86_64="f5d4863774ec134b7a7eac371e5b45b6 \ f55989cc5fd27ee7cbf8addcec370275 \ 7f9dcf287b6e7c2fafcc2ffcd4e22c0a \ bc067af8983f58ff4fb492a5fc79dae6 \ - 109a1dc5d8c7ed5745a78e78a5cfd7f2 \ + 2766ec9d09dd7fa3aa94c318b5f5e3b3 \ cfb9f8a87e1b685ca10fe4e0992c76fe" REQUIRES="libslirp tomlplusplus" MAINTAINER="Steven Voges" |