Fixing patch and sums

4 files changed, 26 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 658c36bf98df..0636f4f66636 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eureka
 	pkgdesc = A map editor for the classic DOOM games
 	pkgver = 1.24
-	pkgrel = 1
+	pkgrel = 2
 	url = http://eureka-editor.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -9,12 +9,12 @@ pkgbase = eureka
 	depends = fltk
 	source = https://download.sourceforge.net/eureka-editor/eureka-124-source.tar.gz
 	source = eureka.patch
-	md5sums = 041e0870a34f0eb43a305e63f1dc32cd
-	md5sums = 5b8ac3ea179cb63fd5351ca544000c57
-	sha1sums = c5c6374fec532d0903b45bc5ce5b806740d6cbc2
-	sha1sums = c32826f72d026661881b619bed222bd0d1492979
-	sha256sums = 75b47eedebc52b17d442988fa0f6e04987c80738defc1cda948db38b1b58312f
-	sha256sums = a009bcd3618c0c3a9dcbb5f8162f25be82884d82f877b1db6106085b3e9e38c1
+	md5sums = 690d64ea32b2b4bbe081e2c079936c1f
+	md5sums = d54b67edf77c3f9c14a30f5b17862cbb
+	sha1sums = 78754c63bda8296627b185f62a6ec57e5c618a15
+	sha1sums = dd0bdca256d4225b80addc9eb5ee333fc495b05a
+	sha256sums = 3bb5a272b53a275f09c7fa5a29f417e257a7dc89d6689de45055a71fad6c91f4
+	sha256sums = 4ae5f645ffa9fe422a3a3f3c2892f2935815bf4d77d82481992f06ff3ac72946
 
 pkgname = eureka
 
diff --git a/.gitignore b/.gitignore
index 5cdd1a7cb4a2..311a9155b538 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 eureka-*.pkg.tar.xz
 eureka-*.tar.gz
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 94bebf7b2689..70454c0d2570 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,44 +5,36 @@
 
 pkgname=eureka
 pkgver=1.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A map editor for the classic DOOM games"
 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")
-md5sums=("041e0870a34f0eb43a305e63f1dc32cd"
-         "5b8ac3ea179cb63fd5351ca544000c57")
-sha1sums=("c5c6374fec532d0903b45bc5ce5b806740d6cbc2"
-          "c32826f72d026661881b619bed222bd0d1492979")
-sha256sums=("75b47eedebc52b17d442988fa0f6e04987c80738defc1cda948db38b1b58312f"
-            "a009bcd3618c0c3a9dcbb5f8162f25be82884d82f877b1db6106085b3e9e38c1")
+        "${pkgname}.patch")
+md5sums=("690d64ea32b2b4bbe081e2c079936c1f"
+         "d54b67edf77c3f9c14a30f5b17862cbb")
+sha1sums=("78754c63bda8296627b185f62a6ec57e5c618a15"
+          "dd0bdca256d4225b80addc9eb5ee333fc495b05a")
+sha256sums=("3bb5a272b53a275f09c7fa5a29f417e257a7dc89d6689de45055a71fad6c91f4"
+            "4ae5f645ffa9fe422a3a3f3c2892f2935815bf4d77d82481992f06ff3ac72946")
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}-source"
-
-  msg2 "Patching Makefile..."
-  patch -p1 -i "../eureka.patch"
+  patch -p1 -i "../${pkgname}.patch"
 }
 
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-source"
-
-  msg2 "Building..."
   make PREFIX=/usr OPTIMISE="$CXXFLAGS $CPPFLAGS"
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}-source"
-
-  msg2 "Packaging..."
   make PREFIX="${pkgdir}/usr" install
-
-  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"
+  install -Dm644 "misc/${pkgname}.xpm" "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm"
+  install -Dm644 "misc/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "misc/${pkgname}.6" "${pkgdir}/usr/share/man/man6/${pkgname}.6"
 }
diff --git a/eureka.patch b/eureka.patch
index 298a33c57b19..a662405fb552 100644
--- a/eureka.patch
+++ b/eureka.patch
@@ -1,16 +1,8 @@
-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
-@@ -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  \
-@@ -144,7 +144,8 @@
+diff --git a/Makefile b/Makefile
+index 17088c5..234755b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -140,7 +140,8 @@ stripped: all
  
  INSTALL_DIR=$(DESTDIR)$(PREFIX)/share/eureka