Bumped the version to 1.7.4.

- included a fix for a missed out return value, which should be checked (and
  get rid of a warning in the process)
- changed the build process to deal with upcoming cmake changes to out of
  source tree building

4 files changed, 64 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47b7fe909c68..e447382e50da 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.7.3
+	pkgver = 1.7.4
 	pkgrel = 1
 	url = http://nanapro.org/en-us/
 	arch = i686
@@ -18,10 +18,12 @@ pkgbase = nana
 	depends = libpng
 	depends = libx11
 	depends = libxft
-	source = https://sourceforge.net/projects/nanapro/files/Nana/Nana 1.x/nana_1.7.3.zip
+	source = https://sourceforge.net/projects/nanapro/files/Nana/Nana 1.x/nana_1.7.4.zip
 	source = fix_the_little_issues.patch
-	sha256sums = af69c2d570d32efdc386c5245cfcd05ebdde4e21c1459b229a78496d2609a9c3
-	sha256sums = 0a00b824b90b9380be9a4376507b0880fb75466b8114275156f2d3bd44c9f32b
+	source = fix_ignored_fread_png_value.patch
+	sha256sums = c5a2e3cf83a9c43a61262c25921ed793280d6d3afbf2ea65364e5dd42440176a
+	sha256sums = fc49f8e342b1193e7eb36b83b82512b4e1250e58d23912b5a8b1a124944515c9
+	sha256sums = 87af9d37341b588c9f52193ee241211366122e95b4392098a849e22bb9736801
 
 pkgname = nana
 
diff --git a/PKGBUILD b/PKGBUILD
index 3db45d1ea85c..8a06c75eb731 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Wilken 'Akiko' Gottwalt <akiko@mailbox.org>
 
 pkgname=nana
-pkgver=1.7.3
+pkgver=1.7.4
 pkgrel=1
 pkgdesc="An opensource cross-platform GUI library written in modern C++11 for static linking"
 arch=("i686" "x86_64")
