Update package for v2.2.0 of ucon64, released on May 31, 2019. Thanks Daniël Hörchner (upstream developer of ucon64) for letting me know, and sorry for the delayed package update. This package drops the two prior patches: these fixes have been amended upstream.

4 files changed, 7 insertions, 131 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6851998b02af..ddc2e60d609f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ucon64
 	pkgdesc = A ROM backup tool and emulator's Swiss Army knife program.
-	pkgver = 2.1.0
-	pkgrel = 2
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = http://ucon64.sourceforge.net/index.php
 	arch = i686
 	arch = x86_64
@@ -9,12 +9,8 @@ pkgbase = ucon64
 	depends = zlib
 	depends = libusb-compat
 	optdepends = libieee1284: libcd64 enhancements
-	source = https://downloads.sourceforge.net/ucon64/ucon64-2.1.0-src.tar.gz
-	source = fix_makefile_cflags.diff
-	source = fix_libcd64_libieee1284.diff
-	sha256sums = c99964060a5337cea811b27c4103e186a14ba1f04b19cff08bac0260271bc872
-	sha256sums = 8f1532c4c35b98af34b3c1dc3bdeaa6c2183c7927be69ce396895491d7e8feff
-	sha256sums = 19efc5d87c07c11797fba657f25619c70fa175d100688eafd1094d14baad1255
+	source = https://downloads.sourceforge.net/ucon64/ucon64-2.2.0-src.tar.gz
+	sha256sums = 5727e0be9ee878bba84d204135a7ca25662db6b56fee6895301e50c1bdda70af
 
 pkgname = ucon64
 
diff --git a/PKGBUILD b/PKGBUILD
index 52fdef8b41e2..eef77e9bc2bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: robb_force <robb_force@holybuffalo.net>
 
 pkgname=ucon64
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A ROM backup tool and emulator's Swiss Army knife program. " 
 arch=('i686' 'x86_64')
 url="http://ucon64.sourceforge.net/index.php"
@@ -13,24 +13,10 @@ license=('GPL')
 depends=('zlib' 'libusb-compat')
 optdepends=('libieee1284: libcd64 enhancements')
 source=(https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-src.tar.gz)
-sha256sums=('c99964060a5337cea811b27c4103e186a14ba1f04b19cff08bac0260271bc872')
-source+=(fix_makefile_cflags.diff)
-sha256sums+=('8f1532c4c35b98af34b3c1dc3bdeaa6c2183c7927be69ce396895491d7e8feff')
-source+=(fix_libcd64_libieee1284.diff)
-sha256sums+=('19efc5d87c07c11797fba657f25619c70fa175d100688eafd1094d14baad1255')
+sha256sums=('5727e0be9ee878bba84d204135a7ca25662db6b56fee6895301e50c1bdda70af')
 
 srcroot="${pkgname}-${pkgver}-src/"
 
