4.2.0

4 files changed, 50 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ccb3943f556..168d4d167117 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-pdcurses
 	pkgdesc = Public Domain Curses wincon port (mingw-w64)
-	pkgver = 4.1.0
-	pkgrel = 2
+	pkgver = 4.2.0
+	pkgrel = 1
 	url = https://www.projectpluto.com/win32a.htm
 	arch = any
 	license = public domain
@@ -11,12 +11,10 @@ pkgbase = mingw-w64-pdcurses
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = pdcurses-4.1.0.tar.gz::https://github.com/Bill-Gray/PDCursesMod/archive/v4.1.0.tar.gz
+	source = pdcurses-4.2.0.tar.gz::https://github.com/Bill-Gray/PDCursesMod/archive/v4.2.0.tar.gz
 	source = 001-mingw-pdcurses-4.1.0-build.patch
-	source = 002-fix-exports.patch
-	sha256sums = c6e036c0cb24f7909dbb8fa5011564727cd64a91efd3b7bb3e81c7509d7f5fde
-	sha256sums = 913b5aff09d0ab1a2197f66a98657927d85a0dc3577c2b5e69179148fb2b0242
-	sha256sums = 246f93facdd2703f8b9d0bcd57e89688fd861d34a30facc60a48892b330b08bc
+	sha256sums = 50e982a680f97ddc4dbf657e933dd1597101294e2f71a51e37060c85b07a3d5d
+	sha256sums = 029b3755eacc8b3bebc09767b2090e18c160acc80be0b07742d8aaa098b6be89
 
 pkgname = mingw-w64-pdcurses
 
diff --git a/001-mingw-pdcurses-4.1.0-build.patch b/001-mingw-pdcurses-4.1.0-build.patch
index 2224b9ce2817..f3fdbf622db3 100644
--- a/001-mingw-pdcurses-4.1.0-build.patch
+++ b/001-mingw-pdcurses-4.1.0-build.patch
@@ -1,29 +1,29 @@
-diff -Naur pdcurses-4.1.0-orig/wincon/Makefile.mng pdcurses-4.1.0/wincon/Makefile.mng
---- pdcurses-4.1.0-orig/wincon/Makefile.mng	2019-05-09 02:27:41.000000000 +0300
-+++ pdcurses-4.1.0/wincon/Makefile.mng	2019-05-28 08:49:28.054006700 +0300
-@@ -100,8 +100,9 @@
+diff -Naur PDCursesMod-4.2.0.orig/wincon/Makefile PDCursesMod-4.2.0/wincon/Makefile
+--- PDCursesMod-4.2.0.orig/wincon/Makefile	2020-10-03 15:41:02.142746719 -0400
++++ PDCursesMod-4.2.0/wincon/Makefile	2020-10-03 15:44:06.328914025 -0400
+@@ -102,8 +102,9 @@
  ifeq ($(DLL),Y)
  	CFLAGS += -DPDC_DLL_BUILD
- 	LIBEXE = $(PREFIX)gcc
+ 	LIBEXE = $(CC)
 -	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
 -	LIBCURSES = pdcurses.dll
-+	LIBARCHIVE = libpdcurses.dll.a
++  LIBARCHIVE = libpdcurses.dll.a
 +	LIBFLAGS = -Wl,--out-implib,$(LIBARCHIVE) -shared -o
 +	LIBCURSES = libpdcurses.dll
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
- 	LIBSADDED =
+ 	LIBSADDED = -lwinmm
  	EXELIBS =
-@@ -113,7 +114,8 @@
+@@ -115,7 +116,8 @@
  else
  	LIBFLAGS	= rv
  endif
 -	LIBCURSES = pdcurses.a
 +	LIBARCHIVE = libpdcurses.a
-+	LIBCURSES = $(LIBARCHIVE)
++  LIBCURSES = $(LIBARCHIVE)
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
- 	LIBSADDED =
+ 	LIBSADDED = -lwinmm
  	EXELIBS =
-@@ -139,7 +141,7 @@
+@@ -141,7 +143,7 @@
  
  $(LIBCURSES) : $(LIBDEPS)
  	$(LIBEXE) $(LIBFLAGS) $@ $? $(LIBSADDED)
