Subject: [alpine-aports] [PATCH 1/3] main/tiff: enable c++ support

From: Alex Raschi <[email-masked]>
Date: Wed, 24 Oct 2018 20:11:51 +0200

* needed for nomacs 3.12
---
 main/tiff/APKBUILD | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD
index 8a663f6540..d90bacd682 100644
--- a/main/tiff/APKBUILD
+++ b/main/tiff/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Michael Mason <[email-masked]>
 pkgname=tiff
 pkgver=4.0.9
-pkgrel=6
+pkgrel=7
 pkgdesc="Provides support for the Tag Image File Format or TIFF"
 url="http://www.libtiff.org"
 arch="all"
@@ -69,8 +69,7 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--disable-cxx
+		--infodir=/usr/share/info
 	make
 }
 
-- 
2.19.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Alex Raschi <[email-masked]>
Date: Wed, 24 Oct 2018 20:11:52 +0200

* needed for nomacs 3.12
---
 testing/quazip-qt5/APKBUILD | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 testing/quazip-qt5/APKBUILD

diff --git a/testing/quazip-qt5/APKBUILD b/testing/quazip-qt5/APKBUILD
new file mode 100644
index 0000000000..efbd1b8cbf
--- /dev/null
+++ b/testing/quazip-qt5/APKBUILD
@@ -0,0 +1,43 @@
+# Maintainer: Alex Raschi <[email-masked]>
+pkgname=quazip-qt5
+_pkgname=quazip
+pkgver=0.7.6
+pkgrel=0
+pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
+url="https://github.com/stachenov/$_pkgname"
+arch="all"
+license="LGPL-2.1-or-later"
+makedepends="cmake zlib-dev qt5-qtbase-dev"
+subpackages="$pkgname-dev"
+options="!check"
+source="$_pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS}
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+dev() {
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/share "$subpkgdir"/usr
+
+	default_dev
+}
+
+sha512sums="4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1  quazip-0.7.6.tar.gz"
-- 
2.19.1

---

---

From: Alex Raschi <[email-masked]>
Date: Wed, 24 Oct 2018 20:11:53 +0200

---
 testing/nomacs/APKBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/nomacs/APKBUILD b/testing/nomacs/APKBUILD
index 79af81c856..8f6f65609b 100644
--- a/testing/nomacs/APKBUILD
+++ b/testing/nomacs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Alex Raschi <[email-masked]>
 pkgname=nomacs
-pkgver=3.10.2
+pkgver=3.12
 pkgrel=0
 pkgdesc="Small and fast Qt image viewer"
 url="https://nomacs.org/"
@@ -16,7 +16,7 @@ makedepends="cmake
 	opencv
 	opencv-dev
 	tiff-dev
-	quazip-dev
+	quazip-qt5-dev
 	libwebp-dev
 	lcov
 	libzip-dev"
@@ -52,10 +52,10 @@ package() {
 lang() {
 	pkgdesc="Languages for package $pkgname"
 	depends=""
-	local langdir="usr/share/$pkgname/translations"
+	local langdir="usr/share/$pkgname/Image Lounge/translations"
 
 	mkdir -p "$subpkgdir"/"$langdir"
 	mv "$pkgdir"/"$langdir"/* "$subpkgdir"/"$langdir"/
 }
 
-sha512sums="977dbe24e09b00001dd8a33b18c1dbbb3a59106715746b07892f289918205818664fd7b4213028d4288009bcf14a0195759ac1eafca076f81ee72a1e2ae027dd  nomacs-3.10.2.tar.gz"
+sha512sums="4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119  nomacs-3.12.tar.gz"
-- 
2.19.1

---

---

From: Natanael Copa <[email-masked]>
Date: Thu, 25 Oct 2018 10:29:11 +0200

On Wed, 24 Oct 2018 20:11:51 +0200

> index 8a663f6540..d90bacd682 100644

I'd like to change it to `--enable-cxx`, to make it more visible. We
may also want to move the c++ support to a separate subpackage.

---

---

From: Natanael Copa <[email-masked]>
Date: Thu, 25 Oct 2018 11:32:31 +0200

On Thu, 25 Oct 2018 10:29:11 +0200

> may also want to move the c++ support to a separate subpackage.

I applied your patch and spliited out libtiffxx.

Thanks!

-nc

---