diff options
14 files changed, 201 insertions, 69 deletions
@@ -1,35 +1,42 @@ pkgbase = quickviewer pkgdesc = An image/comic viewer application - pkgver = 1.1.3 - pkgrel = 1 + pkgver = 1.1.8 + pkgrel = 2 url = https://kanryu.github.io/quickviewer/ arch = i686 arch = x86_64 license = GPL3 license = custom:unrar - license = custom:ResizeHalf makedepends = git makedepends = qt5-tools depends = qt5-base - source = quickviewer::git://github.com/kanryu/quickviewer.git#tag=v1.1.3 - source = ResizeHalf::git://github.com/chikuzen/ResizeHalf.git#commit=5099b0dc6081ddb79c1a39694b223c5840c7da9b - source = easyexif::git://github.com/mayanklahiri/easyexif.git#commit=19d15151c3f663813dc70cf9ff568d25ab6ff93b - source = exiv2::git://github.com/Exiv2/exiv2.git#commit=fa449a4d2c58d63f0d75ff259f25683a98a44630 - source = libexpat::git://github.com/libexpat/libexpat.git#commit=56b64ca0406d31f0a8cd93e155c38a3b30b002f8 - source = luminor::git://github.com/kanryu/luminor.git#commit=c2d113b8a45f3c7118ded920277ca35583689d1c - source = quazip::git://github.com/kanryu/quazip.git#commit=6cc7516f65f20e59739c629fe95a0eac7953260e - source = zimg::git://github.com/sekrit-twc/zimg.git#commit=5e603b6390f0fc1e32e634dece083dd8b729334a - source = zlib::git://github.com/madler/zlib.git#commit=cacf7f1d4e3d44d871b605da3b647f07d718623f - source = qactionmanager::git://github.com/kanryu/qactionmanager.git#commit=2f66c030ef2169eccc240b10a10b7f921bd0cfea - source = qfullscreenframe::git://github.com/kanryu/qfullscreenframe.git#commit=550f001f4383edaf5baf1598ad1473bc698f807a - source = qlanguageselector::git://github.com/kanryu/qlanguageselector.git#commit=d0e5cb6141854c1eacb68d2dd31bf7cb9337a7ab - source = qnamedpipe::git://github.com/kanryu/qnamedpipe.git#commit=f887aadb1b1587c82459e94ef3195c97a697ad05 - source = quickviewer-1.1.3-fix-nonwindows-filename-comparator.patch - source = quickviewer-1.1.3-change-qmake-variable-defs.patch - source = quickviewer-1.1.3-main-projectfile-changes.patch - source = quickviewer-1.1.3-fileloader-projectfile-changes.patch - source = quickviewer-1.1.3-lib7z-projectfile-changes.patch - source = quickviewer-1.1.3-desktopfile-changes.patch + source = quickviewer::git+https://github.com/kanryu/quickviewer.git#tag=v1.1.8 + source = ResizeHalf::git+https://github.com/chikuzen/ResizeHalf.git#commit=f1eb302317b2de5f8c1768db989c167c6f785822 + source = easyexif::git+https://github.com/mayanklahiri/easyexif.git#commit=19d15151c3f663813dc70cf9ff568d25ab6ff93b + source = exiv2::git+https://github.com/Exiv2/exiv2.git#commit=fa449a4d2c58d63f0d75ff259f25683a98a44630 + source = libexpat::git+https://github.com/libexpat/libexpat.git#commit=56b64ca0406d31f0a8cd93e155c38a3b30b002f8 + source = luminor::git+https://github.com/kanryu/luminor.git#commit=c2d113b8a45f3c7118ded920277ca35583689d1c + source = quazip::git+https://github.com/kanryu/quazip.git#commit=6cc7516f65f20e59739c629fe95a0eac7953260e + source = zimg::git+https://github.com/sekrit-twc/zimg.git#commit=5e603b6390f0fc1e32e634dece083dd8b729334a + source = zlib::git+https://github.com/madler/zlib.git#commit=cacf7f1d4e3d44d871b605da3b647f07d718623f + source = qactionmanager::git+https://github.com/kanryu/qactionmanager.git#commit=2f66c030ef2169eccc240b10a10b7f921bd0cfea + source = qfullscreenframe::git+https://github.com/kanryu/qfullscreenframe.git#commit=550f001f4383edaf5baf1598ad1473bc698f807a + source = qlanguageselector::git+https://github.com/kanryu/qlanguageselector.git#commit=d0e5cb6141854c1eacb68d2dd31bf7cb9337a7ab + source = qnamedpipe::git+https://github.com/kanryu/qnamedpipe.git#commit=f887aadb1b1587c82459e94ef3195c97a697ad05 + source = lib7zip::git+https://github.com/kanryu/lib7zip.git#commit=111768f3a72c1d2a8b184024e5be7c675156413f + source = quickviewer-1.1.8-fix-nonwindows-filename-comparator.patch + source = quickviewer-1.1.8-fix-nonwindows-64bit-type-mismatch.patch + source = quickviewer-1.1.8-fix-p7zip-noninteger-type-problem.patch + source = quickviewer-1.1.8-change-qmake-variable-defs.patch + source = quickviewer-1.1.8-main-projectfile-changes.patch + source = quickviewer-1.1.8-fileloader-projectfile-changes.patch + source = quickviewer-1.1.8-lib7z-projectfile-changes.patch + source = quickviewer-1.1.8-Qt7z-projectfile-changes.patch + source = quickviewer-1.1.8-desktopfile-changes.patch + source = quickviewer-1.1.8-fix-missing-c-stddef-include.patch + source = quickviewer-1.1.8-fix-case-sensitivity-include-problem.patch + source = quickviewer-1.1.8-fix-lib7zip-duplicate-function-problem.patch + sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -44,11 +51,16 @@ pkgbase = quickviewer sha256sums = SKIP sha256sums = SKIP sha256sums = 8a2729a3bd5b6b8a5e9124593c881b98a20db7742b66d82641a40ee256faaeb4 + sha256sums = 67e8581b92518e7b3f36ed3af89de3075f2d333b1c96818374a40c1f84e500d5 + sha256sums = a6700a1470ec2d34e10accc32a2ba7fd1afcbfc2431d0990e34b82c62cabf471 sha256sums = 17aaffcb0a8d812ac10d26b69b88163031e25b8144b5eb1ec65be96e33debace - sha256sums = a5acde9f0b45819a472d3024bf12df524bc4e3dbd08cf4af2984f272c6c8a0da - sha256sums = 735373799b838a84c9f962a8319d58f104daeb7617d4da1e89ebd9dfb4e0ab95 + sha256sums = ce083a24eafe219293e66bea47cc8441e1f4250159effbbcbe6915c3ba1c6162 + sha256sums = e4c8dce65e7d7569aa48bf444c4afe5e882f40cf4854712ca86f24a6671fe2c0 sha256sums = 18b03a7f06d9cd4d5afbdc14f48caad5f065b212281984726e1c90bd48dbe5bd + sha256sums = c90a69365b3885efcabbc7c16dc73e17d8377df411ff547659b4d820a411b66b sha256sums = 7c73402e349afe235b1ddcc81f33f0d8272e9271a37cc583c30d71ceb09abe11 + sha256sums = 1a40569ec5cf4e5025447874440f65a1da1281e0c75e95809a8f5686e70e5e9b + sha256sums = e10f9ed1aa87370f4561a0a959c29d73774132a1dc3ac996c1bb1658b5954291 + sha256sums = ca5692130549c492f09cad46ec0b833324e62e9107946d1cd598e35d8af2afd7 pkgname = quickviewer - @@ -1,40 +1,46 @@ # Maintainer: Andrew Munkres <amunkres@nyx.net> pkgname=quickviewer -pkgver=1.1.3 -pkgrel=1 +pkgver=1.1.8 +pkgrel=2 pkgdesc="An image/comic viewer application" arch=('i686' 'x86_64') url="https://kanryu.github.io/quickviewer/" -license=('GPL3' 'custom:unrar' 'custom:ResizeHalf') +license=('GPL3' 'custom:unrar') # Warning: QuickViewer's Git repository imports (as submodules) the source code # of some required 3rd-party libraries into QuickViewer's own source tree as -# Git submodules; and while some of these (such as expat and easyexif) use -# GPL3-compatible licenses, at least one (unrar) uses a GPL3-incompatible -# license, while one other (ResizeHalf) does not appear to have any license -# terms whatsoever. Therefore, the compiled binary likely is not legally -# redistributable. +# Git submodules; and while some of these (such as expat, easyexif, and +# ResizeHalf) use GPL3-compatible licenses, at least one (unrar) uses a +# GPL3-incompatible license. Therefore, the compiled binary likely is not +# legally redistributable. depends=('qt5-base') makedepends=('git' 'qt5-tools') -source=("${pkgname}::git://github.com/kanryu/${pkgname}.git#tag=v${pkgver}" - "ResizeHalf::git://github.com/chikuzen/ResizeHalf.git#commit=5099b0dc6081ddb79c1a39694b223c5840c7da9b" - "easyexif::git://github.com/mayanklahiri/easyexif.git#commit=19d15151c3f663813dc70cf9ff568d25ab6ff93b" - "exiv2::git://github.com/Exiv2/exiv2.git#commit=fa449a4d2c58d63f0d75ff259f25683a98a44630" - "libexpat::git://github.com/libexpat/libexpat.git#commit=56b64ca0406d31f0a8cd93e155c38a3b30b002f8" - "luminor::git://github.com/kanryu/luminor.git#commit=c2d113b8a45f3c7118ded920277ca35583689d1c" - "quazip::git://github.com/kanryu/quazip.git#commit=6cc7516f65f20e59739c629fe95a0eac7953260e" - "zimg::git://github.com/sekrit-twc/zimg.git#commit=5e603b6390f0fc1e32e634dece083dd8b729334a" - "zlib::git://github.com/madler/zlib.git#commit=cacf7f1d4e3d44d871b605da3b647f07d718623f" - "qactionmanager::git://github.com/kanryu/qactionmanager.git#commit=2f66c030ef2169eccc240b10a10b7f921bd0cfea" - "qfullscreenframe::git://github.com/kanryu/qfullscreenframe.git#commit=550f001f4383edaf5baf1598ad1473bc698f807a" - "qlanguageselector::git://github.com/kanryu/qlanguageselector.git#commit=d0e5cb6141854c1eacb68d2dd31bf7cb9337a7ab" - "qnamedpipe::git://github.com/kanryu/qnamedpipe.git#commit=f887aadb1b1587c82459e94ef3195c97a697ad05" - "quickviewer-1.1.3-fix-nonwindows-filename-comparator.patch" - "quickviewer-1.1.3-change-qmake-variable-defs.patch" - "quickviewer-1.1.3-main-projectfile-changes.patch" - "quickviewer-1.1.3-fileloader-projectfile-changes.patch" - "quickviewer-1.1.3-lib7z-projectfile-changes.patch" - "quickviewer-1.1.3-desktopfile-changes.patch") +source=("${pkgname}::git+https://github.com/kanryu/${pkgname}.git#tag=v${pkgver}" + "ResizeHalf::git+https://github.com/chikuzen/ResizeHalf.git#commit=f1eb302317b2de5f8c1768db989c167c6f785822" + "easyexif::git+https://github.com/mayanklahiri/easyexif.git#commit=19d15151c3f663813dc70cf9ff568d25ab6ff93b" + "exiv2::git+https://github.com/Exiv2/exiv2.git#commit=fa449a4d2c58d63f0d75ff259f25683a98a44630" + "libexpat::git+https://github.com/libexpat/libexpat.git#commit=56b64ca0406d31f0a8cd93e155c38a3b30b002f8" + "luminor::git+https://github.com/kanryu/luminor.git#commit=c2d113b8a45f3c7118ded920277ca35583689d1c" + "quazip::git+https://github.com/kanryu/quazip.git#commit=6cc7516f65f20e59739c629fe95a0eac7953260e" + "zimg::git+https://github.com/sekrit-twc/zimg.git#commit=5e603b6390f0fc1e32e634dece083dd8b729334a" + "zlib::git+https://github.com/madler/zlib.git#commit=cacf7f1d4e3d44d871b605da3b647f07d718623f" + "qactionmanager::git+https://github.com/kanryu/qactionmanager.git#commit=2f66c030ef2169eccc240b10a10b7f921bd0cfea" + "qfullscreenframe::git+https://github.com/kanryu/qfullscreenframe.git#commit=550f001f4383edaf5baf1598ad1473bc698f807a" + "qlanguageselector::git+https://github.com/kanryu/qlanguageselector.git#commit=d0e5cb6141854c1eacb68d2dd31bf7cb9337a7ab" + "qnamedpipe::git+https://github.com/kanryu/qnamedpipe.git#commit=f887aadb1b1587c82459e94ef3195c97a697ad05" + "lib7zip::git+https://github.com/kanryu/lib7zip.git#commit=111768f3a72c1d2a8b184024e5be7c675156413f" + "quickviewer-1.1.8-fix-nonwindows-filename-comparator.patch" + "quickviewer-1.1.8-fix-nonwindows-64bit-type-mismatch.patch" + "quickviewer-1.1.8-fix-p7zip-noninteger-type-problem.patch" + "quickviewer-1.1.8-change-qmake-variable-defs.patch" + "quickviewer-1.1.8-main-projectfile-changes.patch" + "quickviewer-1.1.8-fileloader-projectfile-changes.patch" + "quickviewer-1.1.8-lib7z-projectfile-changes.patch" + "quickviewer-1.1.8-Qt7z-projectfile-changes.patch" + "quickviewer-1.1.8-desktopfile-changes.patch" + "quickviewer-1.1.8-fix-missing-c-stddef-include.patch" + "quickviewer-1.1.8-fix-case-sensitivity-include-problem.patch" + "quickviewer-1.1.8-fix-lib7zip-duplicate-function-problem.patch") sha256sums=('SKIP' 'SKIP' 'SKIP' @@ -48,31 +54,45 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' '8a2729a3bd5b6b8a5e9124593c881b98a20db7742b66d82641a40ee256faaeb4' + '67e8581b92518e7b3f36ed3af89de3075f2d333b1c96818374a40c1f84e500d5' + 'a6700a1470ec2d34e10accc32a2ba7fd1afcbfc2431d0990e34b82c62cabf471' '17aaffcb0a8d812ac10d26b69b88163031e25b8144b5eb1ec65be96e33debace' - 'a5acde9f0b45819a472d3024bf12df524bc4e3dbd08cf4af2984f272c6c8a0da' - '735373799b838a84c9f962a8319d58f104daeb7617d4da1e89ebd9dfb4e0ab95' + 'ce083a24eafe219293e66bea47cc8441e1f4250159effbbcbe6915c3ba1c6162' + 'e4c8dce65e7d7569aa48bf444c4afe5e882f40cf4854712ca86f24a6671fe2c0' '18b03a7f06d9cd4d5afbdc14f48caad5f065b212281984726e1c90bd48dbe5bd' - '7c73402e349afe235b1ddcc81f33f0d8272e9271a37cc583c30d71ceb09abe11') + 'c90a69365b3885efcabbc7c16dc73e17d8377df411ff547659b4d820a411b66b' + '7c73402e349afe235b1ddcc81f33f0d8272e9271a37cc583c30d71ceb09abe11' + '1a40569ec5cf4e5025447874440f65a1da1281e0c75e95809a8f5686e70e5e9b' + 'e10f9ed1aa87370f4561a0a959c29d73774132a1dc3ac996c1bb1658b5954291' + 'ca5692130549c492f09cad46ec0b833324e62e9107946d1cd598e35d8af2afd7') prepare() { cd ${pkgname} # Apply patch to fix non-Windows version of fileNameDescendingLessThan function: - patch -Np1 -i ../quickviewer-1.1.3-fix-nonwindows-filename-comparator.patch + patch -Np1 -i ../quickviewer-1.1.8-fix-nonwindows-filename-comparator.patch + # Apply patch to fix integer-type-mismatch bug on non-Windows 64-bit architectures: + patch -Np1 -i ../quickviewer-1.1.8-fix-nonwindows-64bit-type-mismatch.patch + # Apply patch to fix use of integer operators on a bool variable within p7zip source code: + patch -Np1 -i ../quickviewer-1.1.8-fix-p7zip-noninteger-type-problem.patch # Apply patch to not build an AppImage, enable OpenGL, and adjust target pathname-prefix: - patch -Np1 -i ../quickviewer-1.1.3-change-qmake-variable-defs.patch + patch -Np1 -i ../quickviewer-1.1.8-change-qmake-variable-defs.patch # Apply patch to install desktop and icon files, and change pathname for translations, etc.: - patch -Np1 -i ../quickviewer-1.1.3-main-projectfile-changes.patch + patch -Np1 -i ../quickviewer-1.1.8-main-projectfile-changes.patch # Apply patches to have libraries build using qmake installed by their own qmake-projects, # and remove unwanted RPATH: - patch -Np1 -i ../quickviewer-1.1.3-fileloader-projectfile-changes.patch - patch -Np1 -i ../quickviewer-1.1.3-lib7z-projectfile-changes.patch + patch -Np1 -i ../quickviewer-1.1.8-fileloader-projectfile-changes.patch + patch -Np1 -i ../quickviewer-1.1.8-lib7z-projectfile-changes.patch + # Apply patch to include lib7zip source files in Qt7z project file: + patch -Np1 -i ../quickviewer-1.1.8-Qt7z-projectfile-changes.patch # Apply patch to fix the pathname in QuickViewer.desktop: - patch -Np1 -i ../quickviewer-1.1.3-desktopfile-changes.patch + patch -Np1 -i ../quickviewer-1.1.8-desktopfile-changes.patch # Checkout the Git submodules: git submodule init ResizeHalf/ResizeHalf easyexif/easyexif exiv2/exiv2 libexpat/libexpat \ luminor/luminor quazip/quazip zimg/zimg zlib/zlib QuickViewer/src/qactionmanager \ - QuickViewer/src/qfullscreenframe QuickViewer/src/qlanguageselector QuickViewer/src/qnamedpipe + QuickViewer/src/qfullscreenframe QuickViewer/src/qlanguageselector QuickViewer/src/qnamedpipe \ + Qt7z/Qt7z/lib7zip git config submodule.ResizeHalf.url ${srcdir}/ResizeHalf git config submodule.easyexif.url ${srcdir}/easyexif git config submodule.exiv2.url ${srcdir}/exiv2 @@ -85,7 +105,14 @@ prepare() { git config submodule.qfullscreenframe.url ${srcdir}/qfullscreenframe git config submodule.qlanguageselector.url ${srcdir}/qlanguageselector git config submodule.qnamedpipe.url ${srcdir}/qnamedpipe + git config submodule.lib7zip ${srcdir}/lib7zip git submodule update + # Apply patch to fix missing "#include <stddef.h>" in zimg library + patch -Np1 -i ../quickviewer-1.1.8-fix-missing-c-stddef-include.patch + # Apply patch to fix case-mismatched "#include <InitGuid.h>" in lib7zip library + patch -Np1 -i ../quickviewer-1.1.8-fix-case-sensitivity-include-problem.patch + # Apply patch to fix duplicate copy of MyStringCompareNoCase function + patch -Np1 -i ../quickviewer-1.1.8-fix-lib7zip-duplicate-function-problem.patch } build() { diff --git a/quickviewer-1.1.8-Qt7z-projectfile-changes.patch b/quickviewer-1.1.8-Qt7z-projectfile-changes.patch new file mode 100644 index 000000000000..e23bbe39b84f --- /dev/null +++ b/quickviewer-1.1.8-Qt7z-projectfile-changes.patch @@ -0,0 +1,37 @@ +--- quickviewer/Qt7z/Qt7z/Qt7z.pri.orig 2020-06-15 20:27:13.248289440 -0700 ++++ quickviewer/Qt7z/Qt7z/Qt7z.pri 2020-06-16 00:39:19.858140807 -0700 +@@ -232,9 +232,11 @@ + + unix { + INCLUDEPATH += \ ++ $$PWD/p7zip \ + $$PWD/p7zip/CPP/myWindows \ + $$PWD/p7zip/CPP \ + $$PWD/p7zip/CPP/include_windows \ ++ $$PWD/lib7zip/src \ + + LIBS += -ldl + +@@ -427,6 +429,22 @@ + # $$PWD/p7zip/C/XzCrc64Opt.c \ + + SOURCES += \ ++ $$PWD/lib7zip/src/7ZipArchive.cpp \ ++ $$PWD/lib7zip/src/7ZipArchiveItem.cpp \ ++ $$PWD/lib7zip/src/7ZipArchiveOpenCallback.cpp \ ++ $$PWD/lib7zip/src/7ZipCodecInfo.cpp \ ++ $$PWD/lib7zip/src/7ZipCompressCodecsInfo.cpp \ ++ $$PWD/lib7zip/src/7ZipDllHandler.cpp \ ++ $$PWD/lib7zip/src/7ZipFormatInfo.cpp \ ++ $$PWD/lib7zip/src/7ZipInStreamWrapper.cpp \ ++ $$PWD/lib7zip/src/7zipLibrary.cpp \ ++ $$PWD/lib7zip/src/7ZipObjectPtrArray.cpp \ ++ $$PWD/lib7zip/src/7ZipOpenArchive.cpp \ ++ $$PWD/lib7zip/src/GUIDs.cpp \ ++ $$PWD/lib7zip/src/HelperFuncs.cpp \ ++ $$PWD/lib7zip/src/OSFunctions_OS2.cpp \ ++ $$PWD/lib7zip/src/OSFunctions_UnixLike.cpp \ ++ $$PWD/lib7zip/src/OSFunctions_Win32.cpp \ + $$PWD/p7zip/C/7zCrc.c \ + $$PWD/p7zip/C/7zCrcOpt.c \ + $$PWD/p7zip/C/Alloc.c \ diff --git a/quickviewer-1.1.3-change-qmake-variable-defs.patch b/quickviewer-1.1.8-change-qmake-variable-defs.patch index e6ce72063af4..e6ce72063af4 100644 --- a/quickviewer-1.1.3-change-qmake-variable-defs.patch +++ b/quickviewer-1.1.8-change-qmake-variable-defs.patch diff --git a/quickviewer-1.1.3-desktopfile-changes.patch b/quickviewer-1.1.8-desktopfile-changes.patch index ee8cfc221e46..ee8cfc221e46 100644 --- a/quickviewer-1.1.3-desktopfile-changes.patch +++ b/quickviewer-1.1.8-desktopfile-changes.patch diff --git a/quickviewer-1.1.3-fileloader-projectfile-changes.patch b/quickviewer-1.1.8-fileloader-projectfile-changes.patch index 69c4201d0866..71582d40734e 100644 --- a/quickviewer-1.1.3-fileloader-projectfile-changes.patch +++ b/quickviewer-1.1.8-fileloader-projectfile-changes.patch @@ -1,5 +1,5 @@ ---- quickviewer/fileloader/fileloader.pro.orig 2019-02-23 05:29:22.150589475 -0800 -+++ quickviewer/fileloader/fileloader.pro 2019-02-23 05:30:24.377255206 -0800 +--- quickviewer/fileloader/fileloader.pro.orig 2020-06-15 20:27:13.351622773 -0700 ++++ quickviewer/fileloader/fileloader.pro 2020-06-15 20:27:16.064956080 -0700 @@ -16,7 +16,7 @@ *g++* { @@ -9,7 +9,7 @@ QMAKE_CXXFLAGS += -std=c++11 DEFINES += NTDDI_VERSION=NTDDI_VISTA } -@@ -54,11 +54,13 @@ +@@ -57,11 +57,13 @@ INCLUDEPATH += ../Qt7z/Qt7z LIBS += -lQt7z diff --git a/quickviewer-1.1.8-fix-case-sensitivity-include-problem.patch b/quickviewer-1.1.8-fix-case-sensitivity-include-problem.patch new file mode 100644 index 000000000000..04442c13c3ba --- /dev/null +++ b/quickviewer-1.1.8-fix-case-sensitivity-include-problem.patch @@ -0,0 +1,6 @@ +--- quickviewer/Qt7z/Qt7z/lib7zip/src/GUIDs.cpp.orig 2020-06-15 22:04:12.974898763 -0700 ++++ quickviewer/Qt7z/Qt7z/lib7zip/src/GUIDs.cpp 2020-06-16 00:24:21.121482930 -0700 +@@ -1,2 +1,2 @@ +-#include <InitGuid.h> ++#include <initguid.h> + #include "GUIDs.h" diff --git a/quickviewer-1.1.8-fix-lib7zip-duplicate-function-problem.patch b/quickviewer-1.1.8-fix-lib7zip-duplicate-function-problem.patch new file mode 100644 index 000000000000..298c330419f1 --- /dev/null +++ b/quickviewer-1.1.8-fix-lib7zip-duplicate-function-problem.patch @@ -0,0 +1,18 @@ +--- quickviewer/Qt7z/Qt7z/lib7zip/src/HelperFuncs.cpp.orig 2020-06-15 22:04:12.974898763 -0700 ++++ quickviewer/Qt7z/Qt7z/lib7zip/src/HelperFuncs.cpp 2022-03-20 14:53:59.218950775 -0700 +@@ -155,6 +155,7 @@ + #endif + #endif + ++/* MyStringCompareNoCase is defined inline in MyString.cpp + int MyStringCompareNoCase(const wchar_t *s1, const wchar_t *s2) LIB7ZIP_THROW + { + for (;;) { +@@ -169,6 +170,7 @@ + if (c1 == 0) return 0; + } + } ++*/ + + void NormalizeDirPathPrefix(wstring & dirPath) + { diff --git a/quickviewer-1.1.8-fix-missing-c-stddef-include.patch b/quickviewer-1.1.8-fix-missing-c-stddef-include.patch new file mode 100644 index 000000000000..9c915612c45a --- /dev/null +++ b/quickviewer-1.1.8-fix-missing-c-stddef-include.patch @@ -0,0 +1,10 @@ +--- quickviewer/zimg/zimg/src/zimg/colorspace/matrix3.h.orig 2020-06-15 22:55:47.801534726 -0700 ++++ quickviewer/zimg/zimg/src/zimg/colorspace/matrix3.h 2020-06-15 22:56:07.838201199 -0700 +@@ -4,6 +4,7 @@ + #define ZIMG_COLORSPACE_MATRIX3_H_ + + #include <array> ++#include <stddef.h> + + namespace zimg { + namespace colorspace { diff --git a/quickviewer-1.1.8-fix-nonwindows-64bit-type-mismatch.patch b/quickviewer-1.1.8-fix-nonwindows-64bit-type-mismatch.patch new file mode 100644 index 000000000000..5282c5c96ee5 --- /dev/null +++ b/quickviewer-1.1.8-fix-nonwindows-64bit-type-mismatch.patch @@ -0,0 +1,11 @@ +--- quickviewer/fileloader/fileloader7zarchive.cpp.orig 2020-06-15 20:27:13.351622773 -0700 ++++ quickviewer/fileloader/fileloader7zarchive.cpp 2020-06-15 22:28:42.301550922 -0700 +@@ -336,7 +336,7 @@ + // item.GetStringProperty(PropertyIndexEnum::kpidGroup, strVal); + // prop.Group = QString::fromStdWString(strVal); + +- uint64_t uintval; ++ unsigned __int64 uintval; + item.GetUInt64Property(PropertyIndexEnum::kpidSize, uintval); + prop.size = (size_t) uintval; + prop.pre_total = (size_t) pre_total; diff --git a/quickviewer-1.1.3-fix-nonwindows-filename-comparator.patch b/quickviewer-1.1.8-fix-nonwindows-filename-comparator.patch index 1a22d40b2357..1a22d40b2357 100644 --- a/quickviewer-1.1.3-fix-nonwindows-filename-comparator.patch +++ b/quickviewer-1.1.8-fix-nonwindows-filename-comparator.patch diff --git a/quickviewer-1.1.8-fix-p7zip-noninteger-type-problem.patch b/quickviewer-1.1.8-fix-p7zip-noninteger-type-problem.patch new file mode 100644 index 000000000000..4b776ebfee3b --- /dev/null +++ b/quickviewer-1.1.8-fix-p7zip-noninteger-type-problem.patch @@ -0,0 +1,11 @@ +--- quickviewer/Qt7z/Qt7z/p7zip/CPP/7zip/Archive/Wim/WimHandler.cpp.orig 2020-06-15 20:27:13.258289440 -0700 ++++ quickviewer/Qt7z/Qt7z/p7zip/CPP/7zip/Archive/Wim/WimHandler.cpp 2022-03-20 13:53:20.893784479 -0700 +@@ -298,7 +298,7 @@ + + AString res; + +- bool numMethods = 0; ++ unsigned numMethods = 0; + for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) + { + if (methodMask & ((UInt32)1 << i)) diff --git a/quickviewer-1.1.3-lib7z-projectfile-changes.patch b/quickviewer-1.1.8-lib7z-projectfile-changes.patch index 42c1f16c7187..42c1f16c7187 100644 --- a/quickviewer-1.1.3-lib7z-projectfile-changes.patch +++ b/quickviewer-1.1.8-lib7z-projectfile-changes.patch diff --git a/quickviewer-1.1.3-main-projectfile-changes.patch b/quickviewer-1.1.8-main-projectfile-changes.patch index 9b2129bb21ed..1f41caa29c62 100644 --- a/quickviewer-1.1.3-main-projectfile-changes.patch +++ b/quickviewer-1.1.8-main-projectfile-changes.patch @@ -1,6 +1,6 @@ ---- quickviewer/QuickViewer/QuickViewer.pro.orig 2019-02-23 03:43:51.157350083 -0800 -+++ quickviewer/QuickViewer/QuickViewer.pro 2019-02-23 03:45:55.597348307 -0800 -@@ -424,22 +424,21 @@ +--- quickviewer/QuickViewer/QuickViewer.pro.orig 2020-06-15 20:27:13.318289440 -0700 ++++ quickviewer/QuickViewer/QuickViewer.pro 2020-06-15 20:27:16.061622746 -0700 +@@ -437,22 +437,21 @@ # not portable, install into /usr/local/bin linux : !CONFIG(debug, debug|release) : !contains(DEFINES, QV_PORTABLE) { @@ -33,7 +33,7 @@ install_translations.files = \ $${PWD}/translations/languages.ini \ $${PWD}/translations/quickviewer_ja.qm \ -@@ -462,7 +461,7 @@ +@@ -478,7 +477,7 @@ ../AssociateFilesWithQuickViewer/icons/qv_tiff.ico \ ../AssociateFilesWithQuickViewer/icons/qv_webp.ico \ |