@@ -32,22 +32,22 @@ diff -Naur pdcurses-4.1.0-orig/wincon/Makefile.mng pdcurses-4.1.0/wincon/Makefil
  
  $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
  $(PDCOBJS) : $(PDCURSES_WIN_H)
-diff -Naur pdcurses-4.1.0-orig/wingui/Makefile.mng pdcurses-4.1.0/wingui/Makefile.mng
---- pdcurses-4.1.0-orig/wingui/Makefile.mng	2019-05-09 02:27:41.000000000 +0300
-+++ pdcurses-4.1.0/wingui/Makefile.mng	2019-05-28 08:48:33.963930900 +0300
-@@ -98,8 +98,9 @@
+diff -Naur PDCursesMod-4.2.0.orig/wingui/Makefile PDCursesMod-4.2.0/wingui/Makefile
+--- PDCursesMod-4.2.0.orig/wingui/Makefile	2020-10-03 15:41:02.146080103 -0400
++++ PDCursesMod-4.2.0/wingui/Makefile	2020-10-03 15:45:55.877307548 -0400
+@@ -97,8 +97,9 @@
  ifeq ($(DLL),Y)
  	CFLAGS += -DPDC_DLL_BUILD
  	LIBEXE = $(CC)
--	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
+-	LIBFLAGS = -Wl,--out-implib,pdcurses.a -static-libgcc -shared -o
 -	LIBCURSES = pdcurses.dll
 +	LIBARCHIVE = libpdcurses.dll.a
 +	LIBFLAGS = -Wl,--out-implib,$(LIBARCHIVE) -shared -o
 +	LIBCURSES = libpdcurses.dll
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
- 	LIBSADDED = -lgdi32 -lcomdlg32
+ 	LIBSADDED = -lgdi32 -lcomdlg32 -lwinmm
  	EXELIBS =
-@@ -111,7 +112,8 @@
+@@ -110,7 +111,8 @@
  else
  	LIBFLAGS = rv
  endif
@@ -56,8 +56,8 @@ diff -Naur pdcurses-4.1.0-orig/wingui/Makefile.mng pdcurses-4.1.0/wingui/Makefil
 +	LIBCURSES = $(LIBARCHIVE)
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
  	LIBSADDED =
- 	EXELIBS = -lgdi32 -lcomdlg32
-@@ -137,7 +139,7 @@
+ 	EXELIBS = -lgdi32 -lcomdlg32 -lwinmm
+@@ -136,7 +138,7 @@
  
  $(LIBCURSES) : $(LIBDEPS)
  	$(LIBEXE) $(LIBFLAGS) $@ $? $(LIBSADDED)
diff --git a/002-fix-exports.patch b/002-fix-exports.patch
deleted file mode 100644
index 662d22308bfb..000000000000
--- a/002-fix-exports.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ruN PDCurses-patched/term.h PDCurses/term.h
---- PDCurses-patched/term.h	2017-10-02 09:48:51.000000000 +0800
-+++ PDCurses/term.h	2017-10-02 09:49:28.290552879 +0800
-@@ -23,23 +23,23 @@
- /* PDCEX is defined in curses.h */
- PDCEX  TERMINAL *cur_term;
- 
--int     del_curterm(TERMINAL *);
--int     putp(const char *);
--int     restartterm(const char *, int, int *);
--TERMINAL *set_curterm(TERMINAL *);
--int     setterm(const char *);
--int     setupterm(const char *, int, int *);
--int     tgetent(char *, const char *);
--int     tgetflag(const char *);
--int     tgetnum(const char *);
--char   *tgetstr(const char *, char **);
--char   *tgoto(const char *, int, int);
--int     tigetflag(const char *);
--int     tigetnum(const char *);
--char   *tigetstr(const char *);
--char   *tparm(const char *, long, long, long, long, long, 
-+PDCEX  int     del_curterm(TERMINAL *);
-+PDCEX  int     putp(const char *);
-+PDCEX  int     restartterm(const char *, int, int *);
-+PDCEX  TERMINAL *set_curterm(TERMINAL *);
-+PDCEX  int     setterm(const char *);
-+PDCEX  int     setupterm(const char *, int, int *);
-+PDCEX  int     tgetent(char *, const char *);
-+PDCEX  int     tgetflag(const char *);
-+PDCEX  int     tgetnum(const char *);
-+PDCEX  char   *tgetstr(const char *, char **);
-+PDCEX  char   *tgoto(const char *, int, int);
-+PDCEX  int     tigetflag(const char *);
-+PDCEX  int     tigetnum(const char *);
-+PDCEX  char   *tigetstr(const char *);
-+PDCEX  char   *tparm(const char *, long, long, long, long, long, 
-               long, long, long, long);
--int     tputs(const char *, int, int (*)(int));
-+PDCEX  int     tputs(const char *, int, int (*)(int));
- 
- #if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
- }
diff --git a/PKGBUILD b/PKGBUILD
index 64ef57d2b620..5d157bae1e9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: Andrew Sun <adsun701@gmail.com>
-# Contributor: Filip Brcic <brcha@gna.org>
+# Maintainer: Andrew Sun <adsun701 at gmail dot com>
+# Contributor: Filip Brcic <brcha at gna dot org>
 
 pkgname=mingw-w64-pdcurses
 provides=(mingw-w64-curses)
