The attached diff updates tint2 to the latest stable release
https://gitlab.com/o9000/tint2/blob/16.2/ChangeLog
Upstream incorporated 2 OpenBSD patch in 16.1 and dropped "0" from the
release numbering system in 15.0.
Runs on my -current/amd64, additional testing and critique appreciated.
--
J. Scott Heppler
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 1 Sep 2017 10:37:44 -0000 1.6
+++ Makefile 11 Mar 2018 16:28:47 -0000
@@ -2,11 +2,11 @@
COMMENT= freedesktop-compliant panel
-V= 0.14.6
+V= 16.2
CATEGORIES= x11
DISTNAME= tint2-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V}
-WRKDIST= ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec
+WRKDIST= ${WRKDIR}/tint2-v$V-b810bad93ff65854137fbd2f344ad2f99338008f
HOMEPAGE= https://gitlab.com/o9000/tint2/
@@ -38,9 +38,5 @@ MODGNOME_TOOLS+= desktop-file-utils \
shared-mime-info
NO_TEST= Yes
-
-post-install:
- sed -i 's,/usr/share,${LOCALBASE}/share,g' \
- ${PREFIX}/share/examples/tint2/*tint2rc
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 1 Sep 2017 10:37:44 -0000 1.2
+++ distinfo 11 Mar 2018 16:28:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E=
-SIZE (tint2-0.14.6.tar.gz) = 466533
+SHA256 (tint2-16.2.tar.gz) = OAvQGg7wIbcxqpzHFONIerz0mO6WFQ73J0BaAN8wuLI=
+SIZE (tint2-16.2.tar.gz) = 537236
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 1 Sep 2017 10:37:44 -0000 1.1
+++ patches/patch-CMakeLists_txt 11 Mar 2018 16:28:47 -0000
@@ -1,13 +1,14 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2017/09/01 10:37:44 sthen Exp $
+$OpenBSD$
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -257,7 +257,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
+@@ -288,7 +288,7 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-p
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
${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 )
++install( FILES themes/tint2rc DESTINATION
${CMAKE_INSTALL_DATADIR}/examples/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} )
Index: patches/patch-src_tint2conf_main_c
===================================================================
RCS file: patches/patch-src_tint2conf_main_c
diff -N patches/patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c 1 Sep 2017 10:37:44 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_tint2conf_main_c,v 1.2 2017/09/01 10:37:44 sthen Exp $
-
-Index: src/tint2conf/main.c
---- src/tint2conf/main.c.orig
-+++ src/tint2conf/main.c
-@@ -100,7 +100,7 @@ char *file_name_from_path(const char *filepath)
-
- void make_backup(const char *filepath)
- {
-- gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath,
time(NULL));
-+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath, (long
long)time(NULL));
- copy_file(filepath, backup_path);
- g_free(backup_path);
- }
Index: patches/patch-src_tint2conf_properties_c
===================================================================
RCS file: patches/patch-src_tint2conf_properties_c
diff -N patches/patch-src_tint2conf_properties_c
--- patches/patch-src_tint2conf_properties_c 1 Sep 2017 10:37:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_tint2conf_properties_c,v 1.2 2017/09/01 10:37:44 sthen Exp
$
-
-Index: src/tint2conf/properties.c
---- src/tint2conf/properties.c.orig
-+++ src/tint2conf/properties.c
-@@ -180,7 +180,7 @@ void applyClicked(GtkWidget *widget, gpointer data)
- gchar *filepath = get_current_theme_path();
- if (filepath) {
- if (config_is_manual(filepath)) {
-- gchar *backup_path = g_strdup_printf("%s.backup.%ld", filepath,
time(NULL));
-+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", filepath,
(long long)time(NULL));
- copy_file(filepath, backup_path);
- g_free(backup_path);
- }
Index: patches/patch-themes_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-themes_CMakeLists_txt
--- patches/patch-themes_CMakeLists_txt 1 Sep 2017 10:37:44 -0000 1.1
+++ patches/patch-themes_CMakeLists_txt 11 Mar 2018 16:28:47 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-themes_CMakeLists_txt,v 1.1 2017/09/01 10:37:44 sthen Exp $
+$OpenBSD$
Index: themes/CMakeLists.txt
--- themes/CMakeLists.txt.orig
Index: patches/patch-themes_tint2rc
===================================================================
RCS file: /cvs/ports/x11/tint2/patches/patch-themes_tint2rc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-themes_tint2rc
--- patches/patch-themes_tint2rc 1 Sep 2017 10:37:44 -0000 1.1
+++ patches/patch-themes_tint2rc 11 Mar 2018 16:28:47 -0000
@@ -1,20 +1,15 @@
-$OpenBSD: patch-themes_tint2rc,v 1.1 2017/09/01 10:37:44 sthen Exp $
+$OpenBSD$
Index: themes/tint2rc
--- themes/tint2rc.orig
+++ themes/tint2rc
-@@ -136,12 +136,9 @@ launcher_icon_asb = 100 0 0
- launcher_icon_theme_override = 0
- startup_notifications = 1
+@@ -150,9 +150,7 @@ startup_notifications = 1
launcher_tooltip = 1
--launcher_item_app = /usr/share/applications/tint2conf.desktop
- launcher_item_app = /usr/local/share/applications/tint2conf.desktop
--launcher_item_app = /usr/share/applications/firefox.desktop
--launcher_item_app = /usr/share/applications/iceweasel.desktop
--launcher_item_app = /usr/share/applications/chromium-browser.desktop
--launcher_item_app = /usr/share/applications/google-chrome.desktop
-+launcher_item_app = /usr/local/share/applications/firefox.desktop
-+launcher_item_app = /usr/local/share/applications/chromium-browser.desktop
+ launcher_item_app = tint2conf.desktop
+ launcher_item_app = firefox.desktop
+-launcher_item_app = iceweasel.desktop
+ launcher_item_app = chromium-browser.desktop
+-launcher_item_app = google-chrome.desktop
#-------------------------------------
# Clock
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 1 Sep 2017 10:37:44 -0000 1.2
+++ pkg/PLIST 11 Mar 2018 16:28:47 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2017/09/01 10:37:44 sthen Exp $
+@comment $OpenBSD$
@pkgpath x11/tint
@bin bin/tint2
@bin bin/tint2conf
@@ -19,28 +19,14 @@ share/doc/tint2/html/manual.html
share/doc/tint2/html/readme.html
share/doc/tint2/tint2.md
share/examples/tint2/
-@sample ${SYSCONFDIR}/xdg
+@sample ${SYSCONFDIR}/xdg/
@sample ${SYSCONFDIR}/xdg/tint2/
share/examples/tint2/horizontal-dark-opaque.tint2rc
share/examples/tint2/horizontal-dark-transparent.tint2rc
+share/examples/tint2/horizontal-icon-only.tint2rc
share/examples/tint2/horizontal-light-opaque.tint2rc
share/examples/tint2/horizontal-light-transparent.tint2rc
-share/examples/tint2/icon_and_text_1.tint2rc
-share/examples/tint2/icon_and_text_2.tint2rc
-share/examples/tint2/icon_and_text_3.tint2rc
-share/examples/tint2/icon_and_text_4.tint2rc
-share/examples/tint2/icon_only_1.tint2rc
-share/examples/tint2/icon_only_2.tint2rc
-share/examples/tint2/icon_only_3.tint2rc
-share/examples/tint2/icon_only_4.tint2rc
-share/examples/tint2/icon_only_6.tint2rc
-share/examples/tint2/icon_only_7.tint2rc
-share/examples/tint2/text_only_1.tint2rc
-share/examples/tint2/text_only_2.tint2rc
-share/examples/tint2/text_only_3.tint2rc
-share/examples/tint2/text_only_4.tint2rc
-share/examples/tint2/text_only_5.tint2rc
-share/examples/tint2/text_only_6.tint2rc
+share/examples/tint2/horizontal-text-only.tint2rc
share/examples/tint2/tint2rc
@sample ${SYSCONFDIR}/xdg/tint2/tint2rc
share/examples/tint2/vertical-dark-opaque.tint2rc
@@ -51,6 +37,7 @@ share/examples/tint2/vertical-neutral-ic
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
