Hi,
On Tue, May 28, 2013 at 01:03:14PM +0100, Stuart Henderson wrote:
> On 2013/05/27 09:09, Simon Kuhnle wrote:
> > Hi,
> >
> > this is an update for weechat 0.4.1
> >
> > Changelog:
> > http://dev.weechat.org/post/2013/05/20/Version-0.4.1
> >
> > Works for me on amd64/sparc64.
> > Patch for missing include is reported upstream.
> >
> > Where should the icon file go?
>
> That looks like a reasonable place for the icon, but it also wants
> a dep on x11/gtk+2,-guic and this goo in PLIST:
>
> @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
I see, never had to deal with this.
Brian Callahan pointed out the exact same thing offlist.
> OTOH I'm not sure if it's particularly useful to have this without an
> accompanying .desktop file..
To be honest, I don't really see the benefit of the icon file then.
Also adding a dependency only for it...
Attached is a patch that doesn't install the icon file.
Would this be acceptable, too?
Regards
Simon
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 11 Mar 2013 11:35:58 -0000 1.11
+++ Makefile 3 Jun 2013 13:01:12 -0000
@@ -6,7 +6,7 @@
COMMENT-ruby= Ruby bindings for weechat
COMMENT-tcl= Tcl bindings for weechat
-V= 0.4.0
+V= 0.4.1
DISTNAME= weechat-${V}
PKGNAME-main= weechat-${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/weechat/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 25 Jan 2013 08:42:08 -0000 1.3
+++ distinfo 3 Jun 2013 13:01:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.4.0.tar.gz) = rKWtFUdlPL5bZy/8QUF6KlHEHBMreOxanWqtUJWdXZ4=
-SIZE (weechat-0.4.0.tar.gz) = 2527783
+SHA256 (weechat-0.4.1.tar.gz) = PBEKE5erHx4qfPgLiQDiwC6gH4DksJ73lUcGkW4FVj8=
+SIZE (weechat-0.4.1.tar.gz) = 2567828
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 3 Jun 2013 13:01:12 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Mon Jun 3 14:21:15 2013
++++ CMakeLists.txt Mon Jun 3 14:20:56 2013
+@@ -133,7 +133,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION
${LIBDIR}/../pkgconfig)
+
+ # icon
+-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
++#INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION
${SHAREDIR}/icons/hicolor/32x32/apps)
+
+ # packages
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat
client")
Index: patches/patch-src_core_wee-config_c
===================================================================
RCS file: /cvs/ports/net/weechat/patches/patch-src_core_wee-config_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_core_wee-config_c
--- patches/patch-src_core_wee-config_c 25 Jan 2013 08:42:08 -0000 1.2
+++ patches/patch-src_core_wee-config_c 3 Jun 2013 13:01:12 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_core_wee-config_c,v 1.2 2013/01/25 08:42:08 jasper Exp $
---- src/core/wee-config.c.orig Sun Jan 20 09:21:06 2013
-+++ src/core/wee-config.c Fri Jan 25 09:39:57 2013
-@@ -2822,7 +2822,7 @@ config_weechat_init_options ()
+--- src/core/wee-config.c.orig Mon May 20 10:06:14 2013
++++ src/core/wee-config.c Sat May 25 21:55:06 2013
+@@ -2961,7 +2961,7 @@ config_weechat_init_options ()
"gnutls_ca_file", "string",
N_("file containing the certificate authorities (\"%h\" will be "
"replaced by WeeChat home, \"~/.weechat\" by default)"),
Index: patches/patch-src_plugins_xfer_xfer-dcc_c
===================================================================
RCS file: patches/patch-src_plugins_xfer_xfer-dcc_c
diff -N patches/patch-src_plugins_xfer_xfer-dcc_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_plugins_xfer_xfer-dcc_c 3 Jun 2013 13:01:12 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/plugins/xfer/xfer-dcc.c.orig Sun May 26 10:42:17 2013
++++ src/plugins/xfer/xfer-dcc.c Sun May 26 10:42:48 2013
+@@ -21,6 +21,7 @@
+
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
