mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
labplot, bump version (#10746)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -10,13 +10,12 @@ Feature highlights:
|
||||
* Smooth data import and export to and from multiple formats
|
||||
* Available for Windows, macOS, Linux and FreeBSD."
|
||||
HOMEPAGE="https://invent.kde.org/education/labplot"
|
||||
COPYRIGHT="2010-2023 KDE Organisation"
|
||||
COPYRIGHT="2010-2024 KDE Organisation"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="4"
|
||||
SOURCE_URI="$HOMEPAGE/-/archive/$portVersion/labplot-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="305208fdd453f1a996273a001db8642092fcc0c7ab18b6a65af59abc93e93d44"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/labplot/labplot-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="53aa6ac8df39324d99463e60d88de25346b3928da5bb0f210b0563489046679d"
|
||||
SOURCE_DIR="labplot-$portVersion"
|
||||
PATCHES="labplot-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="labplot2.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -25,6 +24,7 @@ SECONDARY_ARCHITECTURES="x86"
|
||||
PROVIDES="
|
||||
labplot$secondaryArchSuffix = $portVersion
|
||||
cmd:labplot2$secondaryArchSuffix = $portVersion
|
||||
lib:liblabplot$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -42,6 +42,7 @@ REQUIRES="
|
||||
lib:libpoppler$secondaryArchSuffix
|
||||
lib:libpoppler_qt5$secondaryArchSuffix
|
||||
lib:libspectre$secondaryArchSuffix
|
||||
lib:libxcb$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
# KF5
|
||||
lib:libcantorlibs$secondaryArchSuffix
|
||||
@@ -63,6 +64,7 @@ REQUIRES="
|
||||
lib:libKF5JobWidgets$secondaryArchSuffix
|
||||
lib:libKF5NewStuffCore$secondaryArchSuffix
|
||||
lib:libKF5Parts$secondaryArchSuffix
|
||||
lib:libKF5Purpose$secondaryArchSuffix
|
||||
lib:libKF5Service$secondaryArchSuffix
|
||||
lib:libKF5Solid$secondaryArchSuffix
|
||||
lib:libKF5SonnetCore$secondaryArchSuffix
|
||||
@@ -86,13 +88,14 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:eigen$secondaryArchSuffix
|
||||
devel:libcerf$secondaryArchSuffix
|
||||
devel:libcfitsio$secondaryArchSuffix >= 10.4
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libexecinfo$secondaryArchSuffix
|
||||
devel:libfftw3f$secondaryArchSuffix
|
||||
devel:libgsl$secondaryArchSuffix
|
||||
devel:libhdf5$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:liblz4$secondaryArchSuffix
|
||||
devel:libmarkdown$secondaryArchSuffix
|
||||
devel:libmatio$secondaryArchSuffix
|
||||
@@ -101,6 +104,7 @@ BUILD_REQUIRES="
|
||||
devel:libpoppler$secondaryArchSuffix >= 131.0.0
|
||||
devel:libspectre$secondaryArchSuffix
|
||||
devel:libssp_nonshared$secondaryArchSuffix
|
||||
devel:libxcb$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
# KF5
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
@@ -122,6 +126,7 @@ BUILD_REQUIRES="
|
||||
devel:libKF5JobWidgets$secondaryArchSuffix
|
||||
devel:libKF5NewStuffCore$secondaryArchSuffix
|
||||
devel:libKF5Parts$secondaryArchSuffix
|
||||
devel:libKF5Purpose$secondaryArchSuffix
|
||||
devel:libKF5Service$secondaryArchSuffix
|
||||
devel:libKF5Solid$secondaryArchSuffix
|
||||
devel:libKF5SonnetUi$secondaryArchSuffix
|
||||
@@ -151,6 +156,13 @@ TEST_REQUIRES="
|
||||
qthaikuplugins$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
# disable docs
|
||||
sed -e '/ DocTools/ s/^#*/#/' -i CMakeLists.txt
|
||||
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -Bbuild -S. $cmakeDirArgs \
|
||||
@@ -158,8 +170,9 @@ BUILD()
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DENABLE_READSTAT=OFF -Wno-dev
|
||||
# false
|
||||
-DENABLE_READSTAT=OFF \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DENABLE_TESTS=OFF -Wno-dev
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
@@ -167,6 +180,7 @@ INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
# don't mess with shared_mime_info files
|
||||
rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
|
||||
rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
|
||||
|
||||
@@ -192,5 +206,6 @@ INSTALL()
|
||||
|
||||
TEST()
|
||||
{
|
||||
make -C build test
|
||||
# 95% tests passed, 3 tests failed out of 65
|
||||
ctest --test-dir build --output-on-failure
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
From 70d3c62bb33c1f905a46d5744d98a2e3916445ed Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Fri, 19 Jan 2024 17:43:10 +0100
|
||||
Subject: Disable DocTools
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5731788..ed55246 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -60,7 +60,6 @@ find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
|
||||
ConfigWidgets
|
||||
CoreAddons
|
||||
Crash
|
||||
- DocTools
|
||||
I18n
|
||||
IconThemes
|
||||
KIO
|
||||
@@ -583,7 +582,6 @@ ENDIF()
|
||||
add_subdirectory(data)
|
||||
add_subdirectory(icons)
|
||||
add_subdirectory(src)
|
||||
-add_subdirectory(doc)
|
||||
#add_subdirectory(lib)
|
||||
|
||||
if (ENABLE_TESTS)
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
From a5e24f9ffc825b06e5cfec5e5a3a1f05db9cb930 Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Fri, 19 Jan 2024 20:02:00 +0100
|
||||
Subject: Build fixes
|
||||
|
||||
|
||||
diff --git a/src/backend/gsl/parser.y b/src/backend/gsl/parser.y
|
||||
index 21a030d..9bcd6bd 100644
|
||||
--- a/src/backend/gsl/parser.y
|
||||
+++ b/src/backend/gsl/parser.y
|
||||
@@ -355,7 +355,11 @@ int yylex(param *p) {
|
||||
#endif
|
||||
double result;
|
||||
if (locale != NULL) {
|
||||
+#if defined(__OpenBSD__) || defined(__HAIKU__)
|
||||
+ result = strtod(s, &remain);
|
||||
+#else
|
||||
result = strtod_l(s, &remain, locale);
|
||||
+#endif
|
||||
freelocale(locale);
|
||||
} else // use C locale
|
||||
result = strtod(s, &remain);
|
||||
diff --git a/src/tools/getRSS.h b/src/tools/getRSS.h
|
||||
index a1f6461..08e9a86 100644
|
||||
--- a/src/tools/getRSS.h
|
||||
+++ b/src/tools/getRSS.h
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <windows.h>
|
||||
#include <psapi.h>
|
||||
|
||||
-#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
|
||||
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__)
|
||||
#include <unistd.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
||||
From 79cf16305254672e8041a02d992c81ea118e053c Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Mon, 1 Apr 2024 21:32:06 +0200
|
||||
Subject: Build fix
|
||||
|
||||
|
||||
diff --git a/src/backend/datasources/projects/OriginProjectParser.h b/src/backend/datasources/projects/OriginProjectParser.h
|
||||
index 9d7e9f6..06c1c0b 100644
|
||||
--- a/src/backend/datasources/projects/OriginProjectParser.h
|
||||
+++ b/src/backend/datasources/projects/OriginProjectParser.h
|
||||
@@ -11,7 +11,7 @@
|
||||
#ifndef ORIGINPROJECTPARSER_H
|
||||
#define ORIGINPROJECTPARSER_H
|
||||
|
||||
-#include "OriginFile.h"
|
||||
+#include "liborigin/OriginFile.h"
|
||||
#include "backend/datasources/projects/ProjectParser.h"
|
||||
#include "backend/worksheet/Background.h"
|
||||
|
||||
--
|
||||
2.43.2
|
||||
|
||||
Reference in New Issue
Block a user