@@ -10,20 +10,26 @@ license=("custom:Boost Software License")
 depends=("alsa-lib" "libjpeg-turbo" "libpng" "libx11" "libxft")
 makedepends=("alsa-lib" "cmake" "libjpeg-turbo" "libpng" "libx11" "libxft" "xorgproto")
 source=("https://sourceforge.net/projects/nanapro/files/Nana/Nana 1.x/nana_${pkgver}.zip"
-        "fix_the_little_issues.patch")
-sha256sums=('af69c2d570d32efdc386c5245cfcd05ebdde4e21c1459b229a78496d2609a9c3'
-            '0a00b824b90b9380be9a4376507b0880fb75466b8114275156f2d3bd44c9f32b')
+        "fix_the_little_issues.patch"
+        "fix_ignored_fread_png_value.patch")
+sha256sums=('c5a2e3cf83a9c43a61262c25921ed793280d6d3afbf2ea65364e5dd42440176a'
+            'fc49f8e342b1193e7eb36b83b82512b4e1250e58d23912b5a8b1a124944515c9'
+            '87af9d37341b588c9f52193ee241211366122e95b4392098a849e22bb9736801')
 
 prepare() {
     cd ${srcdir}/${pkgname}
 
     patch -Np1 -i ../fix_the_little_issues.patch
+    patch -Np1 -i ../fix_ignored_fread_png_value.patch
 }
 
 build() {
-    cd ${srcdir}/${pkgname}
-
-    cmake \
+    if [ ! -d "${srcdir}/${pkgname}_build_static" ]
+    then
+        mkdir ${srcdir}/${pkgname}_build_static
+    fi
+    cd ${srcdir}/${pkgname}_build_static
+    cmake ../${pkgname} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DNANA_CMAKE_ENABLE_AUDIO=YES \
@@ -31,10 +37,16 @@ build() {
         -DNANA_CMAKE_ENABLE_PNG=YES \
         -DNANA_CMAKE_INSTALL=YES \
         -DNANA_CMAKE_NANA_FILESYSTEM_FORCE=NO \
-        -DNANA_CMAKE_STD_FILESYSTEM_FORCE=YES
+        -DNANA_CMAKE_STD_FILESYSTEM_FORCE=YES \
+        -DNANA_CMAKE_INSTALL=ON
     make
 
-    cmake \
+    if [ ! -d "${srcdir}/${pkgname}_build_shared" ]
+    then
+        mkdir ${srcdir}/${pkgname}_build_shared
+    fi
+    cd ${srcdir}/${pkgname}_build_shared
+    cmake ../${pkgname} \
         -DBUILD_SHARED_LIBS=YES \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
@@ -43,15 +55,16 @@ build() {
         -DNANA_CMAKE_ENABLE_PNG=YES \
         -DNANA_CMAKE_INSTALL=YES \
         -DNANA_CMAKE_NANA_FILESYSTEM_FORCE=NO \
-        -DNANA_CMAKE_STD_FILESYSTEM_FORCE=YES
+        -DNANA_CMAKE_STD_FILESYSTEM_FORCE=YES \
+        -DNANA_CMAKE_INSTALL=ON
     make
 }
 
 package() {
-    cd ${srcdir}/${pkgname}
-
+    cd ${srcdir}/${pkgname}_build_shared
     make DESTDIR="${pkgdir}" install
-    cp ${srcdir}/${pkgname}/libnana.a ${pkgdir}/usr/lib
+
+    cp ${srcdir}/${pkgname}_build_static/libnana.a ${pkgdir}/usr/lib
 
     cd ${pkgdir}/usr/lib
     mv libnana.so libnana.so.${pkgver}
diff --git a/fix_ignored_fread_png_value.patch b/fix_ignored_fread_png_value.patch
new file mode 100644
index 000000000000..80d10d761ce9
--- /dev/null
+++ b/fix_ignored_fread_png_value.patch
@@ -0,0 +1,19 @@
+Nope, we do not ignore the fread result, we actually check it like it should
+have been done ...
+---
+diff --no-dereference -urpN a/source/paint/detail/image_png.hpp b/source/paint/detail/image_png.hpp
+--- a/source/paint/detail/image_png.hpp	2020-08-19 18:36:32.888420665 +0200
++++ b/source/paint/detail/image_png.hpp	2020-08-19 18:39:25.116094825 +0200
+@@ -133,10 +133,10 @@ namespace nana
+ 				bool is_opened = false;
+ 
+ 				png_byte png_sig[8];
+-				::fread(png_sig, 1, 8, fp);
++				size_t result = ::fread(png_sig, 1, 8, fp);
+ 
+ 				//Test whether the file is a png.
+-				if(0 == png_sig_cmp(png_sig, 0, 8))
++				if((8 == result) && (0 == png_sig_cmp(png_sig, 0, 8)))
+ 				{
+ 					png_structp png_ptr = ::png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
+ 					if(png_ptr)
diff --git a/fix_the_little_issues.patch b/fix_the_little_issues.patch
index 848468799dba..7f80446b9eda 100644
--- a/fix_the_little_issues.patch
+++ b/fix_the_little_issues.patch
@@ -1,6 +1,18 @@
 Fixed some of the cmake buildsystem issues. CMake provides an ALSA
 module for a long time now ...
 ---
+diff --no-dereference -urpN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-08-19 18:36:32.878420607 +0200
++++ b/CMakeLists.txt	2020-08-19 18:44:25.774516908 +0200
+@@ -22,7 +22,7 @@
+ # cmake 3.12 have more better modern c++ support

+ 

+ cmake_minimum_required(VERSION 3.12  FATAL_ERROR)

+-project(nana VERSION      1.7.3

++project(nana VERSION      1.7.4

+         DESCRIPTION "C++ GUI library"

+         HOMEPAGE_URL http://nanapro.org

+         LANGUAGES CXX         )

 diff -uprN nana.org/build/cmake/enable_audio.cmake nana/build/cmake/enable_audio.cmake
 --- nana.org/build/cmake/enable_audio.cmake	2020-02-13 16:49:53.913064651 +0100
 +++ nana/build/cmake/enable_audio.cmake	2020-02-13 16:50:04.823602262 +0100
@@ -23,6 +35,7 @@ diff -uprN nana.org/build/cmake/enable_audio.cmake nana/build/cmake/enable_audio
 -endif()
 \ No newline at end of file
 +endif()

+
 diff -uprN nana.org/build/cmake/shared_libs.cmake nana/build/cmake/shared_libs.cmake
 --- nana.org/build/cmake/shared_libs.cmake	2020-02-13 16:49:53.913064651 +0100
 +++ nana/build/cmake/shared_libs.cmake	2020-02-13 17:07:49.469445929 +0100