From e5843ee724df94ac8155e75a79f0b8f43e48772d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikko=20V=C3=A4rri?= <vmj@linuxbox.fi>
Date: Mon, 10 Sep 2012 08:24:50 -0500
Subject: [PATCH] desktop/qtwitter: Add patches from upstream.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mikko Värri <vmj@linuxbox.fi>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/qtwitter/fix_insecure_runpaths.patch         | 10 ++++++++++
 .../fix_qtwitter_desktop_to_pass_validation.patch    | 11 +++++++++++
 desktop/qtwitter/fix_underlinking.patch              | 12 ++++++++++++
 desktop/qtwitter/qtwitter.SlackBuild                 |  7 ++++++-
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 desktop/qtwitter/fix_insecure_runpaths.patch
 create mode 100644 desktop/qtwitter/fix_qtwitter_desktop_to_pass_validation.patch
 create mode 100644 desktop/qtwitter/fix_underlinking.patch

diff --git a/desktop/qtwitter/fix_insecure_runpaths.patch b/desktop/qtwitter/fix_insecure_runpaths.patch
new file mode 100644
index 0000000000..7b4ab7d162
--- /dev/null
+++ b/desktop/qtwitter/fix_insecure_runpaths.patch
@@ -0,0 +1,10 @@
+--- qtwitter-app/qtwitter-app.pro.orig	2012-08-07 15:30:44.098000989 +0300
++++ qtwitter-app/qtwitter-app.pro	2012-08-07 15:31:03.446998525 +0300
+@@ -82,7 +82,6 @@
+ }
+ else:unix {
+     LIBS += -L$${DESTDIR} \
+-        -Wl,-rpath,$${DESTDIR} \
+         $$TWITTERAPI_LIB
+     target.path = $${INSTALL_PREFIX}/bin
+     PLUGINS_DIR = $${INSTALL_PREFIX}/lib$${LIB_SUFFIX}/$${TARGET}/plugins
diff --git a/desktop/qtwitter/fix_qtwitter_desktop_to_pass_validation.patch b/desktop/qtwitter/fix_qtwitter_desktop_to_pass_validation.patch
new file mode 100644
index 0000000000..0f850c8b70
--- /dev/null
+++ b/desktop/qtwitter/fix_qtwitter_desktop_to_pass_validation.patch
@@ -0,0 +1,11 @@
+--- qtwitter-app/x11/qtwitter.desktop.orig	2012-08-07 15:34:04.781987614 +0300
++++ qtwitter-app/x11/qtwitter.desktop	2012-08-07 15:34:21.032000002 +0300
+@@ -3,7 +3,7 @@
+ Name=qTwitter
+ Icon=qtwitter
+ Type=Application
+-Categories=Qt;Network;Instant Messaging;
++Categories=Qt;Network;InstantMessaging;
+ Comment=A microblogging client
+ Comment[ca]=El client de Twitter i Identi.ca
+ Comment[de]=Ein Twitter und Identi.ca Kunde
diff --git a/desktop/qtwitter/fix_underlinking.patch b/desktop/qtwitter/fix_underlinking.patch
new file mode 100644
index 0000000000..48078744aa
--- /dev/null
+++ b/desktop/qtwitter/fix_underlinking.patch
@@ -0,0 +1,12 @@
+--- qtwitter-app/qtwitter-app.pro.orig	2012-08-07 15:32:14.975000266 +0300
++++ qtwitter-app/qtwitter-app.pro	2012-08-07 15:32:43.860999601 +0300
+@@ -82,7 +82,8 @@
+ }
+ else:unix {
+     LIBS += -L$${DESTDIR} \
+-        $$TWITTERAPI_LIB
++        $$TWITTERAPI_LIB \
++        -lX11
+     target.path = $${INSTALL_PREFIX}/bin
+     PLUGINS_DIR = $${INSTALL_PREFIX}/lib$${LIB_SUFFIX}/$${TARGET}/plugins
+     DEFINES += PLUGINS_DIR='\\\"$${PLUGINS_DIR}\\\"'
diff --git a/desktop/qtwitter/qtwitter.SlackBuild b/desktop/qtwitter/qtwitter.SlackBuild
index 8fc95f95a4..4738d3a0db 100644
--- a/desktop/qtwitter/qtwitter.SlackBuild
+++ b/desktop/qtwitter/qtwitter.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=qtwitter
 VERSION=${VERSION:-0.10.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -76,6 +76,11 @@ find . \
 patch -p0 <$CWD/twitterapi_twitterapi.pro.patch
 patch -p0 <$CWD/qtwitter-app_qtwitter-app.pro.patch
 
+# Following three patches are from the qtwitter git repository.
+patch -p0 <$CWD/fix_insecure_runpaths.patch
+patch -p0 <$CWD/fix_underlinking.patch
+patch -p0 <$CWD/fix_qtwitter_desktop_to_pass_validation.patch
+
 qmake -unix PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     QMAKE_CFLAGS="$SLKCFLAGS" \
     QMAKE_CXXFLAGS="$SLKCFLAGS" \