svn commit: r409225 - in head/x11/rofi: . files
Kurt Jaeger
pi at FreeBSD.org
Sat Feb 20 08:12:26 UTC 2016
Author: pi
Date: Sat Feb 20 08:12:24 2016
New Revision: 409225
URL: https://svnweb.freebsd.org/changeset/ports/409225
Log:
x11/rofi: fix I3 option
MFH: 2016Q1
PR: 206846
Submitted by: Tobias Kortkamp <t at tobik.me>
Approved by: nomoo at nomoo.ru (maintainer)
Added:
head/x11/rofi/files/
head/x11/rofi/files/patch-source_i3-support.c (contents, props changed)
Modified:
head/x11/rofi/Makefile
Modified: head/x11/rofi/Makefile
==============================================================================
--- head/x11/rofi/Makefile Sat Feb 20 08:00:53 2016 (r409224)
+++ head/x11/rofi/Makefile Sat Feb 20 08:12:24 2016 (r409225)
@@ -2,6 +2,7 @@
PORTNAME= rofi
PORTVERSION= 0.15.11
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= nomoo at nomoo.ru
@@ -25,7 +26,7 @@ OPTIONS_DEFINE= I3
I3_DESC= I3 support
I3_BUILD_DEPENDS= i3:${PORTSDIR}/x11-wm/i3
-I3_CFLAGS= -I${LOCALBASE}/include/i3
+I3_CFLAGS= -I${LOCALBASE}/include
PLIST_FILES= bin/rofi bin/rofi-sensible-terminal man/man1/rofi.1.gz \
man/man1/rofi-sensible-terminal.1.gz
Added: head/x11/rofi/files/patch-source_i3-support.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/rofi/files/patch-source_i3-support.c Sat Feb 20 08:12:24 2016 (r409225)
@@ -0,0 +1,24 @@
+# Description: Use correct namelen when connecting to i3 socket
+# Pull Request: https://github.com/DaveDavenport/rofi/pull/330
+--- source/i3-support.c.orig 2015-12-27 18:45:50 UTC
++++ source/i3-support.c
+@@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
+ void i3_support_focus_window ( Window id )
+ {
+ i3_ipc_header_t head;
+- int s, len;
++ int s;
+ ssize_t t;
+ struct sockaddr_un remote;
+ size_t upm = sizeof ( remote.sun_path );
+@@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id
+
+ remote.sun_family = AF_UNIX;
+ g_strlcpy ( remote.sun_path, i3_socket_path, upm );
+- len = strlen ( remote.sun_path ) + sizeof ( remote.sun_family );
+
+- if ( connect ( s, ( struct sockaddr * ) &remote, len ) == -1 ) {
++ if ( connect ( s, ( struct sockaddr * ) &remote, sizeof ( struct sockaddr_un ) ) == -1 ) {
+ fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) );
+ close ( s );
+ return;
More information about the svn-ports-head
mailing list