Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 467508 - x11-misc/dzen-0.9.5 version bump
Summary: x11-misc/dzen-0.9.5 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Desktop Misc. Team
URL: https://github.com/robm/dzen
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2013-04-27 16:01 UTC by Ted Tanberry
Modified: 2013-07-18 23:23 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
dzen-0.9.5_p20121204.ebuild (dzen-0.9.5_p20121204.ebuild,1.99 KB, text/plain)
2013-04-27 16:01 UTC, Ted Tanberry
Details
dzen-0.9.5-customizable-dock.patch (dzen-0.9.5-customizable-dock.patch,5.13 KB, patch)
2013-04-27 16:02 UTC, Ted Tanberry
Details | Diff
dzen-0.9.5_p20121204.ebuild with customizable-dock and xft USE flags (dzen-0.9.5_p20121204.ebuild,2.27 KB, text/plain)
2013-07-05 06:56 UTC, Ondrej Grover
Details
dzen-0.9.5_p20121204.ebuild with customizable-dock and xft USE flags and '-dock' warning (dzen-0.9.5_p20121204.ebuild,2.50 KB, text/plain)
2013-07-06 15:21 UTC, Ondrej Grover
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Ted Tanberry 2013-04-27 16:01:13 UTC
Created attachment 346708 [details]
dzen-0.9.5_p20121204.ebuild

