changed source location

4 files changed, 27 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0972f8610096..5fb4fec0c695 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 # Generated by mksrcinfo v8
-# Fri Oct 14 21:02:02 UTC 2016
+# Sun Nov  6 04:10:58 UTC 2016
 pkgbase = linthesia
 	pkgdesc = A game of playing music. A fork of Synthesia
-	pkgver = 0.4.3
-	pkgrel = 5
+	pkgver = 20161105
+	pkgrel = 1
+	epoch = 1
 	url = http://linthesia.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -18,12 +19,8 @@ pkgbase = linthesia
 	depends = gtkglextmm
 	depends = alsa-lib
 	depends = fluidsynth
-	source = svn+http://svn.code.sf.net/p/linthesia/code/#revision=r87
-	source = 0000-TextWriter.patch
-	source = 0001-Makefile-CXXFLAGS.patch
+	source = linthesia::git+https://github.com/linthesia/linthesia.git#commit=32d30fb188b375f017dc121c7ae3449b37af177b
 	sha256sums = SKIP
-	sha256sums = 7953b732355bae0417d2eaff421a46d786201f104db289caa291a6a36f6fc199
-	sha256sums = 9e331f9f4656837bb1b89c1ff36e8499a6a392eec28855f5f73b856c7dea4c78
 
 pkgname = linthesia
 
diff --git a/0000-TextWriter.patch b/0000-TextWriter.patch
deleted file mode 100644
index 9b397517000e..000000000000
--- a/0000-TextWriter.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ra -U3 a/src/TextWriter.cpp b/src/TextWriter.cpp
---- a/src/TextWriter.cpp	2016-10-14 15:43:47.264744000 -0500
-+++ b/src/TextWriter.cpp	2016-10-14 15:52:09.558097860 -0500
-@@ -62,7 +62,7 @@
-     fontname = STRING(fontname << " " << in_size);
-     Pango::FontDescription* font_desc = new Pango::FontDescription(fontname);
-     Glib::RefPtr<Pango::Font> ret = Gdk::GL::Font::use_pango_font(*font_desc, 0, 128, list_start);
--    if (ret == 0)
-+    if (!ret)
-       throw LinthesiaError("An error ocurred while trying to use use_pango_font() with "
-                            "font '" + fontname + "'");
- 
-@@ -100,7 +100,7 @@
-   glPopMatrix();
- 
-   // TODO: Should probably delete these on shutdown.
--  //glDeleteLists(1000, 128);
-+  glDeleteLists(1000, 128);
- 
-   return tw;
- }
diff --git a/0001-Makefile-CXXFLAGS.patch b/0001-Makefile-CXXFLAGS.patch
deleted file mode 100644
index bbfb8b6d1762..000000000000
--- a/0001-Makefile-CXXFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ra -U3 a/src/libmidi/Makefile b/src/libmidi/Makefile
---- a/src/libmidi/Makefile	2016-10-14 15:35:27.884724000 -0500
-+++ b/src/libmidi/Makefile	2016-10-14 15:39:39.681401308 -0500
-@@ -1,7 +1,7 @@
- # -*- mode: makefile-gmake; coding: utf-8 -*-
- 
- CXX = g++
--CXXFLAGS = -I . -I .. -ansi -Wall
-+CXXFLAGS = -I . -I .. -ansi -Wall -O2 -fPIC
- TARGET = libmidi.a
- 
- all: $(TARGET)
-diff -ra -U3 a/src/Makefile b/src/Makefile
---- a/src/Makefile	2016-10-14 15:35:27.978057000 -0500
-+++ b/src/Makefile	2016-10-14 15:39:30.234734267 -0500
-@@ -3,7 +3,7 @@
- GRAPHDIR?=../graphics
- 
- CXX = g++
--CXXFLAGS =  -I . -I libmidi -ggdb -Wall -ansi
-+CXXFLAGS =  -I . -I libmidi -ggdb -Wall -ansi -O2 -std=c++11 -fPIC
- CXXFLAGS += `pkg-config --cflags gtkmm-2.4 gconfmm-2.6 gtkglextmm-1.2 alsa` -DGRAPHDIR="\"$(GRAPHDIR)\""
- LDFLAGS = `pkg-config --libs gtkmm-2.4 gconfmm-2.6 gtkglextmm-1.2 alsa`
- TARGET = linthesia
diff --git a/PKGBUILD b/PKGBUILD
index c62ca17b7a4b..03b1542ff1af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,37 @@
 # Maintainer: cth451 <cth451@gmail.com>
 
 pkgname=linthesia
