1.10.1

5 files changed, 38 insertions, 142 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 809176bb6c99..cf0dfa931f40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,17 @@
 pkgbase = vodovod
 	pkgdesc = A free cross-platform pipe connecting game
-	pkgver = 1.10
-	pkgrel = 3
-	url = http://home.gna.org/vodovod/
+	pkgver = 1.10.1
+	pkgrel = 4
+	url = https://github.com/david-redick/vodovod/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = sdl_mixer
 	depends = sdl_image
-	source = http://download.gna.org/vodovod/vodovod-1.10-src.tar.gz
-	source = fix-FTBFS-with-gcc-4.3.patch
-	source = user_files.patch
+	source = vodovod-1.10.1.tar.gz::https://github.com/david-redick/vodovod/archive/1.10.1.tar.gz
 	source = vodovod.desktop
 	source = vodovod.xpm
-	md5sums = fc9baa1704b006761bec5e4e64b7ee9d
-	md5sums = 36fb64ffaaf24f45d0678eccbbe0b180
-	md5sums = 1d29988a13474cdb5ae4822818573825
+	md5sums = 1719a21b673663c22b60057d28653c6d
 	md5sums = db28845dc4a8031fc45ca05e38d462f8
 	md5sums = 94fed2d1ab825bdf9811c59d305398d4
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..577de7a7059f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg
+src
+*.pkg.tar.xz
+*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index aa76ff69df9f..bcc4c0102584 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,41 @@
-# Maintainer: Michał Szymański <smiszym at gmail dot com>
+# Maintainer: David A. Redick <david.a.redick@gmail.com>
+# Contributor: Michał Szymański <smiszym at gmail dot com>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
 pkgname=vodovod
-pkgver=1.10
+pkgver=1.10.1
 pkgrel=4
-pkgdesc=" A free cross-platform pipe connecting game"
+pkgdesc="A free cross-platform pipe connecting game"
 arch=('i686' 'x86_64')
-url="http://home.gna.org/vodovod/"
+url='https://github.com/david-redick/vodovod/'
 license=('GPL')
 depends=('sdl_mixer' 'sdl_image')
-source=(http://download.gna.org/vodovod/$pkgname-$pkgver-src.tar.gz fix-FTBFS-with-gcc-4.3.patch \
-	 user_files.patch vodovod.desktop vodovod.xpm)
-md5sums=('fc9baa1704b006761bec5e4e64b7ee9d'
-         '36fb64ffaaf24f45d0678eccbbe0b180'
-         '1d29988a13474cdb5ae4822818573825'
-         'db28845dc4a8031fc45ca05e38d462f8'
-         '94fed2d1ab825bdf9811c59d305398d4')
+source=(
+	"${pkgname}-${pkgver}.tar.gz::https://github.com/david-redick/${pkgname}/archive/${pkgver}.tar.gz"
+	'vodovod.desktop'
+	'vodovod.xpm'
+)
+md5sums=(
+	'1719a21b673663c22b60057d28653c6d'
+	'db28845dc4a8031fc45ca05e38d462f8'
+	'94fed2d1ab825bdf9811c59d305398d4'
+)
 
