Author: ranger
Date: Fri Oct 26 18:17:57 2007
New Revision: 1018
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1018&repname=user%3a+ranger
Log:
fix kdevelop on leopard, also do the kioslave now that svn is unified
Modified:
trunk/experimental/10.3/main/finkinfo/kde/kdevelop.info
trunk/experimental/10.3/main/finkinfo/kde/kdevelop.patch
trunk/experimental/10.4/main/finkinfo/kde/kdevelop.info
trunk/experimental/10.4/main/finkinfo/kde/kdevelop.patch
trunk/experimental/common/main/finkinfo/kde/kdevelop.info
trunk/experimental/common/main/finkinfo/kde/kdevelop.patch
Modified: trunk/experimental/10.3/main/finkinfo/kde/kdevelop.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kdevelop.info&rev=1018&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kdevelop.info (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/kdevelop.info Fri Oct 26 18:17:57
2007
@@ -14,9 +14,12 @@
graphviz,
libgettext3-shlibs,
libiconv,
- python24 | python24-nox
+ python24 | python24-nox,
+ svn (>= 1.4.4-11)
<<
BuildDepends: <<
+ apr-dev (>= 0.9.12-10),
+ aprutil-dev (>= 0.9.12-10),
arts-dev (>= 1.5.5-11),
autoconf (>= 2.60-1),
automake1.7,
@@ -42,6 +45,7 @@
pkgconfig,
python24 | python24-nox,
qt3 (>= 3.3.8-11),
+ svn-dev (>= 1.4.4-11),
x11-dev
<<
BuildConflicts: unsermake, flex
@@ -71,7 +75,7 @@
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
-ConfigureParams: --with-pythondir=%p --with-qtdoc-dir=%p/share/doc/qt3/html
--with-kdelibsdoxy-dir=%p/share/doc/kde/en/kdelibs-apidocs --enable-scripting
--enable-autoproject --enable-scriptproject --enable-trollproject
--enable-customproject --enable-cvs --enable-ada --enable-haskell
--disable-java --enable-pascal --enable-cxx --enable-dynamic --enable-rpc
--enable-tcl --with-tcl --enable-vba --with-db-includedir=%p/include/db4
--with-db-libdir=%p/lib --with-distribution='Fink/Mac OS X'
+ConfigureParams: --with-pythondir=%p --with-qtdoc-dir=%p/share/doc/qt3/html
--with-kdelibsdoxy-dir=%p/share/doc/kde/en/kdelibs-apidocs --enable-scripting
--enable-autoproject --enable-scriptproject --enable-trollproject
--enable-customproject --enable-cvs --enable-ada --enable-haskell
--disable-java --enable-pascal --enable-cxx --enable-dynamic --enable-rpc
--enable-tcl --with-tcl --enable-vba --with-db-includedir=%p/include/db4
--with-db-libdir=%p/lib --with-distribution='Fink/Mac OS X'
--with-apr-config=%p/bin/apr-config
CompileScript: <<
#!/bin/sh -ev
@@ -86,7 +90,7 @@
perl -pi -e 's/s,[EMAIL PROTECTED]@,\$all_includes,/s,[EMAIL
PROTECTED]@,\$CPPFLAGS \$all_includes,/; s/s,[EMAIL
PROTECTED]@,\$all_libraries,/s,[EMAIL PROTECTED]@,\$LDFLAGS \$all_libraries,/'
configure
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- ./build-helper.sh make %N %v %r make USE_EXCEPTIONS="-fexceptions
-fno-coalesce" include_kioslave_svn_TRUE='#' include_kioslave_svn_FALSE=''
+ ./build-helper.sh make %N %v %r make USE_EXCEPTIONS="-fexceptions
-fno-coalesce"
<<
InstallScript: <<
@@ -95,7 +99,7 @@
export HOME=/tmp PREFIX="%p" PATH="%p/lib/doxygen1.3/bin:$PATH"
QTDOCDIR="%p/share/doc/qt3/html"
. ./environment-helper.sh
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
include_kioslave_svn_TRUE='#' include_kioslave_svn_FALSE=''
+ ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
Modified: trunk/experimental/10.3/main/finkinfo/kde/kdevelop.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/kdevelop.patch&rev=1018&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/kdevelop.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/kdevelop.patch Fri Oct 26
18:17:57 2007
@@ -1,6 +1,6 @@
--- kdevelop-3.5.0/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-05-14 03:41:05.000000000 -0400
-+++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-10-15 16:21:19.000000000 -0400
++++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-10-26 10:28:00.000000000 -0400
@@ -23,13 +23,21 @@
#include "environmentdisplaydialog.h"
@@ -23,3 +23,13 @@
while ( *e )
{
+--- kdevelop-3.5.0/lib/cppparser/cachemanager.h 2007-05-14
03:41:12.000000000 -0400
++++ kdevelop-3.5.0-new/lib/cppparser/cachemanager.h 2007-10-26
10:29:47.000000000 -0400
+@@ -18,6 +18,7 @@
+ #include <cstdlib>
+ #include <set>
+ #include <limits>
++#include <sys/types.h>
+
+ class CacheManager;
+
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdevelop.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdevelop.info&rev=1018&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdevelop.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdevelop.info Fri Oct 26 18:17:57
2007
@@ -14,9 +14,12 @@
graphviz,
libgettext3-shlibs,
libiconv,
- python24 | python24-nox
+ python24 | python24-nox,
+ svn (>= 1.2.3-1012)
<<
BuildDepends: <<
+ apr-dev (>= 0.9.12-10),
+ aprutil-dev (>= 0.9.12-10),
arts-dev (>= 1.5.5-1021),
autoconf (>= 2.60-1),
automake1.7,
@@ -42,6 +45,7 @@
pkgconfig,
python24 | python24-nox,
qt3 (>= 3.3.8-1021),
+ svn-dev (>= 1.2.3-1012),
x11-dev
<<
BuildConflicts: unsermake, flex
@@ -71,7 +75,7 @@
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
-ConfigureParams: --with-pythondir=%p --with-qtdoc-dir=%p/share/doc/qt3/html
--with-kdelibsdoxy-dir=%p/share/doc/kde/en/kdelibs-apidocs --enable-scripting
--enable-autoproject --enable-scriptproject --enable-trollproject
--enable-customproject --enable-cvs --enable-ada --enable-haskell
--enable-pascal --enable-cxx --enable-dynamic --enable-rpc --enable-tcl
--with-tcl --enable-vba --with-db-includedir=%p/include/db4
--with-db-libdir=%p/lib --with-distribution='Fink/Mac OS X'
+ConfigureParams: --with-pythondir=%p --with-qtdoc-dir=%p/share/doc/qt3/html
--with-kdelibsdoxy-dir=%p/share/doc/kde/en/kdelibs-apidocs --enable-scripting
--enable-autoproject --enable-scriptproject --enable-trollproject
--enable-customproject --enable-cvs --enable-ada --enable-haskell
--enable-pascal --enable-cxx --enable-dynamic --enable-rpc --enable-tcl
--with-tcl --enable-vba --with-db-includedir=%p/include/db4
--with-db-libdir=%p/lib --with-distribution='Fink/Mac OS X'
--with-apr-config=%p/bin/apr-config
CompileScript: <<
#!/bin/sh -ev
@@ -86,7 +90,7 @@
perl -pi -e 's/s,[EMAIL PROTECTED]@,\$all_includes,/s,[EMAIL
PROTECTED]@,\$CPPFLAGS \$all_includes,/; s/s,[EMAIL
PROTECTED]@,\$all_libraries,/s,[EMAIL PROTECTED]@,\$LDFLAGS \$all_libraries,/'
configure
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- ./build-helper.sh make %N %v %r make
include_kioslave_svn_TRUE='#' include_kioslave_svn_FALSE=''
+ ./build-helper.sh make %N %v %r make
<<
InstallScript: <<
@@ -95,7 +99,7 @@
export HOME=/tmp PREFIX="%p" PATH="%p/lib/doxygen1.3/bin:$PATH"
QTDOCDIR="%p/share/doc/qt3/html"
. ./environment-helper.sh
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
include_kioslave_svn_TRUE='#' include_kioslave_svn_FALSE=''
+ ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdevelop.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdevelop.patch&rev=1018&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdevelop.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdevelop.patch Fri Oct 26
18:17:57 2007
@@ -1,6 +1,6 @@
--- kdevelop-3.5.0/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-05-14 03:41:05.000000000 -0400
-+++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-10-15 16:21:19.000000000 -0400
++++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-10-26 10:28:00.000000000 -0400
@@ -23,13 +23,21 @@
#include "environmentdisplaydialog.h"
@@ -23,3 +23,13 @@
while ( *e )
{
+--- kdevelop-3.5.0/lib/cppparser/cachemanager.h 2007-05-14
03:41:12.000000000 -0400
++++ kdevelop-3.5.0-new/lib/cppparser/cachemanager.h 2007-10-26
10:29:47.000000000 -0400
+@@ -18,6 +18,7 @@
+ #include <cstdlib>
+ #include <set>
+ #include <limits>
++#include <sys/types.h>
+
+ class CacheManager;
+
Modified: trunk/experimental/common/main/finkinfo/kde/kdevelop.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdevelop.info&rev=1018&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdevelop.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdevelop.info Fri Oct 26
18:17:57 2007
@@ -14,9 +14,12 @@
graphviz,
libgettext3-shlibs,
libiconv,
- python24 | python24-nox
+ python24 | python24-nox,
+ svn (>= 1.4.4-11)
<<
BuildDepends: <<
+ apr-dev (>= 0.9.12-10),
+ aprutil-dev (>= 0.9.12-10),
arts-dev (>= 1.5.5-1),
autoconf (>= 2.59-1),
automake1.7,
@@ -42,6 +45,7 @@
pkgconfig,
python24 | python24-nox,
qt3 (>= 3.3.5-3),
+ svn-dev (>= 1.4.4-11),
x11-dev
<<
BuildConflicts: unsermake, flex
@@ -67,7 +71,7 @@
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-ConfigureParams: --with-pythondir=%p --with-qtdoc-dir=%p/share/doc/qt3/html
--with-kdelibsdoxy-dir=%p/share/doc/kde/en/kdelibs-apidocs --enable-scripting
--enable-autoproject --enable-scriptproject --enable-trollproject
--enable-customproject --enable-cvs --enable-ada --enable-haskell
--disable-java --enable-pascal --enable-cxx --enable-dynamic --enable-rpc
--enable-tcl --with-tcl --enable-vba --with-db-includedir=%p/include/db4
--with-db-libdir=%p/lib --with-distribution='Fink/Mac OS X'
+ConfigureParams: --with-pythondir=%p --with-qtdoc-dir=%p/share/doc/qt3/html
--with-kdelibsdoxy-dir=%p/share/doc/kde/en/kdelibs-apidocs --enable-scripting
--enable-autoproject --enable-scriptproject --enable-trollproject
--enable-customproject --enable-cvs --enable-ada --enable-haskell
--disable-java --enable-pascal --enable-cxx --enable-dynamic --enable-rpc
--enable-tcl --with-tcl --enable-vba --with-db-includedir=%p/include/db4
--with-db-libdir=%p/lib --with-distribution='Fink/Mac OS X'
--with-apr-config=%p/bin/apr-config
# FIXME: java freaks out because of stupid exception crap on gcc-3.3, is there
a workaround?
CompileScript: <<
@@ -84,7 +88,7 @@
perl -pi -e 's/s,[EMAIL PROTECTED]@,\$all_includes,/s,[EMAIL
PROTECTED]@,\$CPPFLAGS \$all_includes,/; s/s,[EMAIL
PROTECTED]@,\$all_libraries,/s,[EMAIL PROTECTED]@,\$LDFLAGS \$all_libraries,/'
configure
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- ./build-helper.sh make %N %v %r make USE_EXCEPTIONS="-fexceptions
-fno-coalesce" include_kioslave_svn_TRUE='#' include_kioslave_svn_FALSE=''
+ ./build-helper.sh make %N %v %r make USE_EXCEPTIONS="-fexceptions
-fno-coalesce"
<<
InstallScript: <<
@@ -93,7 +97,7 @@
export HOME=/tmp PREFIX="%p" PATH="%p/lib/doxygen1.3/bin:$PATH"
QTDOCDIR="%p/share/doc/qt3/html"
. ./environment-helper.sh
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
include_kioslave_svn_TRUE='#' include_kioslave_svn_FALSE=''
+ ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
Modified: trunk/experimental/common/main/finkinfo/kde/kdevelop.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdevelop.patch&rev=1018&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdevelop.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdevelop.patch Fri Oct 26
18:17:57 2007
@@ -1,6 +1,6 @@
diff -uNr kdevelop-3.5.0/buildtools/lib/widgets/environmentdisplaydialog.cpp
kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
--- kdevelop-3.5.0/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-05-14 03:41:05.000000000 -0400
-+++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-10-15 16:21:19.000000000 -0400
++++ kdevelop-3.5.0-new/buildtools/lib/widgets/environmentdisplaydialog.cpp
2007-10-26 10:28:00.000000000 -0400
@@ -23,13 +23,21 @@
#include "environmentdisplaydialog.h"
@@ -23,3 +23,14 @@
while ( *e )
{
+diff -uNr kdevelop-3.5.0/lib/cppparser/cachemanager.h
kdevelop-3.5.0-new/lib/cppparser/cachemanager.h
+--- kdevelop-3.5.0/lib/cppparser/cachemanager.h 2007-05-14
03:41:12.000000000 -0400
++++ kdevelop-3.5.0-new/lib/cppparser/cachemanager.h 2007-10-26
10:29:47.000000000 -0400
+@@ -18,6 +18,7 @@
+ #include <cstdlib>
+ #include <set>
+ #include <limits>
++#include <sys/types.h>
+
+ class CacheManager;
+
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
