diff options
Diffstat (limited to 'sci-mathematics/qtoctave')
12 files changed, 449 insertions, 0 deletions
diff --git a/sci-mathematics/qtoctave/Manifest b/sci-mathematics/qtoctave/Manifest new file mode 100644 index 000000000000..777369f09e99 --- /dev/null +++ b/sci-mathematics/qtoctave/Manifest @@ -0,0 +1,14 @@ +AUX qtoctave-0.10.1-build-out-of-source.patch 754 SHA256 3ef37bcc3c348fb8c7f2c12db221137cbcd1c62933156a12a6d04ba350e3196b SHA512 f1f02efdaf28ae7b40146ac2526e5518e1fa9e871dcff3ec24fdf5f1ef5592d3cb3023d4d9dcc89837119c53222897bdf6a3a79bbab7f38b3f5c5802e70e8ba6 WHIRLPOOL e9826ee5165543765caa4d898a96c0758ea46dd1d08aab9d6604edd7c6a6583835e82bce229c81995ccb65bde8c260fefa026de48bfafc60bb86f3aea22e5e73 +AUX qtoctave-0.10.1-build-widgetserver.patch 2516 SHA256 2fe0cde5ebdf6844eb9794a9f71e6f8a63750801e4d56640176f6af0ccf9131f SHA512 41169582372f0aed15efd3eaaea953c96da7b29a173eceb2807536c12fd85b13f38743601fa14a6c886dedb46457641bab41c3035ca93fda050187929111a15e WHIRLPOOL 4e086cf96486b779f501ccfa2ed10036e6abae903eb435a94edc1f6c829e62d8b47d2a6671685e7beed05f4309e800efe1cf8a57f424ad30577c2857db19bc84 +AUX qtoctave-0.10.1-desktop-file.patch 325 SHA256 904ed122df2567cd1bd4ea8f44ee84d2c2023b4eeae3e937b9d8b3ec31da8659 SHA512 d4040d70a6f15afcb8fc2c9cdeb343fcdedbee877a8baa8a3c025d66f26a34c4006e8c304dba54c7cd0928719141b1e5d990ecd1d68f000e8ab0b30c61c2cb54 WHIRLPOOL 01f877833ed66eb9264cd33c675dc3b0720b92a764cb5f7cedd9311723a1bafaf899be1abedf976ecec30a1c8903167999dae4d5961ce721ddddf9606e94e027 +AUX qtoctave-0.10.1-doc-path.patch 2215 SHA256 0771e7122fd6a07929cbc3c0e8b4ce9f19a1688bf336a0ed3db02d7c5d95e9c6 SHA512 144600cb25254ba258cd0b0e81031e13df068afc273734946fe4a7a48a5209beed2f591df353cd2b9dcf91123d26a081ff8ed9cfeb2d194a66a2b4267e5b1860 WHIRLPOOL 12b58c7f075cefbc895c2d947b23620c045e1c9eb0cf7adbf3631f449c871ecaa377baaef5c773167109adc4f69b3d2adcc1f412679f947995cda0106dd8292b +AUX qtoctave-0.10.1-filedialog-filters.patch 1024 SHA256 0ac2f752a2d769cc69416d70ae9bde96997475360e82df23e5e944d7a79bf8ec SHA512 40bdd2f6d241749ea9df8d01394bab986b04c6ab8fd6ee422970d245a421a918de64517cff1f36754cdafb709e29335963cab748085aeb42765e6a4e6b3ca0ce WHIRLPOOL 2fdbe3c4ea7751c771306442fa72a6e0f962d3f889efcdc881a120b3a52bdbf75c132c7ae95b4d4d038495b17566c05526816c219ab7d146fbc5c6b870f3d430 +AUX qtoctave-0.10.1-initial_position.patch 2132 SHA256 dbb356f36e8533ee8a603c90a73c11eb974fa32c59aca8ba5bdd36a29b4c2933 SHA512 958268a7dea55ffbe5bc0f15c9d75018f246cbadfb94b864a88b8124b58f88cb012a3711e7fb4ad0ed7d0b8e6b5acc479e70bfbda7b70845b794ac9c65b8b0a5 WHIRLPOOL 51550514b3282295047f26ed1dbf174f596963cf2968858bf6d982ab3ad3398e80dae3115c37c45c8bcbcdd59c0a59ed31fded2e80c02bfd9bc6b999cd85c012 +AUX qtoctave-0.10.1-no-native-menubars.patch 1756 SHA256 e812de7110f79599d07c880d558ada48ffbfc11e083ff66fd36be1981dddbf19 SHA512 aada2d650ecb0072cd013eab2993820b7a4744506f19d3c64148a10f4f9493101221c9cf2de3ff99a1cc1280a7719fd10ca4cf5341bfc5e778e268c971d9edb6 WHIRLPOOL 1751e4f988eb4fd259789120a1c451ef669fb178edc8d0fe33b0fe9991ba73c3e5d7456b24fc0099445f0b1261afb2668ac6ab62cbf64bf469f5fceaf3e744f3 +AUX qtoctave-0.10.1-qtinfo-octave3.4.patch 508 SHA256 b582d74141ea2596b52ae2b4ae3e7a0c3959069dc0773d6a60c94913101f00b3 SHA512 1bc3193a327d213ddcd252f07597cecdbc6ec065eb2c326694acb79f5745971de46a146ead40a50d64e73f38ab61377cb5b9387ab049bd81c869cef993be6dcb WHIRLPOOL ea072b80d3c4ba4e1c662fc6c7f1ad6e18f458d15386d2b1fdbfe75f66e76a02641cb720ac97433d46d164e5fc6a0a229c8b095b0188e49f99e402a6378d2057 +AUX qtoctave-0.10.1-use_octave_htmldoc.patch 1185 SHA256 ceb7f8fdc7a9616617f21d19ce733556dc44d3f61e95cdb58f63b6cd24a4ccda SHA512 43fe58a6987b168d5582234b5e8e747d2e426dfc88b57c8f79acd3feb744c96b570a07ed8928465fee721f3da62ec62ff462b0bc43b4c8325feb5ab93bb817cf WHIRLPOOL b5d04ed254937c19736b19bf9b2932ea238a8184c59150ba84b123b1c70d16682afe1e8ddd32ea8d4e6ce11744637bb21534bd386878f8484aff8620d3bb3e1f +DIST qtoctave-0.10.1.tar.gz 4215812 SHA256 4abd367924964887ea691f93c2c8ec90dcc64eb22827893dfb506ae43331b732 SHA512 b91e59ba9f16ebc2da9f2d606d0e7440d06e13cd6670fb7aa896eb30ad43835df74b7ba5127f1e9095c88de2468c6d2b2c174f1c5b1638678968bf81647b665f WHIRLPOOL fc5e3058bf18dcfe1f12315a37d07d4e80b76d6efaaf5c7f1b3622dd2ec6bb8277a76c19f45ce20a00a733db897ba839e23254c55b9cd41664d917a8c54bd097 +EBUILD qtoctave-0.10.1-r1.ebuild 1161 SHA256 d8148d3ed7fc41cb196c0c2e9f0e4339012244f0acf3fe0d75a0d8a5cfb255c2 SHA512 08f25df1a53b52a9393be10fbae9b3c4006aa6c9c4220f3b435b6bd8da3be2c5f098d2e5f99638991a1e1a4b7cb9f132ffb7b857950a1f2d5d2fe263229836fb WHIRLPOOL 9c05d53cc6678bc1f16cb828086d47387036aeafc552cff75f4ad8f7c3d20e1453118c3fb60e80450908f8cb77e1bbdb4d2bfcbf3d303f4e1a5ed933b07c7514 +MISC ChangeLog 3278 SHA256 62cb6472b9dbd65be35cb565d80f2e6bb1b1c755d362b399ad23e190e6440333 SHA512 d400760e9f0d22f858b9e171be6d283228aaad631662de203bcdff1b7bb4d161c074cc7743230ddb7995ab27311c88c5f82e0f34a2f98f7f507e2c471c684e51 WHIRLPOOL 359e44d88e3abf20af008fd0fcc71dad4838b8c12039a954bc457c641d34b4131faae5cbb6b63348dfd51f4c05477149da1bea2b85defcf3b9100c72e09e79f3 +MISC ChangeLog-2015 4683 SHA256 5724ca9bf3d12b6526ba60ab74963bd3b046838327844bf77d4875eeb4b69930 SHA512 5eeb65aea8b3115e40ea210b88be99ee7e612db2f8f823a19b534a58ab6dba321962cecc1458d04a8771669d5f95e3f212475edb55ed48b6542d34bcf5844e89 WHIRLPOOL b48fc594461673da8a2ea60f61fb1ba6623bd4e538a1ece7c2d021967219207007e223e10bb38ff6f96d0283f014eb03a0e0179d881f6fd15d6a66be013cc804 +MISC metadata.xml 668 SHA256 6095d80fd55fb5279d7ffc6c9027e87a182dc10738e4223096a05ae359c0cf70 SHA512 7c451489e7c3f6ed69124913b3360d6b1f300e0baa675eba34968d4e33bb0165bf3e39526b3ae6541e31a5c7558b666c4c46479622137fcc83060b00e93ba184 WHIRLPOOL 5210e0b3cfe9c97baac41c28016274d431aea5013545f48c7b7c33e55f6b4ca64dd1a81293cf155d1199facf892198536a3c7016a71b6efd41accb7a6935f89c diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch new file mode 100644 index 000000000000..e4e7ad9f6a69 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-out-of-source.patch @@ -0,0 +1,20 @@ +From: Thomas Weber <tweber@debian.org> +Description: Remove configure.h to enable correct out-of-source builds + The file is included in the upstream tarball due to the way the release + tarball is generated. +Forwarded: not-needed + +--- a/qtoctave/src/configure.h ++++ /dev/null +@@ -1,11 +0,0 @@ +- +-#ifndef __CONFIGURE_H__ +-#define __CONFIGURE_H__ +-#define CONFIG_PATH "/opt/qtoctave/share/qtoctave" +-#define HELP_PATH "/opt/qtoctave/share/doc/octave-html/octave_doc/index.html" +-#define ICON_PATH "/opt/qtoctave/share/qtoctave/images" +-#define LANG_PATH "/opt/qtoctave/share/qtoctave/lang" +-#define QTOCTAVE_HELP_PATH "/opt/qtoctave/share/doc/qtoctave/qtoctave_doc/index.html" +- +-#define PKG_CMD_PATH "/opt/qtoctave/share/qtoctave/pkg-commands.list" +-#endif diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch new file mode 100644 index 000000000000..17d92a61d5f2 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-build-widgetserver.patch @@ -0,0 +1,98 @@ +From: Jordi Gutiérrez Hermoso <jordigh@gmail.com> +Subject: widgetserver wasn't included in newer CMake build, this fixes this +Forwarded: http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2010-June/007430.html +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,6 +38,7 @@ + + add_subdirectory (qtoctave_pkg/src) + add_subdirectory (xmlwidget/qt4) ++add_subdirectory (widgetserver) + add_subdirectory (easy_plot) + add_subdirectory (simple_rcs) + add_subdirectory (qtjs) +--- /dev/null ++++ b/widgetserver/CMakeLists.txt +@@ -0,0 +1,11 @@ ++add_subdirectory(widgetserver) ++ ++install( ++ DIRECTORY doc ++ DESTINATION share/doc/qtoctave-utils/widgetserver ++) ++ ++install( ++ FILES "leeme.txt" "readme.txt" ++ DESTINATION share/doc/qtoctave-utils/widgetserver ++) +--- /dev/null ++++ b/widgetserver/widgetserver/CMakeLists.txt +@@ -0,0 +1,48 @@ ++FIND_PACKAGE(Qt4 REQUIRED) ++ ++MESSAGE (STATUS "Use file: ${QT_USE_FILE}") ++ ++SET(QT_USE_QTXML 1) ++ ++include(UseQt4) ++ ++include_directories(${QT_INCLUDE_DIR}) ++include_directories(${QT_QT_INCLUDE_DIR}) ++include_directories(${QT_QTCORE_INCLUDE_DIR}) ++include_directories(${QT_QTGUI_INCLUDE_DIR}) ++include_directories(${QT_QTXML_INCLUDE_DIR}) ++include_directories(${CMAKE_CURRENT_BINARY_DIR}) ++include_directories(${QT_QTSCRIPT_INCLUDE_DIR}) ++include_directories(${QT_QTUITOOLS_INCLUDE_DIR}) ++ ++FILE(GLOB widgetserver_moc_headers *.h ) ++FILE(GLOB widgetserver_sources *.cpp ) ++ ++# run moc on these files: ++QT4_WRAP_CPP( widgetserver_moc_sources ${widgetserver_moc_headers} ) ++ ++add_executable(widgetserver ++ ${widgetserver_sources} ${widgetserver_moc_sources} ${widgetserver_moc_headers} ++) ++ ++SET_TARGET_PROPERTIES(widgetserver ++ PROPERTIES INSTALL_RPATH ":usr/lib" ++ BUILD_WITH_INSTALL_RPATH true ++ INSTALL_RPATH_USE_LINK_PATH true ++) ++ ++TARGET_LINK_LIBRARIES(widgetserver ++ ${Qt4_LIBRARIES} ++ ${QT_QTCORE_LIBRARY} ++ ${QT_QTGUI_LIBRARY} ++ ${QT_QTXML_LIBRARY} ++ ${QT_QTSCRIPT_LIBRARY} ++ ${QT_QTUITOOLS_LIBRARY} ++) ++ ++ ++install ( ++ TARGETS widgetserver ++ RUNTIME DESTINATION bin ++ ) ++ +--- a/widgetserver/widgetserver/input.h ++++ b/widgetserver/widgetserver/input.h +@@ -4,6 +4,7 @@ + #include <QThread> + #include "process.h" + #include "buffer.h" ++#include <cstdio> + + class Input:public QThread + { +--- a/widgetserver/widgetserver/process.h ++++ b/widgetserver/widgetserver/process.h +@@ -5,6 +5,7 @@ + #include <QMap> + #include <QWidget> + #include <QBuffer> ++#include <cstdio> + + + class Widget: public QObject diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch new file mode 100644 index 000000000000..b48a3c215737 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-desktop-file.patch @@ -0,0 +1,8 @@ +--- qtoctave/src/config_files/qtoctave.desktop.orig 2013-07-16 11:26:02.619168052 -0700 ++++ qtoctave/src/config_files/qtoctave.desktop 2013-07-16 11:25:54.316124742 -0700 +@@ -4,4 +4,4 @@ + Icon=qtoctave + Exec=qtoctave + Type=Application +-Categories=Education;Science;Math;Qt; ++Categories=Development;Education;Science;Math;Qt; diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch new file mode 100644 index 000000000000..481520b5c656 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-doc-path.patch @@ -0,0 +1,64 @@ +--- qtoctave-0.10.1/qtjs/CMakeLists.txt 2011-01-06 23:48:05.000000000 +0200 ++++ qtoctave-0.10.1/qtjs/CMakeLists.txt 2011-02-06 18:16:37.000000000 +0200 +@@ -2,10 +2,5 @@ + + install( + DIRECTORY doc +- DESTINATION share/doc/qtoctave-utils/qtjs ++ DESTINATION share/qtoctave/qtjs + ) +- +-install( +- FILES "instalar.txt" "install.txt" +- DESTINATION share/doc/qtoctave-utils/qtjs +-) +\ No newline at end of file +--- qtoctave-0.10.1/qtoctave/src/CMakeLists.txt 2011-01-06 23:48:07.000000000 +0200 ++++ qtoctave-0.10.1/qtoctave/src/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200 +@@ -74,7 +74,7 @@ + + install ( + DIRECTORY qtoctave_doc +- DESTINATION share/doc/qtoctave ++ DESTINATION share/qtoctave + PATTERN ".svn" EXCLUDE + ) + +--- qtoctave-0.10.1/qtoctave/src/configure.h.in 2011-01-06 23:48:06.000000000 +0200 ++++ qtoctave-0.10.1/qtoctave/src/configure.h.in 2011-02-06 18:15:41.000000000 +0200 +@@ -5,7 +5,7 @@ + #define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html" + #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images" + #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang" +-#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html" ++#define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/qtoctave_doc/index.html" + + #define PKG_CMD_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/pkg-commands.list" + #endif +--- qtoctave-0.10.1/simple_rcs/CMakeLists.txt 2011-01-06 23:48:06.000000000 +0200 ++++ qtoctave-0.10.1/simple_rcs/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200 +@@ -17,6 +17,6 @@ + + install( + DIRECTORY design +- DESTINATION share/doc/qtoctave-utils/simple_rcs ++ DESTINATION share/qtoctave/simple_rcs + PATTERN ".svn" EXCLUDE + ) +\ No newline at end of file +--- qtoctave-0.10.1/xmlwidget/CMakeLists.txt 2011-01-06 23:48:06.000000000 +0200 ++++ qtoctave-0.10.1/xmlwidget/CMakeLists.txt 2011-02-06 18:15:41.000000000 +0200 +@@ -2,10 +2,10 @@ + + install( + DIRECTORY doc +- DESTINATION share/doc/qtoctave-utils/xmlwidget ++ DESTINATION share/qtoctave/xmlwidget + ) + + install( + DIRECTORY examples +- DESTINATION share/doc/qtoctave-utils/xmlwidget ++ DESTINATION share/qtoctave/xmlwidget + ) +\ No newline at end of file diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch new file mode 100644 index 000000000000..ddee96afc906 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-filedialog-filters.patch @@ -0,0 +1,37 @@ +Description: Fix *.m filename filters in file dialogs + Not forwarded to upstream since upstream author stopped development. +Author: Sébastien Villemot <sebastien@debian.org> +Bug-Debian: http://bugs.debian.org/620062 +Forwarded: no +Last-Update: 2011-08-21 +--- a/qtoctave/src/editor.cpp ++++ b/qtoctave/src/editor.cpp +@@ -295,7 +295,7 @@ + { + QStringList filters; + +- filters << "Octave (*.m; *.M)" ++ filters << "Octave (*.m *.M)" + << "Plain text (*.txt)" + << "All files (*)"; + +@@ -475,7 +475,7 @@ + QFileDialog openDialog(this, tr("Open") /*Qt::Dialog*/); + + QStringList filters; +- filters << "Octave (*.m; *.M)" ++ filters << "Octave (*.m *.M)" + << "Plain text (*.txt)" + << "All files (*)"; + +--- a/qtoctave/src/main.cpp ++++ b/qtoctave/src/main.cpp +@@ -308,7 +308,7 @@ + QFileDialog openDialog(NULL, tr("Open"), "."); + QStringList filters; + +- filters << "Octave (*.m; *.M)"; ++ filters << "Octave (*.m *.M)"; + + openDialog.setFilters(filters); + openDialog.setAcceptMode(QFileDialog::AcceptOpen); diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch new file mode 100644 index 000000000000..cd97291a9bd5 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-initial_position.patch @@ -0,0 +1,61 @@ +Description: Fix crash when closing a dock tool within the first 5 seconds + (a NULL pointer dereference caused by a race condition between the user + closing the tool and the timer setting the initial positions, prevented by + using a QWeakPointer instead of a raw QWidget *) +Author: Kevin Kofler <kevin.kofler@chello.at> +Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=722986 +Forwarded: no +Last-Update: 2011-10-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff -ur qtoctave-0.10.1/qtoctave/src/main.cpp qtoctave-0.10.1-initialposition/qtoctave/src/main.cpp +--- qtoctave-0.10.1/qtoctave/src/main.cpp 2011-01-06 22:48:07.000000000 +0100 ++++ qtoctave-0.10.1-initialposition/qtoctave/src/main.cpp 2011-10-06 20:17:03.000000000 +0200 +@@ -595,7 +595,7 @@ + initPos.maximized=maximized; + initPos.minimized=minimized; + initPos.widget=bw->parentWidget(); +- if(initPos.widget!=NULL) ++ if(!initPos.widget.isNull()) + initialPositionList.append(initPos); + //bw->show(); + //bw->move(x,y); +@@ -694,10 +694,14 @@ + { + foreach(InitialPosition i, initialPositionList) + { +- i.widget->move(i.x,i.y); +- i.widget->resize(i.width, i.height); +- if(i.maximized) i.widget->showMaximized(); +- if(i.minimized) i.widget->showMinimized(); ++ QWidget *widget = i.widget.data(); ++ if (widget) ++ { ++ widget->move(i.x,i.y); ++ widget->resize(i.width, i.height); ++ if(i.maximized) widget->showMaximized(); ++ if(i.minimized) widget->showMinimized(); ++ } + } + } + +diff -ur qtoctave-0.10.1/qtoctave/src/main.h qtoctave-0.10.1-initialposition/qtoctave/src/main.h +--- qtoctave-0.10.1/qtoctave/src/main.h 2011-01-06 22:48:08.000000000 +0100 ++++ qtoctave-0.10.1-initialposition/qtoctave/src/main.h 2011-10-06 20:12:55.000000000 +0200 +@@ -27,6 +27,7 @@ + #include <QListWidget> + #include <QTimer> + #include <QVector> ++#include <QWeakPointer> + #include "mainwindow.h" + #include "octave_connection.h" + #include "terminal.h" +@@ -41,7 +42,7 @@ + struct InitialPosition + { + int x, y, width, height; +- QWidget *widget; ++ QWeakPointer<QWidget> widget; + bool maximized, minimized; + }; + diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch new file mode 100644 index 000000000000..677b5e5ed817 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-no-native-menubars.patch @@ -0,0 +1,35 @@ +Description: Do not export docked window menubars to desktop panel +Author: Aurélien Gâteau <aurelien.gateau@canonical.com> +Forwarded: Sent to http://groups.google.com/group/qtoctave-english +Bug-Ubuntu: https://bugs.launchpad.net/appmenu-qt/+bug/673210 +Index: qtoctave-0.10.1/qtoctave/src/basewidget.cpp +=================================================================== +--- qtoctave-0.10.1.orig/qtoctave/src/basewidget.cpp 2011-01-06 22:48:07.000000000 +0100 ++++ qtoctave-0.10.1/qtoctave/src/basewidget.cpp 2011-09-14 11:03:11.000000000 +0200 +@@ -30,6 +30,7 @@ + //setFocusPolicy(Qt::StrongFocus); + session=NULL; + QWidget *central=new QWidget(this); ++ menuBar()->setNativeMenuBar(false); + setCentralWidget(central); + + QMenu *windows_menu=menuBar()->addMenu(tr("View")); +Index: qtoctave-0.10.1/qtoctave/src/mainwindow.cpp +=================================================================== +--- qtoctave-0.10.1.orig/qtoctave/src/mainwindow.cpp 2011-01-06 22:48:07.000000000 +0100 ++++ qtoctave-0.10.1/qtoctave/src/mainwindow.cpp 2011-09-14 12:03:14.000000000 +0200 +@@ -39,7 +39,13 @@ + setSession(session); + setWindowIcon(QIcon(QString(ICON_PATH) + "/qtoctave.png")); + +- menuBar()->clear(); ++ //The menubar provided by BaseWidget is set as not-native to avoid showing up ++ //in top-panel menubars on desktops like Unity, but we want a native menubar ++ //here, and we also want to get rid of the generic "View" item BaseWidget ++ //added to the menubar. Setting a new menubar is the simplest way to do this ++ //(the old one gets deleted). ++ //[1] https://bugs.launchpad.net/appmenu-qt/+bug/673210 ++ setMenuBar(new QMenuBar()); + + setWindowTitle("QtOctave ["+session->getProjectName()+"]"); + //resize(QSize(800, 600).expandedTo(minimumSizeHint())); diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch new file mode 100644 index 000000000000..5d8824789894 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-qtinfo-octave3.4.patch @@ -0,0 +1,15 @@ +Description: Make qtinfo compatible with Octave >= 3.4 +Origin: upstream, commit: 282 +Forwarded: not-needed +Last-Update: 2012-03-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/qtoctave/src/scripts_octave/qtinfo.m ++++ b/qtoctave/src/scripts_octave/qtinfo.m +@@ -1,5 +1,5 @@ + function qtinfo() + command=sprintf("qtoctave-info-reader %s > /dev/null", info_file); + printf("Starting info: %s\n", command); +- system(command, 1, "async"); ++ system(command, 0, "async"); + endfunction diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch new file mode 100644 index 000000000000..08eeb9c52e34 --- /dev/null +++ b/sci-mathematics/qtoctave/files/qtoctave-0.10.1-use_octave_htmldoc.patch @@ -0,0 +1,34 @@ +Description: Update Octave's HTML doc path to use octave-htmldoc + Also, avoid failure on nonexistent path to upstream stripped HTML files. +Author: Thomas Weber <tweber@debian.org> +Author: Sébastien Villemot <sebastien@debian.org> +Last-Update: 2012-03-11 +Forwarded: not-needed +--- a/qtoctave/src/configure.h.in ++++ b/qtoctave/src/configure.h.in +@@ -2,7 +2,7 @@ + #ifndef __CONFIGURE_H__ + #define __CONFIGURE_H__ + #define CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave" +-#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-html/octave_doc/index.html" ++#define HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/octave-htmldoc/interpreter/index.html" + #define ICON_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/images" + #define LANG_PATH "${CMAKE_INSTALL_PREFIX}/share/qtoctave/lang" + #define QTOCTAVE_HELP_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/qtoctave/qtoctave_doc/index.html" +--- a/qtoctave/src/CMakeLists.txt ++++ b/qtoctave/src/CMakeLists.txt +@@ -64,14 +64,6 @@ + DESTINATION share/qtoctave/lang + ) + +- +- +-install ( +- DIRECTORY octave_doc +- DESTINATION share/doc/octave-html +- PATTERN ".svn" EXCLUDE +- ) +- + install ( + DIRECTORY qtoctave_doc + DESTINATION share/doc/qtoctave diff --git a/sci-mathematics/qtoctave/metadata.xml b/sci-mathematics/qtoctave/metadata.xml new file mode 100644 index 000000000000..c4c5e08b7a66 --- /dev/null +++ b/sci-mathematics/qtoctave/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>sci-mathematics@gentoo.org</email> + <name>Gentoo Mathematics Project</name> +</maintainer> +<longdescription lang="en"> + Besides offering an attractive front-end to GNU Octave, an + environment for numerical computation highly compatible with MATLAB, + QtOctave currently also features matrix data entry and display and + some GUI shortcuts to frequently used Octave functions. It also + offers access in place to Octave's documentation with octave-htmldoc + or octave-info. +</longdescription> +</pkgmetadata> diff --git a/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild b/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild new file mode 100644 index 000000000000..72efb864e808 --- /dev/null +++ b/sci-mathematics/qtoctave/qtoctave-0.10.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils multilib + +PID=2054 + +DESCRIPTION="Qt4 front-end for Octave" +HOMEPAGE="http://forja.rediris.es/projects/csl-qtoctave/" +SRC_URI="http://forja.rediris.es/frs/download.php/${PID}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +CDEPEND=" + || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) + >=dev-qt/qtsvg-4.6:4" +RDEPEND="${CDEPEND} + sci-mathematics/octave" +DEPEND="${CDEPEND} + virtual/pkgconfig" + +DOCS=(readme.txt leeme.txt) + +PATCHES=( + "${FILESDIR}"/${P}-build-out-of-source.patch + "${FILESDIR}"/${P}-build-widgetserver.patch + "${FILESDIR}"/${P}-doc-path.patch + "${FILESDIR}"/${P}-filedialog-filters.patch + "${FILESDIR}"/${P}-initial_position.patch + "${FILESDIR}"/${P}-no-native-menubars.patch + "${FILESDIR}"/${P}-qtinfo-octave3.4.patch + "${FILESDIR}"/${P}-use_octave_htmldoc.patch + "${FILESDIR}"/${P}-desktop-file.patch +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_INSTALL_RPATH=ON + -DCMAKE_SKIP_RPATH=ON + ) + cmake-utils_src_configure +} |