OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 02-Jul-2003 12:17:08
Branch: HEAD Handle: 2003070211170601
Modified files:
openpkg-src/mico mico.patch mico.spec
openpkg-web news.txt
Log:
Minimize patch changes, and replace global std namespace declaration
with four local ones
Summary:
Revision Changes Path
1.8 +38 -5 openpkg-src/mico/mico.patch
1.29 +1 -1 openpkg-src/mico/mico.spec
1.5150 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 mico.patch
--- openpkg-src/mico/mico.patch 30 Jun 2003 11:53:46 -0000 1.7
+++ openpkg-src/mico/mico.patch 2 Jul 2003 10:17:07 -0000 1.8
@@ -10,18 +10,51 @@
install-cd:
for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
---- mico.orig/include/mico/os-math.h 2003-06-13 16:07:15.000000000 +0200
-+++ mico/include/mico/os-math.h 2003-06-13 16:07:16.000000000 +0200
-@@ -280,10 +280,8 @@
+diff -Naur mico.orig/include/mico/os-math.h mico/include/mico/os-math.h
+--- mico.orig/include/mico/os-math.h 2003-05-26 12:55:46.000000000 +0200
++++ mico/include/mico/os-math.h 2003-07-01 12:00:36.000000000 +0200
+@@ -279,11 +279,7 @@
+ #include <unistd.h>
#include <signal.h>
#include <sys/types.h>
-
+-
-#if !defined(__GNUG__) || !defined(__sgi)
-// conflict for initstate ()
-#include <math.h>
-#endif
+#include <cmath>
-+using namespace std;
#ifdef HAVE_FLOAT_H
#include <float.h>
+@@ -343,6 +339,7 @@
+
+ static MICO_Boolean is_infinity (MICO_Double d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISINF)
+ return isinf (d);
+ #elif defined(HAVE_FINITE) && defined(HAVE_ISNAN)
+@@ -354,6 +351,7 @@
+
+ static MICO_Boolean is_nan (MICO_Double d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISNAN)
+ return isnan (d);
+ #else
+@@ -402,6 +400,7 @@
+
+ static MICO_Boolean is_infinityl (MICO_LongDouble d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISINFL)
+ return isinfl (d);
+ #elif defined(HAVE_ISINF)
+@@ -413,6 +412,7 @@
+
+ static MICO_Boolean is_nanl (MICO_LongDouble d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISNANL)
+ return isnanl (d);
+ #elif defined(HAVE_ISNAN)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 mico.spec
--- openpkg-src/mico/mico.spec 30 Jun 2003 11:53:46 -0000 1.28
+++ openpkg-src/mico/mico.spec 2 Jul 2003 10:17:07 -0000 1.29
@@ -33,7 +33,7 @@
Group: System
License: LGPL/GPL
Version: 2.3.10
-Release: 20030630
+Release: 20030702
# package options
%option with_ssl no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5149 -r1.5150 news.txt
--- openpkg-web/news.txt 2 Jul 2003 09:53:48 -0000 1.5149
+++ openpkg-web/news.txt 2 Jul 2003 10:17:06 -0000 1.5150
@@ -1,3 +1,4 @@
+02-Jul-2003: Upgraded package: P<mico-2.3.10-20030702>
02-Jul-2003: Upgraded package: P<libmcrypt-2.5.7-20030702>
02-Jul-2003: Upgraded package: P<cvsps-2.0rc1-20030702>
02-Jul-2003: Upgraded package: P<clamav-0.60-20030702>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
