tint2: update to 16.6.1

2018-08-05 16.6.1
2018-08-04 16.6
2018-08-04 16.5
2018-05-03 16.4
2018-04-17 16.3
- Bugfixes

2018-01-21 16.2
- Preliminary high DPI support

2017-12-20 16.0
- Added Spanish translation (contributed by Vicmz)
- Executor: updated tooltip documentation (issue #676)
- Systray: warn on duplicate config option systray_name_filter (issue #652)
- Taskbar: thumbnail support in tooltips
- Use C11 if possible to support generic printing for unit tests (should fall back to C99)

2017-09-02 15.0
- Panel:
  - _NET_WM_PID is set correctly, so now tint2 can be interacted with more easily from wmctrl and similar apps
- Taskbar: new config option taskbar_hide_different_desktop
- Battery:
  - New config option bat1_format and bat2_format
      - New config option battery_full_cmd
      - Better "Unknown" state handling
- Executor:
  - Hide if output is empty
  - If no user tooltip is set, displays the script standard error as tooltip.
    Tooltip is multiline, can be cleared with the VT100 clear screen sequence, in shell: (>&2 echo -en "\033[2J").
    Long tooltips are truncated to 4096 characters.
- Launcher:
  - Drag and drop now handles correctly text/uri-list
  - Support for Terminal=true
  - Support for %f and %F

5 files changed, 24 insertions, 52 deletions

diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile
index 94738dc7a26..8a47ba348d7 100644
--- a/x11/tint2/Makefile
+++ b/x11/tint2/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.46 2018/11/14 22:22:50 kleink Exp $
+# $NetBSD: Makefile,v 1.47 2019/01/02 15:35:12 tnn Exp $
 
-DISTNAME=		tint2-0.14.6
-PKGREVISION=		4
+DISTNAME=		tint2-v16.6.1
+PKGNAME=		${DISTNAME:S/-v/-/}
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_GITHUB:=o9000/}
-GITHUB_TAG=		v${PKGVERSION_NOREV}
+MASTER_SITES=		https://gitlab.com/o9000/tint2/-/archive/v16.6.1/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		fernandotcl@gmail.com
 HOMEPAGE=		https://gitlab.com/o9000/tint2
-COMMENT=		Tint2 is a simple panel/taskbar
+COMMENT=		Lightweight panel/taskbar for Linux and BSD
 LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES=		c c++ # XXX CMake. pkg does not really need c++
@@ -29,6 +29,7 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/tint2
 
 .include "../../devel/cmake/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
@@ -37,6 +38,5 @@ post-install:
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tint2/PLIST b/x11/tint2/PLIST
index 613d5c5e978..017b1ee2791 100644
--- a/x11/tint2/PLIST
+++ b/x11/tint2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2017/07/28 08:42:17 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/01/02 15:35:12 tnn Exp $
 bin/tint2
 bin/tint2conf
 man/man1/tint2.1
@@ -18,6 +18,7 @@ share/examples/tint2/tint2rc
 share/icons/hicolor/scalable/apps/tint2.svg
 share/icons/hicolor/scalable/apps/tint2conf.svg
 share/locale/bs/LC_MESSAGES/tint2conf.mo
+share/locale/es/LC_MESSAGES/tint2conf.mo
 share/locale/fr/LC_MESSAGES/tint2conf.mo
 share/locale/hr/LC_MESSAGES/tint2conf.mo
 share/locale/pl/LC_MESSAGES/tint2conf.mo
@@ -27,24 +28,10 @@ share/mime/packages/tint2conf.xml
 share/tint2/default_icon.png
 share/tint2/horizontal-dark-opaque.tint2rc
 share/tint2/horizontal-dark-transparent.tint2rc
+share/tint2/horizontal-icon-only.tint2rc
 share/tint2/horizontal-light-opaque.tint2rc
 share/tint2/horizontal-light-transparent.tint2rc
-share/tint2/icon_and_text_1.tint2rc
-share/tint2/icon_and_text_2.tint2rc
-share/tint2/icon_and_text_3.tint2rc
-share/tint2/icon_and_text_4.tint2rc
-share/tint2/icon_only_1.tint2rc
-share/tint2/icon_only_2.tint2rc
-share/tint2/icon_only_3.tint2rc
-share/tint2/icon_only_4.tint2rc
-share/tint2/icon_only_6.tint2rc
-share/tint2/icon_only_7.tint2rc
-share/tint2/text_only_1.tint2rc
-share/tint2/text_only_2.tint2rc
-share/tint2/text_only_3.tint2rc
-share/tint2/text_only_4.tint2rc
-share/tint2/text_only_5.tint2rc
-share/tint2/text_only_6.tint2rc
+share/tint2/horizontal-text-only.tint2rc
 share/tint2/vertical-dark-opaque.tint2rc
 share/tint2/vertical-dark-transparent.tint2rc
 share/tint2/vertical-light-opaque.tint2rc
diff --git a/x11/tint2/distinfo b/x11/tint2/distinfo
index d263612124a..48c82e55a8d 100644
--- a/x11/tint2/distinfo
+++ b/x11/tint2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2017/07/28 08:42:17 tnn Exp $
+$NetBSD: distinfo,v 1.8 2019/01/02 15:35:12 tnn Exp $
 
-SHA1 (tint2-0.14.6.tar.gz) = 19627ec1948ccce6e30dba3f17e4481bbb232b52
-RMD160 (tint2-0.14.6.tar.gz) = 4733f93d22b7761045831d130ee7f6374e60dfad
-SHA512 (tint2-0.14.6.tar.gz) = c27f98d8236e62ae3f71b9cedfba5a4355a49425dcc6cb49c9da0fbca6447ed2ef6844e478f88d642c92e29551c1125bc65cd254e3ac63925c859ed55c351f81
-Size (tint2-0.14.6.tar.gz) = 465895 bytes
-SHA1 (patch-aa) = ed1232cd81cbdc7770c113192cea590e9c07531f
-SHA1 (patch-get_version.sh) = 70a7df800d7687102699eb37bcb61b90b13c725a
+SHA1 (tint2-v16.6.1.tar.bz2) = a2645c3d82c9759592539b5eba8d5312a559533d
+RMD160 (tint2-v16.6.1.tar.bz2) = 3e4db9b0cb9c45a411419eee930cb4df4e0c2cf3
+SHA512 (tint2-v16.6.1.tar.bz2) = d82e64883f40ae93daa67b4dc0aaa530456d28ee2d52c224d8eb1c91bc59bc43ba530843250274079e1567cd30eb9fd1eb79324aeec1af4bb3d748a046fd93aa
+Size (tint2-v16.6.1.tar.bz2) = 398345 bytes
+SHA1 (patch-aa) = fdf0fe697ceb576068b0873532ac406b59752370
diff --git a/x11/tint2/patches/patch-aa b/x11/tint2/patches/patch-aa
index 1693b3d0718..c758ff1ce34 100644
--- a/x11/tint2/patches/patch-aa
+++ b/x11/tint2/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2017/07/28 08:42:17 tnn Exp $
+$NetBSD: patch-aa,v 1.5 2019/01/02 15:35:12 tnn Exp $
 
---- CMakeLists.txt.orig	2017-06-11 09:15:36.000000000 +0000
+handle config file
+
+--- CMakeLists.txt.orig	2018-08-05 21:27:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -257,7 +257,7 @@ set_target_properties( tint2 PROPERTIES 
+@@ -289,7 +289,7 @@ set_target_properties( tint2 PROPERTIES 
  install( TARGETS tint2 DESTINATION bin )
  install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
  install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
--install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
-+#install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 )
+-install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
++#install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
  install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 )
  install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} )
  install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} )
diff --git a/x11/tint2/patches/patch-get_version.sh b/x11/tint2/patches/patch-get_version.sh
deleted file mode 100644
index c916449aa95..00000000000
--- a/x11/tint2/patches/patch-get_version.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-get_version.sh,v 1.1 2017/07/28 08:42:17 tnn Exp $
-
-avoid git dependency
-
---- get_version.sh.orig	2017-06-11 09:15:36.000000000 +0000
-+++ get_version.sh
-@@ -1,5 +1,9 @@
- #!/bin/sh
- 
-+set -e
-+echo '#define VERSION_STRING "'$(head -n 1 ChangeLog)'"' > version.h
-+exit 0
-+
- MAJOR=0.14
- DIRTY=""
-