desktop/qtwitter: Add patches from upstream.

Signed-off-by: Mikko Värri <vmj@linuxbox.fi>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Mikko Värri 2012-09-10 08:24:50 -05:00 committed by Robby Workman
parent ec0890935d
commit e5843ee724
4 changed files with 39 additions and 1 deletions

View file

@ -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

View file

@ -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

View file

@ -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}\\\"'

View file

@ -24,7 +24,7 @@
PRGNAM=qtwitter PRGNAM=qtwitter
VERSION=${VERSION:-0.10.0} VERSION=${VERSION:-0.10.0}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on: # Automatically determine the architecture we're building on:
@ -76,6 +76,11 @@ find . \
patch -p0 <$CWD/twitterapi_twitterapi.pro.patch patch -p0 <$CWD/twitterapi_twitterapi.pro.patch
patch -p0 <$CWD/qtwitter-app_qtwitter-app.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 -unix PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION \
QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CFLAGS="$SLKCFLAGS" \
QMAKE_CXXFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \