Date: Fri, 6 Feb 2015 11:58:33 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378528 - in head/x11/dzen2: . files Message-ID: <201502061158.t16BwXPo072091@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Fri Feb 6 11:58:33 2015 New Revision: 378528 URL: https://svnweb.freebsd.org/changeset/ports/378528 QAT: https://qat.redports.org/buildarchive/r378528/ Log: x11/dzen2: Upgrade version 0.8.5 => 0.9.5 PR: 195756 Submitted by: maintainer (martin - sugioarto.com) Assisted by: Zsolt Udvari Added: head/x11/dzen2/files/patch-Xft (contents, props changed) Deleted: head/x11/dzen2/files/patch-gadgets__kittscanner.sh Modified: head/x11/dzen2/Makefile head/x11/dzen2/distinfo head/x11/dzen2/pkg-descr Modified: head/x11/dzen2/Makefile ============================================================================== --- head/x11/dzen2/Makefile Fri Feb 6 11:15:02 2015 (r378527) +++ head/x11/dzen2/Makefile Fri Feb 6 11:58:33 2015 (r378528) @@ -2,20 +2,25 @@ # $FreeBSD$ 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 + +USES= pkgconfig 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 +34,9 @@ XPM_CFLAGS= -DDZEN_XPM 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}\\\"" Modified: head/x11/dzen2/distinfo ============================================================================== --- head/x11/dzen2/distinfo Fri Feb 6 11:15:02 2015 (r378527) +++ head/x11/dzen2/distinfo Fri Feb 6 11:58:33 2015 (r378528) @@ -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 Added: head/x11/dzen2/files/patch-Xft ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/dzen2/files/patch-Xft Fri Feb 6 11:58:33 2015 (r378528) @@ -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; + } + Modified: head/x11/dzen2/pkg-descr ============================================================================== --- head/x11/dzen2/pkg-descr Fri Feb 6 11:15:02 2015 (r378527) +++ head/x11/dzen2/pkg-descr Fri Feb 6 11:58:33 2015 (r378528) @@ -3,4 +3,4 @@ for X11. It was desigend to be scriptabl 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502061158.t16BwXPo072091>