Request 5350 (accepted)

garglk.changes Changed

@@ -1,4 +1,33 @@
 -------------------------------------------------------------------
+Wed Mar 10 17:29:22 UTC 2021 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 2019.1.1
+  * Bugfix release
+  version 2019.1:
+  * Updated interpreters
+    + Alan3 3.0b6
+    + Bocfel 1.0.1
+    + Git 1.3.5
+    + Glulxe 0.5.4
+    + Hugo 3.3.0
+    + Jacl 2.9.0
+    + Tads2 2.5.17
+    + Tads3 3.1.3
+  * Improved Gtk implementation
+    + Text-to-speech support
+    + The built-in fonts support a much wider range of Unicode
+    + Full screen support
+    + Various accumulated small fixes and updates
+- Drop garglk.babel-include.diff and garglk.patch (merged
+  upstream)
+- Drop garglk.smpeg.patch (no longer necessary)
+- Rebase garglk-optflags.patch and enable it
+- Add garglk-fix_multiple_definitions_1.patch and
+  garglk-fix_multiple_definitions_2.patch
+- Add new package ftjam as build requirement to fix the build on
+  Tumbleweed
+
+-------------------------------------------------------------------
 Fri Feb 26 12:28:32 UTC 2016 - olaf@aepfle.de
 
 - Update to 2011.1

garglk.spec Changed

@@ -1,6 +1,7 @@
 #
-# spec file for package 
+# spec file for package garglk
 #
+# Copyright (c) 2021 Packman Team <packman@links2linux.de>
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,37 +13,35 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
-Name:           garglk
-Version:        2011.1
+
 %define soname  0
+Name:           garglk
+Version:        2019.1.1
 Release:        0
-License: GPL-2.0
 Summary:        Cross-platform IO layer for an interactive fiction player
-Url:            http://code.google.com/p/garglk/
+### there's more in subpackages, recheck
+License:        GPL-2.0-or-later
 Group:          Amusements/Games/Other
-# http://garglk.googlecode.com/files/gargoyle-%{version}-sources.zip
-Source:         https://github.com/garglk/garglk/archive/stable-%{version}.tar.gz
+URL:            https://code.google.com/p/garglk/
+# http://garglk.googlecode.com/files/gargoyle-%%{version}-sources.zip
+Source:         https://github.com/garglk/garglk/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        gargoyle.1
-Patch1:         garglk.babel-include.diff
-Patch2:         garglk.patch
-Patch3:         garglk.smpeg.patch
-BuildRequires:  boost-jam
-BuildRequires:  zlib-devel
-BuildRequires:  gtk2-devel
-%if 0%{?suse_version} >= 1140
-BuildRequires:  libjpeg62-devel
-%else
-BuildRequires:  libjpeg-devel
-%endif
-BuildRequires:  gcc-c++
+Patch0:         garglk-optflags.patch
+Patch5:         garglk-fix_multiple_definitions_1.patch
+Patch6:         garglk-fix_multiple_definitions_2.patch
 BuildRequires:  SDL-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_sound-devel
+BuildRequires:  dos2unix
+BuildRequires:  ftjam
+BuildRequires:  gcc-c++
+BuildRequires:  gtk2-devel
 BuildRequires:  libvorbis-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  zlib-devel
+BuildRequires:  libjpeg62-devel
 
 %description
 Gargoyle is an IF player that supports all the major interactive fiction formats.
@@ -50,21 +49,18 @@
 These portable game files come in many formats.In the past,
 you used to have to download a separate player (interpreter) for each format of IF you wanted to play.
 Gargoyle is based on the standard interpreters for the formats it supports.
-Gargoyle is free software released under the terms of the GNU General Public License. 
+Gargoyle is free software released under the terms of the GNU General Public License.
 
 %prep
-%setup -q -n "%{name}-stable-%{version}"
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-ls -lA
+%autosetup -p1
+dos2unix "licenses/Artistic License 2.0.txt"
 
 %build
 BUILD=DEBUG \