dzen(2) is a minimalist system bar that is used with the likes of dwm etc, I use it for i3 myself. Version 0.8.5 is old and lacks a dedicated "-dock" option for "snapping" to the top or bottom of a workspace. Furthermore, development has moved from googlecode/svn to github. I have updated the ebuild and integrated a patch that makes the dock position configurable (taken from https://code.google.com/p/dzen/issues/detail?id=2). I've set some COMMITID to keep the ebuild stable.
Comment 1 Ted Tanberry 2013-04-27 16:02:02 UTC
Created attachment 346710 [details, diff]
dzen-0.9.5-customizable-dock.patch
Comment 2 Jeroen Roovers (RETIRED) gentoo-dev 2013-04-27 16:18:29 UTC
Comment on attachment 346708 [details]
dzen-0.9.5_p20121204.ebuild

--- dzen-0.8.5.ebuild   2010-06-06 11:49:15.000000000 +0200
+++ -   2013-04-27 18:18:17.988652015 +0200
@@ -2,18 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.8.5.ebuild,v 1.6 2010/06/06 09:49:15 ssuominen Exp $

-inherit toolchain-funcs multilib
+EAPI="4"
+
+inherit vcs-snapshot toolchain-funcs eutils
+
+COMMITID="f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0"
 
 SLOT="2"
-MY_P="${PN}${SLOT}-${PV}"
 
 DESCRIPTION="a general purpose messaging, notification and menuing program for
 X11."
-HOMEPAGE="http://gotmor.googlepages.com/dzen"
-SRC_URI="http://gotmor.googlepages.com/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/robm/${PN}"
+SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="minimal xinerama xpm"
 
 RDEPEND="x11-libs/libX11
@@ -22,11 +25,7 @@
 DEPEND="${RDEPEND}
        xinerama? ( x11-proto/xineramaproto )"

-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        sed -i \
                -e 's:../dzen2:dzen2:' \
                gadgets/kittscanner.sh || die
@@ -49,6 +48,10 @@      
                        -e "/^CFLAGS/s/$/\ -DDZEN_XPM/" \
                        -i config.mk || die "sed failed"
        fi
+
+       # Patch orginally taken from https://code.google.com/p/dzen/issues/detail?id=2
+       # and modified for the latest version. Makes dock position customisable
+       epatch "${FILESDIR}/${PN}-${PV%_p*}-customizable-dock.patch"
 }
 
 src_compile() {
Comment 3 Ondrej Grover 2013-07-05 06:56:46 UTC
Created attachment 352664 [details]
dzen-0.9.5_p20121204.ebuild with customizable-dock and xft USE flags

I made an ebuild for the new snapshot version with two new USE flags: xft and customizable-dock.

The xft flag adds XFT support (dzen now looks really nice with termsyn!) and this requires two new dependencies: x11-libs/libXft  and virtual/pkgconfig (only as DEPEND)

The customizable-dock flag (if anyone can come up with a shorter one, I'll be glad - maybe the vanilla flag?) controls  the patch referenced above. I switched it to be on by default. I think it's better than applying the patch always, people will get this great functionality by default and it can be disabled if they want more vanilla or have problems with it.

It builds and works fine. And looks a lot better too with xft.
Comment 4 Ondrej Grover 2013-07-06 15:21:58 UTC
Created attachment 352724 [details]
dzen-0.9.5_p20121204.ebuild with customizable-dock and xft USE flags and '-dock' warning

I noticed that with the customizable-dock patch applied, dzen will not set the _NET_WM_STRUT property correctly (all coordinates will be 0) unless the new '-dock' option provided by the patch is used.

I think this is more of a feature than a bug, so I just added a warning about this to the end of the ebuild in pkg_postinst.
Comment 5 Jeroen Roovers (RETIRED) gentoo-dev 2013-07-18 22:27:34 UTC
Comment on attachment 352724 [details]
dzen-0.9.5_p20121204.ebuild with customizable-dock and xft USE flags and '-dock' warning

--- dzen-0.8.5.ebuild   2010-06-06 11:49:15.000000000 +0200
+++ -   2013-07-19 00:27:24.227679018 +0200
@@ -2,31 +2,32 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.8.5.ebuild,v 1.6 2010/06/06 09:49:15 ssuominen Exp $

-inherit toolchain-funcs multilib
+EAPI="4"
+
+inherit vcs-snapshot toolchain-funcs eutils
+
+COMMITID="f7907da3a42a6d59e27ede88f5f01e4e41c4c9e0"
 
 SLOT="2"
-MY_P="${PN}${SLOT}-${PV}"

-DESCRIPTION="a general purpose messaging, notification and menuing program for
-X11."
-HOMEPAGE="http://gotmor.googlepages.com/dzen"
-SRC_URI="http://gotmor.googlepages.com/${MY_P}.tar.gz"
+DESCRIPTION="a general purpose messaging, notification and menuing program for X11."
+HOMEPAGE="https://github.com/robm/dzen"
+SRC_URI="https://github.com/robm/${PN}/tarball/${COMMITID} -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE="minimal xinerama xpm"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal xinerama xpm xft +customizable-dock"
 
 RDEPEND="x11-libs/libX11
        xinerama? ( x11-libs/libXinerama )
-       xpm? ( x11-libs/libXpm )"
+       xpm? ( x11-libs/libXpm )
+       xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
-       xinerama? ( x11-proto/xineramaproto )"
+       xinerama? ( x11-proto/xineramaproto )
+       virtual/pkgconfig"

-S=${WORKDIR}/${MY_P}

-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        sed -i \
                -e 's:../dzen2:dzen2:' \
                gadgets/kittscanner.sh || die
@@ -49,6 +50,16 @@      
                        -e "/^CFLAGS/s/$/\ -DDZEN_XPM/" \
                        -i config.mk || die "sed failed"
        fi
+       if use xft ; then
+               sed -e "/^LIBS/s/$/\ \`pkg-config --libs xft\`/" \
+                       -e "/^CFLAGS/s/$/\ -DDZEN_XFT \`pkg-config --cflags xft\`/" \
+                       -i config.mk || die "sed failed"
+       fi
+       if use customizable-dock ; then
+               # Patch orginally taken from https://code.google.com/p/dzen/issues/detail?id=2
+               # and modified for the latest version. Makes dock position customizable
+               epatch "${FILESDIR}/${PN}-${PV%_p*}-customizable-dock.patch"
+       fi
 }
 
 src_compile() {
@@ -72,3 +83,11 @@
                dodoc README* || die
        fi
 }
+
+pkg_postinst(){
+       if use customizable-dock ; then
+               ewarn "With the customizable-dock patch applied,"
+               ewarn "dzen will not set the _NET_WM_STRUT property correctly"
+               ewarn "unless the option '-dock' provided by the patch is used"
+       fi
+}
Comment 6 Jeroen Roovers (RETIRED) gentoo-dev 2013-07-18 23:23:57 UTC
I've put the version bump in. The patch should be reviewed upstream and will probably then land in a future release.

Thanks for the ebuild patch, though! Bits of it ended up in the tree. :)