Compare commits
No commits in common. "rawhide" and "f36" have entirely different histories.
2 changed files with 4 additions and 94 deletions
|
|
@ -1,62 +0,0 @@
|
|||
diff -up xblast-2.10.4/atom.c~ xblast-2.10.4/atom.c
|
||||
--- xblast-2.10.4/atom.c~ 2006-02-09 22:21:22.000000000 +0100
|
||||
+++ xblast-2.10.4/atom.c 2022-07-16 17:36:05.151322538 +0200
|
||||
@@ -168,6 +168,7 @@ XBAtom atomRight;
|
||||
XBAtom atomRightKeyboard;
|
||||
XBAtom atomScrambleDel;
|
||||
XBAtom atomScrambleDraw;
|
||||
+XBAtom atomSDL;
|
||||
XBAtom atomSelect;
|
||||
XBAtom atomServer;
|
||||
XBAtom atomShape;
|
||||
@@ -373,6 +374,7 @@ InitDefaultAtoms (void)
|
||||
atomRightKeyboard = GUI_StringToAtom ("rightKeyboard");
|
||||
atomScrambleDel = GUI_StringToAtom ("scrambleDel");
|
||||
atomScrambleDraw = GUI_StringToAtom ("scrambleDraw");
|
||||
+ atomSDL = GUI_StringToAtom ("sdl");
|
||||
atomSelect = GUI_StringToAtom ("select");
|
||||
atomServer = GUI_StringToAtom ("server");
|
||||
atomShape = GUI_StringToAtom ("shape");
|
||||
diff -up xblast-2.10.4/atom.h~ xblast-2.10.4/atom.h
|
||||
--- xblast-2.10.4/atom.h~ 2006-02-09 22:21:22.000000000 +0100
|
||||
+++ xblast-2.10.4/atom.h 2022-07-16 17:36:05.687320493 +0200
|
||||
@@ -163,6 +163,7 @@ extern XBAtom atomRight;
|
||||
extern XBAtom atomRightKeyboard;
|
||||
extern XBAtom atomScrambleDel;
|
||||
extern XBAtom atomScrambleDraw;
|
||||
+extern XBAtom atomSDL;
|
||||
extern XBAtom atomSelect;
|
||||
extern XBAtom atomServer;
|
||||
extern XBAtom atomShape;
|
||||
diff -up xblast-2.10.4/sdl_config.c~ xblast-2.10.4/sdl_config.c
|
||||
--- xblast-2.10.4/sdl_config.c~ 2006-02-09 22:21:24.000000000 +0100
|
||||
+++ xblast-2.10.4/sdl_config.c 2022-07-16 17:36:30.294228033 +0200
|
||||
@@ -149,7 +149,7 @@ GetColorConfig (void)
|
||||
void
|
||||
GUI_LoadConfig (void)
|
||||
{
|
||||
- dbGui = DB_Create (DT_Config, atomX11);
|
||||
+ dbGui = DB_Create (DT_Config, atomSDL);
|
||||
assert (dbGui != NULL);
|
||||
if (DB_Load (dbGui)) {
|
||||
return;
|
||||
diff -up xblast-2.10.4/x11_config.c~ xblast-2.10.4/x11_config.c
|
||||
--- xblast-2.10.4/x11_config.c~ 2006-02-09 22:21:25.000000000 +0100
|
||||
+++ xblast-2.10.4/x11_config.c 2022-07-16 17:33:34.640897215 +0200
|
||||
@@ -101,6 +101,16 @@ GetFontConfig (void)
|
||||
DB_GetEntryString (section, atomSmall, &cfgFont.small);
|
||||
DB_GetEntryString (section, atomMedium, &cfgFont.medium);
|
||||
DB_GetEntryString (section, atomLarge, &cfgFont.large);
|
||||
+ /*
|
||||
+ * detect old SDL version which saved its settings (which
|
||||
+ * are invalid for x11) to x11.cfg, in this case fall back
|
||||
+ * to the default font settings.
|
||||
+ */
|
||||
+ if (!strcmp (cfgFont.small, "14")) {
|
||||
+ memcpy (&cfgFont, &defaultFontConfig, sizeof (CFGFont));
|
||||
+ StoreFontConfig (&cfgFont);
|
||||
+ DB_Store (dbGui);
|
||||
+ }
|
||||
}
|
||||
return &cfgFont;
|
||||
} /* GetFontConfig */
|
||||
36
xblast.spec
36
xblast.spec
|
|
@ -1,9 +1,8 @@
|
|||
Name: xblast
|
||||
Version: 2.10.4
|
||||
Release: 43%{?dist}
|
||||
Release: 34%{?dist}
|
||||
Summary: Lay bombs and Blast the other players of the field (SDL version)
|
||||
# Automatically converted from old format: GPLv2+ - review is highly recommended.
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
URL: http://xblast.sourceforge.net
|
||||
Source0: http://downloads.sourceforge.net/xblast/xblast-%{version}.tar.gz
|
||||
Source1: xblast.sh
|
||||
|
|
@ -15,8 +14,8 @@ Source6: xblast.appdata.xml
|
|||
Patch0: xblast-2.10.4-sdl-fixes.patch
|
||||
Patch1: xblast-2.10.4-manpage.patch
|
||||
Patch2: xblast-2.10.4-fcommon-fix.patch
|
||||
Patch3: xblast-2.10.4-font-config-fix.patch
|
||||
BuildRequires: gcc make
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libXt-devel gettext gawk desktop-file-utils SDL_gfx-devel
|
||||
BuildRequires: SDL_image-devel SDL_ttf-devel SDL_mixer-devel SDL_net-devel
|
||||
BuildRequires: libappstream-glib
|
||||
|
|
@ -120,33 +119,6 @@ appstream-util validate-relax --nonet \
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 2.10.4-41
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-38
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jul 16 2022 Hans de Goede <hdegoede@redhat.com> - 2.10.4-35
|
||||
- Fix xblast-x11 crashing with BadFont error after using xblast-sdl (#2107144)
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue