r15917 - packages/trunk/freesynd/debian/patches
Lubos Novak
lubos-guest at moszumanska.debian.org
Mon Oct 31 11:23:01 UTC 2016
Author: lubos-guest
Date: 2016-10-31 11:23:01 +0000 (Mon, 31 Oct 2016)
New Revision: 15917
Removed:
packages/trunk/freesynd/debian/patches/01_remove_dump_and_dumpmaps_programs.patches
packages/trunk/freesynd/debian/patches/02_update_music_and_data_path.patches
packages/trunk/freesynd/debian/patches/03_use_only_xmi_files_for_music.patches
packages/trunk/freesynd/debian/patches/04_resolving_calloc_error.patches
packages/trunk/freesynd/debian/patches/05_remove_the_typdef_warning_due_to_gplusplus_4.3_compiler.patches
Log:
remove old patches
Deleted: packages/trunk/freesynd/debian/patches/01_remove_dump_and_dumpmaps_programs.patches
===================================================================
--- packages/trunk/freesynd/debian/patches/01_remove_dump_and_dumpmaps_programs.patches 2016-10-29 07:55:43 UTC (rev 15916)
+++ packages/trunk/freesynd/debian/patches/01_remove_dump_and_dumpmaps_programs.patches 2016-10-31 11:23:01 UTC (rev 15917)
@@ -1,13 +0,0 @@
-Index: freesynd-0.2.dsfg/Makefile
-===================================================================
---- freesynd-0.2.dsfg.orig/Makefile 2008-04-15 22:36:53.000000000 +0200
-+++ freesynd-0.2.dsfg/Makefile 2008-04-15 22:37:18.000000000 +0200
-@@ -31,7 +31,7 @@
- OBJS = $(SRC:.cpp=.o)
- DEPS = $(SRC:.cpp=.d)
-
--all: $(TARGET) $(DUMP_TARGET) $(DUMPMAPS_TARGET)
-+all: $(TARGET)
-
- $(TARGET): $(OBJS)
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SDL_LIBS) $(SDL_MIXER_LIBS) -lpng
Deleted: packages/trunk/freesynd/debian/patches/02_update_music_and_data_path.patches
===================================================================
--- packages/trunk/freesynd/debian/patches/02_update_music_and_data_path.patches 2016-10-29 07:55:43 UTC (rev 15916)
+++ packages/trunk/freesynd/debian/patches/02_update_music_and_data_path.patches 2016-10-31 11:23:01 UTC (rev 15917)
@@ -1,45 +0,0 @@
-Index: freesynd-0.2.dsfg/file.cpp
-===================================================================
---- freesynd-0.2.dsfg.orig/file.cpp 2008-04-15 22:42:41.000000000 +0200
-+++ freesynd-0.2.dsfg/file.cpp 2008-04-15 22:43:14.000000000 +0200
-@@ -31,7 +31,7 @@
- #include "file.h"
- #include "dernc.h"
-
--char File::_path[240] = "./data/";
-+char File::_path[240] = "/usr/share/freesynd-data/data/";
-
-
- const char *File::fileFullPath(const char *filename, bool uppercase)
-Index: freesynd-0.2.dsfg/musicmanager.cpp
-===================================================================
---- freesynd-0.2.dsfg.orig/musicmanager.cpp 2008-04-15 22:39:54.000000000 +0200
-+++ freesynd-0.2.dsfg/musicmanager.cpp 2008-04-15 22:42:03.000000000 +0200
-@@ -61,9 +61,9 @@
-
- #if USE_INTRO_MP3
- tracks_.push_back(new Music);
-- tracks_.back()->loadMusicFile("intro.mp3");
-+ tracks_.back()->loadMusicFile("/usr/share/freesynd-data/intro.mp3");
- #else
-- data = File::loadFile("INTRO.XMI", size);
-+ data = File::loadFile("intro.xmi", size);
- tracks = xmidi.convertXMidi(data, size);
- for (unsigned int i = 0; i < tracks.size(); ++i) {
- tracks_.push_back(new Music);
-@@ -72,13 +72,13 @@
- delete[] data;
- #endif
-
-- data = File::loadFile("SYNGAME.XMI", size);
-+ data = File::loadFile("syngame.xmi", size);
- tracks = xmidi.convertXMidi(data, size);
- for (unsigned int i = 0; i < tracks.size(); ++i) {
- if (i == 0) {
- #if USE_ASSASSINATE_MP3
- tracks_.push_back(new Music);
-- tracks_.back()->loadMusicFile("assassinate.mp3");
-+ tracks_.back()->loadMusicFile("/usr/share/freesynd-data/assassinate.mp3");
- #else
- tracks_.push_back(new Music);
- tracks_.back()->loadMusic(tracks[i].data_, tracks[i].size_);
Deleted: packages/trunk/freesynd/debian/patches/03_use_only_xmi_files_for_music.patches
===================================================================
--- packages/trunk/freesynd/debian/patches/03_use_only_xmi_files_for_music.patches 2016-10-29 07:55:43 UTC (rev 15916)
+++ packages/trunk/freesynd/debian/patches/03_use_only_xmi_files_for_music.patches 2016-10-31 11:23:01 UTC (rev 15917)
@@ -1,14 +0,0 @@
-Index: freesynd-0.2.dsfg/config.h
-===================================================================
---- freesynd-0.2.dsfg.orig/config.h 2008-04-15 22:51:30.000000000 +0200
-+++ freesynd-0.2.dsfg/config.h 2008-04-15 22:51:44.000000000 +0200
-@@ -33,7 +33,7 @@
- //#undef HAVE_SDL_MIXER_1_2_7
- #define HAVE_SDL_MIXER_1_2_7 1
-
--#define USE_INTRO_MP3 1
--#define USE_ASSASSINATE_MP3 1
-+#define USE_INTRO_MP3 0
-+#define USE_ASSASSINATE_MP3 0
-
- #endif
Deleted: packages/trunk/freesynd/debian/patches/04_resolving_calloc_error.patches
===================================================================
--- packages/trunk/freesynd/debian/patches/04_resolving_calloc_error.patches 2016-10-29 07:55:43 UTC (rev 15916)
+++ packages/trunk/freesynd/debian/patches/04_resolving_calloc_error.patches 2016-10-31 11:23:01 UTC (rev 15917)
@@ -1,25 +0,0 @@
-Index: freesynd-0.2.dsfg/dump.cpp
-===================================================================
---- freesynd-0.2.dsfg.orig/dump.cpp 2008-03-15 16:33:21.000000000 +0100
-+++ freesynd-0.2.dsfg/dump.cpp 2008-03-15 16:33:34.000000000 +0100
-@@ -5,7 +5,7 @@
- #include <png.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--
-+#include <cstdlib>
-
- class App : public Singleton < App > {
- public:
-Index: freesynd-0.2.dsfg/dumpmaps.cpp
-===================================================================
---- freesynd-0.2.dsfg.orig/dumpmaps.cpp 2008-03-15 16:33:38.000000000 +0100
-+++ freesynd-0.2.dsfg/dumpmaps.cpp 2008-03-15 16:33:49.000000000 +0100
-@@ -5,6 +5,7 @@
- #include <png.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <cstdlib>
-
- class App : public Singleton < App > {
- public:
Deleted: packages/trunk/freesynd/debian/patches/05_remove_the_typdef_warning_due_to_gplusplus_4.3_compiler.patches
===================================================================
--- packages/trunk/freesynd/debian/patches/05_remove_the_typdef_warning_due_to_gplusplus_4.3_compiler.patches 2016-10-29 07:55:43 UTC (rev 15916)
+++ packages/trunk/freesynd/debian/patches/05_remove_the_typdef_warning_due_to_gplusplus_4.3_compiler.patches 2016-10-31 11:23:01 UTC (rev 15917)
@@ -1,22 +0,0 @@
-Index: freesynd-0.2.dsfg/keys.h
-===================================================================
---- freesynd-0.2.dsfg.orig/keys.h 2008-03-15 22:37:15.000000000 +0100
-+++ freesynd-0.2.dsfg/keys.h 2008-03-15 22:37:49.000000000 +0100
-@@ -293,7 +293,7 @@
- KEY_POWER = 320,
- KEY_EURO = 321,
- KEY_UNDO = 322,
--};
-+} Key;
-
- // Valid key modifiers
- // (Again, a direct copy of the SDLMod enum)
-@@ -311,7 +311,7 @@
- KMD_CAPS = 0x2000,
- KMD_MODE = 0x4000,
- KMD_RESERVED = 0x8000
--};
-+} KeyMod;
-
- const int KMD_CTRL = KMD_LCTRL | KMD_RCTRL;
- const int KMD_SHIFT = KMD_LSHIFT | KMD_RSHIFT;
More information about the Pkg-games-commits
mailing list