[57130] trunk/dports/aqua/qtoctave-mac

[and.damore at macports.org]

Revision: 57130
          http://trac.macports.org/changeset/57130
Author:   and.damore at macports.org
Date:     2009-09-06 12:58:08 -0700 (Sun, 06 Sep 2009)
Log Message:
-----------
Fixed #20714 , cleaned Portfile and a diff file

Modified Paths:
--------------
    trunk/dports/aqua/qtoctave-mac/Portfile
    trunk/dports/aqua/qtoctave-mac/files/patch-src-CMakeList.diff

Added Paths:
-----------
    trunk/dports/aqua/qtoctave-mac/files/patch-src-mainwindow.diff

Modified: trunk/dports/aqua/qtoctave-mac/Portfile
===================================================================
--- trunk/dports/aqua/qtoctave-mac/Portfile	2009-09-06 19:54:21 UTC (rev 57129)
+++ trunk/dports/aqua/qtoctave-mac/Portfile	2009-09-06 19:58:08 UTC (rev 57130)
@@ -4,33 +4,32 @@
 
 name                    qtoctave-mac
 version                 0.7.4
-revision		3
+revision                4
 categories              aqua math
 platforms               darwin
 maintainers             and.damore openmaintainer
 
 description             QtOctave is a front-end for Octave
 long_description        QtOctave is a front-end for Octave. Octave is a high-level language,\
-						primarily intended for numerical computations like Matlab. QtOctave\
-						tries, using menus and forms, make easy Octave.
+                        primarily intended for numerical computations like Matlab. QtOctave \
+                        tries, using menus and forms, make easy Octave.
 
-homepage		http://qtoctave.wordpress.com
-distname		qtoctave-${version}
-master_sites		http://forja.rediris.es/frs/download.php/744/
+homepage    http://qtoctave.wordpress.com
+distname    qtoctave-${version}
+master_sites    http://forja.rediris.es/frs/download.php/744/
 
-depends_lib		port:octave \
-				port:qt4-mac
+depends_lib   port:octave \
+              port:qt4-mac
+depends_build bin:cmake:cmake
 
-depends_build	bin:cmake:cmake
+patchfiles    patch-src-CMakeList.diff \
+              patch-src-mainwindow.diff
 
-patchfiles		patch-src-CMakeList.diff
-patch.pre_args	-p1
+checksums   md5  ac6fbfecd1e1ca5b07f1131701d92186 \
+        sha1  7ad0ae8e891f7a64f4254fd48245968dc83a52df \
+        rmd160  18436cdb862c9ed4f49c5c10b96be7b8201cbae4
 
-checksums		md5  ac6fbfecd1e1ca5b07f1131701d92186 \
-				sha1  7ad0ae8e891f7a64f4254fd48245968dc83a52df \
-				rmd160  18436cdb862c9ed4f49c5c10b96be7b8201cbae4
 
-
 configure.cmd       cmake
 
 configure.pre_args  -DCMAKE_INSTALL_PREFIX=${prefix}

Modified: trunk/dports/aqua/qtoctave-mac/files/patch-src-CMakeList.diff
===================================================================
--- trunk/dports/aqua/qtoctave-mac/files/patch-src-CMakeList.diff	2009-09-06 19:54:21 UTC (rev 57129)
+++ trunk/dports/aqua/qtoctave-mac/files/patch-src-CMakeList.diff	2009-09-06 19:58:08 UTC (rev 57130)
@@ -1,6 +1,5 @@
-diff -ru qtoctave-0.7.4-orig/src/CMakeLists.txt qtoctave-0.7.4/src/CMakeLists.txt
---- qtoctave-0.7.4-orig/src/CMakeLists.txt	2008-04-16 13:35:54.000000000 +0200
-+++ qtoctave-0.7.4/src/CMakeLists.txt	2008-07-25 19:06:17.000000000 +0200
+--- src/CMakeLists.txt.orig	2008-04-16 13:35:54.000000000 +0200
++++ src/CMakeLists.txt	2008-07-25 19:06:17.000000000 +0200
 @@ -58,7 +58,7 @@
  	moc_command_list.cxx
  	config.h

Added: trunk/dports/aqua/qtoctave-mac/files/patch-src-mainwindow.diff
===================================================================
--- trunk/dports/aqua/qtoctave-mac/files/patch-src-mainwindow.diff	                        (rev 0)
+++ trunk/dports/aqua/qtoctave-mac/files/patch-src-mainwindow.diff	2009-09-06 19:58:08 UTC (rev 57130)
@@ -0,0 +1,20 @@
+--- src/mainwindow.cpp.orig	2009-09-06 21:36:40.000000000 +0200
++++ src/mainwindow.cpp	2009-09-06 21:37:57.000000000 +0200
+@@ -213,7 +213,7 @@
+ 
+ void MainWindow::createMenus()
+ {
+-	menubar = new QMenuBar(this);
++	menubar = new QMenuBar(0);
+ 	menuFile = createMenu(QString("/File"),QApplication::tr("File")); 
+ 	menuHelp = createMenu("/Help", QApplication::tr("Help"));
+ 	menuData = createMenu("/Data", QApplication::tr("Data"));
+@@ -234,7 +234,7 @@
+ 	//Shows checks of visible toolbars
+ 	//connect(menuToolbars, SIGNAL(triggered(QAction * )), this, SLOT(setVisibleToolBars(QAction * )));
+ 
+-	setMenuBar(menubar);
++	//setMenuBar(menubar);
+ 
+ 	//Add actions to menubar
+ 	menubar->addAction(menuFile->menuAction());
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090906/40e2f2e2/attachment.html>