From 914a8a2644b633edd35bf3c23afccb41fcd8cb4d Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 20 Mar 2010 17:13:17 +0000 Subject: [PATCH] Fix showing up wrt #310399 by Roman Dobosz. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-misc/bubblemon/ChangeLog | 8 +++- x11-misc/bubblemon/Manifest | 4 +- x11-misc/bubblemon/bubblemon-1.46-r2.ebuild | 44 +++++++++++++++++++ .../files/bubblemon-1.46-no_display.patch | 24 ++++++++++ 4 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 x11-misc/bubblemon/bubblemon-1.46-r2.ebuild create mode 100644 x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch diff --git a/x11-misc/bubblemon/ChangeLog b/x11-misc/bubblemon/ChangeLog index 165a9431b6d5..4232103a1f99 100644 --- a/x11-misc/bubblemon/ChangeLog +++ b/x11-misc/bubblemon/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/bubblemon # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.37 2010/03/20 17:00:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.38 2010/03/20 17:13:16 ssuominen Exp $ + +*bubblemon-1.46-r2 (20 Mar 2010) + + 20 Mar 2010; Samuli Suominen + +bubblemon-1.46-r2.ebuild, +files/bubblemon-1.46-no_display.patch: + Fix showing up wrt #310399 by Roman Dobosz. 20 Mar 2010; Samuli Suominen bubblemon-1.46-r1.ebuild, +files/bubblemon-1.46-asneeded.patch: diff --git a/x11-misc/bubblemon/Manifest b/x11-misc/bubblemon/Manifest index 2138b4ee3de9..2b9499aa8a88 100644 --- a/x11-misc/bubblemon/Manifest +++ b/x11-misc/bubblemon/Manifest @@ -1,8 +1,10 @@ AUX bubblemon-1.46-asneeded.patch 509 RMD160 04963a864f93254345e6ca02bb71fadda4df822b SHA1 8f19a9e9a7d570e513364bba88a4d09d20e016ea SHA256 6b6502b6e1b0e82b38bc4b28161039705eb24785b122594adacc769138ba2017 AUX bubblemon-1.46-gtk.patch 3435 RMD160 45e2d5d562237ec1b45553a21cc003796058dccd SHA1 ed04fadb80b5942f5358986881de53ced0d26984 SHA256 6e02353acaebba6d0b0d2fc51ad200e5d499523e933586c41770bf4b652208b1 +AUX bubblemon-1.46-no_display.patch 494 RMD160 f138997d4056d3362407fbe95d5987df6d50770a SHA1 fb1e4de40c8b6ba614faa1755cd09e914bf67b66 SHA256 311bcab9ae639e632d8396e434488120f77db690224e130f61f502391a203a96 DIST bubblemon-2.0.14.tar.gz 221193 RMD160 1a175178b6ca4f74d3c8d60e2112d03423266c85 SHA1 66990aef47eb4a6fc6197c2ccb82f2ab3d605baf SHA256 720641a930005468fbfefe055b2aa77a2c02c6c2df050794223dce40afb5e261 DIST bubblemon-dockapp-1.46.tar.gz 40001 RMD160 79e8be36cd11a2c6f4998cd747b6125696603a81 SHA1 172de9ea7d78e4578143469187a72da8f836647a SHA256 f928073d3c69b2668e89b93cdcca5f390437831aab3eac3aa2129f8713e79dbf EBUILD bubblemon-1.46-r1.ebuild 1078 RMD160 6578f3d4b018ed3965ffbae2a6cb1a6666e54846 SHA1 62a755d430169045f5395c2904c59ea7c30ed67d SHA256 9a1325bcf11bab03ea486cec1f873538508cd24eb7c08d0f454641f2b975da05 +EBUILD bubblemon-1.46-r2.ebuild 1123 RMD160 b9b0dce3cc3e089783cc9a4c45e6275eb31bdf69 SHA1 633d2082ba6f6918acc6757a64ddc3eec0477b23 SHA256 7870d5662e47f77c34ec95e435d3ffbb5a87fef4a17cfa1b59210fca880cdf3b EBUILD bubblemon-2.0.14.ebuild 1046 RMD160 dbbe89e2a1295d8cabcb11d067f457768ed41bf2 SHA1 1521a85db81495f866c501e2b5fba911e769698a SHA256 d8c92836f6a4d6279674b8d936365437f629fee076933eca885524eb8456ddc5 -MISC ChangeLog 4659 RMD160 418cf84f40669112987bf4683ae1ef8757b177b4 SHA1 4b2bb6315a7d192dc9c89772c7d1785bc54c9a1d SHA256 dfae5b004a3b354f0701ae591953255be181065b310ee0007b8cbb0fc9f4a52c +MISC ChangeLog 4863 RMD160 1017edfeb926e0fc3a2356c184c3e53482d92e5f SHA1 f46246fb1b690d2ceb527ac7cb58a1609010867a SHA256 d62eaae289ded967bb00ce48763181989857b1ada06be9138983fb93e03ba153 MISC metadata.xml 475 RMD160 e1a44b901b512304f79749d9fc6e169e39ee7637 SHA1 f2d0cb73e5f48d43773179277def5e21b0863fd2 SHA256 3e736094fe08714e3ad07d7264f2fb0963c06d278975ee53227c73d8227ac3dd diff --git a/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild b/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild new file mode 100644 index 000000000000..b4dbf68ed94b --- /dev/null +++ b/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild,v 1.1 2010/03/20 17:13:16 ssuominen Exp $ + +EAPI=2 +inherit eutils toolchain-funcs + +DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck" +HOMEPAGE="http://www.ne.jp/asahi/linux/timecop" +SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +IUSE="" + +RDEPEND="x11-libs/gtk+:2" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +S=${WORKDIR}/${PN}-dockapp-${PV} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gtk.patch \ + "${FILESDIR}"/${P}-asneeded.patch \ + "${FILESDIR}"/${P}-no_display.patch +} + +src_compile() { + tc-export CC + emake GENTOO_CFLAGS="${CFLAGS}" || die "emake failed." +} + +src_install() { + dobin bubblemon || die + + dodoc ChangeLog README doc/Xdefaults.sample + + insinto /usr/share/${PN} + doins misc/*.{xcf,wav} || die + + exeinto /usr/share/${PN} + doexe misc/wakwak.sh || die +} diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch new file mode 100644 index 000000000000..d1f1f0168d2d --- /dev/null +++ b/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/310399 + +--- bubblemon.c ++++ bubblemon.c +@@ -44,7 +44,7 @@ + */ + #define _GNU_SOURCE + +-#define VERSION "1.41" ++#define VERSION "1.46" + + /* general includes */ + #include +@@ -607,10 +607,7 @@ + + gdk_window_show(bm.win); + XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints); +-#ifdef KDE_DOCKAPP +- /* makes the dockapp visible inside KDE wm */ + gdk_window_show(bm.iconwin); +-#endif + + /* We begin with zero bubbles */ + bm.n_bubbles = 0; -- 2.26.2