graphics/nomacs: Updated for version 3.14.2.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2020-04-21 15:38:32 +02:00 committed by Willy Sudiarto Raharjo
parent f816ab506a
commit 005d57cf50
No known key found for this signature in database
GPG key ID: 887B8374D7333381
3 changed files with 7 additions and 44 deletions

View file

@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=nomacs
VERSION=${VERSION:-3.12}
PVERSION=${PVERSION:-3.12.0}
VERSION=${VERSION:-3.14.2}
PVERSION=${PVERSION:-3.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -76,7 +76,6 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
cd ImageLounge
patch -p0 < $CWD/opencv4.diff
# Fix man pages and plugins installation path
sed -i "s|share\/man|man|" cmake/UnixBuildTarget.cmake || exit 1
@ -91,9 +90,6 @@ cd build
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DENABLE_QUAZIP=1 \
-DUSE_SYSTEM_QUAZIP=1 \
-DENABLE_PAINT=0 \
-DENABLE_THRESHOLD=1 \
-DENABLE_TRANSFORM=0 \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG

View file

@ -1,10 +1,10 @@
PRGNAM="nomacs"
VERSION="3.12"
VERSION="3.14.2"
HOMEPAGE="http://www.nomacs.org"
DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.12/nomacs-3.12.tar.gz \
https://github.com/nomacs/nomacs-plugins/archive/3.12.0/nomacs-plugins-3.12.0.tar.gz"
MD5SUM="7b2160cbcf907ee080d696c61b3dc4e8 \
4e174bfa19b695ac7fa6e0010de4d4a2"
DOWNLOAD="https://github.com/nomacs/nomacs/archive/3.14.2/nomacs-3.14.2.tar.gz \
https://github.com/nomacs/nomacs-plugins/archive/3.14/nomacs-plugins-3.14.tar.gz"
MD5SUM="65bd50be8f611305850d3c071adcfcc3 \
52eff2a14ff70e2f439f7f2119d80895"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="lcov opencv quazip-qt5"

View file

@ -1,33 +0,0 @@
--- plugins/FakeMiniaturesPlugin/src/DkFakeMiniaturesDialog.h.orig 2018-06-05 18:21:41.000000000 +1000
+++ plugins/FakeMiniaturesPlugin/src/DkFakeMiniaturesDialog.h 2018-11-28 23:01:53.711000000 +1000
@@ -44,8 +44,9 @@
#pragma warning(disable: 4996)
#endif
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv4/opencv2/core/core.hpp"
+#include "opencv4/opencv2/imgproc/imgproc.hpp"
+#include "opencv4/opencv2/imgproc/types_c.h"
using namespace cv;
#endif
@@ -263,4 +264,4 @@
~DkSaturation();
};
-};
\ No newline at end of file
+};
--- plugins/PageExtractionPlugin/src/DkPageSegmentationUtils.h.orig 2018-11-28 23:15:54.600000000 +1000
+++ plugins/PageExtractionPlugin/src/DkPageSegmentationUtils.h 2018-11-28 23:20:57.093000000 +1000
@@ -27,7 +27,8 @@
#include "DkMath.h"
#pragma warning(push, 0) // no warnings from includes - begin
-#include <opencv2/core/core.hpp>
+#include <opencv4/opencv2/core/core.hpp>
+#include <opencv4/opencv2/imgproc/imgproc_c.h>
#include <QString>
#pragma warning(pop) // no warnings from includes - end