OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Jun-2006 21:32:24
Branch: HEAD Handle: 2006061420322000
Modified files:
openpkg-src/aspell aspell.patch aspell.spec
Log:
fix building under stricter C++ of GCC 4.1
Summary:
Revision Changes Path
1.8 +24 -12 openpkg-src/aspell/aspell.patch
1.49 +1 -1 openpkg-src/aspell/aspell.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aspell/aspell.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 aspell.patch
--- openpkg-src/aspell/aspell.patch 9 Feb 2005 16:24:52 -0000 1.7
+++ openpkg-src/aspell/aspell.patch 14 Jun 2006 19:32:20 -0000 1.8
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2004-08-23 03:22:41 +0200
-+++ Makefile.in 2004-08-27 21:46:22 +0200
-@@ -425,7 +425,7 @@
+--- Makefile.in.orig 2005-10-19 11:14:24 +0200
++++ Makefile.in 2006-06-14 21:25:36 +0200
+@@ -447,7 +447,7 @@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = foreign subdir-objects
SUBDIRS = . po manual
@@ -10,9 +10,9 @@
filterdir = ${pkglibdir}
optdir = ${pkgdatadir}
localedir = ${datadir}/locale
-diff -uNr ../aspell-0.60.2.orig/aspell6-de-20030222-1/configure
./aspell6-de-20030222-1/configure
---- ../aspell-0.60.2.orig/aspell6-de-20030222-1/configure 2004-11-03
18:46:10.000000000 -0800
-+++ ./aspell6-de-20030222-1/configure 2005-01-27 17:28:10.000000000
-0800
+Index: aspell6-de-20030222-1/configure
+--- aspell6-de-20030222-1/configure.orig 2004-11-04 03:46:10 +0100
++++ aspell6-de-20030222-1/configure 2006-06-14 21:25:36 +0200
@@ -66,9 +66,9 @@
#echo $ASPELL
@@ -37,9 +37,9 @@
echo "DESTDIR = $DESTDIR" >> Makefile
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
-diff -uNr ../aspell-0.60.2.orig/aspell6-de-alt-2.1-1/configure
./aspell6-de-alt-2.1-1/configure
---- ../aspell-0.60.2.orig/aspell6-de-alt-2.1-1/configure 2004-11-03
18:48:55.000000000 -0800
-+++ ./aspell6-de-alt-2.1-1/configure 2005-01-27 17:28:54.000000000 -0800
+Index: aspell6-de-alt-2.1-1/configure
+--- aspell6-de-alt-2.1-1/configure.orig 2004-11-04 03:48:55 +0100
++++ aspell6-de-alt-2.1-1/configure 2006-06-14 21:25:36 +0200
@@ -66,9 +66,9 @@
#echo $ASPELL
@@ -64,9 +64,9 @@
echo "DESTDIR = $DESTDIR" >> Makefile
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
-diff -uNr ../aspell-0.60.2.orig/aspell6-en-6.0-0/configure
./aspell6-en-6.0-0/configure
---- ../aspell-0.60.2.orig/aspell6-en-6.0-0/configure 2004-08-10
02:01:33.000000000 -0700
-+++ ./aspell6-en-6.0-0/configure 2005-01-27 17:29:27.000000000 -0800
+Index: aspell6-en-6.0-0/configure
+--- aspell6-en-6.0-0/configure.orig 2004-08-10 11:01:33 +0200
++++ aspell6-en-6.0-0/configure 2006-06-14 21:25:36 +0200
@@ -66,9 +66,9 @@
#echo $ASPELL
@@ -91,3 +91,15 @@
echo "DESTDIR = $DESTDIR" >> Makefile
echo "dictdir = $dictdir" >> Makefile
echo "datadir = $datadir" >> Makefile
+Index: modules/filter/nroff.cpp
+--- modules/filter/nroff.cpp.orig 2005-02-20 22:49:18 +0100
++++ modules/filter/nroff.cpp 2006-06-14 21:27:10 +0200
+@@ -73,7 +73,7 @@
+ return false;
+ }
+
+- bool NroffFilter::process_char (FilterChar::Chr c);
++ bool process_char (FilterChar::Chr c);
+
+ public:
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/aspell/aspell.spec
============================================================================
$ cvs diff -u -r1.48 -r1.49 aspell.spec
--- openpkg-src/aspell/aspell.spec 1 Jan 2006 13:12:06 -0000 1.48
+++ openpkg-src/aspell/aspell.spec 14 Jun 2006 19:32:20 -0000 1.49
@@ -40,7 +40,7 @@
Group: Text
License: GPL
Version: %{V_aspell}
-Release: 20051026
+Release: 20060614
# package options
%option with_perl no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
