Attachment #183779 for bug #218397

View | Details | Raw Unified | Return to bug 218397
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	rofi
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

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/COPYING

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

USES=		gmake pkgconfig shebangfix
USE_GNOME=	cairo pango
USE_XORG=	xcb

GNU_CONFIGURE=	yes
SHEBANG_FILES=	${WRKSRC}/script/get_git_rev.sh \
		${WRKSRC}/script/rofi-sensible-terminal
bash_CMD=	/bin/sh
USE_GNOME=	pango

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>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (DaveDavenport-rofi-0.15.12_GH0.tar.gz) = e5e6b0ed01fd1186652af2488ca2e7780cbde5f0750d9482eb816bae447f4e84	1	TIMESTAMP = 1498373936
2	SIZE (DaveDavenport-rofi-0.15.12_GH0.tar.gz) = 966863	2	SHA256 (rofi-1.3.1.tar.gz) = da61d2da7e5f4f354da2bfb50ec06b0613d6aba6cf09346a86177f3351db2326
		3	SIZE (rofi-1.3.1.tar.gz) = 281690




# 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;




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

Return to bug 218397

Lines 1-8 Link Here

(-)Makefile (-16 / +18 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= rofi	3	PORTNAME= rofi
4	PORTVERSION= 0.15.12	4	PORTVERSION= 1.3.1
5	CATEGORIES= x11	5	CATEGORIES= x11
		6	MASTER_SITES= https://github.com/DaveDavenport/rofi/releases/download/${PORTVERSION}/
6		7
7	MAINTAINER= nomoo@nomoo.ru	8	MAINTAINER= nomoo@nomoo.ru
8	COMMENT= Window switcher, run dialog and dmenu replacement	9	COMMENT= Window switcher, run dialog and dmenu replacement
Lines 10-33 Link Here
10	LICENSE= MIT	11	LICENSE= MIT
11	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
12		13
13	LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification	14	LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
		15	libxcb-util.so:x11/xcb-util \
		16	libxkbcommon-x11.so:x11/libxkbcommon \
		17	libxcb-ewmh.so:x11/xcb-util-wm \
		18	libxcb-icccm.so:x11/xcb-util-wm \
		19	libxcb-xrm.so:x11/xcb-util-xrm
14		20
15	USE_GITHUB= yes	21	USES= gmake pkgconfig shebangfix
16	GH_ACCOUNT= DaveDavenport	22	USE_GNOME= cairo pango
		23	USE_XORG= xcb
17		24
18	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
19	USES= autoreconf gmake pkgconfig shebangfix	26	SHEBANG_FILES= ${WRKSRC}/script/get_git_rev.sh \
20	SHEBANG_FILES= ${WRKSRC}/script/rofi-sensible-terminal	27	${WRKSRC}/script/rofi-sensible-terminal
21	USE_XORG= x11 xinerama xft	28	bash_CMD= /bin/sh
22	USE_GNOME= pango
23		29
24	OPTIONS_DEFINE= I3	30	post-patch:
		31	# Fix rofi-theme-selector which assumes we have GNU sed
		32	@${REINPLACE_CMD} 's\|$${SED} -i \|$${SED} -i "" \|' \
		33	${WRKSRC}/script/rofi-theme-selector
25		34
26	I3_DESC= I3 support
27	I3_BUILD_DEPENDS= i3:x11-wm/i3
28	I3_CFLAGS= -I${LOCALBASE}/include
29
30	PLIST_FILES= bin/rofi bin/rofi-sensible-terminal man/man1/rofi.1.gz \
31	man/man1/rofi-sensible-terminal.1.gz
32
33	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)files/patch-source_i3-support.c (-24 lines)
1	# Description: Use correct namelen when connecting to i3 socket
2	# Pull Request: https://github.com/DaveDavenport/rofi/pull/330
3	--- source/i3-support.c.orig 2015-12-27 18:45:50 UTC
4	+++ source/i3-support.c
5	@@ -50,7 +50,7 @@ char *i3_socket_path = NULL;
6	void i3_support_focus_window ( Window id )
7	{
8	i3_ipc_header_t head;
9	- int s, len;
10	+ int s;
11	ssize_t t;
12	struct sockaddr_un remote;
13	size_t upm = sizeof ( remote.sun_path );
14	@@ -68,9 +68,8 @@ void i3_support_focus_window ( Window id
15
16	remote.sun_family = AF_UNIX;
17	g_strlcpy ( remote.sun_path, i3_socket_path, upm );
18	- len = strlen ( remote.sun_path ) + sizeof ( remote.sun_family );
19
20	- if ( connect ( s, ( struct sockaddr * ) &remote, len ) == -1 ) {
21	+ if ( connect ( s, ( struct sockaddr * ) &remote, sizeof ( struct sockaddr_un ) ) == -1 ) {
22	fprintf ( stderr, "Failed to connect to I3 (%s): %s\n", i3_socket_path, strerror ( errno ) );
23	close ( s );
24	return;

Line 0 Link Here

(-)pkg-plist (+25 lines)
	1	bin/rofi
	2	bin/rofi-sensible-terminal
	3	bin/rofi-theme-selector
	4	man/man1/rofi-sensible-terminal.1.gz
	5	man/man1/rofi.1.gz
	6	%%DATADIR%%/themes/Adapta-Nokto.theme
	7	%%DATADIR%%/themes/Arc.theme
	8	%%DATADIR%%/themes/DarkBlue.theme
	9	%%DATADIR%%/themes/Indego.theme
	10	%%DATADIR%%/themes/Monokai.theme
	11	%%DATADIR%%/themes/Paper.theme
	12	%%DATADIR%%/themes/android_notification.theme
	13	%%DATADIR%%/themes/blue.theme
	14	%%DATADIR%%/themes/c64.theme
	15	%%DATADIR%%/themes/glue_pro_blue.theme
	16	%%DATADIR%%/themes/gruvbox-dark-hard.theme
	17	%%DATADIR%%/themes/gruvbox-dark-soft.theme
	18	%%DATADIR%%/themes/gruvbox-dark.theme
	19	%%DATADIR%%/themes/gruvbox-light-hard.theme
	20	%%DATADIR%%/themes/gruvbox-light-soft.theme
	21	%%DATADIR%%/themes/gruvbox-light.theme
	22	%%DATADIR%%/themes/lb.theme
	23	%%DATADIR%%/themes/purple.theme
	24	%%DATADIR%%/themes/solarized.theme
	25	%%DATADIR%%/themes/solarized_alternate.theme