-CFLAGS="%{optflags} -std=gnu++98" \
-CCFLAGS="%{optflags} -std=gnu++98" \
-CXXFLAGS="%{optflags} -std=gnu++98" \
-OPTFLAGS="%{optflags} -std=gnu++98" \
+CFLAGS="%{optflags}" \
+CCFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
+OPTFLAGS="%{optflags}" \
 _BINDIR="%{_bindir}" \
 _LIBDIR="%{_libdir}" \
 _APPDIR="%{_libdir}/%{name}" \
@@ -72,28 +68,27 @@
 
 %install
 BUILD=DEBUG \
-CFLAGS="%{optflags} -std=gnu++98" \
-CCFLAGS="%{optflags} -std=gnu++98" \
-CXXFLAGS="%{optflags} -std=gnu++98" \
-OPTFLAGS="%{optflags} -std=gnu++98" \
+CFLAGS="%{optflags}" \
+CCFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
+OPTFLAGS="%{optflags}" \
 _BINDIR="%{_bindir}" \
 _LIBDIR="%{_libdir}" \
 _APPDIR="%{_libdir}/%{name}" \
-DESTDIR="%{buildroot}" \
+DESTDIR=%{buildroot} \
 jam -d3 install
 
-%__install -Dm0644 %{S:1} %{buildroot}/%{_mandir}/man1/gargoyle.1
+install -Dm0644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/gargoyle.1
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc License.txt licenses/*
+%license License.txt
+%doc licenses/*
 %{_bindir}/gargoyle
 %{_libdir}/libgarglk.so
 %{_libdir}/%{name}
-%doc %{_mandir}/man1/gargoyle.1*
+%{_mandir}/man1/gargoyle.1%{?ext_man}
 
 %changelog

garglk-fix_multiple_definitions_1.patch Added

@@ -0,0 +1,118 @@
+From e7038f7e899a73992c3bbfbbfb91abdd32064092 Mon Sep 17 00:00:00 2001
+From: Chris Spiegel <cspiegel@gmail.com>
+Date: Sun, 10 May 2020 21:10:09 -0700
+Subject: [PATCH] Fix incorrect global declarations.
+
+The standard (and now gcc) requires that globals (with external linkage)
+be marked extern in headers, and defined in one (and only one) .c file.
+A few interpreters violated this rule, and therefore broke with the
+latest gcc version. Update them to conform to the standard.
+---
+ terps/alan2/glkio.h      | 4 ++--
+ terps/alan2/main.c       | 3 +++
+ terps/alan3/glkio.h      | 4 ++--
+ terps/alan3/output.h     | 4 ++--
+ terps/alan3/term.h       | 2 +-
+ terps/jacl/glk_startup.c | 2 +-
+ terps/jacl/parser.c      | 2 +-
+ 7 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/terps/alan2/glkio.h b/terps/alan2/glkio.h
+index c12d04f4..8c3c683c 100644
+--- a/terps/alan2/glkio.h
++++ b/terps/alan2/glkio.h
+@@ -11,8 +11,8 @@
+ 
+ #include "glk.h"
+ 
+-winid_t glkMainWin;
+-winid_t glkStatusWin;
++extern winid_t glkMainWin;
++extern winid_t glkStatusWin;
+ 
+ /* NB: this header must be included in any file which calls printf() */
+ 
+diff --git a/terps/alan2/main.c b/terps/alan2/main.c
+index 84903953..65989124 100644
+--- a/terps/alan2/main.c
++++ b/terps/alan2/main.c
+@@ -43,6 +43,9 @@
+ 
+ /* PUBLIC DATA */
+ 
++winid_t glkMainWin;
++winid_t glkStatusWin;
++
+ /* The Amachine memory */
+ Aword *memory;
+ static AcdHdr dummyHeader;	/* Dummy to use until memory allocated */
+diff --git a/terps/alan3/glkio.h b/terps/alan3/glkio.h
+index 1a121171..70b4148c 100644
+--- a/terps/alan3/glkio.h
++++ b/terps/alan3/glkio.h
+@@ -11,8 +11,8 @@
+ 
+ #include "glk.h"
+ 
+-winid_t glkMainWin;
+-winid_t glkStatusWin;
++static winid_t glkMainWin;
++static winid_t glkStatusWin;
+ 
+ /* NB: this header must be included in any file which calls printf() */
+ 
+diff --git a/terps/alan3/output.h b/terps/alan3/output.h
+index c01aaaa7..25bcfde2 100644
+--- a/terps/alan3/output.h
++++ b/terps/alan3/output.h
+@@ -22,9 +22,9 @@ extern bool capitalize;
+ /* Log file */
+ #ifdef HAVE_GLK
+ #include "glk.h"
+-strid_t logFile;
++extern strid_t logFile;
+ #else
+-FILE *logFile;
++extern FILE *logFile;
+ #endif
+ 
+ 
+diff --git a/terps/alan3/term.h b/terps/alan3/term.h
+index a7f5f1b6..148ae10b 100644
+--- a/terps/alan3/term.h
++++ b/terps/alan3/term.h
+@@ -10,7 +10,7 @@
+ 
+ 
+ /* DATA */
+-bool onStatusLine;
++extern bool onStatusLine;
+ 
+ 
+ /* FUNCTIONS */
+diff --git a/terps/jacl/glk_startup.c b/terps/jacl/glk_startup.c
+index e704a334..a07dade9 100644
+--- a/terps/jacl/glk_startup.c
++++ b/terps/jacl/glk_startup.c
+@@ -31,7 +31,7 @@ extern short int	release;
+ glkunix_startup_t *arguments;
+ 
+ /* THE STREAM FOR OPENING UP THE ARCHIVE CONTAINING GRAPHICS AND SOUND */
+-strid_t				blorb_stream;
++extern strid_t				blorb_stream;
+ 
+ /* PROTOTYPE FOR NEEDED UTILITY FUNCTION */
+ void create_paths();
+diff --git a/terps/jacl/parser.c b/terps/jacl/parser.c
+index fd6747a1..47ce8b31 100644
+--- a/terps/jacl/parser.c
++++ b/terps/jacl/parser.c
+@@ -62,7 +62,7 @@ char							*from_word;
+ 
+ int								object_expected = FALSE;
+ 
+-char							default_function[84];
++extern char							default_function[84];
+ char							object_name[84];
+ 
+ char				            base_function[84];

