[gentoo-commits] proj/betagarden:master commit in: net-im/jitsi/, net-im/jitsi/files/

[gentoo-commits] proj/betagarden:master commit in: net-im/jitsi/, net-im/jitsi/files/

[Sebastian Pipping]

commit:     c7e19ab2942fd47e3ca871498563034eaa40267d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jun 24 14:41:20 2013 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 14:41:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=c7e19ab2

net-im/jitsi: 2.2-r1 (with GTK+ look and feel patch)

---
 net-im/jitsi/files/jitsi-2.2-gtk-laf.patch         | 37 ++++++++++++++++++++++
 .../{jitsi-2.2.ebuild => jitsi-2.2-r1.ebuild}      |  2 ++
 2 files changed, 39 insertions(+)

diff --git a/net-im/jitsi/files/jitsi-2.2-gtk-laf.patch b/net-im/jitsi/files/jitsi-2.2-gtk-laf.patch
new file mode 100644
index 0000000..1a23ca8
--- /dev/null
+++ b/net-im/jitsi/files/jitsi-2.2-gtk-laf.patch
@@ -0,0 +1,37 @@
+From 177783e194c6db40cc6dece9fc7ad848a54d85b7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 24 Jun 2013 15:59:14 +0200
+Subject: [PATCH] Prefer GTK+ over Metal in non-KDE Linux/BSD environment (e.g.
+ XFCE), too
+
+---
+ src/net/java/sip/communicator/impl/gui/UIServiceImpl.java | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+index 33fa243..a3abe47 100644
+--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
++++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+@@ -895,11 +895,6 @@ public class UIServiceImpl
+             {
+                 try
+                 {
+-                    String kdeFullSession = System.getenv("KDE_FULL_SESSION");
+-
+-                    if ((kdeFullSession != null)
+-                            && (kdeFullSession.length() != 0))
+-                    {
+                         for (LookAndFeelInfo lafi
+                                 : UIManager.getInstalledLookAndFeels())
+                         {
+@@ -909,7 +904,6 @@ public class UIServiceImpl
+                                 break;
+                             }
+                         }
+-                    }
+                 }
+                 catch (Throwable t)
+                 {
+-- 
+1.8.2.1
+

diff --git a/net-im/jitsi/jitsi-2.2.ebuild b/net-im/jitsi/jitsi-2.2-r1.ebuild
similarity index 98%
rename from net-im/jitsi/jitsi-2.2.ebuild
rename to net-im/jitsi/jitsi-2.2-r1.ebuild
index d4000ab..14f263b 100644
--- a/net-im/jitsi/jitsi-2.2.ebuild
+++ b/net-im/jitsi/jitsi-2.2-r1.ebuild
@@ -24,6 +24,8 @@ RESTRICT="strip"
 QA_PREBUILT="usr/share/jitsi/lib/native/*"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk-laf.patch
+
 	# Leave linux and mac .jars only (without mac we get build errors from src/net/java/sip/communicator/...)
 	rm -R lib/os-specific/{freebsd,solaris,windows}/ || die