OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 13-Oct-2003 20:39:36
Branch: HEAD Handle: 2003101319393402
Modified files:
openpkg-re/vcheck vc.mico
openpkg-src/mico mico.patch mico.spec
openpkg-web news.txt
Log:
upgrading package: mico 2.3.10 -> 2.3.11
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-re/vcheck/vc.mico
1.10 +68 -82 openpkg-src/mico/mico.patch
1.55 +3 -3 openpkg-src/mico/mico.spec
1.6990 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.mico
============================================================================
$ cvs diff -u -r1.4 -r1.5 vc.mico
--- openpkg-re/vcheck/vc.mico 27 May 2003 14:11:12 -0000 1.4
+++ openpkg-re/vcheck/vc.mico 13 Oct 2003 18:39:34 -0000 1.5
@@ -2,7 +2,7 @@
}
prog mico = {
- version = 2.3.10
+ version = 2.3.11
url = http://www.mico.org/FrameDescription.html#source
regex = mico-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 mico.patch
--- openpkg-src/mico/mico.patch 30 Jul 2003 15:03:18 -0000 1.9
+++ openpkg-src/mico/mico.patch 13 Oct 2003 18:39:36 -0000 1.10
@@ -1,67 +1,7 @@
-diff -Naur mico.orig/Makefile mico/Makefile
---- mico.orig/Makefile Fri Feb 14 11:55:53 2003
-+++ mico/Makefile Fri Feb 14 14:15:35 2003
-@@ -72,7 +72,7 @@
- $(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
- $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
- fi
-- -ldconfig
-+# -ldconfig
-
- install-cd:
- for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
-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>
-
- #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)
-diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc
---- mico.orig/auxdir/tclmico.cc Fri Dec 11 14:24:55 1998
-+++ mico/auxdir/tclmico.cc Wed Jul 30 16:14:17 2003
-@@ -46,9 +46,9 @@
+Index: auxdir/tclmico.cc
+--- auxdir/tclmico.cc.orig 2003-10-13 11:49:22.000000000 +0200
++++ auxdir/tclmico.cc 2003-10-13 20:02:21.000000000 +0200
+@@ -48,9 +48,9 @@
TclDispatcher *disp = event->disp;
CORBA::Long handle = event->handle;
@@ -73,7 +13,7 @@
for (i = disp->fevents.begin(); i != disp->fevents.end(); ++i) {
if ((*i)->handle != handle)
continue;
-@@ -80,7 +80,7 @@
+@@ -82,7 +82,7 @@
TimerEvent *event = (TimerEvent *)_event;
TclDispatcher *disp = event->disp;
@@ -82,7 +22,7 @@
for (i = disp->tevents.begin(); i != disp->tevents.end(); ++i) {
if ((*i) == event) {
disp->tevents.erase(i);
-@@ -97,13 +97,13 @@
+@@ -99,13 +99,13 @@
TclDispatcher::~TclDispatcher ()
{
@@ -98,7 +38,7 @@
for (j = tevents.begin(); j != tevents.end(); ++j) {
(*j)->cb->callback (this, Remove);
delete *j;
-@@ -123,7 +123,7 @@
+@@ -125,7 +125,7 @@
ev = 0;
int mask = 0;
@@ -107,7 +47,7 @@
for (i = fevents.begin(); i != fevents.end(); ++i) {
if ((*i)->handle != handle)
continue;
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
TclDispatcher::remove (CORBA::DispatcherCallback *cb, Event e)
{
if (e == All || e == Timer) {
@@ -116,7 +56,7 @@
for (i = tevents.begin(); i != tevents.end(); i = next) {
next = i;
++next;
-@@ -195,7 +195,7 @@
+@@ -197,7 +197,7 @@
}
}
if (e == All || e == Read || e == Write || e == Except) {
@@ -125,17 +65,63 @@
for (i = fevents.begin(); i != fevents.end(); i = next) {
next = i;
++next;
-diff -Naur mico.orig/include/mico/tclmico.h mico/include/mico/tclmico.h
---- mico.orig/include/mico/tclmico.h Mon May 26 12:55:46 2003
-+++ mico/include/mico/tclmico.h Wed Jul 30 16:13:57 2003
-@@ -57,8 +57,8 @@
- : disp (_disp), token (_token), cb (_cb)
- {}
- };
-- list<FileEvent *> fevents;
-- list<TimerEvent *> tevents;
-+ std::list<FileEvent *> fevents;
-+ std::list<TimerEvent *> tevents;
+Index: include/mico/os-math.h
+--- include/mico/os-math.h.orig 2003-10-13 11:49:32.000000000 +0200
++++ include/mico/os-math.h 2003-10-13 20:02:21.000000000 +0200
+@@ -296,11 +296,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>
+
+ #ifdef HAVE_FLOAT_H
+ #include <float.h>
+@@ -360,6 +356,7 @@
- static void input_callback (ClientData, int mask);
- static void timer_callback (ClientData);
+ 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)
+@@ -371,6 +368,7 @@
+
+ static MICO_Boolean is_nan (MICO_Double d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISNAN)
+ return isnan (d);
+ #else
+@@ -419,6 +417,7 @@
+
+ static MICO_Boolean is_infinityl (MICO_LongDouble d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISINFL)
+ return isinfl (d);
+ #elif defined(HAVE_ISINF)
+@@ -430,6 +429,7 @@
+
+ static MICO_Boolean is_nanl (MICO_LongDouble d)
+ {
++ using namespace std;
+ #if defined(HAVE_ISNANL)
+ return isnanl (d);
+ #elif defined(HAVE_ISNAN)
+Index: Makefile
+--- Makefile.orig 2003-10-13 11:49:22.000000000 +0200
++++ Makefile 2003-10-13 20:02:21.000000000 +0200
+@@ -73,7 +73,7 @@
+ $(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \
+ $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \
+ fi
+- -ldconfig
++# -ldconfig
+
+ install-cd:
+ for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 mico.spec
--- openpkg-src/mico/mico.spec 8 Oct 2003 06:31:03 -0000 1.54
+++ openpkg-src/mico/mico.spec 13 Oct 2003 18:39:36 -0000 1.55
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: System
License: LGPL/GPL
-Version: 2.3.10
-Release: 20031008
+Version: 2.3.11
+Release: 20031013
# package options
%option with_ssl no
@@ -89,7 +89,7 @@
%prep
%setup -q -n mico
- %patch -p1
+ %patch -p0
%build
CC="%{l_cc}"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6989 -r1.6990 news.txt
--- openpkg-web/news.txt 13 Oct 2003 18:14:50 -0000 1.6989
+++ openpkg-web/news.txt 13 Oct 2003 18:39:34 -0000 1.6990
@@ -1,3 +1,4 @@
+13-Oct-2003: Upgraded package: P<mico-2.3.11-20031013>
13-Oct-2003: Upgraded package: P<mozilla-1.4.1-20031013>
13-Oct-2003: Upgraded package: P<dia-0.92pre6-20031013>
13-Oct-2003: Upgraded package: P<netpbm-10.11.15-20031013>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