-prepare()
-{
-    echo "Applying Makefile CFLAGS fix"
-    patch -d "${srcroot}" -p1 < "../fix_makefile_cflags.diff"
-
-    # Thanks harpin from the aur forums for pointing this bug out!
-    echo "Applying libcd64 ieee1284 shared library fix"
-    patch -d "${srcroot}" -p1 < "../fix_libcd64_libieee1284.diff"
-}
-
 build() 
 {
     cd "${srcroot}/src"
diff --git a/fix_libcd64_libieee1284.diff b/fix_libcd64_libieee1284.diff
deleted file mode 100644
index 5001593eb916..000000000000
--- a/fix_libcd64_libieee1284.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur ./src.old/Makefile ./src/Makefile
---- ./src.old/Makefile	2019-05-19 12:35:45.185395051 +0200
-+++ ./src/Makefile	2019-05-19 12:36:09.705081792 +0200
-@@ -95,6 +95,21 @@
- 
- ifdef USE_LIBCD64
- LDFLAGS+=backup/libcd64/libcd64.a
-+# The following condition was added for the arch ucon64 AUR package:
-+# https://aur.archlinux.org/packages/ucon64/
-+# The arch/artix 'libieee1284' package ships the library as a shared 
-+# library rather than a static one. As a result, libcd64 has no static
-+# library to link against, and consequently ucon64 itself, when linking
-+# in libcd64, needs to also link against the libieee1284 shared library.
-+# See also src/backup/libcd64/Makefile
-+ifndef DJGPP
-+ifeq ($(shell if test -r /usr/include/ieee1284.h; then echo 1; else echo 0; fi),1)
-+LDFLAGS+=-lieee1284
-+$(info Building with libieee1284 support)
-+else
-+$(warning Building without libieee1284 support)
-+endif
-+endif
- endif
- 
- ifdef USE_ZLIB
-diff -Naur ./src.old/backup/libcd64/Makefile ./src/backup/libcd64/Makefile
---- ./src.old/backup/libcd64/Makefile	2019-05-19 12:35:45.185395051 +0200
-+++ ./src/backup/libcd64/Makefile	2019-05-19 12:36:20.374945478 +0200
-@@ -102,6 +102,9 @@
- ifeq ($(findstring Linux,$(OSTYPE)),Linux)
- ifeq ($(shell if test -r /usr/include/ieee1284.h; then echo 1; else echo 0; fi),1)
- LIBIEEE1284=1
-+$(info Building with libieee1284 support)
-+else
-+$(warning Building without libieee1284 support)
- endif
- ifeq ($(shell if test -r /usr/include/linux/ppdev.h; then echo 1; else echo 0; fi),1)
- PPDEV=1
-@@ -116,7 +119,15 @@
- 
- ifdef LIBIEEE1284
- CFLAGS+=-DCD64_USE_LIBIEEE1284
-+# The following condition was added for the arch ucon64 AUR package:
-+# https://aur.archlinux.org/packages/ucon64/
-+# The arch/artix (i.e linux) 'libieee1284' package ships the library as a 
-+# shared library rather than a static one, so including the static file leading 
-+# to a linking error. 
-+# DJGPP (i.e gcc for DOS) probably still expects a static library.
-+ifdef DJGPP
- LIBS+=/usr/lib/libieee1284.a
-+endif
- LDFLAGS+=-lieee1284
- endif
- 
diff --git a/fix_makefile_cflags.diff b/fix_makefile_cflags.diff
deleted file mode 100644
index 185c72bb6261..000000000000
--- a/fix_makefile_cflags.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- ./src/Makefile.old	2019-05-19 11:02:52.666559482 +0200
-+++ ./src/Makefile	2019-05-19 11:09:34.651427078 +0200
-@@ -227,20 +227,26 @@
- 	$(CC) $(CFLAGS) -Ibackup/libcd64 -c $< -o $@
- 
- 
-+# The following lines which make use of and quote $(CFLAGS0) have been patched
-+# by the arch ucon64 AUR package: https://aur.archlinux.org/packages/ucon64/
-+# It resolves an issue where the build will fail if a user supplies a custom
-+# CFLAGS argument which contains multiple parameters, e.g
-+# $ CFLAGS="-O2 -ggdb3" make
-+# which doesn't impede the normal build process, but makes debugging a pain.
- ifdef USE_DISCMAGE
- .PHONY: libdiscmage/$(FULLLIBNAME_DM)
- libdiscmage/$(FULLLIBNAME_DM):
- ifeq ($(GCC_WIN),1)
--	cd libdiscmage && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+	cd libdiscmage && CFLAGS="$(CFLAGS0)" LDFLAGS=$(LDFLAGS0) $(MAKE)
- else
- ifdef DJGPP
- 	cd libdiscmage
--	set CFLAGS=$(CFLAGS0)
-+	set CFLAGS="$(CFLAGS0)"
- 	set LDFLAGS=$(LDFLAGS0)
- 	$(MAKE)
- 	cd ..
- else
--	cd libdiscmage && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+	cd libdiscmage && CFLAGS="$(CFLAGS0)" LDFLAGS=$(LDFLAGS0) $(MAKE)
- endif                                   # DJGPP
- endif                                   # GCC_WIN
- endif                                   # USE_DISCMAGE
-@@ -250,16 +256,16 @@
- #.PHONY: backup/libcd64/libcd64.a  Do not force linking an executable.
- backup/libcd64/libcd64.a:
- ifeq ($(GCC_WIN),1)
--	cd backup/libcd64 && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+	cd backup/libcd64 && CFLAGS="$(CFLAGS0)" LDFLAGS=$(LDFLAGS0) $(MAKE)
- else
- ifdef DJGPP
- 	cd backup/libcd64
--	set CFLAGS=$(CFLAGS0)
-+	set CFLAGS="$(CFLAGS0)"
- 	set LDFLAGS=$(LDFLAGS0)
- 	$(MAKE)
- 	cd ../..
- else
--	cd backup/libcd64 && CFLAGS=$(CFLAGS0) LDFLAGS=$(LDFLAGS0) $(MAKE)
-+	cd backup/libcd64 && CFLAGS="$(CFLAGS0)" LDFLAGS=$(LDFLAGS0) $(MAKE)
- endif                                   # DJGPP
- endif                                   # GCC_WIN
- endif                                   # USE_LIBCD64