Attachment 150304 Details for Bug 195756 – updated patch

[patch] updated patch

dzen2.diff (text/plain), 5.70 KB, created by Zsolt Udvari on 2014-12-07 12:48:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zsolt Udvari

Created: 2014-12-07 12:48:59 UTC

Size: 5.70 KB

patch

obsolete

>diff -ruN /usr/ports/x11/dzen2/Makefile x11/dzen2/Makefile
>--- /usr/ports/x11/dzen2/Makefile	2014-07-27 12:02:09.000000000 +0200
>+++ x11/dzen2/Makefile	2014-12-07 13:38:57.000000000 +0100
>@@ -2,20 +2,24 @@
> # $FreeBSD: head/x11/dzen2/Makefile 363034 2014-07-27 10:02:09Z marino $
> 
> PORTNAME=	dzen2
>-PORTVERSION=	0.8.5
>-PORTREVISION=	2
>+PORTVERSION=	0.9.5
> CATEGORIES=	x11
>-MASTER_SITES=	http://gotmor.googlepages.com/
> 
> MAINTAINER=	udvzsolt@gmail.com
> COMMENT=	General purpose messaging, notification and menuing program for X11
> 
> LICENSE=	MIT
> 
>+USE_GITHUB=     yes
>+GH_ACCOUNT=     robm
>+GH_PROJECT=     dzen
>+GH_COMMIT=      488ab66
>+GH_TAGNAME=	488ab66019
>+
> USE_XORG=	x11
> 
>-OPTIONS_DEFINE=	EXAMPLES GADGETS XPM XINERAMA
>-OPTIONS_DEFAULT=	XPM XINERAMA
>+OPTIONS_DEFINE=	EXAMPLES GADGETS XPM XINERAMA XFT
>+OPTIONS_DEFAULT=	XPM XFT XINERAMA
> GADGETS_DESC=Build and install gadgets
> OPTIONS_SUB=yes
> 
>@@ -29,7 +33,9 @@
> XPM_LDFLAGS=	-lXpm
> XINERAMA_USE=	XORG=xinerama
> XINERAMA_LDFLAGS=	-lXinerama
>-XINERAMA_CLAGS=	-DDZEN_XINERAMA
>+XINERAMA_CFLAGS=	-DDZEN_XINERAMA
>+XFT_CFLAGS=	-DDZEN_XFT -I${LOCALBASE}/include/freetype2
>+XFT_USE=	XORG=xft
> 
> MAKE_ARGS+=	LDFLAGS="${LDFLAGS} \$${LIBS}" \
> 		CFLAGS="${CFLAGS} ${INCS} -DVERSION=\\\"\$${VERSION}\\\""
>diff -ruN /usr/ports/x11/dzen2/distinfo x11/dzen2/distinfo
>--- /usr/ports/x11/dzen2/distinfo	2014-01-22 16:30:13.000000000 +0100
>+++ x11/dzen2/distinfo	2014-12-07 13:26:45.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (dzen2-0.8.5.tar.gz) = 5e4ce96e8ed22a4a0ad6cfafacdde0532d13d049d77744214b196c4b2bcddff9
>-SIZE (dzen2-0.8.5.tar.gz) = 33274
>+SHA256 (dzen2-0.9.5.tar.gz) = d4f7943cd39dc23fd825eb684b49dc3484860fa8443d30b06ee38af72a53b556
>+SIZE (dzen2-0.9.5.tar.gz) = 38178
>diff -ruN /usr/ports/x11/dzen2/files/patch-Xft x11/dzen2/files/patch-Xft
>--- /usr/ports/x11/dzen2/files/patch-Xft	1970-01-01 01:00:00.000000000 +0100
>+++ x11/dzen2/files/patch-Xft	2014-12-07 12:47:47.000000000 +0100
>@@ -0,0 +1,115 @@
>+--- draw.c.orig	2013-09-23 11:57:39.000000000 +0200
>++++ draw.c	2014-12-06 20:30:50.785932524 +0100
>+@@ -395,21 +395,20 @@
>+ 	XpmColorSymbol xpms;
>+ #endif
>+ 
>++	/* icon cache */
>++	int ip;
>++
>+ #ifdef DZEN_XFT
>+ 	XftDraw *xftd=NULL;
>+ 	XftColor xftc;
>+ 	char *xftcs;
>+-	int xftcs_f=0;
>+ 	char *xftcs_bg;
>+-	int xftcs_bgf=0;
>+ 
>+-	xftcs    = (char *)dzen.fg;
>+-    xftcs_bg = (char *)dzen.bg;
>++	/* set default fg/bg for XFT */
>++	xftcs = estrdup(dzen.fg);
>++	xftcs_bg = estrdup(dzen.bg);
>+ #endif
>+ 
>+-	/* icon cache */
>+-	int ip;
>+-
>+ 	/* parse line and return the text without control commands */
>+ 	if(nodraw) {
>+ 		rbuf = emalloc(MAX_LINE_LEN);
>+@@ -446,8 +445,7 @@
>+ 			xpms.pixel = dzen.norm[ColBG];
>+ #endif
>+ #ifdef DZEN_XFT
>+-			xftcs_bg = (char *)dzen.bg;
>+-			xftcs_bgf = 0;
>++			xftcs_bg = estrdup(dzen.bg);
>+ #endif
>+ 		}
>+ 		else {
>+@@ -679,15 +677,9 @@
>+ 						case bg:
>+ 							lastbg = tval[0] ? (unsigned)getcolor(tval) : dzen.norm[ColBG];
>+ #ifdef DZEN_XFT
>+-							if(xftcs_bgf) free(xftcs_bg);				
>+-							if(tval[0]) {
>+-								xftcs_bg = estrdup(tval);
>+-								xftcs_bgf = 1;
>+-							} else {
>+-								xftcs_bg = (char *)dzen.bg;
>+-								xftcs_bgf = 0;
>+-							}
>+-#endif							
>++							if(xftcs_bg) free(xftcs_bg);
>++							xftcs_bg = estrdup(tval[0] ? tval : dzen.bg);
>++#endif
>+ 
>+ 							break;
>+ 
>+@@ -695,19 +687,14 @@
>+ 							lastfg = tval[0] ? (unsigned)getcolor(tval) : dzen.norm[ColFG];
>+ 							XSetForeground(dzen.dpy, dzen.tgc, lastfg);
>+ #ifdef DZEN_XFT
>+-							if(tval[0]) {
>+-								xftcs = estrdup(tval);
>+-								xftcs_f = 1;
>+-							} else {
>+-								xftcs = (char *)dzen.fg;
>+-								xftcs_f = 0;
>+-							}
>+-#endif							
>++							if (xftcs) free(xftcs);
>++							xftcs = estrdup(tval[0] ? tval : dzen.fg);
>++#endif
>+ 							break;
>+ 
>+ 						case fn:
>+ 							if(tval[0]) {
>+-#ifndef DZEN_XFT		
>++#ifndef DZEN_XFT
>+ 								if(!strncmp(tval, "dfnt", 4)) {
>+ 									cur_fnt = &(dzen.fnpl[atoi(tval+4)]);
>+ 
>+@@ -816,18 +803,8 @@
>+ 						DefaultColormap(dzen.dpy, dzen.screen),  xftcs,  &xftc);
>+ 				}
>+ 
>+-				XftDrawStringUtf8(xftd, &xftc, 
>++				XftDrawStringUtf8(xftd, &xftc,
>+ 						cur_fnt->xftfont, px, py + dzen.font.xftfont->ascent, (const FcChar8 *)lbuf, strlen(lbuf));
>+-
>+-				if(xftcs_f) {
>+-					free(xftcs);
>+-					xftcs_f = 0;
>+-				}
>+-				if(xftcs_bgf) {
>+-					free(xftcs_bg);
>+-					xftcs_bgf = 0;
>+-				}
>+-
>+ #endif
>+ 
>+ 				max_y = MAX(max_y, py+dzen.font.height);
>+@@ -920,6 +897,11 @@
>+ #endif
>+ 	}
>+ 
>++#ifdef DZEN_XFT
>++	if(xftcs) free(xftcs);
>++	if(xftcs_bg) free(xftcs_bg);
>++#endif
>++
>+ 	return nodraw ? rbuf : NULL;
>+ }
>+ 
>diff -ruN /usr/ports/x11/dzen2/files/patch-gadgets__kittscanner.sh x11/dzen2/files/patch-gadgets__kittscanner.sh
>--- /usr/ports/x11/dzen2/files/patch-gadgets__kittscanner.sh	2014-07-27 03:29:03.000000000 +0200
>+++ x11/dzen2/files/patch-gadgets__kittscanner.sh	1970-01-01 01:00:00.000000000 +0100
>@@ -1,17 +0,0 @@
>---- ./gadgets/kittscanner.sh.orig	2014-06-17 15:00:13.000000000 +0200
>-+++ ./gadgets/kittscanner.sh	2014-06-17 15:00:24.000000000 +0200
>-@@ -19,10 +19,10 @@
>- 
>- SLEEP=0.1
>- 
>--#DZEN=/usr/local/bin/dzen2
>--DZEN=../dzen2
>--#DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR"
>--DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR -xs 1 -y 30"
>-+DZEN=/usr/local/bin/dzen2
>-+#DZEN=../dzen2
>-+DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR"
>-+#DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR -xs 1 -y 30"
>- 
>- #-----------------------------------------------------------------------
>- 
>diff -ruN /usr/ports/x11/dzen2/pkg-descr x11/dzen2/pkg-descr
>--- /usr/ports/x11/dzen2/pkg-descr	2014-01-22 16:44:51.000000000 +0100
>+++ x11/dzen2/pkg-descr	2014-12-07 13:43:12.000000000 +0100
>@@ -3,4 +3,4 @@
> integrate well with window managers like dwm, wmii and xmonad though
> it will work with any windowmanger.
> 
>-WWW: http://gotmor.googlepages.com/dzen
>+WWW: https://github.com/robm/dzen

Flags:

uzsolt: maintainer-approval+

Actions: View | Diff

Attachments on bug 195756: 150280 | 150304 | 152154