[arch-commits] Commit in nomacs/trunk (PKGBUILD nomacs-3.17.2206-quazip-1.0.0.patch)

[Antonio Rojas]

    Date: Sunday, October 11, 2020 @ 19:20:47
  Author: arojas
Revision: 723542

Support quazip 1.1

Modified:
  nomacs/trunk/PKGBUILD
  nomacs/trunk/nomacs-3.17.2206-quazip-1.0.0.patch

-------------------------------------+
 PKGBUILD                            |    4 ++--
 nomacs-3.17.2206-quazip-1.0.0.patch |   10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-11 19:15:28 UTC (rev 723541)
+++ PKGBUILD	2020-10-11 19:20:47 UTC (rev 723542)
@@ -20,10 +20,10 @@
         )
 sha512sums=('3137a64d2688abf17940fc1f6bf7a94c7a08365c67f30cc47e14dac31455e01c1cd32a58f39c2e3a83368a957a2ef619c881637dcd6ce7f25ff926b085b94b31'
             'cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747'
-            '0a72d9f6d68d3f59f6ff4df8bbd1f7dcbe7aafd3a0bc770c7e20df431a4648513c8bf3abb707f35051c13c5ab69d3fc5ed4aa9c42de970394c9b9700fef9f862')
+            'a5177357b186beaebba5b5887589a4c5bcfe197fc8708032cee50ade7119c90f5b726266cd23b4a90dd3d82d0da21e6b9f157853c5615d0ff73ef8cc97488f05')
 b2sums=('943126c32c3e58f2ef1d389d3114f9fc1ba7d85a15dd4490c1f39b3b521d6f792e4635cb3c8877af478815ef7ffdffbf7a4f06a5f1bad5d1a9109f6e1baafdb8'
         '2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409'
-        'bfa9eab76b214c04db9c2cf43e3cfbf9ce24e3126f2068d677fdeccd899afc75c1ffd3eae2a5b5d43223cb4e80e5ca23e22d555634dea808e2c45d0467f1ee5c')
+        'bb5c6252417a74f773ed4e2962a3e8b94e2d13efdc8294b324d01d96a0d1eb7b8943d8717175db012aa92e97d3ce78960c772e657135d18dea5752e5abfb75eb')
 
 prepare() {
   cd "${pkgname}-${pkgver}"

Modified: nomacs-3.17.2206-quazip-1.0.0.patch
===================================================================
--- nomacs-3.17.2206-quazip-1.0.0.patch	2020-10-11 19:15:28 UTC (rev 723541)
+++ nomacs-3.17.2206-quazip-1.0.0.patch	2020-10-11 19:20:47 UTC (rev 723542)
@@ -46,7 +46,7 @@
  		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
  			HINTS /usr/include /usr/local/include
 -			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+			PATH_SUFFIXES QuaZip-Qt5-1.0/quazip
++			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip QuaZip-Qt5-1.1/quazip
  		)
  		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
  	ENDIF (WIN32)
@@ -58,7 +58,7 @@
  // quazip
  #ifdef WITH_QUAZIP
 -#include <quazip5/JlCompress.h>
-+#include <QuaZip-Qt5-1.0/quazip/JlCompress.h>
++#include <JlCompress.h>
  #endif
  
  // opencv
@@ -70,7 +70,7 @@
  // quazip
  #ifdef WITH_QUAZIP
 -#include <quazip5/JlCompress.h>
-+#include <QuaZip-Qt5-1.0/quazip/JlCompress.h>
++#include <JlCompress.h>
  #endif
  #pragma warning(pop)		// no warnings from includes - end
  
@@ -82,7 +82,7 @@
  // quazip
  #ifdef WITH_QUAZIP
 -#include <quazip5/JlCompress.h>
-+#include <QuaZip-Qt5-1.0/quazip/JlCompress.h>
++#include <JlCompress.h>
  #endif
  
  // opencv
@@ -101,7 +101,7 @@
  // quazip
  #ifdef WITH_QUAZIP
 -#include <quazip5/JlCompress.h>
-+#include <QuaZip-Qt5-1.0/quazip/JlCompress.h>
++#include <JlCompress.h>
  #endif
  
  #pragma warning(pop)		// no warnings from includes - end