summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-01 22:50:12 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-05-01 22:50:12 +0000
commit2d9508f8daa0acb2a28eff6c96f4055f8ade1d8f (patch)
tree17a3d0eb5746ae325c1a9c5456bf4ddd3d1fce25
parentfd5a6b3c286853da6fb2a85d831577cd4e3a82f0 (diff)
downloadpackages-2d9508f8daa0acb2a28eff6c96f4055f8ade1d8f.tar.gz
packages-2d9508f8daa0acb2a28eff6c96f4055f8ade1d8f.tar.bz2
packages-2d9508f8daa0acb2a28eff6c96f4055f8ade1d8f.tar.xz
packages-2d9508f8daa0acb2a28eff6c96f4055f8ade1d8f.zip
user/labplot: bump to 2.6
-rw-r--r--user/labplot/APKBUILD11
-rw-r--r--user/labplot/liborigin-endian.patch26
2 files changed, 4 insertions, 33 deletions
diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD
index 35cd3cfb2..caf9aa5df 100644
--- a/user/labplot/APKBUILD
+++ b/user/labplot/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=labplot
-pkgver=2.5.0
-pkgrel=2
+pkgver=2.6
+pkgrel=0
pkgdesc="Interactive tool for graphing and analysis of scientific data"
url="https://www.kde.org/applications/education/labplot/"
arch="all"
@@ -15,9 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev
cantor-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz
- liborigin-endian.patch
- "
+source="https://download.kde.org/stable/labplot/$pkgver.0/labplot-$pkgver.0.tar.xz"
build() {
cd "$builddir"
@@ -46,5 +44,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba labplot-2.5.0.tar.xz
-d251300ca0992637453ef12021f3fa4ba0ed5651a19b27bee7573f50b101aaa787544c035bf0d00b9a9ef14156536ce027879d605ede228761754b762db88ded liborigin-endian.patch"
+sha512sums="6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af labplot-2.6.0.tar.xz"
diff --git a/user/labplot/liborigin-endian.patch b/user/labplot/liborigin-endian.patch
deleted file mode 100644
index b40782a3a..000000000
--- a/user/labplot/liborigin-endian.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/OriginAnyParser.cpp b/OriginAnyParser.cpp
-index c9e863e..2637945 100644
---- a/liborigin/OriginAnyParser.cpp
-+++ b/liborigin/OriginAnyParser.cpp
-@@ -24,10 +24,18 @@
- #include <cinttypes>
-
- /* define a macro to get an int (or uint) from a istringstream in binary mode */
--#define GET_INT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 4);};
--#define GET_SHORT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 2);};
--#define GET_FLOAT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 4);};
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define GET_SHORT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 2);};
-+#define GET_INT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 4);};
-+#define GET_FLOAT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 4);};
- #define GET_DOUBLE(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 8);};
-+#else
-+void inline swap_bytes(unsigned char* data, int size) {int i = 0, j = size - 1; while(i < j) {std::swap(data[i], data[j]); ++i, --j;}}
-+#define GET_SHORT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 2); swap_bytes(reinterpret_cast<unsigned char *>(&ovalue), 2);};
-+#define GET_INT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 4); swap_bytes(reinterpret_cast<unsigned char *>(&ovalue), 4);};
-+#define GET_FLOAT(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 4); swap_bytes(reinterpret_cast<unsigned char *>(&ovalue), 4);};
-+#define GET_DOUBLE(iss, ovalue) {iss.read(reinterpret_cast<char *>(&ovalue), 8); swap_bytes(reinterpret_cast<unsigned char *>(&ovalue), 8);};
-+#endif
-
- OriginAnyParser::OriginAnyParser(const string& fileName)
- : file(fileName.c_str(),ios::binary),