Attachment 183779 Details for Bug 218397 – rofi.diff

[patch] rofi.diff

rofi.diff (text/plain), 5.00 KB, created by Tobias Kortkamp on 2017-06-25 07:28:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-06-25 07:28:40 UTC

Size: 5.00 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 444254)
>+++ Makefile	(working copy)
>@@ -1,8 +1,9 @@
> # $FreeBSD$
> 
> PORTNAME=	rofi
>-PORTVERSION=	0.15.12
>+PORTVERSION=	1.3.1
> CATEGORIES=	x11
>+MASTER_SITES=	https://github.com/DaveDavenport/rofi/releases/download/${PORTVERSION}/
> 
> MAINTAINER=	nomoo@nomoo.ru
> COMMENT=	Window switcher, run dialog and dmenu replacement
>@@ -10,24 +11,25 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
>+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
>+		libxcb-util.so:x11/xcb-util \
>+		libxkbcommon-x11.so:x11/libxkbcommon \
>+		libxcb-ewmh.so:x11/xcb-util-wm \
>+		libxcb-icccm.so:x11/xcb-util-wm \
>+		libxcb-xrm.so:x11/xcb-util-xrm
> 
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	DaveDavenport
>+USES=		gmake pkgconfig shebangfix
>+USE_GNOME=	cairo pango
>+USE_XORG=	xcb
> 
> GNU_CONFIGURE=	yes
>-USES=		autoreconf gmake pkgconfig shebangfix
>-SHEBANG_FILES=	${WRKSRC}/script/rofi-sensible-terminal
>-USE_XORG=	x11 xinerama xft
>-USE_GNOME=	pango
>+SHEBANG_FILES=	${WRKSRC}/script/get_git_rev.sh \
>+		${WRKSRC}/script/rofi-sensible-terminal
>+bash_CMD=	/bin/sh
> 
>-OPTIONS_DEFINE=	I3
>+post-patch:
>+# Fix rofi-theme-selector which assumes we have GNU sed
>+	@${REINPLACE_CMD} 's|$${SED} -i |$${SED} -i "" |' \
>+		${WRKSRC}/script/rofi-theme-selector
> 
>-I3_DESC=	I3 support
>-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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 444254)
>+++ distinfo	(working copy)
>@@ -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 = 1498373936
>+SHA256 (rofi-1.3.1.tar.gz) = da61d2da7e5f4f354da2bfb50ec06b0613d6aba6cf09346a86177f3351db2326
>+SIZE (rofi-1.3.1.tar.gz) = 281690
>Index: files/patch-source_i3-support.c
>===================================================================
>--- files/patch-source_i3-support.c	(revision 444254)
>+++ files/patch-source_i3-support.c	(nonexistent)
>@@ -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;
>
>Property changes on: files/patch-source_i3-support.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(nonexistent)
>+++ pkg-plist	(working copy)
>@@ -0,0 +1,25 @@
>+bin/rofi
>+bin/rofi-sensible-terminal
>+bin/rofi-theme-selector
>+man/man1/rofi-sensible-terminal.1.gz
>+man/man1/rofi.1.gz
>+%%DATADIR%%/themes/Adapta-Nokto.theme
>+%%DATADIR%%/themes/Arc.theme
>+%%DATADIR%%/themes/DarkBlue.theme
>+%%DATADIR%%/themes/Indego.theme
>+%%DATADIR%%/themes/Monokai.theme
>+%%DATADIR%%/themes/Paper.theme
>+%%DATADIR%%/themes/android_notification.theme
>+%%DATADIR%%/themes/blue.theme
>+%%DATADIR%%/themes/c64.theme
>+%%DATADIR%%/themes/glue_pro_blue.theme
>+%%DATADIR%%/themes/gruvbox-dark-hard.theme
>+%%DATADIR%%/themes/gruvbox-dark-soft.theme
>+%%DATADIR%%/themes/gruvbox-dark.theme
>+%%DATADIR%%/themes/gruvbox-light-hard.theme
>+%%DATADIR%%/themes/gruvbox-light-soft.theme
>+%%DATADIR%%/themes/gruvbox-light.theme
>+%%DATADIR%%/themes/lb.theme
>+%%DATADIR%%/themes/purple.theme
>+%%DATADIR%%/themes/solarized.theme
>+%%DATADIR%%/themes/solarized_alternate.theme
>
>Property changes on: pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval? (nomoo)

Actions: View | Diff

Attachments on bug 218397: 183779