On Fri, Nov 23, 2018 at 05:41:09PM +0100, Ingo Feinerer wrote:
> Brian Callahan wrote:
> > Joel Carnat wrote:
> > > On a journey to find a statusbar for cwm, I found that x11/lemonbar
> > > didn't support XFT. I used sources from https://github.com/krypt-n/bar
> > > to compile on OpenBSD 6.4/amd64 and it seems to work. So far, it
> > > compiles, lemonbar starts and renders text using xft:Sans:size=11.
> 
> Thanks for investigating and preparing a patch!
> 
> > This would additionally need a REVISION bump in the port Makefile.
> > But this seems rather large and invasive.
> 
> I agree that this patch is quite invasive.
> 
> > That's not a "no" in and of itself, but would it make more sense to
> > send this upstream
> 
> Since there is a issue (https://github.com/LemonBoy/bar/issues/188) from
> Aug 5, 2016 with no progress I do not think that this has good chances.
> But who knows ...
> 
> > or perhaps switch to that forked repo with this already included?
> 
> I think that is the way to go. The few commits in LemonBoy/bar in the
> last two years are mainly of cosmetic nature (see GitHub history), so
> the forked repo has the original and new functionality.

A few days later ...

Here is a diff that switches lemonbar to the krypt-n/bar fork supporting
XFT. A tarball is attached for two patches (I wanted to avoid `cvs add`
on the patches directory). The inline diff just shows the changes to the
Makefile and distinfo.

At the same time add pledge() before the main processing loop. It is
nice to see that "stdio" is enough at this point (after initialization
which needed at least "rpath" is my tests; likely for loading some
fonts).

Alternatively we could create a new port for the fork (e.g.,
lemonbar-xft). But since both LemonBoy/bar and krypt-n/bar have not seen
a lot of changes recently we won't miss anything important if we just
switch.

So OK for the switch?

Best regards,
Ingo

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/lemonbar/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    21 Nov 2017 06:08:37 -0000      1.5
+++ Makefile    8 Feb 2019 18:52:54 -0000
@@ -2,13 +2,14 @@
 
 COMMENT =      featherweight lemon-scented bar
 
-VERSION =      1.3
+VERSION =      1.1_20180416
+EPOCH =                0
 
-PKGNAME =      lemonbar-${VERSION}
+DISTNAME =     lemonbar-${VERSION}
 
-GH_ACCOUNT =   LemonBoy
+GH_ACCOUNT =   krypt-n
 GH_PROJECT =   bar
-GH_TAGNAME =   v${VERSION}
+GH_COMMIT =    00a3fe6f3485203896156480e86014136749a221
 
 CATEGORIES =   x11
 
@@ -17,7 +18,9 @@ MAINTAINER =          Ingo Feinerer <feinerer@lo
 # MIT
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += c xcb xcb-randr xcb-xinerama
+# uses pledge()
+WANTLIB += X11 X11-xcb Xft c fontconfig freetype xcb xcb-randr
+WANTLIB += xcb-xinerama z
 
 COMPILER =             base-clang ports-gcc
 COMPILER_LANGS =       c
@@ -31,9 +34,6 @@ NO_TEST =             Yes
 CFLAGS +=              -I${X11BASE}/include
 
 ALL_TARGET =           all doc
-
-pre-configure:
-       sed -i '/^CFLAGS/s/-Os //' ${WRKSRC}/Makefile
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lemonbar/
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/lemonbar/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo    21 Nov 2017 06:08:37 -0000      1.2
+++ distinfo    8 Feb 2019 18:52:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (bar-1.3.tar.gz) = 6ueExeN1stCxITi+GpkCvrS17rgH81EvMPFLoj3ao30=
-SIZE (bar-1.3.tar.gz) = 14930
+SHA256 (lemonbar-1.1_20180416-00a3fe6f.tar.gz) = 
wNz3vlI37dHYiA/Zg0WIPDRDsxl6BFd6nYKuGzjDA94=
+SIZE (lemonbar-1.1_20180416-00a3fe6f.tar.gz) = 16715

Attachment: lemonbar.tar.gz
Description: application/tar-gz

Reply via email to