summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO4
-rw-r--r--0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch171
-rw-r--r--PKGBUILD15
3 files changed, 183 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 248882c6063e..313f02d6fb24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = tomatoes
pkgdesc = How many tomatoes can you smash in ten short minutes?
pkgver = 1.55
- pkgrel = 11
+ pkgrel = 12
url = http://tomatoes.sourceforge.net
arch = i686
arch = x86_64
@@ -13,11 +13,13 @@ pkgbase = tomatoes
source = http://downloads.sourceforge.net/tomatoes/tomatoes-linux-1.5.tar.bz2
source = 0001-tomatoes-1.55-makefile-Append-to-compile-flags.patch
source = 0002-tomatoes-1.55-Quell-const-char-conversion-warnings.patch
+ source = 0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch
source = config.cfg
sha1sums = aa123a5fa9c8c0223c602c0cffe8a5bb0ebad60c
sha1sums = 8dc306617800f7ccc1e8610fb39e87d8181c482d
sha1sums = 65faa7dc05d4f5629339cf4150f5dcbf2626e3a5
sha1sums = 6ad404f67a05781efe8787773e352af1a2922c60
+ sha1sums = 77c85236c92f1746aa1b9ec0f42951b15a73eda9
sha1sums = e241ac2f76abad1f618e20f8e2d0089cdfa555af
pkgname = tomatoes
diff --git a/0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch b/0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch
new file mode 100644
index 000000000000..a3c1f9b9173b
--- /dev/null
+++ b/0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch
@@ -0,0 +1,171 @@
+Subject: Fix code for loading / saving config and hiscore file
+
+--- include/config.h 2016-11-06 18:39:10.034679787 +0100
++++ include/config.h 2016-11-06 18:40:15.210067898 +0100
+@@ -30,6 +30,8 @@
+ #ifndef CONFIG_H
+ #define CONFIG_H
+
++#include <string>
++
+ // Config structure
+ struct CONFIG {
+ int vid_w; // Video mode width
+@@ -54,19 +56,19 @@
+ int moving_style[2]; // Moving style (1 == relative, 2 == absolute)
+ };
+
+-
+-// Helper function which returns suitable path for the
+-// config file. It first checks the user's home directory,
+-// and if that fails it uses the CONFIG_DIR defined in the
+-// makefile.
+-const char *get_config_location(bool write = false);
++
++// Helper function which returns suitable path for the
++// config file. It first checks the user's home directory,
++// and if that fails it uses the CONFIG_DIR defined in the
++// makefile.
++std::string get_config_location(bool write = false);
+
+
+ // Load config from file
+-void load_config(const char *file, CONFIG *conf);
++void load_config(std::string file, CONFIG *conf);
+
+ // Save config to file
+-void save_config(const char *file, CONFIG *conf);
++void save_config(std::string file, CONFIG *conf);
+
+ #endif
+
+
+--- include/hiscore.h 2016-11-06 18:39:10.034679787 +0100
++++ include/hiscore.h 2016-11-06 18:43:27.992937549 +0100
+@@ -40,6 +40,7 @@
+ #define HISCORE_FILE "hiscore.lst"
+ #define HISCORE_FILE2 "hiscore2.lst"
+
++#include <string>
+
+ // Record structure
+ struct RECORD {
+@@ -57,8 +58,8 @@
+ void sort(); // Sort the list
+ int add_name(const char *name, int score); // Add a record
+ void draw(int place, float fade); // Draw the list
+- void save(const char *file); // Save the list
+- void load(const char *file); // Load the list
++ void save(std::string file); // Save the list
++ void load(std::string file); // Load the list
+ void input_name(int place); // Input a name
+ };
+
+@@ -66,7 +67,7 @@
+ extern HISCORE_LIST hiscore_1;
+ extern HISCORE_LIST hiscore_2;
+
+-const char *get_hiscore_location(int which, bool write = false);
++std::string get_hiscore_location(int which, bool write = false);
+
+
+ #endif
+
+--- src/config.cpp 2016-11-06 18:39:18.441181712 +0100
++++ src/config.cpp 2016-11-06 18:46:08.603094300 +0100
+@@ -76,7 +76,7 @@
+ // config file. It first checks the user's home directory,
+ // and if that fails it uses the CONFIG_DIR defined in the
+ // makefile.
+-const char *get_config_location(bool write) {
++string get_config_location(bool write) {
+ #ifdef LINUX
+ // Get the path to the config file
+ string tmp = get_tomatoes_dir() + "config.cfg";
+@@ -91,7 +91,7 @@
+ fclose(ftest);
+ }
+
+- return (const char*)tmp.c_str();
++ return tmp;
+ #endif
+
+ // Return the CONFIG_DIR
+@@ -100,11 +100,11 @@
+
+
+ // Load config from file
+-void load_config(const char *file, CONFIG *conf) {
++void load_config(string file, CONFIG *conf) {
+
+- FILE *f = fopen(file, "rt");
++ FILE *f = fopen(file.c_str(), "rt");
+ if(!f)
+- error_msg("Unable to load config file: %s!", file);
++ error_msg("Unable to load config file: %s!", file.c_str());
+
+ fscanf(f, "video_mode = %d x %d\n", &(conf->vid_w), &(conf->vid_h));
+ fscanf(f, "video_mode_color_depth = %d\n", &(conf->vid_color_depth));
+@@ -127,11 +127,11 @@
+
+
+ // Save config to file
+-void save_config(const char *file, CONFIG *conf) {
++void save_config(string file, CONFIG *conf) {
+
+- FILE *f = fopen(file, "wt");
++ FILE *f = fopen(file.c_str(), "wt");
+ if(!f)
+- error_msg("Unable to save config file: %s!", file);
++ error_msg("Unable to save config file: %s!", file.c_str());
+
+ fprintf(f, "video_mode = %d x %d\n", (conf->vid_w), (conf->vid_h));
+ fprintf(f, "video_mode_color_depth = %d\n", (conf->vid_color_depth));
+
+--- src/hiscore.cpp 2016-11-06 18:39:18.437848445 +0100
++++ src/hiscore.cpp 2016-11-06 18:48:27.587005089 +0100
+@@ -69,7 +69,7 @@
+ // hiscore file. It first checks the user's home directory,
+ // and if that fails it uses the HISCORE_DIR defined in the
+ // makefile.
+-const char *get_hiscore_location(int which, bool write) {
++string get_hiscore_location(int which, bool write) {
+ #ifdef LINUX
+ // Get the path to the hiscore file
+ string tmp;
+@@ -91,7 +91,7 @@
+ fclose(ftest);
+ }
+
+- return (char*)tmp.c_str();
++ return tmp;
+ #endif
+
+ // Return the HISCORE_DIR
+@@ -401,11 +401,11 @@
+
+
+ // Save the list to a file
+-void HISCORE_LIST::save(const char *file) {
++void HISCORE_LIST::save(string file) {
+ FILE *fout;
+- fout = fopen(file, "wb");
++ fout = fopen(file.c_str(), "wb");
+ if(!fout)
+- error_msg("Unable to save the hiscore list to %s!\n", file);
++ error_msg("Unable to save the hiscore list to %s!\n", file.c_str());
+
+ // Write the scores
+ int f;
+@@ -421,9 +421,9 @@
+
+
+ // Load the list from a file
+-void HISCORE_LIST::load(const char *file) {
++void HISCORE_LIST::load(string file) {
+ FILE *fin;
+- fin = fopen(file, "rb");
++ fin = fopen(file.c_str(), "rb");
+ if(!fin) {
+ // The list wasn't found, no problem.
+ clear();
diff --git a/PKGBUILD b/PKGBUILD
index 26c005e02b7e..04f9e3b1ddf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,23 @@
pkgname=tomatoes
pkgver=1.55
-pkgrel=11
+pkgrel=12
pkgdesc="How many tomatoes can you smash in ten short minutes?"
url="http://tomatoes.sourceforge.net"
license=('ZLIB')
arch=('i686' 'x86_64')
depends=('sdl_image' 'sdl_mixer' 'glu')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-linux-src-$pkgver.tar.bz2
- http://downloads.sourceforge.net/$pkgname/$pkgname-linux-1.5.tar.bz2
- 0001-tomatoes-1.55-makefile-Append-to-compile-flags.patch
- 0002-tomatoes-1.55-Quell-const-char-conversion-warnings.patch
- config.cfg)
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-linux-src-$pkgver.tar.bz2"
+ "http://downloads.sourceforge.net/$pkgname/$pkgname-linux-1.5.tar.bz2"
+ "0001-tomatoes-1.55-makefile-Append-to-compile-flags.patch"
+ "0002-tomatoes-1.55-Quell-const-char-conversion-warnings.patch"
+ "0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch"
+ "config.cfg")
sha1sums=('aa123a5fa9c8c0223c602c0cffe8a5bb0ebad60c'
'8dc306617800f7ccc1e8610fb39e87d8181c482d'
'65faa7dc05d4f5629339cf4150f5dcbf2626e3a5'
'6ad404f67a05781efe8787773e352af1a2922c60'
+ '77c85236c92f1746aa1b9ec0f42951b15a73eda9'
'e241ac2f76abad1f618e20f8e2d0089cdfa555af')
prepare() {
@@ -25,6 +27,7 @@ prepare() {
patch -p1 < ../0001-tomatoes-1.55-makefile-Append-to-compile-flags.patch
patch -p1 < ../0002-tomatoes-1.55-Quell-const-char-conversion-warnings.patch
+ patch -p0 < ../0003-tomatoes-1.55-config-hiscore-file-saving-loading.patch
sed -n '7,27p' README-src > LICENSE
}