Version bump from 1.5.1 to 1.5.2. Also removed the memfix patch, because it got

fixed finally.

4 files changed, 14 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37880947cf1d..5b471e2c0f8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nana
 	pkgdesc = An opensource cross-platform GUI library written in modern C++11 for static linking
-	pkgver = 1.5.1
+	pkgver = 1.5.2
 	pkgrel = 1
 	url = http://nanapro.org/en-us/
 	arch = i686
@@ -18,12 +18,10 @@ pkgbase = nana
 	depends = libpng
 	depends = libx11
 	depends = libxft
-	source = http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/nana 1.5.1.zip
-	source = fix_memcpy.patch
+	source = http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/nana 1.5.2.zip
 	source = add_missing_includes.patch
-	sha256sums = 7a0afd92060d7c2c40a594b9649aa408b2ad42795c7e27a2d3ddd95aeb8ab415
-	sha256sums = 98c5401396583534682c21b8b2762a1cbbcbecd997804a5b11aabe1094ac4b44
-	sha256sums = ec0896c20b111b4c5c4d51b90399716d79d0239e34a45029d687419a8e73e19a
+	sha256sums = e0a1e0f7f1cf21221a0c55ddfa21e6ac34d7a0bc4c50d93b21e60a2746f07875
+	sha256sums = 13bc32f2432d49f79a0af5c2b2bb26dd1a165e194dd90722715a3650cd022d3a
 
 pkgname = nana
 
diff --git a/PKGBUILD b/PKGBUILD
index 7a240c8b4760..de7c9c067e2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Wilken 'Akiko' Gottwalt <akiko@mailbox.org>
 
 pkgname=nana
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="An opensource cross-platform GUI library written in modern C++11 for static linking"
 arch=("i686" "x86_64")
@@ -10,16 +10,13 @@ license=("custom:Boost Software License")
 depends=("alsa-lib" "libjpeg-turbo" "libpng" "libx11" "libxft")
 makedepends=("alsa-lib" "cmake" "libjpeg-turbo" "libpng" "libx11" "libxft" "xproto")
 source=("http://downloads.sourceforge.net/project/nanapro/Nana/Nana 1.x/${pkgname} ${pkgver}.zip"
-        fix_memcpy.patch
         add_missing_includes.patch)
-sha256sums=('7a0afd92060d7c2c40a594b9649aa408b2ad42795c7e27a2d3ddd95aeb8ab415'
-            '98c5401396583534682c21b8b2762a1cbbcbecd997804a5b11aabe1094ac4b44'
-            'ec0896c20b111b4c5c4d51b90399716d79d0239e34a45029d687419a8e73e19a')
+sha256sums=('e0a1e0f7f1cf21221a0c55ddfa21e6ac34d7a0bc4c50d93b21e60a2746f07875'
+            '13bc32f2432d49f79a0af5c2b2bb26dd1a165e194dd90722715a3650cd022d3a')
 
 prepare() {
     cd ${srcdir}/${pkgname}
 
-    patch -Np1 < ../fix_memcpy.patch
     patch -Np1 < ../add_missing_includes.patch
 }
 
diff --git a/add_missing_includes.patch b/add_missing_includes.patch
index d03922f9447f..f28dae548767 100644
--- a/add_missing_includes.patch
+++ b/add_missing_includes.patch
@@ -5,10 +5,10 @@ diff -urpN a/include/nana/gui/detail/native_window_interface.hpp b/include/nana/
 --- a/include/nana/gui/detail/native_window_interface.hpp	2016-07-19 23:47:42.039678224 +0200
 +++ b/include/nana/gui/detail/native_window_interface.hpp	2017-06-06 11:50:44.154404510 +0200
 @@ -15,6 +15,7 @@
- 

- #include "../basis.hpp"

- #include <nana/paint/image.hpp>

-+#include <functional>

- 

- namespace nana

- {

+ 
+ #include "../basis.hpp"
+ #include <nana/paint/image.hpp>
++#include <functional>
+ 
+ namespace nana
+ {
diff --git a/fix_memcpy.patch b/fix_memcpy.patch
deleted file mode 100644
index 4e5a5d4438c4..000000000000
--- a/fix_memcpy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urpN a/source/paint/detail/image_png.hpp b/source/paint/detail/image_png.hpp
---- a/source/paint/detail/image_png.hpp	2016-02-08 12:57:42.000000000 +0100
-+++ b/source/paint/detail/image_png.hpp	2016-07-10 12:20:27.927506748 +0200
-@@ -10,7 +10,7 @@
- 	#include <png.h>

- #endif

- 

--#include <stdio.h>

-+#include <cstring>

- 

- namespace nana

- {