Bug 195756 - [maintainer] x11/dzen2 Enable Xft support (upgrade 0.8.5 => 0.9.5)
Summary: [maintainer] x11/dzen2 Enable Xft support (upgrade 0.8.5 => 0.9.5)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: John Marino
URL:
Keywords: patch-ready
Depends on:
Blocks:
 
Reported: 2014-12-06 19:56 UTC by martin
Modified: 2015-02-07 14:24 UTC (History)
2 users (show)

See Also:
uzsolt: maintainer-feedback+


Attachments
diff -ruN output (5.75 KB, patch)
2014-12-06 19:56 UTC, martin
no flags Details | Diff
updated patch (5.70 KB, patch)
2014-12-07 12:48 UTC, Zsolt Udvari
uzsolt: maintainer-approval+
Details | Diff
Build log (4.92 KB, text/plain)
2015-01-26 07:07 UTC, Zsolt Udvari
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description martin 2014-12-06 19:56:32 UTC
Created attachment 150280 [details]
diff -ruN output

FreeBSD does not have Xft support for dzen2 and it is buggy in upstream that's why I made a patch to make it work in the port. Please note that I notified upstream about the patch, but I am not sure if it will ever be processed.

After applying patch, please check if the folowing patches have been removed:
* files/patch-gadgets__config.mk
* files/patch-gadgets__kittscanner.sh

The following new patch should be included (it can be safely applied whether Xft is enabled or not):
* files/patch-Xft

The original sources are now on Github. I forked the branch and you would get the sources like they are in https://github.com/nakal/dzen (after the patch above). BUT PLEASE DON'T LINK TO MY FORK, BECAUSE I WANT TO HAVE THE FREEDOM TO REMOVE IT!
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2014-12-06 19:56:32 UTC
Maintainer CC'd
Comment 2 Zsolt Udvari freebsd_committer freebsd_triage 2014-12-06 20:40:04 UTC
Comment on attachment 150280 [details]
diff -ruN output

