jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nomacs: update to 3.6.1

Browse source
This commit is contained in:
Alessio Sergi 2017-04-02 18:12:13 +02:00
parent b65be0d4b0
commit 39d1cb4378
2 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
srcpkgs/nomacs/patches/gcc6.patch
View file

@ -1,22 +0,0 @@
--- src/DkGui/DkPong.cpp.orig 2016-04-28 11:31:15.000000000 +0000
+++ src/DkGui/DkPong.cpp 2016-12-30 18:51:24.147034114 +0000
@@ -655,7 +655,7 @@
double angle = mDirection.angle();
double range = CV_PI / 5.0;
double sign = angle > 0 ? 1.0 : -1.0;
- angle = abs(angle);
+ angle = std::abs(angle);
double newAngle = 0.0;
if (angle < CV_PI*0.5 && angle > CV_PI*0.5 - range) {
--- src/DkGui/DkViewPort.cpp.orig 2016-04-28 11:31:15.000000000 +0000
+++ src/DkGui/DkViewPort.cpp 2016-12-30 18:54:36.602044043 +0000
@@ -1251,7 +1251,7 @@
mAnimationValue = 1.0f-(float)(mAnimationTime.elapsed()/1000.0)/Settings::param().display().animationDuration;
// slow in - slow out
- double speed = mAnimationValue > 0.5 ? abs(1.0 - mAnimationValue) : abs(mAnimationValue);
+ double speed = mAnimationValue > 0.5 ? std::abs(1.0 - mAnimationValue) : std::abs(mAnimationValue);
speed *= .05;
mAnimationValue += (float)speed;

24
srcpkgs/nomacs/template
View file

@ -1,15 +1,25 @@
# Template file for 'nomacs'
pkgname=nomacs
version=3.2.0
revision=4
version=3.6.1
revision=1
build_style=cmake
build_wrksrc="ImageLounge"
configure_args="-DUSE_SYSTEM_QUAZIP=1"
hostmakedepends="pkg-config"
# XXX: use vendored quazip for now
makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel"
makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel quazip-qt5-devel"
short_desc="Simple yet powerful Qt imageviewer"
maintainer="Kharlamov Alexey <der@2-47.ru>"
replaces="nomacs-qt5>=0"
license="GPL-3"
homepage="http://nomacs.org/"
distfiles="https://github.com/nomacs/nomacs/releases/download/${version}/nomacs-${version}-source.tar.bz2"
checksum=82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad
distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz"
checksum=09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068
pre_configure() {
# fix build with quazip-qt5
sed -i 's/find_package(QuaZIP/find_package(QuaZip5/' cmake/Unix.cmake
sed -e 's/include <quazip/&5/' \
-i src/DkCore/DkImageLoader.cpp \
-i src/DkCore/DkImageContainer.cpp \
-i src/DkCore/DkBasicLoader.cpp \
-i src/DkGui/DkDialog.cpp
}