From 741dddbe94b04897119e475b56f5b8d83e44ddc6 Mon Sep 17 00:00:00 2001
From: ponce <matteo.bernardini@gmail.com>
Date: Tue, 24 Jul 2012 09:24:43 +0200
Subject: system/qstardict: Updated for version 1.0.1.

This fixes build with gcc-4.7.x when coupled with
the added patch for glib > 2.30.x.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/qstardict/qstardict-1.0.1-glib_includes.patch | 14 ++++++++++++++
 system/qstardict/qstardict.SlackBuild                |  8 +++++---
 system/qstardict/qstardict.info                      |  8 ++++----
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 system/qstardict/qstardict-1.0.1-glib_includes.patch

diff --git a/system/qstardict/qstardict-1.0.1-glib_includes.patch b/system/qstardict/qstardict-1.0.1-glib_includes.patch
new file mode 100644
index 0000000000..fd6e993b92
--- /dev/null
+++ b/system/qstardict/qstardict-1.0.1-glib_includes.patch
@@ -0,0 +1,14 @@
+Index: plugins/stardict/stardict.cpp
+===================================================================
+--- plugins/stardict/stardict.cpp.orig
++++ plugins/stardict/stardict.cpp
+@@ -28,8 +28,7 @@
+ #include <QFile>
+ #include <QSettings>
+ #include <QStack>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "lib.h"
+ #include "file.hpp"
+ #include "settingsdialog.h"
diff --git a/system/qstardict/qstardict.SlackBuild b/system/qstardict/qstardict.SlackBuild
index afbf663c4a..f1095c62bc 100644
--- a/system/qstardict/qstardict.SlackBuild
+++ b/system/qstardict/qstardict.SlackBuild
@@ -6,7 +6,7 @@
 # Modified by Branko Grubic <branko.grubic@gmail.com>
 
 PRGNAM=qstardict
-VERSION=${VERSION:-0.13.1}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,13 +51,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Patch for glib > 2.30.x
+# http://sourceforge.net/tracker/?func=detail&aid=3471473&group_id=200786&atid=974933
+patch -p0 < $CWD/qstardict-1.0.1-glib_includes.patch
+
 # qstardict only have "stardict" and "web" plugins enabled by default.
 # Actually there are swac and multitran plugins in addition.
 # Uncomment the following line to get full plugins.
 # enabled_plugins="stardict web swac multitran"
 
-patch -p1 <$CWD/gcc4.4.patch
-
 qmake QMAKE_CXXFLAGS="$SLKCFLAGS" \
       PLUGINS_DIR=/usr/lib${LIBDIRSUFFIX}/qstardict/plugins \
       DOCS_DIR=/usr/doc/$PRGNAM-$VERSION \
diff --git a/system/qstardict/qstardict.info b/system/qstardict/qstardict.info
index 39328eea4e..35317dadb0 100644
--- a/system/qstardict/qstardict.info
+++ b/system/qstardict/qstardict.info
@@ -1,10 +1,10 @@
 PRGNAM="qstardict"
-VERSION="0.13.1"
+VERSION="1.0.1"
 HOMEPAGE="http://qstardict.ylsoftware.com/index.php"
-DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-0.13.1.tar.bz2"
-MD5SUM="0828c3fa01c5237db8a67d356a9d1a8c"
+DOWNLOAD="http://qstardict.ylsoftware.com/files/qstardict-1.0.1.tar.bz2"
+MD5SUM="4e058439edad45103a9f5c74d2a381e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="stardict"
+REQUIRES=""
 MAINTAINER="Branko Grubic"
 EMAIL="branko.grubic@gmail.com"
-- 
cgit v1.2.3