Thanks for update!
But I've a question: do you think this git-version is enough stable and usable? I didn't try it.
Comment 3 martin 2014-12-06 21:03:10 UTC
Cannot tell for sure. It is running well on my amd64 (I don't have anything else than this platform) and I will submit further patches, if needed. The author also does not use tags in his repo and there are 3 further patches pending, the oldest one since 6 months.

I've had a quick look over the entire sources to see if there are any obvious evil things. I haven't found anything suspicious.

The sources look clean except for the entire function that I made a patch for. A bit messy there.

I also haven't checked the entire functionality with all switches and all configuration commands, but I am using some reasonable subset of it and there are no problems so far with it.
Comment 4 Zsolt Udvari freebsd_committer freebsd_triage 2014-12-07 12:28:26 UTC
Why did you delete files/patch-gadgets__config.mk? In directory `gadgets' exists an another config.mk.
Comment 5 martin 2014-12-07 12:34:43 UTC
You are right, I made a mistake. It breaks the GADGETS switch. Put files/patch-gadgets__config.mk back into the port directory, please.
Comment 6 Zsolt Udvari freebsd_committer freebsd_triage 2014-12-07 12:45:39 UTC
Oh, ok :)
I've made some clarifications of your diff.
Comment 7 Zsolt Udvari freebsd_committer freebsd_triage 2014-12-07 12:48:59 UTC
Created attachment 150304 [details]
updated patch

Diff with original patch:
- doesn't need DISTNAME and update distinfo
- disable deleting of patch-gadgets__config.mk
- update WWW
- added Xft to use_xorg if it's enabled


Changelog:
- updated to 0.9.5
- added Xft support
Comment 8 martin 2014-12-07 13:13:44 UTC
I verified your updated patch. It works for me. Thanks.
Comment 9 Zsolt Udvari freebsd_committer freebsd_triage 2014-12-07 13:17:02 UTC
Thanks (and your work too). I think can push into ports tree.
Comment 10 martin 2015-01-03 08:12:37 UTC
One month almost passed. Is this going to be committed?
Comment 11 Zsolt Udvari freebsd_committer freebsd_triage 2015-01-03 08:17:15 UTC
Yes, it can commit. But I don't have write access to port tree, I'm "only" a maintainer. Should wait a committer.
Comment 12 John Marino freebsd_committer freebsd_triage 2015-01-25 18:34:45 UTC
Zsolt, this is a significant patch (it upgrades the version).  Can you provide a poudriere log?

I updated the subject which will make this PR more visible.
Comment 13 Zsolt Udvari freebsd_committer freebsd_triage 2015-01-26 07:06:26 UTC
I don't use poudriere but I can attach output of 'make stage stage-qa check-plist'.
Comment 14 Zsolt Udvari freebsd_committer freebsd_triage 2015-01-26 07:07:18 UTC
Created attachment 152154 [details]
Build log

make stage stage-qa check-plist
Comment 15 John Marino freebsd_committer freebsd_triage 2015-01-26 07:17:13 UTC
(In reply to Zsolt Udvari from comment #13)
"I don't use poudriere"

As active as you are in ports, you should rectify that soon.  poudriere tests more and running those tests on a live system can't really trusted.

In other words, it's better than nothing, but not 100% trustworthy.  I've seen passing output utterly fail on poudriere due to missing / uninstalled software in the clean jail.

Anyway, I'll promote based on maintainer timeout, but think about installing poudriere soon. :)
Comment 16 Zsolt Udvari freebsd_committer freebsd_triage 2015-01-26 07:26:39 UTC
(In reply to John Marino from comment #15)
Okay, I'll implement soon :)
Comment 17 John Marino freebsd_committer freebsd_triage 2015-02-06 11:53:10 UTC
Zsolt, see what I mean?

--- dzen2 ---
LD dzen2
pkg-config: not found
draw.o: In function `parse_line':
draw.c:(.text+0x2f2): undefined reference to `XftDrawCreate'
draw.c:(.text+0x688): undefined reference to `XftTextExtentsUtf8'
draw.c:(.text+0x735): undefined reference to `XftTextExtentsUtf8'
draw.c:(.text+0x934): undefined reference to `XftColorAllocName'
draw.c:(.text+0x981): undefined reference to `XftDrawStringUtf8'
draw.c:(.text+0x1a5f): undefined reference to `XftDrawDestroy'
draw.o: In function `setfont':
draw.c:(.text+0x1b32): undefined reference to `XftFontClose'
draw.c:(.text+0x1b47): undefined reference to `XftFontOpenXlfd'
draw.c:(.text+0x1b6b): undefined reference to `XftFontOpenName'
draw.c:(.text+0x1bc6): undefined reference to `XftTextExtentsUtf8'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
*** [dzen2] Error code 1

make[1]: stopped in /wrkdirs/usr/ports/x11/dzen2/work/robm-dzen-488ab66


It looks like there is at least two problems with this port.
(missing pkgconfig and xft not specified).

If this doesn't convince you about poudriere, nothing will. :)
Comment 18 John Marino freebsd_committer freebsd_triage 2015-02-06 11:56:58 UTC
all it needed was "USES= pkgconfig".
xft was already specified, it just couldn't be found.
Comment 19 commit-hook freebsd_committer freebsd_triage 2015-02-06 11:59:04 UTC
A commit references this bug:

Author: marino
Date: Fri Feb  6 11:58:34 UTC 2015
New revision: 378528
URL: https://svnweb.freebsd.org/changeset/ports/378528

Log:
  x11/dzen2: Upgrade version 0.8.5 => 0.9.5

  PR:		195756
  Submitted by:	maintainer (martin - sugioarto.com)
  Assisted by:	Zsolt Udvari

Changes:
  head/x11/dzen2/Makefile
  head/x11/dzen2/distinfo
  head/x11/dzen2/files/patch-Xft
  head/x11/dzen2/files/patch-gadgets__kittscanner.sh
  head/x11/dzen2/pkg-descr
Comment 20 John Marino freebsd_committer freebsd_triage 2015-02-06 12:02:03 UTC
thanks, sorry about the delay.
Comment 21 Zsolt Udvari freebsd_committer freebsd_triage 2015-02-07 14:24:30 UTC
(In reply to John Marino from comment #20)
Thanks! I don't have time now (for some weeks) to set up poudriere.