FreeBSD Bugzilla – Attachment 166439 Details for
Bug 206846
x11/rofi: Update to 0.15.12 and unbreak i3 support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
rofi_bugfix.diff
rofi_bugfix.diff (text/plain), 1.78 KB, created by
Tobias Kortkamp
on 2016-02-02 14:00:19 UTC
(
hide
)
Description:
rofi_bugfix.diff
Filename:
MIME Type:
Creator:
Tobias Kortkamp
Created:
2016-02-02 14:00:19 UTC
Size:
1.78 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 407715) >+++ Makefile (working copy) >@@ -2,6 +2,7 @@ > > PORTNAME= rofi > PORTVERSION= 0.15.11 >+PORTREVISION= 1 > CATEGORIES= x11 > > MAINTAINER= nomoo@nomoo.ru >@@ -25,7 +26,7 @@ > > 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 >Index: files/patch-source_i3-support.c >=================================================================== >--- files/patch-source_i3-support.c (nonexistent) >+++ files/patch-source_i3-support.c (working copy) >@@ -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;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
tobik
:
maintainer-approval?
(
nomoo
)
Actions:
View
|
Diff
Attachments on
bug 206846
:
166435
|
166436
|
166437
| 166439 |
166440