-build()
-{
-        cd ${srcdir}/$pkgname-$pkgver-src
-        patch -p1 < ../user_files.patch
-        patch -p1 < ../fix-FTBFS-with-gcc-4.3.patch
+build () {
+        cd "${srcdir}/${pkgname}-${pkgver}"
         make
 }
 
-package()
-{
-        cd ${srcdir}/$pkgname-$pkgver-src
-        mkdir -p ${pkgdir}/usr/share/{applications,vodovod,pixmaps}
-        mkdir -p ${pkgdir}/usr/bin
-        cp -R vodovod data html ${pkgdir}/usr/share/vodovod
-        echo "cd '/usr/share/vodovod/' && ./vodovod" > ${pkgdir}/usr/bin/vodovod
-        chmod 755 ${pkgdir}/usr/bin/vodovod
-        install ../vodovod.desktop ${pkgdir}/usr/share/applications
-        install ../vodovod.xpm ${pkgdir}/usr/share/pixmaps
+package () {
+        mkdir -p "${pkgdir}/usr/share/applications"
+        mkdir -p "${pkgdir}/usr/share/vodovod"
+        mkdir -p "${pkgdir}/usr/share/pixmaps"
+        mkdir -p "${pkgdir}/usr/bin"
+
+        cd "${srcdir}/${pkgname}-${pkgver}"
+        cp -R vodovod data html "${pkgdir}/usr/share/vodovod"
+        echo "cd '/usr/share/vodovod/' && ./vodovod" > "${pkgdir}/usr/bin/vodovod"
+        chmod 755 "${pkgdir}/usr/bin/vodovod"
+        install ../vodovod.desktop "${pkgdir}/usr/share/applications"
+        install ../vodovod.xpm "${pkgdir}/usr/share/pixmaps"
 }
diff --git a/fix-FTBFS-with-gcc-4.3.patch b/fix-FTBFS-with-gcc-4.3.patch
deleted file mode 100644
index a3f57f996c86..000000000000
--- a/fix-FTBFS-with-gcc-4.3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/hiscore.cpp
-+++ b/hiscore.cpp
-@@ -21,6 +21,8 @@
- #include <stdlib.h>
- #include <sys/stat.h>
- #include "hiscore.h"
-+#include <climits>
-+#include <cstring>
- //-----------------------------------------------------------------------------
- HiScores &hiScores()
- {
---- a/config.cpp
-+++ b/config.cpp
-@@ -25,6 +25,7 @@
- #include <stdio.h>
- #include <sys/stat.h>
- #include "config.h"
-+#include <climits>
- //------------------------------------------------------------------------------
- using namespace std;
- //-----------------------------------------------------------------------------
diff --git a/user_files.patch b/user_files.patch
deleted file mode 100644
index ef2557990fed..000000000000
--- a/user_files.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- vodovod-1.05.orig/config.cpp
-+++ vodovod-1.05/config.cpp
-@@ -21,6 +21,9 @@
- #include <string>
- #include <fstream>
- #include <sstream>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <sys/stat.h>
- #include "config.h"
- //------------------------------------------------------------------------------
- using namespace std;
-@@ -155,7 +158,19 @@
- //-----------------------------------------------------------------------------
- bool Config::save()
- {
--    std::ofstream file("vodovod.conf");
-+    char vodovod_conf[PATH_MAX] = "vodovod.conf";
-+
-+#ifndef _WIN32
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+    {
-+        snprintf(vodovod_conf, sizeof(vodovod_conf), "%s/.vodovod", home);
-+        mkdir(vodovod_conf, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-+    }
-+    strncat(vodovod_conf, "/vodovod.conf", sizeof(vodovod_conf));
-+#endif
-+
-+    std::ofstream file(vodovod_conf);
-     if (!file)
-         return false;
- 
-@@ -171,7 +186,15 @@
- // this gets called from main() so we're sure config.ini is in the right place
- bool Config::load()
- {
--    std::ifstream file("vodovod.conf");
-+    char vodovod_conf[PATH_MAX] = "vodovod.conf";
-+
-+#ifndef _WIN32
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+        snprintf(vodovod_conf, sizeof(vodovod_conf), "%s/.vodovod/vodovod.conf", home);
-+#endif
-+
-+    std::ifstream file(vodovod_conf);
-     if (!file)
-         return false;
- 
---- vodovod-1.05.orig/hiscore.cpp
-+++ vodovod-1.05/hiscore.cpp
-@@ -17,7 +17,9 @@
- along with Vodovod in file COPYING; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- -----------------------------------------------------------------------------*/
--#include "stdio.h"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/stat.h>
- #include "hiscore.h"
- //-----------------------------------------------------------------------------
- HiScores &hiScores()
-@@ -102,9 +104,21 @@
- //-----------------------------------------------------------------------------
- HiScores::~HiScores()
- {
-+    char hiscore_dat[PATH_MAX] = "hiscore.dat";
-+
-+#ifndef _WIN32
-+    char *home = getenv("HOME");
-+    if (home != NULL)
-+    {
-+        snprintf(hiscore_dat, sizeof(hiscore_dat), "%s/.vodovod", home);
-+        mkdir(hiscore_dat, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-+    }
-+    strncat(hiscore_dat, "/hiscore.dat", sizeof(hiscore_dat));
-+#endif
-+
-     // save to file
-     // format: NAME#POINTS#SWAPS#
--    FILE *fp = fopen("hiscore.dat", "w+");
-+    FILE *fp = fopen(hiscore_dat, "w+");
-     if (fp)
-     {
-         for (iterator it = begin(); it != end(); ++it)