Bumped the version to 1.7.3.

4 files changed, 54 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8dfc91a09bad..47b7fe909c68 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.2
+	pkgver = 1.7.3
 	pkgrel = 1
 	url = http://nanapro.org/en-us/
 	arch = i686
@@ -18,10 +18,10 @@ pkgbase = nana
 	depends = libpng
 	depends = libx11
 	depends = libxft
-	source = https://sourceforge.net/projects/nanapro/files/Nana/Nana 1.x/nana_1.7.2.zip
-	source = fix_all_the_little_issues.patch
-	sha256sums = 442b0e0ad899792bb97dd5b3aed0cb3d36b62fb2e0564b28604b5bcb228960c3
-	sha256sums = 0033bdd672a2acfb8fe785b15de27e8e89fc843f94340bcde814e631477e3239
+	source = https://sourceforge.net/projects/nanapro/files/Nana/Nana 1.x/nana_1.7.3.zip
+	source = fix_the_little_issues.patch
+	sha256sums = af69c2d570d32efdc386c5245cfcd05ebdde4e21c1459b229a78496d2609a9c3
+	sha256sums = 0a00b824b90b9380be9a4376507b0880fb75466b8114275156f2d3bd44c9f32b
 
 pkgname = nana
 
diff --git a/PKGBUILD b/PKGBUILD
index e349239ccb4e..3db45d1ea85c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Wilken 'Akiko' Gottwalt <akiko@mailbox.org>
 
 pkgname=nana
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="An opensource cross-platform GUI library written in modern C++11 for static linking"
 arch=("i686" "x86_64")
