From: qrczak <qrczak@pld-linux.org>
Date: Thu, 15 Feb 2007 20:46:39 +0000 (+0000)
Subject: - Fixed a compilation error with a newer gcc
X-Git-Tag: auto/th/mpage-2_5_1-8~1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmpage.git;a=commitdiff_plain;h=3a5f3aa114eb532d01b0bdbdd707832668b024df

- Fixed a compilation error with a newer gcc
- Release 8

Changed files:
    mpage-incomplete-type.patch -> 1.1
    mpage.spec -> 1.23
---

diff --git a/mpage-incomplete-type.patch b/mpage-incomplete-type.patch
new file mode 100644
index 0000000..b728b2f
--- /dev/null
+++ b/mpage-incomplete-type.patch
@@ -0,0 +1,20 @@
+--- mpage-2.5.1/mpage.h~	1998-03-24 23:07:58.000000000 +0100
++++ mpage-2.5.1/mpage.h	2007-02-15 21:43:42.000000000 +0100
+@@ -159,7 +159,6 @@
+ extern int ps_width;	/* number of points in the X direction (8.5 inches) */
+ extern int ps_height;	/* number of points in the Y direction (11 inches) */
+ extern char * media;	/* name of output page media */
+-extern struct page_desc paper[];
+ 
+ /*
+  * a sheet describes the measurements and orientatation of a page for
+@@ -208,7 +207,8 @@
+     int width;
+     int height;
+ };
+-    
++
++extern struct page_desc paper[];
+ 
+ /* array of sheets where pages are ordered for coli ??? */
+ extern struct sheet coli[];
diff --git a/mpage.spec b/mpage.spec
index 4f0a882..4b1b4bd 100644
--- a/mpage.spec
+++ b/mpage.spec
@@ -5,7 +5,7 @@ Summary(pl.UTF-8):	Narzędzie pozwalające umieścić wiele stron na jednym wydr
 Summary(tr.UTF-8):	Birden fazla metin sayfasını tek bir PostScript sayfasına yerleştirir
 Name:		mpage
 Version:	2.5.1
-Release:	7
+Release:	8
 License:	BSD
 Group:		Applications/Publishing
 Source0:	http://www.mesa.nl/pub/mpage/%{name}251pre.tgz
@@ -16,6 +16,7 @@ Patch2:		%{name}-debian.patch
 Patch3:		%{name}-tempfile.patch
 Patch4:		%{name}-j.patch
 Patch5:		%{name}-level3.patch
+Patch6:		%{name}-incomplete-type.patch
 URL:		http://www.mesa.nl/index_e.html
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,6 +59,7 @@ olanak verir.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__make} \