summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsomero <xgizzmo@slackbuilds.org>2011-03-26 11:27:03 -0400
committerRobby Workman <rworkman@slackbuilds.org>2011-03-27 11:26:55 -0500
commitf44df30815eaa18785979a347da5a023b8038bdf (patch)
treed47e55a44e954758010c6b6f26582e19d9a4ff48
parent38eda82fb7ee5975133346469f3e1c6a877b8cec (diff)
downloadslackbuilds-f44df30815eaa18785979a347da5a023b8038bdf.tar.gz
network/Blokkal: Patched to build with qt4.7.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--network/Blokkal/Blokkal.SlackBuild5
-rw-r--r--network/Blokkal/blokkal-1.2_qt47fix.diff28
2 files changed, 32 insertions, 1 deletions
diff --git a/network/Blokkal/Blokkal.SlackBuild b/network/Blokkal/Blokkal.SlackBuild
index d5fbce3689..dfb2641dd1 100644
--- a/network/Blokkal/Blokkal.SlackBuild
+++ b/network/Blokkal/Blokkal.SlackBuild
@@ -23,7 +23,7 @@
PRGNAM=Blokkal
VERSION=${VERSION:-0.1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -68,6 +68,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix building with qt4.7.
+patch -p0 < $CWD/blokkal-1.2_qt47fix.diff
+
mkdir build
cd build
cmake \
diff --git a/network/Blokkal/blokkal-1.2_qt47fix.diff b/network/Blokkal/blokkal-1.2_qt47fix.diff
new file mode 100644
index 0000000000..574f990f4d
--- /dev/null
+++ b/network/Blokkal/blokkal-1.2_qt47fix.diff
@@ -0,0 +1,28 @@
+--- src/protocols/livejournal/ljio/editfriendsjob.cpp 2009-10-23 17:15:11.000000000 +0200
++++ src/protocols/livejournal/ljio/editfriendsjob.cpp.old 2010-07-02 09:44:18.000000000 +0200
+@@ -28,10 +28,10 @@
+ {
+ public:
+ AddUser( void ):
+- user( 0 ),
++ user(),
+ fg( QColor() ),
+ bg( QColor() ),
+- groupmask( 0 ) {}
++ groupmask() {}
+
+ AddUser( const QString & user,
+ const QColor & fg,
+--- src/core/config/accountwizard.cpp 2009-10-23 17:16:07.000000000 +0200
++++ src/core/config/accountwizard.cpp.old 2010-07-02 09:10:56.000000000 +0200
+@@ -46,8 +46,8 @@
+
+ BlokkalAccountWizard::BlokkalAccountWizard( QWidget *parent ) :
+ KAssistantDialog( parent ),
+-m_editAccountPage( 0 ),
+-m_accountName( 0 ),
++m_editAccountPage(),
++m_accountName(),
+ m_fetcher( new RsdDataFetcher( this ) )
+ {
+ setWindowTitle( i18n( "Add Account" ) );