Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv16067/sci
Modified Files:
qtiplot-qt4-mac.info qtiplot-qt4-mac.patch
qtiplot-qt4-x11.info qtiplot-qt4-x11.patch
Log Message:
fix building against Qt 4.7.x (OK'd by maintainer)
Index: qtiplot-qt4-mac.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-mac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qtiplot-qt4-mac.patch 26 Apr 2009 19:03:36 -0000 1.1
+++ qtiplot-qt4-mac.patch 20 Jul 2011 19:39:58 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/exp_saturation/exp_saturation.pro
qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
>qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/exp_saturation/exp_saturation.pro
2009-04-01 16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
2009-03-27 10:03:07.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
qtiplot-0.9.7.6-new/fitPlugins/exp_saturation/exp_saturation.pro
+--- qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
2009-04-01 10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/exp_saturation/exp_saturation.pro
2011-07-19 14:24:04.000000000 -0400
@@ -12,14 +12,14 @@
DESTDIR = ../
@@ -22,9 +22,9 @@
+#INSTALLS += target
SOURCES += exp_saturation.c
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/explin/explin.pro
qtiplot-0.9.7.6/fitPlugins/explin/explin.pro >> qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/explin/explin.pro 2009-04-01
16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/explin/explin.pro 2009-03-27
10:03:17.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/explin/explin.pro
qtiplot-0.9.7.6-new/fitPlugins/explin/explin.pro
+--- qtiplot-0.9.7.6/fitPlugins/explin/explin.pro 2009-04-01
10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/explin/explin.pro 2011-07-19
14:24:04.000000000 -0400
@@ -12,14 +12,14 @@
DESTDIR = ../
@@ -46,9 +46,9 @@
+#INSTALLS += target
SOURCES += explin.c
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro >>
qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/fitRational0/fitRational0.pro
2009-04-01 16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro 2009-03-27
10:03:23.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.7.6-new/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro 2009-04-01
10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/fitRational0/fitRational0.pro
2011-07-19 14:24:04.000000000 -0400
@@ -1,25 +1,25 @@
-QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
@@ -99,9 +99,9 @@
+#INSTALLS += target
+
SOURCES += fitRational0.cpp
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro >>
qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/fitRational1/fitRational1.pro
2009-04-01 16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro 2009-03-27
10:03:29.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.7.6-new/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro 2009-04-01
10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/fitRational1/fitRational1.pro
2011-07-19 14:24:04.000000000 -0400
@@ -12,14 +12,14 @@
DESTDIR = ../
@@ -123,9 +123,9 @@
+#INSTALLS += target
SOURCES += fitRational1.cpp
-diff -Naur qtiplot-0.9.7.6.orig/manual/Makefile
qtiplot-0.9.7.6/manual/Makefile >> qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/manual/Makefile 2009-04-01 16:16:49.000000000
+0200
-+++ qtiplot-0.9.7.6/manual/Makefile 2009-03-26 12:50:12.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/manual/Makefile qtiplot-0.9.7.6-new/manual/Makefile
+--- qtiplot-0.9.7.6/manual/Makefile 2009-04-01 10:16:49.000000000 -0400
++++ qtiplot-0.9.7.6-new/manual/Makefile 2011-07-19 14:24:04.000000000
-0400
@@ -1,3 +1,9 @@
html-pdf:
- docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
@@ -138,9 +138,9 @@
+clean:
+
+distclean:
-diff -Naur qtiplot-0.9.7.6.orig/qtiplot/qtiplot.pro
qtiplot-0.9.7.6/qtiplot/qtiplot.pro >> qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/qtiplot/qtiplot.pro 2009-04-02 02:53:44.000000000
+0200
-+++ qtiplot-0.9.7.6/qtiplot/qtiplot.pro 2009-04-08 09:47:16.000000000
+0200
+diff -Nurd qtiplot-0.9.7.6/qtiplot/qtiplot.pro
qtiplot-0.9.7.6-new/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.6/qtiplot/qtiplot.pro 2009-04-01 20:53:44.000000000
-0400
++++ qtiplot-0.9.7.6-new/qtiplot/qtiplot.pro 2011-07-19 14:25:55.000000000
-0400
@@ -1,6 +1,6 @@
# building without muParser doesn't work yet
SCRIPTING_LANGS += muParser
@@ -149,7 +149,7 @@
# a console displaying output of scripts; particularly useful on Windows
# where running QtiPlot from a terminal is inconvenient
-@@ -28,13 +28,14 @@
+@@ -28,13 +28,15 @@
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
@@ -158,6 +158,7 @@
+INCLUDEPATH += @PREFIX@/include/gsl
+INCLUDEPATH += @PREFIX@/include/boost
+INCLUDEPATH += @PREFIX@/lib/qt4-mac/include/qwt
++INCLUDEPATH += @PREFIX@/lib/qt4-mac/include/QtAssistant
INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
INCLUDEPATH += ../3rdparty/liborigin
@@ -168,7 +169,7 @@
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
-@@ -43,17 +44,14 @@
+@@ -43,17 +45,14 @@
##################### Linux (Mac OS X) ######################################
# statically link against libraries in 3rdparty
@@ -192,7 +193,7 @@
##################### Windows ###############################################
-@@ -84,7 +82,7 @@
+@@ -84,7 +83,7 @@
INSTALLS += documentation
unix:INSTALLS += man
@@ -201,7 +202,7 @@
win32: INSTALLBASE = C:/QtiPlot
unix: target.path = $$INSTALLBASE/bin
-@@ -186,7 +184,7 @@
+@@ -186,7 +185,7 @@
qtiUtil.py \
qti_wordlist.txt \
@@ -210,7 +211,7 @@
win32: pythonconfig.path = $$INSTALLBASE
DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\
")\\\"
}
-@@ -210,8 +208,8 @@
+@@ -210,8 +209,8 @@
contains(CONFIG, HAVE_LIBPNG){
DEFINES += GL2PS_HAVE_LIBPNG
Index: qtiplot-qt4-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-mac.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qtiplot-qt4-mac.info 26 Jun 2009 10:51:52 -0000 1.3
+++ qtiplot-qt4-mac.info 20 Jul 2011 19:39:58 -0000 1.4
@@ -1,11 +1,11 @@
Package: qtiplot-qt4-mac
Version: 0.9.7.6
-Revision: 3
+Revision: 5
Maintainer: Alexandre Vial <av...@altern.org>
-Depends: qt4-mac-core-shlibs (>=4.5.1-1), qt4-mac-gui-shlibs(>=4.5.1-1),
gsl-shlibs, muparser-shlibs, boost1.35.nopython-shlibs, qwt-qt4-mac-shlibs
(>=5.2.0), libpng3-shlibs
-BuildDepends: qt4-mac, gsl, muparser, libpng3, boost1.35.nopython, qwt-qt4-mac
(>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev, flag-sort,
system-openssl-dev
+Depends: qt4-mac-core-shlibs (>=4.7.3-4), qt4-mac-gui-shlibs(>=4.7.3-4),
gsl-shlibs, muparser-shlibs, boost1.41.cmake-shlibs, qwt-qt4-mac-shlibs
(>=5.2.0), libpng3-shlibs
+BuildDepends: qt4-mac (>=4.7.3-4), gsl, muparser, libpng3, boost1.41.cmake,
qwt-qt4-mac (>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev, flag-sort,
system-openssl-dev
BuildConflicts: labplot, labplot-shlibs, liborigin, liborigin-shlibs
Conflicts: qtiplot-aqua
Replaces: qtiplot-aqua
@@ -21,7 +21,7 @@
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 3d4f7fbef64803f53db5d0906c9cef05
+PatchFile-MD5: e3ece70bc011f6c499abf519ee30bea7
PatchScript: <<
#!/bin/sh -ev
sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
Index: qtiplot-qt4-x11.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- qtiplot-qt4-x11.patch 19 Apr 2009 18:27:01 -0000 1.6
+++ qtiplot-qt4-x11.patch 20 Jul 2011 19:39:58 -0000 1.7
@@ -1,6 +1,6 @@
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/exp_saturation/exp_saturation.pro
qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
>qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/exp_saturation/exp_saturation.pro
2009-04-01 16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
2009-03-27 10:03:07.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
qtiplot-0.9.7.6-new/fitPlugins/exp_saturation/exp_saturation.pro
+--- qtiplot-0.9.7.6/fitPlugins/exp_saturation/exp_saturation.pro
2009-04-01 10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/exp_saturation/exp_saturation.pro
2011-07-19 14:28:46.000000000 -0400
@@ -12,14 +12,14 @@
DESTDIR = ../
@@ -22,9 +22,9 @@
+#INSTALLS += target
SOURCES += exp_saturation.c
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/explin/explin.pro
qtiplot-0.9.7.6/fitPlugins/explin/explin.pro >> qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/explin/explin.pro 2009-04-01
16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/explin/explin.pro 2009-03-27
10:03:17.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/explin/explin.pro
qtiplot-0.9.7.6-new/fitPlugins/explin/explin.pro
+--- qtiplot-0.9.7.6/fitPlugins/explin/explin.pro 2009-04-01
10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/explin/explin.pro 2011-07-19
14:28:46.000000000 -0400
@@ -12,14 +12,14 @@
DESTDIR = ../
@@ -46,9 +46,9 @@
+#INSTALLS += target
SOURCES += explin.c
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro >>
qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/fitRational0/fitRational0.pro
2009-04-01 16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro 2009-03-27
10:03:23.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro
qtiplot-0.9.7.6-new/fitPlugins/fitRational0/fitRational0.pro
+--- qtiplot-0.9.7.6/fitPlugins/fitRational0/fitRational0.pro 2009-04-01
10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/fitRational0/fitRational0.pro
2011-07-19 14:28:46.000000000 -0400
@@ -1,25 +1,25 @@
-QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
@@ -99,9 +99,9 @@
+#INSTALLS += target
+
SOURCES += fitRational0.cpp
-diff -Naur qtiplot-0.9.7.6.orig/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro >>
qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/fitPlugins/fitRational1/fitRational1.pro
2009-04-01 16:16:14.000000000 +0200
-+++ qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro 2009-03-27
10:03:29.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro
qtiplot-0.9.7.6-new/fitPlugins/fitRational1/fitRational1.pro
+--- qtiplot-0.9.7.6/fitPlugins/fitRational1/fitRational1.pro 2009-04-01
10:16:14.000000000 -0400
++++ qtiplot-0.9.7.6-new/fitPlugins/fitRational1/fitRational1.pro
2011-07-19 14:28:46.000000000 -0400
@@ -12,14 +12,14 @@
DESTDIR = ../
@@ -123,9 +123,9 @@
+#INSTALLS += target
SOURCES += fitRational1.cpp
-diff -Naur qtiplot-0.9.7.6.orig/manual/Makefile
qtiplot-0.9.7.6/manual/Makefile >> qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/manual/Makefile 2009-04-01 16:16:49.000000000
+0200
-+++ qtiplot-0.9.7.6/manual/Makefile 2009-03-26 12:50:12.000000000 +0100
+diff -Nurd qtiplot-0.9.7.6/manual/Makefile qtiplot-0.9.7.6-new/manual/Makefile
+--- qtiplot-0.9.7.6/manual/Makefile 2009-04-01 10:16:49.000000000 -0400
++++ qtiplot-0.9.7.6-new/manual/Makefile 2011-07-19 14:28:46.000000000
-0400
@@ -1,3 +1,9 @@
html-pdf:
- docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
@@ -138,9 +138,9 @@
+clean:
+
+distclean:
-diff -Naur qtiplot-0.9.7.6.orig/qtiplot/qtiplot.pro
qtiplot-0.9.7.6/qtiplot/qtiplot.pro >> qtiplot-qt4-x11.patch
---- qtiplot-0.9.7.6.orig/qtiplot/qtiplot.pro 2009-04-02 02:53:44.000000000
+0200
-+++ qtiplot-0.9.7.6/qtiplot/qtiplot.pro 2009-04-08 09:47:16.000000000
+0200
+diff -Nurd qtiplot-0.9.7.6/qtiplot/qtiplot.pro
qtiplot-0.9.7.6-new/qtiplot/qtiplot.pro
+--- qtiplot-0.9.7.6/qtiplot/qtiplot.pro 2009-04-01 20:53:44.000000000
-0400
++++ qtiplot-0.9.7.6-new/qtiplot/qtiplot.pro 2011-07-19 14:29:00.000000000
-0400
@@ -1,6 +1,6 @@
# building without muParser doesn't work yet
SCRIPTING_LANGS += muParser
@@ -149,7 +149,7 @@
# a console displaying output of scripts; particularly useful on Windows
# where running QtiPlot from a terminal is inconvenient
-@@ -28,13 +28,14 @@
+@@ -28,13 +28,15 @@
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
@@ -158,6 +158,7 @@
+INCLUDEPATH += @PREFIX@/include/gsl
+INCLUDEPATH += @PREFIX@/include/boost
+INCLUDEPATH += @PREFIX@/lib/qt4-x11/include/qwt
++INCLUDEPATH += @PREFIX@/lib/qt4-x11/include/QtAssistant
INCLUDEPATH += ../3rdparty/qwtplot3d/include
-INCLUDEPATH += ../3rdparty/qwt/src
INCLUDEPATH += ../3rdparty/liborigin
@@ -168,7 +169,7 @@
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
-@@ -43,17 +44,14 @@
+@@ -43,17 +45,14 @@
##################### Linux (Mac OS X) ######################################
# statically link against libraries in 3rdparty
@@ -192,7 +193,7 @@
##################### Windows ###############################################
-@@ -84,7 +82,7 @@
+@@ -84,7 +83,7 @@
INSTALLS += documentation
unix:INSTALLS += man
@@ -201,7 +202,7 @@
win32: INSTALLBASE = C:/QtiPlot
unix: target.path = $$INSTALLBASE/bin
-@@ -186,7 +184,7 @@
+@@ -186,7 +185,7 @@
qtiUtil.py \
qti_wordlist.txt \
@@ -210,7 +211,7 @@
win32: pythonconfig.path = $$INSTALLBASE
DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\
")\\\"
}
-@@ -210,8 +208,8 @@
+@@ -210,8 +209,8 @@
contains(CONFIG, HAVE_LIBPNG){
DEFINES += GL2PS_HAVE_LIBPNG
Index: qtiplot-qt4-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- qtiplot-qt4-x11.info 14 Aug 2010 11:50:30 -0000 1.12
+++ qtiplot-qt4-x11.info 20 Jul 2011 19:39:58 -0000 1.13
@@ -1,11 +1,11 @@
Package: qtiplot-qt4-x11
Version: 0.9.7.6
-Revision: 4
+Revision: 5
Maintainer: Alexandre Vial <av...@altern.org>
-Depends: x11, qt4-x11-core-shlibs, qt4-x11-gui-shlibs, gsl-shlibs,
muparser-shlibs, boost1.35.nopython-shlibs, qwt-qt4-x11-shlibs (>=5.2.0),
libpng14-shlibs, libiconv
-BuildDepends: x11-dev, qt4-x11, gsl, muparser, boost1.35.nopython, qwt-qt4-x11
(>=5.2.0), fink (>= 0.28), flag-sort, libpng14, libiconv-dev, system-openssl-dev
+Depends: x11, qt4-x11-core-shlibs (>=4.7.3-4), qt4-x11-gui-shlibs (>=4.7.3-4),
gsl-shlibs, muparser-shlibs, boost1.41.cmake-shlibs, qwt-qt4-x11-shlibs
(>=5.2.0), libpng14-shlibs, libiconv
+BuildDepends: x11-dev, qt4-x11 (>=4.7.3-4), gsl, muparser, boost1.41.cmake,
qwt-qt4-x11 (>=5.2.0), fink (>= 0.28), flag-sort, libpng14, libiconv-dev,
system-openssl-dev
Conflicts: qtiplot
Replaces: qtiplot
@@ -15,7 +15,7 @@
Source: http://soft.proindependent.com/src/qtiplot-%v.tar.bz2
SourceDirectory: qtiplot-%v
-Source-MD5: a9b9b2fbd3044022a7afa3a89ec5c47d
+Source-MD5: 775573038fb41d19c0db24c191750dac
GCC: 4.0
------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
