OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 30-Jul-2003 17:03:18
Branch: HEAD Handle: 2003073016031800
Modified files:
openpkg-src/mico mico.patch mico.spec
Log:
Fix option handling and dependencies, add patchcode to correct missing
namespaces in TCL library code
Summary:
Revision Changes Path
1.9 +81 -0 openpkg-src/mico/mico.patch
1.40 +28 -3 openpkg-src/mico/mico.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 mico.patch
--- openpkg-src/mico/mico.patch 2 Jul 2003 10:17:07 -0000 1.8
+++ openpkg-src/mico/mico.patch 30 Jul 2003 15:03:18 -0000 1.9
@@ -58,3 +58,84 @@
#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 @@
+ TclDispatcher *disp = event->disp;
+ CORBA::Long handle = event->handle;
+
+- set<FileEvent *, less<FileEvent *> > seen;
++ std::set<FileEvent *, std::less<FileEvent *> > seen;
+ while (42) {
+- list<FileEvent *>::iterator i;
++ std::list<FileEvent *>::iterator i;
+ for (i = disp->fevents.begin(); i != disp->fevents.end(); ++i) {
+ if ((*i)->handle != handle)
+ continue;
+@@ -80,7 +80,7 @@
+ TimerEvent *event = (TimerEvent *)_event;
+ TclDispatcher *disp = event->disp;
+
+- list<TimerEvent *>::iterator i;
++ std::list<TimerEvent *>::iterator i;
+ for (i = disp->tevents.begin(); i != disp->tevents.end(); ++i) {
+ if ((*i) == event) {
+ disp->tevents.erase(i);
+@@ -97,13 +97,13 @@
+
+ TclDispatcher::~TclDispatcher ()
+ {
+- list<FileEvent *>::iterator i;
++ std::list<FileEvent *>::iterator i;
+ for (i = fevents.begin(); i != fevents.end(); ++i) {
+ (*i)->cb->callback (this, Remove);
+ delete *i;
+ }
+
+- list<TimerEvent *>::iterator j;
++ std::list<TimerEvent *>::iterator j;
+ for (j = tevents.begin(); j != tevents.end(); ++j) {
+ (*j)->cb->callback (this, Remove);
+ delete *j;
+@@ -123,7 +123,7 @@
+ ev = 0;
+ int mask = 0;
+
+- list<FileEvent *>::iterator i;
++ std::list<FileEvent *>::iterator i;
+ for (i = fevents.begin(); i != fevents.end(); ++i) {
+ if ((*i)->handle != handle)
+ continue;
+@@ -183,7 +183,7 @@
+ TclDispatcher::remove (CORBA::DispatcherCallback *cb, Event e)
+ {
+ if (e == All || e == Timer) {
+- list<TimerEvent *>::iterator i, next;
++ std::list<TimerEvent *>::iterator i, next;
+ for (i = tevents.begin(); i != tevents.end(); i = next) {
+ next = i;
+ ++next;
+@@ -195,7 +195,7 @@
+ }
+ }
+ if (e == All || e == Read || e == Write || e == Except) {
+- list<FileEvent *>::iterator i, next;
++ std::list<FileEvent *>::iterator i, next;
+ 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;
+
+ static void input_callback (ClientData, int mask);
+ static void timer_callback (ClientData);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 mico.spec
--- openpkg-src/mico/mico.spec 23 Jul 2003 13:32:04 -0000 1.39
+++ openpkg-src/mico/mico.spec 30 Jul 2003 15:03:18 -0000 1.40
@@ -33,7 +33,7 @@
Group: System
License: LGPL/GPL
Version: 2.3.10
-Release: 20030723
+Release: 20030730
# package options
%option with_ssl no
@@ -59,6 +59,14 @@
BuildPreReq: qt
PreReq: qt
%endif
+%if "%{with_gtk}" == "yes"
+BuildPreReq: gtk
+PreReq: gtk
+%endif
+%if "%{with_tcl}" == "yes"
+BuildPreReq: tcl
+PreReq: tcl
+%endif
AutoReq: no
AutoReqProv: no
@@ -83,10 +91,19 @@
CXX="%{l_cxx}"
CFLAGS="%{l_cflags -O}"
CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated"
+ CPPFLAGS="%{l_cppflags}"
+%if "%{with_ssl}" == "yes"
+ CPPFLAGS="$CPPFLAGS -I%{l_prefix}/include/openssl}"
+%endif
%if "%{with_qt}" == "yes"
- CXXFLAGS="$CXXFLAGS %{l_cppflags qt}"
+ CPPFLAGS="$CPPFLAGS -I%{l_prefix}/include/qt}"
+%endif
+%if "%{with_gtk}" == "yes"
+ CPPFLAGS="$CPPFLAGS -I%{l_prefix}/include/gtk}"
+%endif
+%if "%{with_tcl}" == "yes"
+ CPPFLAGS="$CPPFLAGS -I%{l_prefix}/include/tcl}"
%endif
- CPPFLAGS="%{l_cppflags}"
LDFLAGS="%{l_ldflags}"
JAVAC=no
export CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS JAVAC
@@ -94,15 +111,23 @@
--prefix=%{l_prefix} \
%if "%{with_ssl}" == "yes"
--with-ssl=%{l_prefix} \
+%else
+ --with-ssl=no \
%endif
%if "%{with_qt}" == "yes"
--with-qt=%{l_prefix} \
+%else
+ --with-qt=no \
%endif
%if "%{with_gtk}" == "yes"
--with-gtk=%{l_prefix} \
+%else
+ --with-gtk=no \
%endif
%if "%{with_tcl}" == "yes"
--with-tcl=%{l_prefix} \
+%else
+ --with-tcl=no \
%endif
--disable-mini-stl \
--disable-shared
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
