diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | flext-cpp11.patch | 53 |
3 files changed, 6 insertions, 68 deletions
@@ -1,7 +1,7 @@ pkgbase = pd-flext-git pkgdesc = C++ development layer for Pure Data - pkgver = r1353.098455b - pkgrel = 2 + pkgver = r1362.4280d93 + pkgrel = 1 url = https://grrrr.org/research/software/flext/ arch = i686 arch = x86_64 @@ -13,9 +13,7 @@ pkgbase = pd-flext-git conflicts = pd-flext options = staticlibs source = flext::git+https://github.com/grrrr/flext.git - source = flext-cpp11.patch md5sums = SKIP - md5sums = 21e110a285bb2bfed260557b39de46a5 pkgname = pd-flext-git @@ -1,8 +1,8 @@ # Maintainer: JP Cimalando <jp-dev@inbox.ru> pkgname=pd-flext-git _pkgname=flext -pkgver=r1353.098455b -pkgrel=3 +pkgver=r1362.4280d93 +pkgrel=1 pkgdesc="C++ development layer for Pure Data" arch=('i686' 'x86_64') url="https://grrrr.org/research/software/flext/" @@ -16,10 +16,8 @@ replaces=() backup=() options=('staticlibs') install= -source=("$_pkgname::git+https://github.com/grrrr/flext.git" - 'flext-cpp11.patch') -md5sums=('SKIP' - '21e110a285bb2bfed260557b39de46a5') +source=("$_pkgname::git+https://github.com/grrrr/flext.git") +md5sums=('SKIP') noextract=() pkgver() { @@ -27,11 +25,6 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare() { - cd "$srcdir/$_pkgname" - patch -p1 -i "$srcdir/$_pkgname-cpp11.patch" -} - build() { cd "$srcdir/$_pkgname" ./bootstrap.sh diff --git a/flext-cpp11.patch b/flext-cpp11.patch deleted file mode 100644 index 23d30e9eb8f8..000000000000 --- a/flext-cpp11.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/source/flsupport.h b/source/flsupport.h -index e6a7678..b016264 100644 ---- a/source/flsupport.h -+++ b/source/flsupport.h -@@ -63,9 +63,11 @@ public: - #ifdef FLEXT_USE_CMEM - inline void *operator new(size_t bytes) { return ::operator new(bytes); } - inline void operator delete(void *blk) { ::operator delete(blk); } -+ inline void operator delete(void *blk, size_t) { ::operator delete(blk); } - - inline void *operator new[](size_t bytes) { return ::operator new[](bytes); } - inline void operator delete[](void *blk) { ::operator delete[](blk); } -+ inline void operator delete[](void *blk, size_t) { ::operator delete[](blk); } - - static bool MemCheck(void *) { return true; } - #else -@@ -76,10 +78,12 @@ public: - void *operator new(size_t bytes); - //! Overloaded delete method - void operator delete(void *blk); -+ void operator delete(void *blk, size_t) { operator delete(blk); } - - #ifndef __MRC__ // doesn't allow new[] overloading?! - inline void *operator new[](size_t bytes) { return operator new(bytes); } - inline void operator delete[](void *blk) { operator delete(blk); } -+ inline void operator delete[](void *blk, size_t) { operator delete(blk); } - #endif - - #ifdef FLEXT_DEBUGMEM -@@ -118,7 +122,10 @@ public: - // MFC doesn't like global overloading of allocators - // anyway, who likes MFC - --#if !defined(_MSC_VER) && !defined(__BORLANDC__) -+#if __cplusplus >= 201103L -+#define NEWTHROW -+#define DELTHROW noexcept -+#elif !defined(_MSC_VER) && !defined(__BORLANDC__) - #define NEWTHROW throw(std::bad_alloc) - #define DELTHROW throw() - #else -@@ -129,9 +136,11 @@ public: - // define global new/delete operators - inline void *operator new(size_t bytes) NEWTHROW { return flext_root::operator new(bytes); } - inline void operator delete(void *blk) DELTHROW { flext_root::operator delete(blk); } -+inline void operator delete(void *blk, size_t) DELTHROW { flext_root::operator delete(blk); } - #ifndef __MRC__ // doesn't allow new[] overloading?! - inline void *operator new[](size_t bytes) NEWTHROW { return flext_root::operator new[](bytes); } - inline void operator delete[](void *blk) DELTHROW { flext_root::operator delete[](blk); } -+inline void operator delete[](void *blk, size_t) DELTHROW { flext_root::operator delete[](blk); } - #endif - - #endif // FLEXT_USE_CMEM |