mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-16 18:43:18 -04:00
Merge updates from master
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST scidavis-2.3.0.tar.gz 9821439 BLAKE2B df542f570c4aa0ac93b8565dbd96937e6d3afe74d907d3f5145abd68cd44eff67f7d8892c70c21d9e9b308db119635050630efab9ca6ecffe70df38415711b86 SHA512 2ede70bcf5b910fc61e5a23ba36129bde11fd10b14470d4e8c9509eecb245c73242a3a1eec174b4f9a22abd21880e6ecbd9f0d1e492af87ff781163ad05e20cf
|
||||
@@ -1,39 +0,0 @@
|
||||
diff --git a/config.pri b/config.pri
|
||||
index 2b8d943..6034b6a 100644
|
||||
--- a/config.pri
|
||||
+++ b/config.pri
|
||||
@@ -278,30 +278,13 @@ osx_dist {
|
||||
|
||||
contains(PRESET, linux_package) {
|
||||
### dynamically link against Qwt(3D) installed system-wide
|
||||
-
|
||||
- exists(/usr/include/qt5/qwt5-qt5) {INCLUDEPATH+=/usr/include/qt5/qwt5-qt5}
|
||||
- exists(/usr/include/qt5/qwtplot3d-qt5) {INCLUDEPATH+=/usr/include/qt5/qwtplot3d-qt5}
|
||||
- exists(/usr/include/qwt5-qt5) {INCLUDEPATH+=/usr/include/qwt5-qt5}
|
||||
- exists(/usr/include/qwtplot3d) {INCLUDEPATH+=/usr/include/qwtplot3d}
|
||||
-
|
||||
- system (ls /usr/lib*/libqwt5-qt5.so) {LIBS+=-lqwt5-qt5}
|
||||
- system (ls /usr/lib*/*/libqwt5-qt5.so) {LIBS+=-lqwt5-qt5}
|
||||
- system (ls /usr/lib*/libqwt-qt5.so) {LIBS+=-lqwt-qt5}
|
||||
- system (ls /usr/lib*/libqwtplot3d-qt5.so) {LIBS+=-lqwtplot3d-qt5}
|
||||
- system (ls /usr/lib*/*/libqwtplot3d-qt5.so) {LIBS+=-lqwtplot3d-qt5}
|
||||
-
|
||||
-
|
||||
+ INCLUDEPATH +=/usr/include/qwt5
|
||||
+ INCLUDEPATH +=/usr/include/qwtplot3d
|
||||
+ LIBS +=-lqwt5-qt5
|
||||
+ LIBS +=-lqwtplot3d
|
||||
LIBS += -lz -lGLU
|
||||
-
|
||||
- INCLUDEPATH += /usr/include/muParser
|
||||
LIBS += -lgsl -lgslcblas
|
||||
LIBS += -lmuparser
|
||||
-
|
||||
- # enable user installed packages
|
||||
- INCLUDEPATH = "$(HOME)/usr/include" $$INCLUDEPATH
|
||||
- QMAKE_LIBDIR = "$(HOME)/usr/lib" $$QMAKE_LIBDIR
|
||||
-
|
||||
-
|
||||
}
|
||||
|
||||
contains(PRESET, self_contained) {
|
||||
@@ -1,10 +0,0 @@
|
||||
diff --git a/test/testPaintDevice.cpp b/test/testPaintDevice.cpp
|
||||
index 8657307..89693b0 100644
|
||||
--- a/test/testPaintDevice.cpp
|
||||
+++ b/test/testPaintDevice.cpp
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "testPaintDevice.h"
|
||||
+#include <QPainterPath>
|
||||
using namespace std;
|
||||
|
||||
namespace
|
||||
@@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>andrewammerlaan@riseup.net</email>
|
||||
<name>Andrew Ammerlaan</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
SciDAVis is a user-friendly data analysis and visualization program primarily aimed at high-quality plotting of scientific data.
|
||||
It strives to combine an intuitive, easy-to-use graphical user interface with powerful features such as Python scriptability.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="assistant">Compile with QAssistant (documentation broweser) support from <pkg>dev-qt/assistant</pkg>.</flag>
|
||||
<flag name="origin">Add support for reading OriginLab OPJ project files through <pkg>sci-libs/liborigin</pkg>.</flag>
|
||||
<flag name="python">Build support for python scripting.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">SciDAVis</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit python-single-r1 qmake-utils xdg
|
||||
|
||||
DESCRIPTION="Application for Scientific Data Analysis and Visualization"
|
||||
HOMEPAGE="http://scidavis.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/SciDAVis/$(ver_cut 1)/$(ver_cut 1-2)/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="assistant doc origin python test"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
dev-cpp/muParser
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtopengl:5
|
||||
sci-libs/gsl
|
||||
sys-libs/zlib[minizip]
|
||||
x11-libs/qwt5-qt5:5
|
||||
x11-libs/qwtplot3d
|
||||
assistant? ( dev-qt/assistant )
|
||||
origin? ( sci-libs/liborigin )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/PyQt5[${PYTHON_USEDEP}]
|
||||
dev-python/PyQt5-sip[${PYTHON_USEDEP}]
|
||||
dev-python/sip[${PYTHON_USEDEP}]
|
||||
')
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
doc? ( app-doc/doxygen )
|
||||
test? ( dev-libs/unittest++ )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-build.patch"
|
||||
"${FILESDIR}/${PN}-tests.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# OF has been renamed in Gentoo https://bugs.gentoo.org/383179
|
||||
# Note this is *not* packaged in sys-libs/zlib[minizip] because
|
||||
# this file resides in the test directory in upstream zlib
|
||||
sed -i -r 's:\<(O[FN])\>:_Z_\1:g' 3rdparty/minigzip/minigzip.c || die
|
||||
|
||||
# fix paths
|
||||
cat >> config.pri <<-EOF
|
||||
# install docs to ${PF} instead of ${PN}
|
||||
documentation.path = "\$\$INSTALLBASE/share/doc/${PF}"
|
||||
|
||||
# install python files in Gentoo specific directories
|
||||
pythonconfig.path = "$(python_get_scriptdir)"
|
||||
pythonutils.path = "$(python_get_scriptdir)"
|
||||
|
||||
# /usr/share/appdata is deprecated
|
||||
appdata.path = "\$\$INSTALLBASE/share/metainfo"
|
||||
EOF
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
INSTALLBASE="${EPREFIX}/usr" eqmake5 \
|
||||
$(usex assistant " " " CONFIG+=noassistant ") \
|
||||
$(usex origin " CONFIG+=liborigin " " ") \
|
||||
$(usex python " CONFIG+=python " " ") \
|
||||
$(usex test " CONFIG+=test " " ")
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
if use doc ; then
|
||||
doxygen Doxyfile || die "doxygen failed"
|
||||
HTML_DOCS="API/html"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake INSTALL_ROOT="${D}" install || die "install failed"
|
||||
einstalldocs
|
||||
use python && python_optimize
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
DIST qwt5-qt5-5.2.3_p20200902.tar.gz 2317623 BLAKE2B 5ac4333b01eac3a0b8b2f291804408679b8173ff624932d94e85a6789ad7f966417f80acba8c8d993465703e256c9ac7c675971cffac40d5f3b2becf0e7e7460 SHA512 1980f7e21684dba36c192a08e1a3bce719dcd7b1e700ce5f8a27821af83a65fe518d078888d6ad3733d3cde1c2af40cd694537ce0193d622d7f0b3bcee1ed55e
|
||||
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>andrewammerlaan@riseup.net</email>
|
||||
<name>Andrew Ammerlaan</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
The Qwt library contains GUI Components and utility classes which are
|
||||
primarily useful for programs with a technical background.
|
||||
Besides a 2D plot widget it provides scales, sliders, dials,
|
||||
compasses, thermometers, wheels and knobs to control or display
|
||||
values, arrays or ranges of type double.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">qwt</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit qmake-utils
|
||||
|
||||
COMMIT="0052f96fdd6d5f021f20a1cfc4d2fcfc605941da"
|
||||
|
||||
DESCRIPTION="2D plotting library for Qt5"
|
||||
HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/gbm19/qwt5-qt5"
|
||||
SRC_URI="https://github.com/gbm19/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="qwt"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
|
||||
SLOT="5"
|
||||
IUSE="doc examples svg"
|
||||
|
||||
RDEPEND="
|
||||
dev-qt/designer:5
|
||||
dev-qt/qtgui:5
|
||||
svg? ( dev-qt/qtsvg:5 )
|
||||
"
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( CHANGES README )
|
||||
|
||||
S="${WORKDIR}/${PN}-${COMMIT}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i qwt.prf || die
|
||||
|
||||
cat > qwtconfig.pri <<-EOF
|
||||
target.path = "${EPREFIX}/usr/$(get_libdir)"
|
||||
headers.path = "${EPREFIX}/usr/include/qwt5"
|
||||
doc.path = "${EPREFIX}/usr/share/doc/${PF}"
|
||||
CONFIG += qt warn_on thread release
|
||||
CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
|
||||
VERSION = ${PV}
|
||||
QWT_VERSION = ${PV/_*}
|
||||
QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer"
|
||||
QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/features"
|
||||
EOF
|
||||
sed -i -e 's/headers doc/headers/' src/src.pro || die
|
||||
use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
if use doc ; then
|
||||
cd doc || die
|
||||
doxygen Doxyfile || die "doxygen failed"
|
||||
HTML_DOCS="doc/html"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
einstalldocs
|
||||
doman doc/man/*/*
|
||||
|
||||
if use examples; then
|
||||
# don't build examples - fix the qt files to build once installed
|
||||
cat > examples/examples.pri <<-EOF
|
||||
include( qwtconfig.pri )
|
||||
TEMPLATE = app
|
||||
MOC_DIR = moc
|
||||
INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
|
||||
DEPENDPATH += "${EPREFIX}/usr/include/qwt5"
|
||||
LIBS += -lqwt
|
||||
EOF
|
||||
sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
|
||||
cp *.pri examples/ || die
|
||||
insinto /usr/share/qwt5
|
||||
doins -r examples
|
||||
fi
|
||||
|
||||
# avoid file conflict with qwt:6
|
||||
# https://github.com/gbm19/qwt5-qt5/issues/2
|
||||
pushd "${ED}/usr/share/man/man3/"
|
||||
for f in *; do mv ${f} ${f//.3/.5qt5.3}; done
|
||||
popd
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
DIST qwtplot3d-0.2.7.tgz 183836 BLAKE2B f34fafdea591b2a1440321756872eb8f5580ccf8d5785eeeb6b32e1a4ee515b48ce2cf6e97462f69c2c82b83eebd90226b73d160e1e7027695024f590c4c1c6f SHA512 88e6d270695931775f3c1c0e718118e31118dbfe9f5f582834de09ab515fdf9e8a0f90d424f276653fdf1cf0b39e2060282385701a4ab48843420fe55a1dcf0c
|
||||
@@ -1,28 +0,0 @@
|
||||
--- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000
|
||||
+++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000
|
||||
@@ -116,7 +116,7 @@
|
||||
HTML_ALIGN_MEMBERS = YES
|
||||
GENERATE_HTMLHELP = NO
|
||||
CHM_FILE = qwtplot3d.chm
|
||||
-HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
|
||||
+#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
|
||||
GENERATE_CHI = NO
|
||||
BINARY_TOC = YES
|
||||
TOC_EXPAND = YES
|
||||
@@ -181,7 +181,7 @@
|
||||
MACRO_EXPANSION = NO
|
||||
EXPAND_ONLY_PREDEF = NO
|
||||
SEARCH_INCLUDES = YES
|
||||
-INCLUDE_PATH = V:/cvs/qwtplot3d/include/
|
||||
+INCLUDE_PATH = ../include
|
||||
INCLUDE_FILE_PATTERNS = *.h
|
||||
PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
|
||||
QT_VERSION=0x040000
|
||||
@@ -212,7 +212,6 @@
|
||||
GRAPHICAL_HIERARCHY = YES
|
||||
DIRECTORY_GRAPH = YES
|
||||
DOT_IMAGE_FORMAT = png
|
||||
-DOT_PATH = V:/graphviz/Graphviz/bin/
|
||||
DOTFILE_DIRS =
|
||||
MAX_DOT_GRAPH_WIDTH = 974
|
||||
MAX_DOT_GRAPH_HEIGHT = 10000
|
||||
@@ -1,125 +0,0 @@
|
||||
diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
|
||||
--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include "axes.h"
|
||||
#include "axesmainwindow.h"
|
||||
-#include "../../../include/qwt3d_function.h"
|
||||
+#include <qwt3d_function.h>
|
||||
|
||||
using namespace std;
|
||||
using namespace Qwt3D;
|
||||
diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
|
||||
--- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000
|
||||
@@ -1,13 +1,13 @@
|
||||
TEMPLATE = app
|
||||
-CONFIG += qt warn_on thread debug
|
||||
+CONFIG += qt warn_on thread
|
||||
UI_DIR = tmp
|
||||
MOC_DIR = tmp
|
||||
OBJECTS_DIR = tmp
|
||||
-INCLUDEPATH += ../../include
|
||||
+INCLUDEPATH += /usr/include/qwtplot3d
|
||||
DEPENDPATH = $$INCLUDEPATH
|
||||
DESTDIR = ../bin
|
||||
|
||||
-unix:LIBS += -lqwtplot3d -L../../lib
|
||||
+unix:LIBS += -lqwtplot3d
|
||||
linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
|
||||
|
||||
win32{
|
||||
@@ -25,7 +25,7 @@
|
||||
ISQT4 = $$find(MYVERSION, ^[2-9])
|
||||
|
||||
!isEmpty( ISQT4 ) {
|
||||
-RESOURCES = ../images.qrc
|
||||
+#RESOURCES = ../images.qrc
|
||||
QT += opengl
|
||||
}
|
||||
|
||||
diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
|
||||
--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "enrichmentmainwindow.h"
|
||||
#include "enrichments.h"
|
||||
-#include "../../../include/qwt3d_function.h"
|
||||
+#include <qwt3d_function.h>
|
||||
|
||||
using namespace Qwt3D;
|
||||
|
||||
diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
|
||||
--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <qframe.h>
|
||||
#include <qpixmap.h>
|
||||
|
||||
-#include "../../../include/qwt3d_types.h"
|
||||
+#include <qwt3d_types.h>
|
||||
|
||||
#if QT_VERSION < 0x040000
|
||||
|
||||
diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
|
||||
--- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000
|
||||
@@ -2,8 +2,8 @@
|
||||
#define __EXAMPLE_H__
|
||||
|
||||
#include <math.h>
|
||||
-#include "../../../include/qwt3d_parametricsurface.h"
|
||||
-#include "../../../include/qwt3d_function.h"
|
||||
+#include <qwt3d_parametricsurface.h>
|
||||
+#include <qwt3d_function.h>
|
||||
|
||||
using namespace Qwt3D;
|
||||
|
||||
diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
|
||||
--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000
|
||||
@@ -3,10 +3,10 @@
|
||||
|
||||
#include <math.h>
|
||||
#include <qapplication.h>
|
||||
-#include "../../../include/qwt3d_parametricsurface.h"
|
||||
-#include "../../../include/qwt3d_surfaceplot.h"
|
||||
-#include "../../../include/qwt3d_enrichment.h"
|
||||
-#include "../../../include/qwt3d_color.h"
|
||||
+#include <qwt3d_parametricsurface.h>
|
||||
+#include <qwt3d_surfaceplot.h>
|
||||
+#include <qwt3d_enrichment.h>
|
||||
+#include <qwt3d_color.h>
|
||||
|
||||
#if QT_VERSION < 0x040000
|
||||
#include "lightingdlgbase.h"
|
||||
diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
|
||||
--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000
|
||||
@@ -33,9 +33,9 @@
|
||||
#include "colormapreader.h"
|
||||
#include "lightingdlg.h"
|
||||
#include "femreader.h"
|
||||
-#include "../../../include/qwt3d_io.h"
|
||||
-#include "../../../include/qwt3d_io_gl2ps.h"
|
||||
-#include "../../../include/qwt3d_io_reader.h"
|
||||
+#include <qwt3d_io.h>
|
||||
+#include <qwt3d_io_gl2ps.h>
|
||||
+#include <qwt3d_io_reader.h>
|
||||
|
||||
using namespace Qwt3D;
|
||||
using namespace std;
|
||||
diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
|
||||
--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
|
||||
#define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
|
||||
|
||||
-#include "../../../include/qwt3d_surfaceplot.h"
|
||||
+#include <qwt3d_surfaceplot.h>
|
||||
|
||||
|
||||
#if QT_VERSION < 0x040000
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h
|
||||
--- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400
|
||||
+++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400
|
||||
@@ -2,6 +2,7 @@
|
||||
#define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code
|
||||
|
||||
#include "qwt3d_gridmapping.h"
|
||||
+#include <cstdio>
|
||||
|
||||
namespace Qwt3D
|
||||
{
|
||||
Only in qwtplot3d/tmp: qwt3d_function.o
|
||||
@@ -1,27 +0,0 @@
|
||||
--- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000
|
||||
+++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
TARGET = qwtplot3d
|
||||
TEMPLATE = lib
|
||||
-CONFIG += qt warn_on opengl thread zlib debug
|
||||
+CONFIG += qt warn_on opengl thread zlib
|
||||
MOC_DIR = tmp
|
||||
OBJECTS_DIR = tmp
|
||||
INCLUDEPATH = include
|
||||
@@ -21,7 +21,7 @@
|
||||
win32:CONFIG -= zlib
|
||||
|
||||
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
|
||||
-unix:VERSION = 0.2.6
|
||||
+unix:VERSION = 0.2.7
|
||||
|
||||
# Input
|
||||
SOURCES += src/qwt3d_axis.cpp \
|
||||
@@ -92,4 +92,4 @@
|
||||
DEFINES += GL2PS_HAVE_ZLIB
|
||||
win32:LIBS += zlib.lib
|
||||
unix:LIBS += -lz
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
@@ -1,34 +0,0 @@
|
||||
diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h
|
||||
--- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300
|
||||
+++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200
|
||||
@@ -2,12 +2,7 @@
|
||||
#define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
|
||||
|
||||
#include <time.h>
|
||||
-
|
||||
-#if QT_VERSION < 0x040000
|
||||
-#include <qgl.h>
|
||||
-#else
|
||||
-#include <QtOpenGL/qgl.h>
|
||||
-#endif
|
||||
+#include <QtOpenGL>
|
||||
|
||||
#include "qwt3d_types.h"
|
||||
#include "qwt3d_io.h"
|
||||
diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h
|
||||
--- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300
|
||||
+++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200
|
||||
@@ -2,11 +2,8 @@
|
||||
#define __openglhelper_2003_06_06_15_49__
|
||||
|
||||
#include "qglobal.h"
|
||||
-#if QT_VERSION < 0x040000
|
||||
-#include <qgl.h>
|
||||
-#else
|
||||
-#include <QtOpenGL/qgl.h>
|
||||
-#endif
|
||||
+#include <QtOpenGL>
|
||||
+#include <GL/glu.h>
|
||||
|
||||
namespace Qwt3D
|
||||
{
|
||||
@@ -1,31 +0,0 @@
|
||||
--- qwtplot3d.pro.orig 2009-04-07 19:45:29.985645378 +0100
|
||||
+++ qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100
|
||||
@@ -80,13 +80,11 @@
|
||||
include/qwt3d_graphplot.h \
|
||||
include/qwt3d_multiplot.h
|
||||
|
||||
-# gl2ps support
|
||||
-HEADERS+=3rdparty/gl2ps/gl2ps.h \
|
||||
- include/qwt3d_io_gl2ps.h
|
||||
+# gl2ps support taken from system libs
|
||||
+HEADERS+=include/qwt3d_io_gl2ps.h
|
||||
|
||||
-SOURCES+=src/qwt3d_io_gl2ps.cpp \
|
||||
- 3rdparty/gl2ps/gl2ps.c
|
||||
-
|
||||
+SOURCES+=src/qwt3d_io_gl2ps.cpp
|
||||
+unix:LIBS += -lgl2ps
|
||||
# zlib support for gl2ps
|
||||
zlib {
|
||||
DEFINES += GL2PS_HAVE_ZLIB
|
||||
--- src/qwt3d_io_gl2ps.cpp.orig 2009-04-07 19:44:38.536418391 +0100
|
||||
+++ src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <time.h>
|
||||
#include "qwt3d_openglhelper.h"
|
||||
-#include "../3rdparty/gl2ps/gl2ps.h"
|
||||
+#include <gl2ps.h>
|
||||
#include "qwt3d_io_gl2ps.h"
|
||||
#include "qwt3d_plot.h"
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>andrewammerlaan@riseup.net</email>
|
||||
<name>Andrew Ammerlaan</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
QwtPlot3D is a graphics extension to the Qt GUI application framework.
|
||||
It provides a 3D plotting widget for scientific data and mathematical expressions.
|
||||
It compares to the existing Qwt Project.
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">qwtplot3d</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit qmake-utils
|
||||
|
||||
DESCRIPTION="3D plotting library for Qt5"
|
||||
HOMEPAGE="http://qwtplot3d.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="doc examples"
|
||||
|
||||
RDEPEND="
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtopengl:5
|
||||
x11-libs/gl2ps
|
||||
"
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-profile.patch"
|
||||
"${FILESDIR}/${PN}-examples.patch"
|
||||
"${FILESDIR}/${PN}-doxygen.patch"
|
||||
"${FILESDIR}/${PN}-gcc44.patch"
|
||||
"${FILESDIR}/${PN}-qt-4.8.0.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply -p0 "${FILESDIR}/${PN}-sys-gl2ps.patch"
|
||||
cat >> ${PN}.pro <<-EOF
|
||||
target.path = "${EPREFIX}/usr/$(get_libdir)"
|
||||
headers.path = "${EPREFIX}/usr/include/${PN}"
|
||||
headers.files = \$\$HEADERS
|
||||
INSTALLS = target headers
|
||||
EOF
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
if use doc ; then
|
||||
cd doc || die
|
||||
doxygen Doxyfile.doxygen || die "doxygen failed"
|
||||
HTML_DOCS="doc/web/doxygen/"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake INSTALL_ROOT="${D}" install || die "install failed"
|
||||
einstalldocs
|
||||
if use examples; then
|
||||
insinto /usr/share/${PN}
|
||||
doins -r examples
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user