Upgrading to version 1.24

4 files changed, 47 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96f1dec70510..658c36bf98df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
 pkgbase = eureka
 	pkgdesc = A map editor for the classic DOOM games
-	pkgver = 1.21
-	pkgrel = 3
-	url = http://eureka-editor.sourceforge.net
+	pkgver = 1.24
+	pkgrel = 1
+	url = http://eureka-editor.sourceforge.net/
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	depends = fltk
-	source = https://download.sourceforge.net/eureka-editor/eureka-121-source.tar.gz
+	source = https://download.sourceforge.net/eureka-editor/eureka-124-source.tar.gz
 	source = eureka.patch
-	sha256sums = 39ce6ce40137be3f8391a513adc533a616fc0a8c5e51c4e4f9cc9912fb71f7a8
-	sha256sums = f2f3f1f7927997a2ddebf1abb477c77d46b7b2c7d7b69fd10f782771eefb176a
+	md5sums = 041e0870a34f0eb43a305e63f1dc32cd
+	md5sums = 5b8ac3ea179cb63fd5351ca544000c57
+	sha1sums = c5c6374fec532d0903b45bc5ce5b806740d6cbc2
+	sha1sums = c32826f72d026661881b619bed222bd0d1492979
+	sha256sums = 75b47eedebc52b17d442988fa0f6e04987c80738defc1cda948db38b1b58312f
+	sha256sums = a009bcd3618c0c3a9dcbb5f8162f25be82884d82f877b1db6106085b3e9e38c1
 
 pkgname = eureka
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..5cdd1a7cb4a2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+eureka-*.pkg.tar.xz
+eureka-*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 0c8bc5c80ddb..94bebf7b2689 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,48 @@
-# Maintainer:
+# Maintainer: Fredy García <frealgagu at gmail dot com>
 # Contributor: Michael Straube <michael.straube@posteo.de>
 # Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor: Valsu [arch(at)hylia.de]
 
 pkgname=eureka
-pkgver=1.21
-pkgrel=3
+pkgver=1.24
+pkgrel=1
 pkgdesc="A map editor for the classic DOOM games"
-arch=('i686' 'x86_64')
-url="http://eureka-editor.sourceforge.net"
-license=('GPL')
-depends=('fltk')
-source=("https://download.sourceforge.net/eureka-editor/eureka-121-source.tar.gz"
+arch=("i686" "x86_64")
+url="http://${pkgname}-editor.sourceforge.net/"
+license=("GPL2")
+depends=("fltk")
+source=("https://download.sourceforge.net/${pkgname}-editor/${pkgname}-${pkgver/\./}-source.tar.gz"
         "eureka.patch")
-sha256sums=('39ce6ce40137be3f8391a513adc533a616fc0a8c5e51c4e4f9cc9912fb71f7a8'
-            'f2f3f1f7927997a2ddebf1abb477c77d46b7b2c7d7b69fd10f782771eefb176a')
+md5sums=("041e0870a34f0eb43a305e63f1dc32cd"
+         "5b8ac3ea179cb63fd5351ca544000c57")
+sha1sums=("c5c6374fec532d0903b45bc5ce5b806740d6cbc2"
+          "c32826f72d026661881b619bed222bd0d1492979")
+sha256sums=("75b47eedebc52b17d442988fa0f6e04987c80738defc1cda948db38b1b58312f"
+            "a009bcd3618c0c3a9dcbb5f8162f25be82884d82f877b1db6106085b3e9e38c1")
 
 prepare() {
-  cd $pkgname-$pkgver-source
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
-  # patch Makefile
-  patch -p1 -i ../eureka.patch
+  msg2 "Patching Makefile..."
+  patch -p1 -i "../eureka.patch"
 }
 
+
 build() {
-  cd $pkgname-$pkgver-source
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
+  msg2 "Building..."
   make PREFIX=/usr OPTIMISE="$CXXFLAGS $CPPFLAGS"
 }
 
 package() {
-  cd $pkgname-$pkgver-source
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
-  make PREFIX="$pkgdir"/usr install
+  msg2 "Packaging..."
+  make PREFIX="${pkgdir}/usr" install
 
-  install -Dm644 misc/eureka.xpm "$pkgdir"/usr/share/pixmaps/eureka.xpm
-  install -Dm644 misc/eureka.desktop "$pkgdir"/usr/share/applications/eureka.desktop
-  install -Dm644 misc/eureka.6 "$pkgdir"/usr/share/man/man6/eureka.6
+  msg2 "Installing icon, desktop file and man page"
+  install -Dm644 "misc/eureka.xpm" "${pkgdir}/usr/share/pixmaps/eureka.xpm"
+  install -Dm644 "misc/eureka.desktop" "${pkgdir}/usr/share/applications/eureka.desktop"
+  install -Dm644 "misc/eureka.6" "${pkgdir}/usr/share/man/man6/eureka.6"
 }
diff --git a/eureka.patch b/eureka.patch
index e3b577d4fc4d..298a33c57b19 100644
--- a/eureka.patch
+++ b/eureka.patch
@@ -1,31 +1,22 @@
 diff -ru eureka-1.21-source-orig/Makefile eureka-1.21-source/Makefile
 --- eureka-1.21-source-orig/Makefile	2018-01-09 14:05:02.549661357 +0100
 +++ eureka-1.21-source/Makefile	2018-01-09 14:06:03.161776098 +0100
-@@ -26,7 +26,7 @@
- CXXFLAGS=$(OPTIMISE) -Wall -D$(OS)  \
-          -D_THREAD_SAFE -D_REENTRANT
+@@ -22,7 +22,7 @@
+ 
+ CXXFLAGS=$(OPTIMISE) $(WARNINGS) -D_THREAD_SAFE -D_REENTRANT
  
 -LDFLAGS=-L/usr/X11R6/lib
 +LDFLAGS+=-L/usr/X11R6/lib
  
  LIBS= \
       -lfltk_images -lfltk_gl -lfltk  \
-@@ -134,7 +134,8 @@
- stripped: $(PROGRAM)
- 	strip $(STRIP_FLAGS) $(PROGRAM)
+@@ -144,7 +144,8 @@
+ 
+ INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/eureka
  
 -install: stripped
 +install:
 +	install -d $(PREFIX)/bin
- 	install -o root -m 755 $(PROGRAM) $(PREFIX)/bin/
+ 	install -o root -m 755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/
  	install -d $(INSTALL_DIR)/games
  	install -d $(INSTALL_DIR)/common
-@@ -147,8 +148,6 @@
- 	install -o root -m 644 games/*.* $(INSTALL_DIR)/games
- 	install -o root -m 644 common/*.* $(INSTALL_DIR)/common
- 	install -o root -m 644 ports/*.* $(INSTALL_DIR)/ports
--	xdg-desktop-menu  install --novendor misc/eureka.desktop
--	xdg-icon-resource install --novendor --size 32 misc/eureka.xpm
- 
- uninstall:
- 	rm -v $(PREFIX)/bin/$(PROGRAM)