Re: Revised x11/tint2 0.12.2 -> 0.14.6 update
Forgot the diff
--
J. Scott Heppler
Index: Makefile
===
RCS file: /cvs/ports/x11/tint2/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile26 Nov 2016 02:06:16 - 1.5
+++ Makefile27 Aug 2017 19:31:47 -
@@ -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,24 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 p
WANTLIB += z
BUILD_DEPENDS= devel/gettext-tools
-LIB_DEPENDS= graphics/imlib2 \
- devel/gettext \
+
+LIB_DEPENDS= devel/gettext \
devel/pango \
devel/startup-notification \
+graphics/imlib2 \
x11/gnome/librsvg \
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' \
- ${PREFIX}/share/examples/tint2/*tint2rc
- rm ${PREFIX}/share/tint2/*.tint2rc
+ rm ${PREFIX}/share/examples/tint2/*.tint2rc
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/tint2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo11 Sep 2015 14:14:07 - 1.1.1.1
+++ distinfo27 Aug 2017 19:31:47 -
@@ -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 -
+++ patches/patch-CMakeLists_txt27 Aug 2017 19:31:47 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -257,7 +257,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 /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 -
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -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: patches/patch-src_tint2conf_main_c
diff -N patches/patch-src_tint2conf_main_c
--- patches/patch-src_tint2conf_main_c 26 Nov 2016 02:06:16 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$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
Re: Revised x11/tint2 0.12.2 -> 0.14.6 update
Summary so far:
1) Updated 0.12.2 - 0.14.6
2) Removed rc files with Linux /usr/share/application path
3) Patched default tint2rc with /usr/local/share/application path
4) Searched tint2conf/main.c tint2conf/properties.c for incorrect
declaration and patched to print_t %lld (long long)
Current Issues:
1) diff with 2 additional patchs to correct print_t %lld (long long)
seems incomplete - missing new line numbers. How to get the new @@ line
numbers to show in the diff?
2) I'm still also getting the portcheck message regarding WANTLIB look
liked masked RUN_DEPENDS and did not understand the previous guidance to
add back x11/gtk+2 to LIB_DEPENDS - I had moved it but it is in
LIB_DEPENDS currently
3) Port Module x11/gnome - If x11/gnome is used should I specify Configure Style
= cmake?
patch-src_tint2conf_main_c:
$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)
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);
}
and
patch-src_tint2conf_properties_c:
$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);
}
--
J. Scott Heppler
Re: Revised x11/tint2 0.12.2 -> 0.14.6 update
On Aug 24, 2017: 15:37, Brian Callahan wrote: Hi Scott -- On 8/24/2017 12:43 AM, Heppler, J. Scott wrote: There have been a large number of upstream commits to this port listed at https://gitlab.com/o9000/tint2/blob/master/ChangeLog After further consideration, I removed 11 *.tint2rc examples and just retained the default. In 0.12.2, sed was used to edit the path to /usr/share/applications/*.desktop files to /usr/local/share/applications/*.desktop. The desktop files included google-chrome, iceweasel, firefox, chromium-browser and tint2conf. Outside of tint2conf, none of the other desktop files are certain to be present. Missing *desktop files generate not found-errors in .xsession-errors although tint2conf will still function. I added a pkg README that describes the issue with the example.tint2rc files and gave the user the url to download the additional examples. FreeBSD is at 0.14.5 and NetBSD is 0.14.6. Neither addressed the issues with desktop files in the example *.tint2rc's. Although the Makefile WANTLIBs were unchanged portcheck now generates the following: Tigger# /usr/ports/infrastructure/bin/portcheck the following libraries in WANTLIB look like masked by RUN_DEPENDS: Imlib2 atk-1.0 cairo gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0 rsvg-2 startup-notification-1 x11/tint2. Although I'd like portcheck to run cleanly, I'm not sure what to make of "look like". It means you need to add x11/gtk+2 back to LIB_DEPENDS. It sees that it's a dependency of RUN_DEPENDS, but WANTLIB requires its inclusion in LIB_DEPENDS. I had moved x11/gtk+2 to the last entry in LIB_DEPENDS but it is there in the *.diff. I reverted the order and still get the same portcheck error. /usr/ports/infrastructure/bin/check-lib-depends does not generate any errors. Is there something being pulled in? gtk+3 by update-icon-cache. I saw ninja flash by in the build. New PLIST entries to update-mime-database? Thanks for mentoring ~Scott H. ~Brian Do I need to re-arrange WANTLIB/RUN_DEPENDS? Constructive comments appreciated. -- J. Scott Heppler Penguin Innovations - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOTICE: This e-mail message and any attachments may contain legally privileged and confidential information intended solely for the use of the intended recipients. If you are not an intended recipient, you are hereby notified that you have received this message in error and any review, dissemination, distribution, copying, or other unauthorized use of this email and any attachment is strictly prohibited. If you have received this email in error, please notify the sender immediately and delete the message and any attachments from your system.
