Date: Monday, March 16, 2020 @ 15:24:34 Author: dvzrv Revision: 599786
upgpkg: nomacs 3.14-1: Upgrading to 3.14. Removing all patches (everything has been merged upstream). Modified: nomacs/trunk/PKGBUILD Deleted: nomacs/trunk/nomacs-opencv-4.2.patch -------------------------+ PKGBUILD | 31 ++++++++----------------------- nomacs-opencv-4.2.patch | 26 -------------------------- 2 files changed, 8 insertions(+), 49 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-16 15:01:59 UTC (rev 599785) +++ PKGBUILD 2020-03-16 15:24:34 UTC (rev 599786) @@ -1,42 +1,27 @@ # Maintainer: David Runge <[email protected]> # Contributor: speps <speps at aur dot archlinux dot org> -_plugins_pkgver=3.12.0 +_plugins_pkgver=3.14 pkgname=nomacs -pkgver=3.12 -pkgrel=9 +pkgver=3.14 +pkgrel=1 pkgdesc="A Qt image viewer" arch=('x86_64') url="https://nomacs.org/"; license=('GPL3') -depends=('desktop-file-utils' 'exiv2' 'gcc-libs' 'glibc' 'libtiff' 'libraw' -'opencv' 'quazip' 'qt5-base' 'qt5-svg') +depends=('exiv2' 'gcc-libs' 'glibc' 'libtiff' 'libraw' 'opencv' 'quazip' +'qt5-base' 'qt5-svg') optdepends=('qt5-imageformats: support additional image formats') makedepends=('cmake' 'qt5-tools') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"; - "${pkgname}-plugins-${_plugins_pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}-plugins/archive/${_plugins_pkgver}.tar.gz"; - "${pkgname}-opencv-4.2.patch" - "${pkgname}-3.12-opencv4.patch::https://github.com/${pkgname}/${pkgname}-plugins/commit/7fdb4371135909bf5a2ba0caac2370e2a1a1c692.patch"; - "${pkgname}-3.12-gcc9.patch::https://github.com/nomacs/nomacs/commit/37805e3bc8753970127db101f4aa0c061bc5a70d.patch";) -sha512sums=('4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119' - 'b46a2523737893bd342e90331d22082a84f3ff9abf4fdcf360d3fb9f2724cf616a6d77eacc272f117e103a9978f99b70feb8364f4c818681a147f78bfe356032' - 'fdbef4eba4968cf4f01bcb7601633b8042f5fefb43307b534c3ff685594a0a96c27f9b18a2f4da27fe6948459ea99a0e141246e6035afd2abcd381aedf1711ac' - '456bb01e88974c4bad1b9ad0c24857a473777c78755adfcfbebbe0377db5e756c08321c462b9a56eb141dccb7da80582a4a6c17ebc0af80c229982c532c32ccb' - 'ba5db2b6423742d5cc0068ed3e65e0888026628cea2e303cf66ed8f232a15e82d7620588ee23a3ba5e5d592339a5e53fee51bd5f21efe4dabd717d41ab244e12') + "${pkgname}-plugins-${_plugins_pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}-plugins/archive/${_plugins_pkgver}.tar.gz";) +sha512sums=('09d4c222f421661a09b7dfd5d2d162a5bb773dd9b262563dfe9f8af4fafd5d653892a1c42993154cf362fb69668bc4bac42da3a0b32b04b421513eca1ae54ec3' + 'c0bca87e50b7b91d80a9d6afd95eeb1d6730b17b9a28ad4109514b36c42781b3f67b25f68f48c0953110d1e02bb03762e813af9c1ec2851c072b4aea74969cbd') prepare() { cd "${pkgname}-${pkgver}" # symlinking plugins into place ln -sv "${srcdir}/${pkgname}-plugins-${_plugins_pkgver}" "ImageLounge/plugins" - # fixes for gcc >= 9: - # https://github.com/nomacs/nomacs/issues/408 - patch -Np1 -i "../${pkgname}-3.12-gcc9.patch" - # fixes for opencv >= 4.0.0: - # https://github.com/nomacs/nomacs-plugins/issues/26 - patch -d ImageLounge/plugins -Np1 -i "${srcdir}/${pkgname}-3.12-opencv4.patch" - # fixes for opencv >= 4.2.0: - # https://github.com/nomacs/nomacs/issues/410 - patch -Np1 -i "../${pkgname}-opencv-4.2.patch" } build() { Deleted: nomacs-opencv-4.2.patch =================================================================== --- nomacs-opencv-4.2.patch 2020-03-16 15:01:59 UTC (rev 599785) +++ nomacs-opencv-4.2.patch 2020-03-16 15:24:34 UTC (rev 599786) @@ -1,26 +0,0 @@ -diff --git a/ImageLounge/src/DkCore/DkImageStorage.cpp b/ImageLounge/src/DkCore/DkImageStorage.cpp -index f121c88e..c6b0c894 100644 ---- a/ImageLounge/src/DkCore/DkImageStorage.cpp -+++ b/ImageLounge/src/DkCore/DkImageStorage.cpp -@@ -1419,7 +1419,7 @@ void DkImage::mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTa - qDebug() << "gamma computation takes: " << dt; - } - --void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale) { -+void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale) { - - cv::Mat mapx, mapy; - -diff --git a/ImageLounge/src/DkCore/DkImageStorage.h b/ImageLounge/src/DkCore/DkImageStorage.h -index 751057e3..62a87971 100644 ---- a/ImageLounge/src/DkCore/DkImageStorage.h -+++ b/ImageLounge/src/DkCore/DkImageStorage.h -@@ -105,7 +105,7 @@ public: - static void mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTable); - static void gammaToLinear(cv::Mat& img); - static void linearToGamma(cv::Mat& img); -- static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale = 1.0); -+ static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale = 1.0); - static void tinyPlanet(QImage& img, double scaleLog, double angle, QSize s, bool invert = false); - #endif -
