4.3.5

3 files changed, 34 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3b7ef0aead1..066b22cc45fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-pdcurses
 	pkgdesc = Public Domain Curses wincon port (mingw-w64)
-	pkgver = 4.3.4
+	pkgver = 4.3.5
 	pkgrel = 1
 	url = https://www.projectpluto.com/win32a.htm
 	arch = any
@@ -11,9 +11,9 @@ pkgbase = mingw-w64-pdcurses
 	options = staticlibs
 	options = !buildflags
 	options = !strip
-	source = pdcurses-4.3.4.tar.gz::https://github.com/Bill-Gray/PDCursesMod/archive/v4.3.4.tar.gz
+	source = pdcurses-4.3.5.tar.gz::https://github.com/Bill-Gray/PDCursesMod/archive/v4.3.5.tar.gz
 	source = 001-mingw-pdcurses-4.1.0-build.patch
-	sha256sums = abbd099a51612200d1bfe236d764e0f0748ee71c3a6bc2c4069447d907d55b82
-	sha256sums = 029b3755eacc8b3bebc09767b2090e18c160acc80be0b07742d8aaa098b6be89
+	sha256sums = 6d7f43d1883b9306c0dd205c4e2cc1fd8a48d37e42c3afde3b490120465e53df
+	sha256sums = 7f2e9066dfa70a57249b4c4c898e6bdc22ed686f8bb92b05852dc04b3c4bef90
 
 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 f3fdbf622db3..696c96092ab7 100644
--- a/001-mingw-pdcurses-4.1.0-build.patch
+++ b/001-mingw-pdcurses-4.1.0-build.patch
@@ -1,67 +1,69 @@
-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 @@
+diff -Naur PDCursesMod-4.3.5.orig/wincon/Makefile PDCursesMod-4.3.5/wincon/Makefile
+--- PDCursesMod-4.3.5.orig/wincon/Makefile	2022-11-29 07:10:34.152931789 -0500
++++ PDCursesMod-4.3.5/wincon/Makefile	2022-11-29 07:15:02.644861393 -0500
+@@ -101,10 +101,11 @@
+ DLLNAME = pdcurses
+ 
  ifeq ($(DLL),Y)
++	LIBARCHIVE = libpdcurses.dll.a
  	CFLAGS += -DPDC_DLL_BUILD
  	LIBEXE = $(CC)
--	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
--	LIBCURSES = pdcurses.dll
-+  LIBARCHIVE = libpdcurses.dll.a
+-	LIBFLAGS = -Wl,--out-implib,$(LIBNAME).a -shared -o
+-	LIBCURSES = $(DLLNAME).dll
 +	LIBFLAGS = -Wl,--out-implib,$(LIBARCHIVE) -shared -o
 +	LIBCURSES = libpdcurses.dll
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
  	LIBSADDED = -lwinmm
  	EXELIBS =
-@@ -115,7 +116,8 @@
+@@ -116,7 +117,8 @@
  else
- 	LIBFLAGS	= rv
+ 	LIBFLAGS = rv
  endif
--	LIBCURSES = pdcurses.a
+-	LIBCURSES = $(LIBNAME).a
 +	LIBARCHIVE = libpdcurses.a
-+  LIBCURSES = $(LIBARCHIVE)
++	LIBCURSES = $(LIBARCHIVE)
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
- 	LIBSADDED = -lwinmm
- 	EXELIBS =
-@@ -141,7 +143,7 @@
+ 	LIBSADDED =
+ 	EXELIBS = -lwinmm
+@@ -142,7 +144,7 @@
  
  $(LIBCURSES) : $(LIBDEPS)
  	$(LIBEXE) $(LIBFLAGS) $@ $? $(LIBSADDED)
--	$(CP) pdcurses.a panel.a
+-	$(CP) $(LIBNAME).a panel.a
 +	$(CP) $(LIBARCHIVE) libpanel.a
  
  $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
  $(PDCOBJS) : $(PDCURSES_WIN_H)
-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 @@
+diff -Naur PDCursesMod-4.3.5.orig/wingui/Makefile PDCursesMod-4.3.5/wingui/Makefile
+--- PDCursesMod-4.3.5.orig/wingui/Makefile	2022-11-29 07:10:34.156265146 -0500
++++ PDCursesMod-4.3.5/wingui/Makefile	2022-11-29 07:16:20.368757254 -0500
+@@ -99,8 +99,9 @@
  ifeq ($(DLL),Y)
  	CFLAGS += -DPDC_DLL_BUILD
  	LIBEXE = $(CC)
--	LIBFLAGS = -Wl,--out-implib,pdcurses.a -static-libgcc -shared -o
--	LIBCURSES = pdcurses.dll
+-	LIBFLAGS = -Wl,--out-implib,$(LIBNAME).a -static-libgcc -shared -o
+-	LIBCURSES = $(DLLNAME).dll
 +	LIBARCHIVE = libpdcurses.dll.a
 +	LIBFLAGS = -Wl,--out-implib,$(LIBARCHIVE) -shared -o
 +	LIBCURSES = libpdcurses.dll
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
  	LIBSADDED = -lgdi32 -lcomdlg32 -lwinmm
  	EXELIBS =
-@@ -110,7 +111,8 @@
+@@ -112,7 +113,8 @@
  else
  	LIBFLAGS = rv
  endif
--	LIBCURSES = pdcurses.a
+-	LIBCURSES = $(LIBNAME).a
 +	LIBARCHIVE = libpdcurses.a
 +	LIBCURSES = $(LIBARCHIVE)
  	LIBDEPS = $(LIBOBJS) $(PDCOBJS)
  	LIBSADDED =
  	EXELIBS = -lgdi32 -lcomdlg32 -lwinmm
-@@ -136,7 +138,7 @@
+@@ -138,7 +140,7 @@
  
  $(LIBCURSES) : $(LIBDEPS)
  	$(LIBEXE) $(LIBFLAGS) $@ $? $(LIBSADDED)
--	$(CP) pdcurses.a panel.a
+-	$(CP) $(LIBNAME).a panel.a
 +	$(CP) $(LIBARCHIVE) libpanel.a
  
  $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
diff --git a/PKGBUILD b/PKGBUILD
index 72faaca16b96..eeeb17149f1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mingw-w64-pdcurses
 provides=(mingw-w64-curses)
-pkgver=4.3.4
+pkgver=4.3.5
 pkgrel=1
 pkgdesc="Public Domain Curses wincon port (mingw-w64)"
 arch=('any')
@@ -14,8 +14,8 @@ 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)
-sha256sums=('abbd099a51612200d1bfe236d764e0f0748ee71c3a6bc2c4069447d907d55b82'
-            '029b3755eacc8b3bebc09767b2090e18c160acc80be0b07742d8aaa098b6be89')
+sha256sums=('6d7f43d1883b9306c0dd205c4e2cc1fd8a48d37e42c3afde3b490120465e53df'
+            '7f2e9066dfa70a57249b4c4c898e6bdc22ed686f8bb92b05852dc04b3c4bef90')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"