From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sun, 6 Jun 2010 06:31:25 +0000 (+0000)
Subject: Update -no_display.patch patch wrt #310399 by Roman Dobosz.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dcf40b88ac4dd683f4298a4e23ee1396de7f2c4b;p=gentoo.git

Update -no_display.patch patch wrt #310399 by Roman Dobosz.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/x11-misc/bubblemon/ChangeLog b/x11-misc/bubblemon/ChangeLog
index 4232103a1f99..e4db8d5a8e21 100644
--- a/x11-misc/bubblemon/ChangeLog
+++ b/x11-misc/bubblemon/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2010/03/20 17:13:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.39 2010/06/06 06:31:24 ssuominen Exp $
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/bubblemon-1.46-no_display.patch:
+  Update -no_display.patch patch wrt #310399 by Roman Dobosz.
 
 *bubblemon-1.46-r2 (20 Mar 2010)
 
diff --git a/x11-misc/bubblemon/Manifest b/x11-misc/bubblemon/Manifest
index 2b9499aa8a88..d83757858170 100644
--- a/x11-misc/bubblemon/Manifest
+++ b/x11-misc/bubblemon/Manifest
@@ -1,10 +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
+AUX bubblemon-1.46-no_display.patch 720 RMD160 0d02f03573c3c1e00db88a1023cce15f3c22abf6 SHA1 5e38dc8d409537698e5c57f79150c70c1882fc96 SHA256 1085f400745c845c2a18c8cb68ec50897a4767c24b35dab479eb5faabe5707dc
 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 4863 RMD160 1017edfeb926e0fc3a2356c184c3e53482d92e5f SHA1 f46246fb1b690d2ceb527ac7cb58a1609010867a SHA256 d62eaae289ded967bb00ce48763181989857b1ada06be9138983fb93e03ba153
+MISC ChangeLog 5021 RMD160 c96f6734594746ffc5d57dc248e2b2203203d3da SHA1 6fb9858927a0ec8108d025c1081f62cececea885 SHA256 d589beb19b12fffdcee0255ca1ea6fc3b905f313156097733794f4c2cfa640c4
 MISC metadata.xml 475 RMD160 e1a44b901b512304f79749d9fc6e169e39ee7637 SHA1 f2d0cb73e5f48d43773179277def5e21b0863fd2 SHA256 3e736094fe08714e3ad07d7264f2fb0963c06d278975ee53227c73d8227ac3dd
diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch
index d1f1f0168d2d..f50d4f50d5ec 100644
--- a/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch
+++ b/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch
@@ -11,7 +11,16 @@ http://bugs.gentoo.org/310399
  
  /* general includes */
  #include <stdio.h>
-@@ -607,10 +607,7 @@
+@@ -276,6 +276,8 @@
+ 
+ int main(int argc, char **argv)
+ {
++    /* This is needed to proper dockapp work on >=GTK+-2.18 */
++    setenv("GDK_NATIVE_WINDOWS", "1", 0);
+     char execute[256];
+     int proximity = 0;
+     int ch;
+@@ -607,10 +609,7 @@
  
      gdk_window_show(bm.win);
      XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);