@@ -10,14 +10,14 @@ 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_all_the_little_issues.patch")
-sha256sums=('442b0e0ad899792bb97dd5b3aed0cb3d36b62fb2e0564b28604b5bcb228960c3'
-            '0033bdd672a2acfb8fe785b15de27e8e89fc843f94340bcde814e631477e3239')
+        "fix_the_little_issues.patch")
+sha256sums=('af69c2d570d32efdc386c5245cfcd05ebdde4e21c1459b229a78496d2609a9c3'
+            '0a00b824b90b9380be9a4376507b0880fb75466b8114275156f2d3bd44c9f32b')
 
 prepare() {
     cd ${srcdir}/${pkgname}
 
-    patch -Np1 -i ../fix_all_the_little_issues.patch
+    patch -Np1 -i ../fix_the_little_issues.patch
 }
 
 build() {
@@ -30,7 +30,8 @@ build() {
         -DNANA_CMAKE_ENABLE_JPEG=YES \
         -DNANA_CMAKE_ENABLE_PNG=YES \
         -DNANA_CMAKE_INSTALL=YES \
-        -DNANA_CMAKE_NANA_FILESYSTEM_FORCE=YES
+        -DNANA_CMAKE_NANA_FILESYSTEM_FORCE=NO \
+        -DNANA_CMAKE_STD_FILESYSTEM_FORCE=YES
     make
 
     cmake \
@@ -41,7 +42,8 @@ build() {
         -DNANA_CMAKE_ENABLE_JPEG=YES \
         -DNANA_CMAKE_ENABLE_PNG=YES \
         -DNANA_CMAKE_INSTALL=YES \
-        -DNANA_CMAKE_NANA_FILESYSTEM_FORCE=YES
+        -DNANA_CMAKE_NANA_FILESYSTEM_FORCE=NO \
+        -DNANA_CMAKE_STD_FILESYSTEM_FORCE=YES
     make
 }
 
diff --git a/fix_all_the_little_issues.patch b/fix_all_the_little_issues.patch
deleted file mode 100644
index 976c00cc303b..000000000000
--- a/fix_all_the_little_issues.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fixed some of the cmake buildsystem issues. They still forget to set the
-proper version and still seam to not check the Linux builds. CMake
-provides an ALSA module for a long time now ...
----
-diff -urpN nana.orig/CMakeLists.txt nana/CMakeLists.txt
---- nana.orig/CMakeLists.txt	2019-10-05 08:13:02.018317259 +0200
-+++ nana/CMakeLists.txt	2019-10-05 08:13:38.796748368 +0200
-@@ -21,11 +21,11 @@
- # https://cmake.org/cmake/help/v3.12/module/CMakeDependentOption.html?highlight=cmakedependentoption

- # cmake 3.12 have more better modern c++ support

- 

--cmake_minimum_required(VERSION 3.12  FATAL_ERROR)

--project(nana VERSION      1.7.1

-+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)

-+project(nana VERSION 1.7.2

-         DESCRIPTION "C++ GUI library"

-         HOMEPAGE_URL http://nanapro.org

--        LANGUAGES CXX         )

-+        LANGUAGES CXX)

- 

- #######################     Main setting of Nana targets, sources and installs    #####################

- 

-diff -urpN nana.orig/build/cmake/enable_audio.cmake nana/build/cmake/enable_audio.cmake
---- nana.orig/build/cmake/enable_audio.cmake	2019-10-05 08:13:02.018317259 +0200
-+++ nana/build/cmake/enable_audio.cmake	2019-10-05 08:14:23.775572475 +0200
-@@ -4,12 +4,12 @@ option(NANA_CMAKE_ENABLE_AUDIO "Enable c
- if(NANA_CMAKE_ENABLE_AUDIO)

-     target_compile_definitions(nana PUBLIC NANA_ENABLE_AUDIO)

-     if(UNIX)

--        find_package(ASOUND) # ? https://github.com/hintjens/demidi/blob/master/Findasound.cmake

--        if(ASOUND_FOUND)

--            target_include_directories(nana PUBLIC ${ASOUND_INCLUDE_DIRS})

--            target_link_libraries(nana PUBLIC  ${ASOUND_LIBRARIES})

-+        find_package(ALSA) # ? https://github.com/hintjens/demidi/blob/master/Findasound.cmake

-+        if(ALSA_FOUND)

-+            target_include_directories(nana PUBLIC ${ALSA_INCLUDE_DIRS})

-+            target_link_libraries(nana PUBLIC ${ALSA_LIBRARIES})

-         else()

-             message(FATAL_ERROR "libasound is not found")

-         endif()

-     endif()

--endif()
-\ No newline at end of file
-+endif()

diff --git a/fix_the_little_issues.patch b/fix_the_little_issues.patch
new file mode 100644
index 000000000000..848468799dba
--- /dev/null
+++ b/fix_the_little_issues.patch
@@ -0,0 +1,40 @@
+Fixed some of the cmake buildsystem issues. CMake provides an ALSA
+module for a long time now ...
+---
+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
+@@ -4,12 +4,12 @@ option(NANA_CMAKE_ENABLE_AUDIO "Enable c
+ if(NANA_CMAKE_ENABLE_AUDIO)

+     target_compile_definitions(nana PUBLIC NANA_ENABLE_AUDIO)

+     if(UNIX)

+-        find_package(ASOUND) # ? https://github.com/hintjens/demidi/blob/master/Findasound.cmake

+-        if(ASOUND_FOUND)

+-            target_include_directories(nana PUBLIC ${ASOUND_INCLUDE_DIRS})

+-            target_link_libraries(nana PUBLIC  ${ASOUND_LIBRARIES})

++        find_package(ALSA) # ? https://github.com/hintjens/demidi/blob/master/Findasound.cmake

++        if(ALSA_FOUND)

++            target_include_directories(nana PUBLIC ${ALSA_INCLUDE_DIRS})

++            target_link_libraries(nana PUBLIC  ${ALSA_LIBRARIES})

+         else()

+             message(FATAL_ERROR "libasound is not found")

+         endif()

+     endif()

+-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
+@@ -37,10 +37,6 @@ if(BUILD_SHARED_LIBS)   # todo test
+ endif()

+ 

+ if(NANA_STATIC_STDLIB)

+-    target_link_libraries(nana

+-        PUBLIC

+-            $<$<CXX_COMPILER_ID:GNU>:-static-libgcc -static-libstdc++>

+-            $<$<CXX_COMPILER_ID:Clang>:-static-libgcc -static-libstdc++>

+-            )

++    target_link_libraries(nana PUBLIC -static-libgcc -static-libstdc++)

+ endif()

+