-pkgver=4.1.0
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Public Domain Curses wincon port (mingw-w64)"
 arch=('any')
 url="https://www.projectpluto.com/win32a.htm"
@@ -13,18 +13,15 @@ makedepends=('mingw-w64-gcc')
 options=(staticlibs !buildflags !strip)
 license=("public domain")
 source=(pdcurses-${pkgver}.tar.gz::"https://github.com/Bill-Gray/PDCursesMod/archive/v${pkgver}.tar.gz"
-        001-mingw-pdcurses-4.1.0-build.patch
-        002-fix-exports.patch)
-sha256sums=('c6e036c0cb24f7909dbb8fa5011564727cd64a91efd3b7bb3e81c7509d7f5fde'
-            '913b5aff09d0ab1a2197f66a98657927d85a0dc3577c2b5e69179148fb2b0242'
-            '246f93facdd2703f8b9d0bcd57e89688fd861d34a30facc60a48892b330b08bc')
+        001-mingw-pdcurses-4.1.0-build.patch)
+sha256sums=('50e982a680f97ddc4dbf657e933dd1597101294e2f71a51e37060c85b07a3d5d'
+            '029b3755eacc8b3bebc09767b2090e18c160acc80be0b07742d8aaa098b6be89')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/PDCursesMod-${pkgver}"
   patch -p1 -i ${srcdir}/001-mingw-pdcurses-4.1.0-build.patch
-  patch -p1 -i ${srcdir}/002-fix-exports.patch
 }
 
 build() {
@@ -36,7 +33,15 @@ build() {
 # vice-versa.  That causes build failures - no surpise.
     cp -rf wingui wingui-shared-${_arch}
     pushd wingui-shared-${_arch}
-      make -f Makefile.mng \
+      make \
+        CC=${_arch}-gcc \
+        LINK=${_arch}-gcc \
+        STRIP=${_arch}-strip \
+        AR=${_arch}-ar \
+        WIDE=Y \
+        UTF8=Y \
+        DLL=Y
+      make demos \
         CC=${_arch}-gcc \
         LINK=${_arch}-gcc \
         STRIP=${_arch}-strip \
@@ -48,7 +53,14 @@ build() {
 
     cp -rf wingui wingui-static-${_arch}
     pushd wingui-static-${_arch}
-      make -f Makefile.mng \
+      make \
+        CC=${_arch}-gcc \
+        LINK=${_arch}-gcc \
+        STRIP=${_arch}-strip \
+        AR=${_arch}-ar \
+        WIDE=Y \
+        UTF8=Y
+      make demos \
         CC=${_arch}-gcc \
         LINK=${_arch}-gcc \
         STRIP=${_arch}-strip \
@@ -76,7 +88,7 @@ package() {
     install wingui-static-${_arch}/libpdcurses.a ${pkgdir}/usr/${_arch}/lib/libpanel.a
 
     echo '#include "pdcurses/curses.h"' > pdcurses.h
-    install -m 0644 curses.h panel.h term.h acs_defs.h ${pkgdir}/usr/${_arch}/include/pdcurses/
+    install -m 0644 curses.h curspriv.h panel.h ${pkgdir}/usr/${_arch}/include/pdcurses/
     install -m 0644 pdcurses.h ${pkgdir}/usr/${_arch}/include/pdcurses.h
 
     find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-unneeded {} \;