garglk-fix_multiple_definitions_2.patch Added

@@ -0,0 +1,106 @@
+From 91c0b740ef4224f25e1595cb2e456452dc5e25b9 Mon Sep 17 00:00:00 2001
+From: Chris Spiegel <cspiegel@gmail.com>
+Date: Sun, 10 May 2020 21:01:05 -0700
+Subject: [PATCH] Increase internal linkage in garglk.
+
+Versions of gcc prior to 10 were fine with multiple tentative
+definitions, but with 10 they now become linker errors. In fact, these
+variables are *not* meant to be related, but instead are meant to be
+confined to their own files. It just so happens that some of their names
+overlap, so they were being shared. The intent is *not* to share, so
+it's correct to give them internal linkage.
+---
+ garglk/launcher.c  |  8 ++++----
+ garglk/launchgtk.c |  6 +++---
+ garglk/launchmac.m | 10 +++++-----
+ garglk/launchwin.c | 10 +++++-----
+ 4 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/garglk/launcher.c b/garglk/launcher.c
+index e479b440..f19b9764 100644
+--- a/garglk/launcher.c
++++ b/garglk/launcher.c
+@@ -48,10 +48,10 @@
+ #define ID_GLUL (giblorb_make_id('G','L','U','L'))
+ 
+ #define MaxBuffer 1024
+-char tmp[MaxBuffer];
+-char terp[MaxBuffer];
+-char exe[MaxBuffer];
+-char flags[MaxBuffer];
++static char tmp[MaxBuffer];
++static char terp[MaxBuffer];
++static char exe[MaxBuffer];
++static char flags[MaxBuffer];
+ 
+ int runblorb(char *path, char *game)
+ {
+diff --git a/garglk/launchgtk.c b/garglk/launchgtk.c
+index 248954f8..505c4020 100644
+--- a/garglk/launchgtk.c
++++ b/garglk/launchgtk.c
+@@ -41,9 +41,9 @@ static const char * AppName = "Gargoyle " VERSION;
+ static const char * LaunchingTemplate = "%s/%s";
+ static const char * DirSeparator = "/";
+ 
+-char dir[MaxBuffer];
+-char buf[MaxBuffer];
+-char tmp[MaxBuffer];
++static char dir[MaxBuffer];
++static char buf[MaxBuffer];
++static char tmp[MaxBuffer];
+ 
+ struct filter
+ {
+diff --git a/garglk/launchmac.m b/garglk/launchmac.m
+index 4a890650..5de70181 100644
+--- a/garglk/launchmac.m
++++ b/garglk/launchmac.m
+@@ -40,13 +40,13 @@
+ static const char * LaunchingTemplate = "%s/%s";
+ static const char * DirSeparator = "/";
+ 
+-char dir[MaxBuffer];
+-char buf[MaxBuffer];
+-char tmp[MaxBuffer];
+-char etc[MaxBuffer];
++static char dir[MaxBuffer];
++static char buf[MaxBuffer];
++static char tmp[MaxBuffer];
++static char etc[MaxBuffer];
+ 
+ enum FILEFILTERS { FILTER_SAVE, FILTER_TEXT, FILTER_ALL };
+-char *winfilters[] =
++static char *winfilters[] =
+ {
+     "sav",
+     "txt",
+diff --git a/garglk/launchwin.c b/garglk/launchwin.c
+index 90d7199a..30108c97 100644
+--- a/garglk/launchwin.c
++++ b/garglk/launchwin.c
+@@ -33,11 +33,11 @@ static const char * AppName = "Gargoyle " VERSION;
+ static const char * LaunchingTemplate = "\"%s\\%s.exe\" %s \"%s\"";
+ static const char * DirSeparator = "\\";
+ 
+-char dir[MaxBuffer];
+-char buf[MaxBuffer];
+-char tmp[MaxBuffer];
++static char dir[MaxBuffer];
++static char buf[MaxBuffer];
++static char tmp[MaxBuffer];
+ 
+-char filterlist[] =
++static char filterlist[] =
+ "All Games\0*.taf;*.agx;*.d$$;*.acd;*.a3c;*.asl;*.cas;*.ulx;*.hex;*.jacl;*.j2;*.gam;*.t3;*.z?;*.l9;*.sna;*.mag;*.dat;*.saga;*.blb;*.glb;*.zlb;*.blorb;*.gblorb;*.zblorb\0"
+ "Adrift Games (*.taf)\0*.taf\0"
+ "AdvSys Games (*.dat)\0*.dat\0"
+@@ -65,7 +65,7 @@ void winmsg(const char *msg)
+     MessageBox(NULL, msg, AppName, MB_ICONERROR);
+ }
+ 
+-int urldecode(char *decoded, unsigned int maxlen, const char *encoded)
++static int urldecode(char *decoded, unsigned int maxlen, const char *encoded)
+ {
+     unsigned int i;
+     int convert, ascii;

garglk-optflags.patch Changed

garglk.babel-include.diff Deleted

garglk.patch Deleted

garglk.smpeg.patch Deleted

garglk-2019.1.1.tar.gz Added

stable-2011.1.tar.gz Deleted

Overview

Request 5350 (accepted)

Request History