Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv27872
Modified Files:
qtoctave.info qtoctave.patch
Log Message:
dep upgrade (buildable with newer qt)...no idea if it *works* (should be nuked
entirely if no version is both buildable and at least marginally functional).
Index: qtoctave.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtoctave.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qtoctave.patch 3 Sep 2008 17:36:09 -0000 1.1
+++ qtoctave.patch 15 Jun 2011 08:45:53 -0000 1.2
@@ -1,29 +1,20 @@
-diff -r b0aef91c89a5 src/CMakeLists.txt
---- a/src/CMakeLists.txt Sat May 31 18:52:24 2008 +0200
-+++ b/src/CMakeLists.txt Sat May 31 18:56:13 2008 +0200
-@@ -58,7 +58,7 @@
- moc_command_list.cxx
- config.h
- dynamic_help/dynamic_help.h
-- moc_dynamic_help.cxx
-+ dynamic_help/moc_dynamic_help.cxx
- editor.h
- moc_editor.cxx
- generate_menu.h
-@@ -76,13 +76,13 @@
- octave_connection.h
- moc_octave_connection.cxx
- operations/general_menu.h
-- moc_general_menu.cxx
-+ operations/moc_general_menu.cxx
- operations/table_plot.h
-- moc_table_plot.cxx
-+ operations/moc_table_plot.cxx
- operations.h
- moc_operations.cxx
- projects/projects.h
-- moc_projects.cxx
-+ projects/moc_projects.cxx
- search_dialog.h
- moc_search_dialog.cxx
- session.h
+diff -Nurd -x'*~' qtoctave-0.9.1.orig/CMakeLists.txt
qtoctave-0.9.1/CMakeLists.txt
+--- qtoctave-0.9.1.orig/CMakeLists.txt 2010-01-25 08:19:48.000000000 -0500
++++ qtoctave-0.9.1/CMakeLists.txt 2011-06-15 04:28:28.000000000 -0400
+@@ -28,13 +28,13 @@
+
+ include(UseQt4)
+
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6 )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 7 )
+ MESSAGE (FATAL_ERROR
+- "Qt version 4.6 required.\n"
++ "Qt version 4.7 required.\n"
+ "Qt version installed is:
${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+ "Please install required version.\n"
+ )
+-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6 )
++endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 7 )
+
+ add_subdirectory (qtoctave_pkg/src)
+ add_subdirectory (xmlwidget/qt4)
Index: qtoctave.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtoctave.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- qtoctave.info 15 Jun 2011 08:44:28 -0000 1.19
+++ qtoctave.info 15 Jun 2011 08:45:53 -0000 1.20
@@ -1,14 +1,30 @@
Info2: <<
Package: qtoctave%type_pkg[-ui]
Version: 0.9.1
-Revision: 1005
+Revision: 1006
Type: -ui (-x11 -mac)
Source: http://forja.rediris.es/frs/download.php/1760/%{ni}-%v.tar.bz2
-##PatchFile: %{ni}.patch
-##PatchFile-MD5: 8623a4ab63e4373f1328b4add483e235
-PatchScript: perl -pi -e "s,qtinfo,qtoctave-info,g" src/scripts_octave/qtinfo.m
-Depends: qt4%type_pkg[-ui]-core-shlibs (>= 4.6-1),
qt4%type_pkg[-ui]-gui-shlibs (>= 4.6-1), fontconfig2-shlibs
-BuildDepends: (type_pkg[-ui] = -x11) x11-dev, qt4%type_pkg[-ui] (>= 4.6-1),
cmake (>= 2.6.1-2), fink (>= 0.24.12-1), fontconfig2-dev
+PatchFile: %{ni}.patch
+PatchFile-MD5: 652aacdce6c09dcbadcaffc2f330b42c
+PatchScript: <<
+ %{default_script}
+ perl -pi -e "s,qtinfo,qtoctave-info,g" src/scripts_octave/qtinfo.m
+<<
+Depends: <<
+ qt4-base%type_pkg[-ui]-qtcore-shlibs (>= 4.7.3-1),
+ qt4-base%type_pkg[-ui]-qtgui-shlibs (>= 4.7.3-1),
+ qt4-base%type_pkg[-ui]-qtnetwork-shlibs (>= 4.7.3-1),
+ qt4-base%type_pkg[-ui]-qtscript-shlibs (>= 4.7.3-1),
+ qt4-base%type_pkg[-ui]-qtsql-shlibs (>= 4.7.3-1),
+ qt4-base%type_pkg[-ui]-qtsvg-shlibs (>= 4.7.3-1),
+ qt4-base%type_pkg[-ui]-qtxml-shlibs (>= 4.7.3-1)
+<<
+BuildDepends: <<
+ cmake (>= 2.6.1-2),
+ fink (>= 0.24.12-1),
+ qt4-base%type_pkg[-ui] (>= 4.7.3-1),
+ (type_pkg[-ui] = -x11) x11-dev
+<<
Suggests: octave | octave-atlas
Conflicts: qtoctave-x11, qtoctave-mac
Replaces: qtoctave (<< 0.7.4-1006), qtoctave-x11, qtoctave-mac
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
