summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
-rw-r--r--fineftp-server.filesystem.cpp.patch10
3 files changed, 8 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b74043d18541..3dfc986f135a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ecal
pkgdesc = enhanced Communication Abstraction Layer
- pkgver = 5.10.2
+ pkgver = 5.10.3
pkgrel = 1
url = https://github.com/eclipse-ecal/ecal
arch = x86_64
@@ -17,9 +17,7 @@ pkgbase = ecal
depends = hdf5
backup = etc/ecal/ecal.ini
backup = etc/ecal/ecaltime.ini
- source = https://github.com/eclipse-ecal/ecal/releases/download/v5.10.2/ecal-fat-source.tar.gz
- source = fineftp-server.filesystem.cpp.patch
- sha256sums = 6be9b6318896bc91e86fb288f40811d377633dc1d485c3cecaa34900a3657abd
- sha256sums = ebbc58b792f402c43d83f05e4dec59b714ae455077a5e93aff5a040fffd3bb72
+ source = https://github.com/eclipse-ecal/ecal/releases/download/v5.10.3/ecal-fat-source.tar.gz
+ sha256sums = 3d80dc37364474e3a9cf52ac0b05a3cd256e407d547ae0417545f0947f9fd558
pkgname = ecal
diff --git a/PKGBUILD b/PKGBUILD
index 3586ac76b380..7f58d54ff1d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tobias Borgert <tobias (dot) borgert (at) gmail (dot) com>
pkgname=ecal
-pkgver=5.10.2
+pkgver=5.10.3
pkgrel=1
pkgdesc="enhanced Communication Abstraction Layer"
arch=('x86_64' 'armv7h')
@@ -10,14 +10,13 @@ license=('Apache')
depends=('curl' 'protobuf' 'qt5-base' 'qwt' 'hdf5')
makedepends=('cmake' 'doxygen' 'git' 'graphviz')
optdepends=()
-source=("https://github.com/eclipse-ecal/ecal/releases/download/v${pkgver}/ecal-fat-source.tar.gz"
- "fineftp-server.filesystem.cpp.patch")
-sha256sums=('6be9b6318896bc91e86fb288f40811d377633dc1d485c3cecaa34900a3657abd'
- 'ebbc58b792f402c43d83f05e4dec59b714ae455077a5e93aff5a040fffd3bb72')
+source=("https://github.com/eclipse-ecal/ecal/releases/download/v${pkgver}/ecal-fat-source.tar.gz")
+sha256sums=('3d80dc37364474e3a9cf52ac0b05a3cd256e407d547ae0417545f0947f9fd558')
backup=('etc/ecal/ecal.ini' 'etc/ecal/ecaltime.ini')
prepare() {
- patch --forward --strip=1 --input="../fineftp-server.filesystem.cpp.patch" "$pkgname/thirdparty/fineftp-server/fineftp-server/src/filesystem.cpp"
+# patch --forward --strip=1 --input="../fineftp-server.filesystem.cpp.patch" "$pkgname/thirdparty/fineftp-server/fineftp-server/src/filesystem.cpp"
+ :
}
build() {
diff --git a/fineftp-server.filesystem.cpp.patch b/fineftp-server.filesystem.cpp.patch
deleted file mode 100644
index 52b3e51cdf53..000000000000
--- a/fineftp-server.filesystem.cpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /home/jtb/Werkbank/c_c++/ecal/thirdparty/fineftp-server/fineftp-server/src/filesystem.cpp 2022-05-24 11:32:32.000000000 +0200
-+++ /home/jtb/Werkbank/c_c++/ecal-fat-source/thirdparty/fineftp-server/fineftp-server/src/filesystem.cpp 2022-05-31 10:32:29.031990966 +0200
-@@ -14,6 +14,7 @@
-
- #else // WIN32
-
-+#include <cstring>
- #include <dirent.h>
-
- #endif // WIN32