[packages/xmorph] - updated to 20060817

[qboosh]

commit 6bb341679db96febf75dbbf93e5f6fc23bc2d49d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 3 20:52:15 2024 +0100

    - updated to 20060817

 xmorph-format.patch  | 11 +++++++++++
 xmorph-inline.patch  | 11 +++++++++++
 xmorph-libname.patch |  7 ++++---
 xmorph.spec          | 23 +++++++++++++++--------
 4 files changed, 41 insertions(+), 11 deletions(-)
---
diff --git a/xmorph.spec b/xmorph.spec
index 3d6dc65..ef24b51 100644
--- a/xmorph.spec
+++ b/xmorph.spec
@@ -1,30 +1,33 @@
 #
 # Conditional build:
-%bcond_with	gimp	# build as gimp plugin (broken)
+%bcond_with	gimp	# build as gimp plugin (outdated, broken)
 #
 Summary:	An X Window System tool for creating morphed images
 Summary(pl.UTF-8):	Narzędzie do morphingu pod X Window System
 Name:		xmorph
-Version:	20060130
+Version:	20060817
 Release:	1
 License:	GPL
 Group:		X11/Applications/Graphics
-Source0:	http://dl.sourceforge.net/xmorph/%{name}_%{version}.tar.gz
-# Source0-md5:	09c386be10b4318070d58bdfe494830e
+Source0:	https://downloads.sourceforge.net/xmorph/%{name}_%{version}.tar.gz
+# Source0-md5:	b4128d90c458be6d2fca9fc6045b6ddb
 Patch0:		%{name}-gimp.patch
 Patch1:		%{name}-libname.patch
 Patch2:		%{name}-info.patch
-URL:		http://xmorph.sourceforge.net/
-BuildRequires:	XFree86-devel
-BuildRequires:	autoconf
+Patch3:		%{name}-format.patch
+Patch4:		%{name}-inline.patch
+URL:		https://xmorph.sourceforge.net/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	fftw3-devel >= 3.0
 %{?with_gimp:BuildRequires:	gimp-devel >= 1:1.2}
 BuildRequires:	gtk+2-devel >= 1:2.0.0
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	texinfo
 BuildRequires:	waili-devel
+BuildRequires:	xorg-lib-libX11-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with gimp}
@@ -83,12 +86,15 @@ Statyczna biblioteka xmorph.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 echo 'AM_DEFUN([AM_PATH_GTK],[$3])' > acinclude.m4
 
 %build
+%{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -125,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/morph
 %attr(755,root,root) %{_bindir}/xmorph
 %attr(755,root,root) %{_libdir}/libxmorph.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmorph.so.1
 %{_datadir}/xmorph
 %{_mandir}/man1/morph.1*
 %{_mandir}/man1/xmorph.1*
diff --git a/xmorph-format.patch b/xmorph-format.patch
new file mode 100644
index 0000000..bfd3305
--- /dev/null
+++ b/xmorph-format.patch
@@ -0,0 +1,11 @@
+--- xmorph-20060817/gtkmorph/testfourier.cc.orig	2005-03-06 19:35:46.000000000 +0100
++++ xmorph-20060817/gtkmorph/testfourier.cc	2024-02-03 18:58:06.482305827 +0100
+@@ -149,7 +149,7 @@ int main(int argc,char* argv[])
+       result = gdk_pixbuf_save(dst,argv[7],"png",&error,NULL);
+       g_assert ((result  && !error ) || (!result && error ));
+       if(error)
+-	{g_warning((error)->message);g_error_free (error);}   
++	{g_warning("%s", (error)->message);g_error_free (error);}   
+   }
+   return 0;
+ 		     
diff --git a/xmorph-inline.patch b/xmorph-inline.patch
new file mode 100644
index 0000000..21fdc55
--- /dev/null
+++ b/xmorph-inline.patch
@@ -0,0 +1,11 @@
+--- xmorph-20060817/gtkmorph/utils.h.orig	2006-01-27 14:32:01.000000000 +0100
++++ xmorph-20060817/gtkmorph/utils.h	2024-02-03 19:01:07.664657611 +0100
+@@ -63,7 +63,7 @@ do_warp_an_image_new(int lp);
+  *  shows libc error 
+  */
+ 
+-inline  void 
++void 
+ showerr(const char *file, const  char *msg);
+ 
+ 
diff --git a/xmorph-libname.patch b/xmorph-libname.patch
index 796b1fd..90d2947 100644
--- a/xmorph-libname.patch
+++ b/xmorph-libname.patch
@@ -33,9 +33,9 @@
    mesh.c         spline.c   my_malloc.h  tga.c   tga.h  \
    RgbaImage.c         spl-array.c   warp2.c \
    relax.c  resample.c braindead_msvc.h sinc_256.h resample_snippet.h \
---- xmorph-current/morph/Makefile.am.orig	2003-05-27 08:58:55.000000000 +0200
-+++ xmorph-current/morph/Makefile.am	2004-04-12 19:27:46.526198328 +0200
-@@ -8,6 +8,6 @@
+--- xmorph-20060817/morph/Makefile.am.orig	2024-02-03 18:48:43.628688400 +0100
++++ xmorph-20060817/morph/Makefile.am	2024-02-03 18:50:20.884828185 +0100
+@@ -8,7 +8,7 @@ INCLUDES = 	-I$(top_srcdir)/libmorph -I$
  
  bin_PROGRAMS = morph
  
@@ -43,6 +43,7 @@
 +morph_LDADD =   $(INTLLIBS)  ../libmorph/libxmorph.la $(NON_GUI_LIBS)
  
  morph_SOURCES =    main.c
+ 
 --- xmorph-20060130/xmorph/Makefile.am.orig	2006-01-28 15:10:17.000000000 +0100
 +++ xmorph-20060130/xmorph/Makefile.am	2006-02-04 16:58:59.583637250 +0100
 @@ -36,4 +36,4 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xmorph.git/commitdiff/6bb341679db96febf75dbbf93e5f6fc23bc2d49d