Attachment 173376 Details for Bug 211639 – rofi.diff

[patch] rofi.diff

rofi.diff (text/plain), 3.48 KB, created by Greg Fitzgerald on 2016-08-07 02:05:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Fitzgerald

Created: 2016-08-07 02:05:54 UTC

Size: 3.48 KB

patch

obsolete

>diff -Naur /usr/ports/x11/rofi/Makefile /root/rofi/Makefile
>--- /usr/ports/x11/rofi/Makefile	2016-04-01 10:33:55.000000000 -0400
>+++ /root/rofi/Makefile	2016-08-06 22:04:02.588827000 -0400
>@@ -1,8 +1,9 @@
> # $FreeBSD: head/x11/rofi/Makefile 412351 2016-04-01 14:33:55Z mat $
> 
> PORTNAME=	rofi
>-PORTVERSION=	0.15.12
>+PORTVERSION= 1.1.0
> CATEGORIES=	x11
>+MASTER_SITES =	https://github.com/DaveDavenport/${PORTNAME}/releases/download/${PORTVERSION}/
> 
> MAINTAINER=	nomoo@nomoo.ru
> COMMENT=	Window switcher, run dialog and dmenu replacement
>@@ -10,14 +11,13 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	DaveDavenport
>-
>-GNU_CONFIGURE=	yes
>-USES=		autoreconf gmake pkgconfig shebangfix
>-SHEBANG_FILES=	${WRKSRC}/script/rofi-sensible-terminal
>+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
>+		libxcb-xrm.so:x11/xcb-util-xrm \
>+		libxcb-icccm.so:x11/xcb-util-wm
>+
>+GNU_CONFIGURE=  yes
>+USES= gmake pkgconfig shebangfix
>+SHEBANG_FILES= ${WRKSRC}/script/rofi-sensible-terminal
> USE_XORG=	x11 xinerama xft
> USE_GNOME=	pango
> 
>@@ -27,7 +27,4 @@
> I3_BUILD_DEPENDS=	i3:x11-wm/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
>-
> .include <bsd.port.mk>
>diff -Naur /usr/ports/x11/rofi/distinfo /root/rofi/distinfo
>--- /usr/ports/x11/rofi/distinfo	2016-02-20 06:23:40.000000000 -0500
>+++ /root/rofi/distinfo	2016-08-06 22:04:02.588900000 -0400
>@@ -1,2 +1,3 @@
>-SHA256 (DaveDavenport-rofi-0.15.12_GH0.tar.gz) = e5e6b0ed01fd1186652af2488ca2e7780cbde5f0750d9482eb816bae447f4e84
>-SIZE (DaveDavenport-rofi-0.15.12_GH0.tar.gz) = 966863
>+TIMESTAMP = 1470534828
>+SHA256 (rofi-1.1.0.tar.gz) = fdba5ea0b6cf38d5b8771aeb5e83f12823aa6cb097231e13fc27540985b0ff98
>+SIZE (rofi-1.1.0.tar.gz) = 249579
>diff -Naur /usr/ports/x11/rofi/files/patch-source_i3-support.c /root/rofi/files/patch-source_i3-support.c
>--- /usr/ports/x11/rofi/files/patch-source_i3-support.c	2016-02-20 03:12:24.000000000 -0500
>+++ /root/rofi/files/patch-source_i3-support.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,24 +0,0 @@
>-# 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;
>diff -Naur /usr/ports/x11/rofi/pkg-plist /root/rofi/pkg-plist
>--- /usr/ports/x11/rofi/pkg-plist	1969-12-31 19:00:00.000000000 -0500
>+++ /root/rofi/pkg-plist	2016-08-06 22:04:26.817115000 -0400
>@@ -0,0 +1,4 @@
>+bin/rofi
>+bin/rofi-sensible-terminal
>+man/man1/rofi-sensible-terminal.1.gz
>+man/man1/rofi.1.gz

Flags:

vlad-fbsd: maintainer-approval? (nomoo)

Actions: View | Diff

Attachments on bug 211639: 173376