From 2ed37ce8cf392da2379484bd4d5bf8f7eb99d593 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 25 Jul 2018 00:45:13 -0500
Subject: user/tigervnc: bump to 1.9.0, fix for gettext-tiny

---
 user/tigervnc/APKBUILD           | 21 ++++++++++-----------
 user/tigervnc/libintl-fix.patch  | 26 --------------------------
 user/tigervnc/use-intltool.patch | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 37 deletions(-)
 delete mode 100644 user/tigervnc/libintl-fix.patch
 create mode 100644 user/tigervnc/use-intltool.patch

diff --git a/user/tigervnc/APKBUILD b/user/tigervnc/APKBUILD
index 9d2c6dbd3..eaf175005 100644
--- a/user/tigervnc/APKBUILD
+++ b/user/tigervnc/APKBUILD
@@ -1,22 +1,21 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=tigervnc
-pkgver=1.8.0
+pkgver=1.9.0
 pkgrel=0
-pkgdesc="A high-performance, platform-neutral VNC remote desktop application"
+pkgdesc="High-performance, platform-neutral VNC remote desktop application"
 url="http://tigervnc.org/"
 arch="all"
-license="GPL-2.0"
 options="!check"  # No test suite.
+license="GPL-2.0"
 depends=""
-depends_dev=""
-makedepends="cmake fltk-dev libx11-dev zlib-dev gettext-dev libjpeg-turbo-dev
-	libxft-dev fontconfig-dev libxfixes-dev libxcursor-dev libxrender-dev
-	libxtst-dev linux-pam-dev"
-install=""
+makedepends="cmake fltk-dev fontconfig-dev gnutls-dev intltool
+	libjpeg-turbo-dev libx11-dev libxcursor-dev libxfixes-dev libxft-dev
+	libxrender-dev libxtst-dev linux-pam-dev zlib-dev"
 subpackages="$pkgname-lang $pkgname-doc"
 source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$pkgver.tar.gz
-	libintl-fix.patch"
+	use-intltool.patch
+	"
 
 build() {
 	cd "$builddir"
@@ -40,5 +39,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a  tigervnc-1.8.0.tar.gz
-ee748bf3dc62b47161b9eb1536c3edf18e30abdc72733d8a0dec0502cb4d7f97c95cbdf89801a4a4be30a1c13aada50568f317956d4d1e5c474c54ef605ffadc  libintl-fix.patch"
+sha512sums="333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d  tigervnc-1.9.0.tar.gz
+5c1cee98b7ba41c7cf121480fdfe16d5ef17c9562ff2ba3ea4e74235161fc63e2e3ed63e788c0aa999610b660b394c1269d6fdcc9716c5563651fd67d723f619  use-intltool.patch"
diff --git a/user/tigervnc/libintl-fix.patch b/user/tigervnc/libintl-fix.patch
deleted file mode 100644
index 82565d276..000000000
--- a/user/tigervnc/libintl-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-libc gettext is never sufficient on musl
-
---- tigervnc-1.8.0/CMakeLists.txt.old	2017-05-16 08:53:28.000000000 -0500
-+++ tigervnc-1.8.0/CMakeLists.txt	2017-09-10 16:05:13.397275098 -0500
-@@ -152,9 +152,9 @@
-       set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-       set(CMAKE_REQUIRED_FLAGS -fno-builtin-dgettext)
-       check_function_exists(dgettext LIBC_HAS_DGETTEXT)
--      if(LIBC_HAS_DGETTEXT)
--        set(GETTEXT_FOUND TRUE)
--      else()
-+      #if(LIBC_HAS_DGETTEXT)
-+      #  set(GETTEXT_FOUND TRUE)
-+      #else()
-         find_library(LIBINTL_LIBRARY NAMES intl libintl)
-         if(LIBINTL_LIBRARY)
-           check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
-@@ -163,7 +163,7 @@
-             set(GETTEXT_FOUND TRUE)
-           endif()
-         endif()
--      endif()
-+      #endif()
-       set(CMAKE_REQUIRED_LIBRARIES)
-       set(CMAKE_REQUIRED_FLAGS)
-     endif()
diff --git a/user/tigervnc/use-intltool.patch b/user/tigervnc/use-intltool.patch
new file mode 100644
index 000000000..930bf21eb
--- /dev/null
+++ b/user/tigervnc/use-intltool.patch
@@ -0,0 +1,32 @@
+--- tigervnc-1.9.0/vncviewer/CMakeLists.txt.old	2018-07-16 14:08:55.000000000 +0000
++++ tigervnc-1.9.0/vncviewer/CMakeLists.txt	2018-07-25 05:43:25.670000000 +0000
+@@ -66,14 +66,7 @@
+ 
+   configure_file(vncviewer.desktop.in.in vncviewer.desktop.in)
+   find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+-  if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99)
+-    add_custom_command(OUTPUT vncviewer.desktop
+-      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
+-                --desktop --template vncviewer.desktop.in
+-                -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
+-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+-    )
+-  elseif(INTLTOOL_MERGE_EXECUTABLE)
++  if(INTLTOOL_MERGE_EXECUTABLE)
+     add_custom_command(OUTPUT vncviewer.desktop
+       COMMAND sed -e 's/^Name/_Name/'
+                 -e 's/^GenericName/_GenericName/'
+@@ -84,6 +77,13 @@
+                 vncviewer.desktop.intl vncviewer.desktop
+       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+     )
++  elseif("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99)
++    add_custom_command(OUTPUT vncviewer.desktop
++      COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
++                --desktop --template vncviewer.desktop.in
++                -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
++      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
++    )
+   else()
+     add_custom_command(OUTPUT vncviewer.desktop
+       COMMAND cp vncviewer.desktop.in vncviewer.desktop
-- 
cgit v1.2.3-70-g09d2