New cvs diff -uNP generated: 1) Updated 0.12.2 -> 0.14.6 2) sed applied to example rc files per @sthen 3) Patched default tint2rc with OpenBSD path and apps 4) Searched tint2conf/main.c tint2conf/properties.c for incorrect declaration and patched to print_t %lld (long long) 5) New tint2conf no longer needs python - removed 6) Incorporated Valère_Monseur modifications 7) Removed RUN_DEPENDS 8) Changed to ${LOCALBASE} per @sthen
Builds/Runs amd64 -- J. Scott Heppler
Index: Makefile =================================================================== RCS file: /cvs/ports/x11/tint2/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile 26 Nov 2016 02:06:16 -0000 1.5 +++ Makefile 1 Sep 2017 05:29:31 -0000 @@ -2,13 +2,11 @@ COMMENT= freedesktop-compliant panel -V= 0.12.2 -REVISION= 2 +V= 0.14.6 CATEGORIES= x11 DISTNAME= tint2-$V DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{archive${EXTRACT_SUFX}?ref=v$V} -WRKDIST= ${WRKDIR}/tint2-v$V-dc300c021531f47cca336e15b50adf3b4a9bc9ae -INSTDIR= ${PREFIX}/tint2 +WRKDIST= ${WRKDIR}/tint2-v$V-8046600a552774253939b8a83bdd3fc0e60dacec HOMEPAGE= https://gitlab.com/o9000/tint2/ @@ -25,30 +23,23 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p WANTLIB += z BUILD_DEPENDS= devel/gettext-tools -LIB_DEPENDS= graphics/imlib2 \ - devel/gettext \ - devel/pango \ + +LIB_DEPENDS= devel/pango \ devel/startup-notification \ - x11/gnome/librsvg \ + graphics/imlib2 \ x11/gtk+2 -RUN_DEPENDS= x11/py-gtk2 \ - devel/desktop-file-utils MODULES= devel/cmake \ - lang/python \ x11/gnome -MODGNOME_TOOLS+= gtk-update-icon-cache +MODGNOME_TOOLS+= desktop-file-utils \ + gtk-update-icon-cache \ + shared-mime-info NO_TEST= Yes -CONFIGURE_ARGS= -DMANDIR="${PREFIX}/man" - post-install: - cp -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/tint2/ - sed -i -e '/\/usr\/local\/share\/applications/d' -e \ - 's,/usr/share/applications,${LOCALBASE}/share/applications,g' \ + sed -i 's,/usr/share,${LOCALBASE}/share,g' \ ${PREFIX}/share/examples/tint2/*tint2rc - rm ${PREFIX}/share/tint2/*.tint2rc .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/tint2/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo 11 Sep 2015 14:14:07 -0000 1.1.1.1 +++ distinfo 1 Sep 2017 05:29:31 -0000 @@ -1,2 +1,2 @@ -SHA256 (tint2-0.12.2.tar.gz) = vanMkT1Ln9QTKF6jRGasFJVZ6emTjhKfRqZkwxEBM0U= -SIZE (tint2-0.12.2.tar.gz) = 229320 +SHA256 (tint2-0.14.6.tar.gz) = F3Dio33IBmozr3OFuhu+dAUQG87Y6fx+6V1IzvU801E= +SIZE (tint2-0.14.6.tar.gz) = 466533 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: patches/patch-CMakeLists_txt diff -N patches/patch-CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-CMakeLists_txt 1 Sep 2017 05:29:31 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -257,7 +257,6 @@ 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 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_CMakeLists_txt =================================================================== RCS file: patches/patch-src_tint2conf_CMakeLists_txt diff -N patches/patch-src_tint2conf_CMakeLists_txt --- patches/patch-src_tint2conf_CMakeLists_txt 11 Sep 2015 14:14:07 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -$OpenBSD: patch-src_tint2conf_CMakeLists_txt,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $ ---- src/tint2conf/CMakeLists.txt.orig Tue Aug 11 09:26:49 2015 -+++ src/tint2conf/CMakeLists.txt Fri Sep 11 15:30:10 2015 -@@ -71,4 +71,3 @@ add_subdirectory(po) - install( TARGETS tint2conf DESTINATION bin ) - install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps ) - install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications ) --install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) Index: patches/patch-src_tint2conf_main_c =================================================================== RCS file: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_main_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_tint2conf_main_c --- patches/patch-src_tint2conf_main_c 26 Nov 2016 02:06:16 -0000 1.1 +++ patches/patch-src_tint2conf_main_c 1 Sep 2017 05:29:31 -0000 @@ -1,12 +1,14 @@ -$OpenBSD: patch-src_tint2conf_main_c,v 1.1 2016/11/26 02:06:16 jca Exp $ ---- src/tint2conf/main.c.orig Tue Nov 22 21:42:54 2016 -+++ src/tint2conf/main.c Tue Nov 22 21:43:58 2016 -@@ -503,7 +503,7 @@ static void set_current_theme() +$OpenBSD$ + +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) - gchar *main_file = g_build_filename(g_get_user_config_dir(), "tint2", "tint2rc", NULL); - { -- gchar *backup_path = g_strdup_printf("%s.backup.%ld", main_file, time(NULL)); -+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", main_file, (long long)time(NULL)); - copy_file(main_file, backup_path); - g_free(backup_path); - } + 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: /cvs/ports/x11/tint2/patches/patch-src_tint2conf_properties_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_tint2conf_properties_c --- patches/patch-src_tint2conf_properties_c 26 Nov 2016 02:06:16 -0000 1.1 +++ patches/patch-src_tint2conf_properties_c 1 Sep 2017 05:29:31 -0000 @@ -1,12 +1,14 @@ -$OpenBSD: patch-src_tint2conf_properties_c,v 1.1 2016/11/26 02:06:16 jca Exp $ ---- src/tint2conf/properties.c.orig Tue Nov 22 21:44:18 2016 -+++ src/tint2conf/properties.c Tue Nov 22 21:44:32 2016 -@@ -171,7 +171,7 @@ void applyClicked(GtkWidget *widget, gpointer data) - gchar *file = get_current_theme_file_name(); - if (file) { - if (config_is_manual(file)) { -- gchar *backup_path = g_strdup_printf("%s.backup.%ld", file, time(NULL)); -+ gchar *backup_path = g_strdup_printf("%s.backup.%lld", file, (long long)time(NULL)); - copy_file(file, backup_path); - g_free(backup_path); - } +$OpenBSD$ + +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: patches/patch-themes_CMakeLists_txt diff -N patches/patch-themes_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-themes_CMakeLists_txt 1 Sep 2017 05:29:31 -0000 @@ -0,0 +1,10 @@ +$OpenBSD$ + +Index: themes/CMakeLists.txt +--- themes/CMakeLists.txt.orig ++++ themes/CMakeLists.txt +@@ -1,2 +1,2 @@ +-file( GLOB EXTRATHEMEFILES *.tint2rc ) +-install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 ) ++file( GLOB EXTRATHEMEFILES tint2rc *.tint2rc ) ++install( FILES ${EXTRATHEMEFILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/tint2 ) Index: patches/patch-themes_tint2rc =================================================================== RCS file: patches/patch-themes_tint2rc diff -N patches/patch-themes_tint2rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-themes_tint2rc 1 Sep 2017 05:29:31 -0000 @@ -0,0 +1,20 @@ +$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 + 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 + + #------------------------------------- + # Clock Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/tint2/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- pkg/PLIST 11 Sep 2015 14:14:07 -0000 1.1.1.1 +++ pkg/PLIST 1 Sep 2017 05:29:31 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2015/09/11 14:14:07 sthen Exp $ +@comment $OpenBSD$ @pkgpath x11/tint @bin bin/tint2 @bin bin/tint2conf @@ -9,8 +9,18 @@ share/doc/tint2/ share/doc/tint2/AUTHORS share/doc/tint2/ChangeLog share/doc/tint2/README.md +share/doc/tint2/html/ +share/doc/tint2/html/images/ +share/doc/tint2/html/images/panel_padding.jpg +share/doc/tint2/html/images/panel_size_margin.jpg +share/doc/tint2/html/images/task_padding.jpg +share/doc/tint2/html/images/taskbar_padding.jpg +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-light-opaque.tint2rc @@ -32,22 +42,26 @@ share/examples/tint2/text_only_4.tint2rc share/examples/tint2/text_only_5.tint2rc share/examples/tint2/text_only_6.tint2rc share/examples/tint2/tint2rc -@sample ${SYSCONFDIR}/xdg/tint2/ @sample ${SYSCONFDIR}/xdg/tint2/tint2rc share/examples/tint2/vertical-dark-opaque.tint2rc share/examples/tint2/vertical-dark-transparent.tint2rc share/examples/tint2/vertical-light-opaque.tint2rc share/examples/tint2/vertical-light-transparent.tint2rc +share/examples/tint2/vertical-neutral-icons.tint2rc share/icons/hicolor/scalable/apps/tint2.svg share/icons/hicolor/scalable/apps/tint2conf.svg share/locale/bs/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 +share/locale/ru/LC_MESSAGES/tint2conf.mo share/locale/sr/LC_MESSAGES/tint2conf.mo +share/mime/packages/tint2conf.xml share/tint2/ share/tint2/default_icon.png @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor +@exec %D/bin/update-mime-database %D/share/mime +@unexec-delete %D/bin/update-mime-database %D/share/mime