[neon/extras/labplot/Neon/stable] /: ignore missing cmake bits
Jonathan Esk-Riddell
null at kde.org
Wed Mar 22 15:42:41 GMT 2023
Git commit 803a181f85c1422d3077744a593a649e6639e8ab by Jonathan Esk-Riddell.
Committed on 22/03/2023 at 15:42.
Pushed by jriddell into branch 'Neon/stable'.
ignore missing cmake bits
M +1 -0 debian/labplot.lintian-overrides
A +2 -0 debian/meta/cmake-ignore
D +0 -117 patch/std-isnan.diff
D +0 -142 snapcraft.yaml
https://invent.kde.org/neon/extras/labplot/commit/803a181f85c1422d3077744a593a649e6639e8ab
diff --git a/debian/labplot.lintian-overrides b/debian/labplot.lintian-overrides
index 4a14241..30f6e92 100644
--- a/debian/labplot.lintian-overrides
+++ b/debian/labplot.lintian-overrides
@@ -1,2 +1,3 @@
# non-standard library location, so seems a legit RPATH setting
labplot: custom-library-search-path RUNPATH /usr/lib/*/hdf5/serial [usr/bin/labplot2]
+labplot: package-name-doesnt-match-sonames libVector-BLF2
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
new file mode 100644
index 0000000..8142e87
--- /dev/null
+++ b/debian/meta/cmake-ignore
@@ -0,0 +1,2 @@
+LibOrigin
+QXlsx
diff --git a/patch/std-isnan.diff b/patch/std-isnan.diff
deleted file mode 100644
index ab56cea..0000000
--- a/patch/std-isnan.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/src/backend/worksheet/plots/cartesian/XYCurve.cpp b/src/backend/worksheet/plots/cartesian/XYCurve.cpp
-index 76797e292..d6101a8f8 100644
---- a/src/backend/worksheet/plots/cartesian/XYCurve.cpp
-+++ b/src/backend/worksheet/plots/cartesian/XYCurve.cpp
-@@ -1222,11 +1222,11 @@ void XYCurvePrivate::addUniqueLine(QPointF p0, QPointF p1, QPointF& lastPoint, q
- //QDEBUG(Q_FUNC_INFO << " :" << p0 << " ->" << p1 << ", lastPoint =" << lastPoint << ", pixelDiff =" << pixelDiff)
- if (pixelDiff == 0) {
- //QDEBUG(" pixelDiff == 0!")
-- if (isnan(lastPoint.x())) // save last point
-+ if (std::isnan(lastPoint.x())) // save last point
- lastPoint = p0;
- } else { // pixelDiff > 0
- //QDEBUG(" pixelDiff =" << pixelDiff << ", last point : " << lastPoint)
-- if (!isnan(lastPoint.x())) { // when previously lastPoint, draw a line
-+ if (!std::isnan(lastPoint.x())) { // when previously lastPoint, draw a line
- //QDEBUG(" REDUCED LINE from " << lastPoint << " to " << p0)
- //TODO: only when line in scene
- //if ((p0.x() >= plot->xMin() && p0.x() <= plot->xMax()) || (p1.x() >= plot->xMin() && p1.x() <= plot->xMax()))
-@@ -1343,7 +1343,7 @@ void XYCurvePrivate::updateLines() {
- addLine(p0, p1, lastPoint, pixelDiff, numberOfPixelX);
- }
-
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(lastPoint, p1));
-
- break;
-@@ -1361,7 +1361,7 @@ void XYCurvePrivate::updateLines() {
- addLine(p0, tempPoint1, lastPoint, pixelDiff, numberOfPixelX);
- addLine(tempPoint1, p1, lastPoint, pixelDiff, numberOfPixelX);
- }
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(lastPoint, p1));
-
- break;
-@@ -1378,7 +1378,7 @@ void XYCurvePrivate::updateLines() {
- addLine(p0, tempPoint1, lastPoint, pixelDiff, numberOfPixelX);
- addLine(tempPoint1, p1, lastPoint, pixelDiff, numberOfPixelX);
- }
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(lastPoint, p1));
-
- break;
-@@ -1398,7 +1398,7 @@ void XYCurvePrivate::updateLines() {
- addLine(tempPoint1, tempPoint2, lastPoint, pixelDiff, numberOfPixelX);
- addLine(tempPoint2, p1, lastPoint, pixelDiff, numberOfPixelX);
- }
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(lastPoint, p1));
-
- break;
-@@ -1418,7 +1418,7 @@ void XYCurvePrivate::updateLines() {
- addLine(tempPoint1, tempPoint2, lastPoint, pixelDiff, numberOfPixelX);
- addLine(tempPoint2, p1, lastPoint, pixelDiff, numberOfPixelX);
- }
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(lastPoint, p1));
-
- break;
-@@ -1438,13 +1438,13 @@ void XYCurvePrivate::updateLines() {
- skip++;
- } else {
- skip = 0;
-- if (!isnan(lastPoint.x())) {
-+ if (!std::isnan(lastPoint.x())) {
- lastPoint.setX(NAN);
- m_lines.append(QLineF(lastPoint, p1));
- }
- }
- }
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(m_logicalPoints.at(endIndex - 1), m_logicalPoints.at(endIndex)));
-
- break;
-@@ -1494,13 +1494,13 @@
- skip++;
- } else {
- skip = 0;
-- if (!isnan(lastPoint.x())) {
-+ if (!std::isnan(lastPoint.x())) {
- lastPoint.setX(NAN);
- m_lines.append(QLineF(lastPoint, p1));
- }
- }
- }
-- if (!isnan(lastPoint.x())) // last line
-+ if (!std::isnan(lastPoint.x())) // last line
- m_lines.append(QLineF(m_logicalPoints.at(endIndex - 1), m_logicalPoints.at(endIndex)));
-
- break;
-@@ -1573,7 +1573,7 @@ void XYCurvePrivate::updateLines() {
- lastPoint, pixelDiff, numberOfPixelX);
-
- // add last line
-- if (!isnan(lastPoint.x()))
-+ if (!std::isnan(lastPoint.x()))
- m_lines.append(QLineF(QPointF(xinterp[xinterp.size() - 1], yinterp[yinterp.size() - 1]),
- QPointF(x[numberOfPoints - 1], y[numberOfPoints - 1])));
- }
-diff --git a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
-index a082f45bc..9953265cf 100644
---- a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
-+++ b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
-@@ -2161,7 +2161,7 @@ void XYFitCurvePrivate::writeSolverState(gsl_multifit_fdfsolver* s, double chi)
- }
-
- //current value of chi
-- if (isnan(chi))
-+ if (std::isnan(chi))
- chi = gsl_blas_dnrm2(s->f);
- state += QString::number(chi*chi);
- state += ';';
diff --git a/snapcraft.yaml b/snapcraft.yaml
deleted file mode 100644
index 0b088e5..0000000
--- a/snapcraft.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
----
-name: labplot
-version: 2.9.0
-confinement: strict
-grade: stable
-base: core20
-adopt-info: labplot
-apps:
- labplot:
- common-id: org.kde.labplot2.desktop
- command: kf5-launch labplot2
- plugs:
- - kde-frameworks-5-plug
- - home
- - x11
- - opengl
- - network
- - network-bind
- - audio-playback
- - desktop
- - desktop-legacy
-slots:
- session-dbus-interface:
- interface: dbus
- name: org.kde.labplot
- bus: session
-plugs:
- kde-frameworks-5-plug:
- content: kde-frameworks-5-qt-5-15-core20-all
- interface: content
- default-provider: kde-frameworks-5-qt-5-15-core20
- target: kf5
-package-repositories:
-- type: apt
- components:
- - main
- suites:
- - focal
- key-id: 444DABCF3667D0283F894EDDE6D4736255751E5D
- url: http://origin.archive.neon.kde.org/user
- key-server: keyserver.ubuntu.com
-parts:
- patches:
- source: patch/
- plugin: dump
- prime:
- - "-*"
- stage:
- - std-isnan.diff
- labplot:
- parse-info:
- - usr/share/metainfo/org.kde.labplot2.appdata.xml
- build-snaps:
- - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
- after:
- - kde-frameworks-5-env
- - patches
- plugin: cmake
- build-environment:
- - CMAKE_BUILD_PARALLEL_LEVEL: '4'
- - VERBOSE: '1'
- override-build: |-
- cd $SNAPCRAFT_PART_SRC
- patch -p1 < $SNAPCRAFT_STAGE/std-isnan.diff
- cp src/org.kde.labplot2.desktop .
- snapcraftctl build
- build-packages:
- - libkf5xmlgui-data
- - libkf5xmlgui5
- - libcantorlibs-dev
- - libhdf5-dev
- - libgsl-dev
- - libfftw3-dev
- - bison
- - libkf5kdelibs4support-dev
- - libkf5syntaxhighlighting-dev
- - libqt5serialport5-dev
- - kuserfeedback-dev
- - libnetcdf-dev
- - libcfitsio-dev
- - libcerf-dev
- - liblz4-dev
- - extra-cmake-modules
- - libqt5svg5-dev
- - gettext
- - libpoppler-dev
- - libpoppler-qt5-dev
- stage-packages:
- - libkuserfeedbackwidgets1
- - libgsl23
- - libfftw3-double3
- - bison
- - libkf5kdelibs4support5
- - libhdf5-103
- - libxcb-keysyms1
- - libxcb1
- - libasn1-8-heimdal
- - libbrotli1
- - libcantorlibs28
- - libcerf1
- - libcfitsio8
- - libcurl3-gnutls
- - libgs9
- - libgssapi3-heimdal
- - libhcrypto4-heimdal
- - libheimbase1-heimdal
- - libheimntlm0-heimdal
- - libhx509-5-heimdal
- - libidn11
- - libijs-0.35
- - libjbig0
- - libjbig2dec0
- - libkrb5-26-heimdal
- - liblcms2-2
- - libldap-2.4-2
- - libnetcdf15
- - libnghttp2-14
- - libnspr4
- - libnss3
- - libopenjp2-7
- - libpaper1
- - libpsl5
- - libroken18-heimdal
- - librtmp1
- - libsasl2-2
- - libspectre1
- - libssh-4
- - libtiff5
- - libwebp6
- - libwind0-heimdal
- source: https://download.kde.org/stable/labplot/2.9.0/labplot-2.9.0.tar.xz
- cmake-parameters:
- - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
- - "-DCMAKE_INSTALL_PREFIX=/usr"
- - "-DCMAKE_BUILD_TYPE=Release"
- - "-DENABLE_TESTING=OFF"
- - "-DBUILD_TESTING=OFF"
- - "-DKDE_SKIP_TEST_SETTINGS=ON"
- - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
- kde-frameworks-5-env:
- plugin: dump
- source: https://invent.kde.org/packaging/snap-kf5-launcher.git
More information about the Neon-commits
mailing list