[packages/xpaint] - up to 3.1.4, todo unpackaged files

[baggins]

commit e82fc68cefaa2f6b200d8db6669dce68575a2ac3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 27 03:59:58 2025 +0200

    - up to 3.1.4, todo unpackaged files

 xpaint-util-opt.patch | 19 +++++++------------
 xpaint.spec           | 31 ++++++++++++++-----------------
 2 files changed, 21 insertions(+), 29 deletions(-)
---
diff --git a/xpaint.spec b/xpaint.spec
index 69f9f9e..37f4103 100644
--- a/xpaint.spec
+++ b/xpaint.spec
@@ -6,24 +6,25 @@ Summary(pl.UTF-8):	Program do rysowania pod X Window
 Summary(pt_BR.UTF-8):	Programa de desenho para X
 Summary(tr.UTF-8):	X altında boyama programı
 Name:		xpaint
-Version:	2.9.10
-Release:	2
+Version:	3.1.4
+Release:	0.1
 License:	MIT
 Group:		X11/Applications/Graphics
 Source0:	http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
-# Source0-md5:	8608e4e034aa6c09541070fcecc527e0
+# Source0-md5:	e20c3283db9513d204090d6b67f62a3a
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-util-opt.patch
 URL:		http://sourceforge.net/projects/sf-xpaint/
-BuildRequires:	libxaw3dxft-devel >= 1.6.2
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpgf-devel
 BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	libtiff-devel
+BuildRequires:	netpbm-devel
 BuildRequires:	openjpeg-devel
+BuildRequires:	libxaw3dxft-devel >= 1.6.4
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXft-devel
 BuildRequires:	xorg-lib-libXpm-devel >= 3.4c
@@ -77,24 +78,20 @@ bir programdır.
 %setup -q
 %patch -P0 -p1
 
-# force regeneration and creation of xaw_incdir symlink
-%{__rm} version.h
-# kill prebuilt binaries
-%{__rm} util/{pdfconcat,ppmtops,pgf2pnm,*.o}
-
-%{__sed} -e 's#@CC@#%{__cc}#' \
-	-e 's#@CXX@#%{__cxx}#' \
-	-e 's#@CFLAGS@#%{rpmcflags}#' \
-	-e 's#@CXXFLAGS@#%{rpmcxxflags}#' \
-	-e 's#@CPPFLAGS@#%{rpmcppflags}#' \
-	-i util/Makefile
-
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure
 
+export CXXFLAGS="%{rpmcxxflags} -std=c++11"
 %{__make} -j1 \
 	XAPPLOADDIR=%{_appdefsdir}
 
+%{__make} -j1 -C util \
+	XAPPLOADDIR=%{_appdefsdir}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
@@ -107,7 +104,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 # API not exported, library requires symbols from executable
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/librw.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libxpaintrw.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/xpaint-util-opt.patch b/xpaint-util-opt.patch
index fe64300..b96e622 100644
--- a/xpaint-util-opt.patch
+++ b/xpaint-util-opt.patch
@@ -1,16 +1,11 @@
---- xpaint-2.9.10/util/Makefile.orig	2012-02-05 15:14:24.000000000 +0100
-+++ xpaint-2.9.10/util/Makefile	2014-07-22 17:02:25.404157758 +0200
-@@ -1,10 +1,10 @@
--GCC = gcc
--CPP = g++ -fpermissive
-+GCC = @CC@ @CFLAGS@ @CPPFLAGS@
-+CPP = @CXX@ @CXXFLAGS@ @CPPFLAGS@ -fpermissive
- 
- all: pdfconcat ppmtops pgf2pnm
+--- xpaint-3.1.4/util/Makefile.orig	2020-08-09 19:20:37.000000000 +0200
++++ xpaint-3.1.4/util/Makefile	2025-09-27 01:19:59.253326383 +0200
+@@ -10,7 +10,7 @@
+ endif
  
  pdfconcat:
--	$(GCC) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
-+	$(GCC) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
+-	$(CC) $(CFLAGS) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
++	$(CC) $(CFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
  
  ppmtops:
- 	$(GCC) ppmtops.c -o ppmtops
+ 	$(CC) $(CFLAGS) ppmtops.c -o ppmtops
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xpaint.git/commitdiff/e82fc68cefaa2f6b200d8db6669dce68575a2ac3