[packages/wterm] - fix build with -fno-common, update app-defaults patch, release 6

[qboosh]

commit d47bd884db4ecafdb67637d6b3de0b94c97fccfc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 18 13:39:52 2026 +0200

    - fix build with -fno-common, update app-defaults patch, release 6

 wterm-extern.patch | 13 +++++++++++++
 wterm-path.patch   | 11 +++++++++++
 wterm.spec         | 32 ++++++++++++++++++++------------
 3 files changed, 44 insertions(+), 12 deletions(-)
---
diff --git a/wterm.spec b/wterm.spec
index ca15eac..5b5d1d1 100644
--- a/wterm.spec
+++ b/wterm.spec
@@ -2,15 +2,21 @@ Summary:	Terminal emulator for WindowMaker
 Summary(pl.UTF-8):	Emulator terminala dla WindowMakera
 Name:		wterm
 Version:	6.2.9
-Release:	5
-License:	GPL
+Release:	6
+License:	GPL v2+
 Group:		X11/Applications
+# host not found, now available at https://sourceforge.net/projects/wterm/ (but only as .tar.gz)
 Source0:	http://largo.windowmaker.org/files/%{name}-%{version}.tar.bz2
 # Source0-md5:	09ec12901333ad51aeca2ecd8c88730d
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-URL:		http://largo.windowmaker.org/files.php#wterm
+Patch0:		%{name}-extern.patch
+Patch1:		%{name}-path.patch
+URL:		https://sourceforge.net/projects/wterm/
 BuildRequires:	WindowMaker-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXpm-devel
+# for <X11/Intrinsic.h>
 BuildRequires:	xorg-lib-libXt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,17 +32,19 @@ przezroczystości tła czy przezroczysty pasek przewijania typu NeXT.
 
 %prep
 %setup -q 
+%patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %configure2_13 \
-	--enable-transparency \
+	--enable-menubar \
 	--enable-next-scroll \
+	--enable-transparency \
 	--enable-ttygid \
-	--enable-xpm-background \
-	--with-xpm-library=%{_libdir} \
-	--enable-menubar \
+	--enable-utmp \
 	--enable-wtmp \
-	--enable-utmp
+	--enable-xpm-background \
+	--with-xpm-library=%{_libdir}
 
 %{__make}
 
@@ -47,8 +55,8 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README doc/{BUGS,FAQ,README*,TODO}
 %attr(755,root,root) %{_bindir}/wterm
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.png
+%{_desktopdir}/wterm.desktop
+%{_pixmapsdir}/wterm.png
 %{_mandir}/man1/wterm.1*
diff --git a/wterm-extern.patch b/wterm-extern.patch
new file mode 100644
index 0000000..c438bc3
--- /dev/null
+++ b/wterm-extern.patch
@@ -0,0 +1,13 @@
+--- wterm-6.2.9/src/command.c.orig	2001-08-17 06:47:22.000000000 +0200
++++ wterm-6.2.9/src/command.c	2026-07-18 13:20:51.544632719 +0200
+@@ -286,8 +286,8 @@ static Atom     wmDeleteWindow;
+ #ifdef OFFIX_DND
+ static Atom     DndProtocol, DndSelection;
+ #endif				/* OFFIX_DND */
+-WMMenu *menu;
+-WMAppContext *app;
++extern WMMenu *menu;
++extern WMAppContext *app;
+ 
+ 
+ #ifndef NO_XLOCALE
diff --git a/wterm-path.patch b/wterm-path.patch
new file mode 100644
index 0000000..17a7ead
--- /dev/null
+++ b/wterm-path.patch
@@ -0,0 +1,11 @@
+--- wterm-6.2.9/src/feature.h.orig	2000-03-05 12:20:42.000000000 +0100
++++ wterm-6.2.9/src/feature.h	2026-07-18 13:36:40.496158474 +0200
+@@ -96,7 +96,7 @@
+  * Only if USE_XGETDEFAULT is not defined.
+  */
+ #ifndef XAPPLOADDIR
+-#define XAPPLOADDIR    "/usr/X11R6/lib/X11/app-defaults"
++#define XAPPLOADDIR    "/usr/share/X11/app-defaults"
+ #endif
+  
+ /*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wterm.git/commitdiff/d47bd884db4ecafdb67637d6b3de0b94c97fccfc