profiles: Drop last-rited sci-mathematics/qtoctave

Closes: https://bugs.gentoo.org/631524
Closes: https://bugs.gentoo.org/615284
Closes: https://bugs.gentoo.org/614582
Closes: https://bugs.gentoo.org/598930
This commit is contained in:
Andreas Sturmlechner
2017-12-21 00:15:35 +01:00
parent 25a02f548c
commit dd9a9a3f00
13 changed files with 0 additions and 441 deletions

View File

@@ -387,11 +387,6 @@ net-analyzer/aimsniff
# Masked for removal in 30 days. Bug #638432
dev-perl/Mail-SPF-Query
# Andreas Sturmlechner <asturm@gentoo.org> (21 Nov 2017)
# Totally broken, depends on dead Qt4. Use sci-mathematics/octave[gui].
# Masked for removal in 30 days. Bugs #598930, #615284, #614582, #631524
sci-mathematics/qtoctave
# Alice Ferrazzi <alicef@gentoo.org> (21 Nov 2017)
# A regression in kernel 4.14.0
# Data corruption issue that affects at minimum bcache.

View File

@@ -1 +0,0 @@
DIST qtoctave-0.10.1.tar.gz 4215812 BLAKE2B 742f2ab0fbe697a8728e76b7b4dfe4e3088031ca521140ef2c52d6fe2523a46b60e67e368d531b7b3279c07a13f2a44ac0b3daecf1c41610028eb942b1287255 SHA512 b91e59ba9f16ebc2da9f2d606d0e7440d06e13cd6670fb7aa896eb30ad43835df74b7ba5127f1e9095c88de2468c6d2b2c174f1c5b1638678968bf81647b665f

View File

@@ -1,20 +0,0 @@
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

View File

@@ -1,98 +0,0 @@
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

View File

@@ -1,8 +0,0 @@
--- 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;

View File

@@ -1,64 +0,0 @@
--- 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

View File

@@ -1,37 +0,0 @@
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);

View File

@@ -1,61 +0,0 @@
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;
};

View File

@@ -1,35 +0,0 @@
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()));

View File

@@ -1,15 +0,0 @@
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

View File

@@ -1,34 +0,0 @@
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

View File

@@ -1,16 +0,0 @@
<?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>

View File

@@ -1,47 +0,0 @@
# 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
}