-pkgver=0.4.3
-pkgrel=5
+epoch=1
+pkgver=20161105
+pkgrel=1
 pkgdesc="A game of playing music. A fork of Synthesia"
 arch=('i686' 'x86_64')
 url="http://linthesia.sourceforge.net/"
 license=('GPL2')
 depends=('gtkmm' 'gconfmm' 'gtkglextmm' 'alsa-lib' 'fluidsynth')
 makedepends=('gtkmm' 'gconfmm' 'gtkglextmm' 'alsa-lib' 'svn')
-source=("svn+http://svn.code.sf.net/p/linthesia/code/#revision=r87" 
-0000-TextWriter.patch 
-0001-Makefile-CXXFLAGS.patch)
-sha256sums=('SKIP' '7953b732355bae0417d2eaff421a46d786201f104db289caa291a6a36f6fc199' '9e331f9f4656837bb1b89c1ff36e8499a6a392eec28855f5f73b856c7dea4c78')
+source=("linthesia::git+https://github.com/linthesia/linthesia.git#commit=32d30fb188b375f017dc121c7ae3449b37af177b")
+sha256sums=('SKIP')
 
 build() {
-    cd "$srcdir/code"
-    patch -p1 -i "$srcdir/0000-TextWriter.patch"
-	patch -p1 -i "$srcdir/0001-Makefile-CXXFLAGS.patch"
-    make GRAPHDIR="/usr/share/linthesia/graphics"
-    cd "$srcdir/code/extra"
-    sed -i linthesia.desktop -e "s/Exec=linthesia/Exec=\/usr\/games\/linthesia/g"
+	cd "$srcdir/linthesia"
+	./autogen.sh
+	./configure --prefix=/usr
+	make GRAPHDIR="/usr/share/linthesia/graphics"
 }
 
 package () {
-    cd "$srcdir/code"
-    make DESTDIR="$pkgdir" install
-    # Install desktop file
-    mkdir "$pkgdir/usr/share/applications"
-    install -Tm644 extra/linthesia.desktop $pkgdir/usr/share/applications/linthesia.desktop 
-    # Install pixmap
-    mkdir "$pkgdir/usr/share/pixmaps"
-    install -Tm644 extra/linthesia.xpm $pkgdir/usr/share/pixmaps/linthesia.xpm
-    # Install docs
-    mkdir "$pkgdir/usr/share/doc"
-    mkdir "$pkgdir/usr/share/doc/linthesia"
-    install -Tm644 README $pkgdir/usr/share/doc/linthesia/README
-    install -Tm644 COPYING $pkgdir/usr/share/doc/linthesia/COPYING
+	cd "$srcdir/linthesia"
+	make DESTDIR="$pkgdir" install
+	# Install desktop file
+	mkdir "$pkgdir/usr/share/applications"
+	install -Tm644 extra/linthesia.desktop $pkgdir/usr/share/applications/linthesia.desktop 
+	# Install pixmap
+	mkdir "$pkgdir/usr/share/pixmaps"
+	install -Tm644 extra/linthesia.xpm $pkgdir/usr/share/pixmaps/linthesia.xpm
+	# Install docs
+	mkdir "$pkgdir/usr/share/doc"
+	mkdir "$pkgdir/usr/share/doc/linthesia"
+	install -Tm644 README $pkgdir/usr/share/doc/linthesia/README
+	install -Tm644 COPYING $pkgdir/usr/share/doc/linthesia/COPYING
 }