[qstardict] - Rebuild against GCC 4.7 - Incorporate a patch to solve GLib 2.31 compatibility

[cheeselee]

commit 57fa49ccc097cb5f6a7cf977c63523e2a4fd61a3
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Fri Jan 6 14:49:41 2012 +0800

    - Rebuild against GCC 4.7
    - Incorporate a patch to solve GLib 2.31 compatibility

 qstardict-1.0.1-glib-2.31.patch |   14 ++++++++++++++
 qstardict.spec                  |   11 +++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/qstardict-1.0.1-glib-2.31.patch b/qstardict-1.0.1-glib-2.31.patch
new file mode 100644
index 0000000..a7c3b8d
--- /dev/null
+++ b/qstardict-1.0.1-glib-2.31.patch
@@ -0,0 +1,14 @@
+diff --git a/plugins/stardict/stardict.cpp b/plugins/stardict/stardict.cpp
+index 06c8778..fe68167 100644
+--- a/plugins/stardict/stardict.cpp
++++ b/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/qstardict.spec b/qstardict.spec
index 7fa6c0b..eb3c9fa 100644
--- a/qstardict.spec
+++ b/qstardict.spec
@@ -1,6 +1,6 @@
 Name:       qstardict
 Version:    1.0.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    StarDict clone written using Qt4
 License:    GPLv2+
 Group:      Applications/System
@@ -8,6 +8,8 @@ URL:        http://qstardict.ylsoftware.com/
 Source0:    http://qstardict.ylsoftware.com/files/%{name}-%{version}.tar.bz2
 # include a manpage from Debian
 Source1:    qstardict.1
+# Fix GLib 2.31 compatibility, sent upstream via email 20120106
+Patch0:     qstardict-1.0.1-glib-2.31.patch
 
 BuildRequires:  glib2-devel
 BuildRequires:  desktop-file-utils
@@ -40,9 +42,10 @@ This package contains KDE plasma applet of qstardict.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%_qt4_qmake PLUGINS_DIR=%{_libdir}/%{name}/plugins LIBS+=" -lX11"
+%_qt4_qmake PLUGINS_DIR=%{_libdir}/%{name}/plugins
 make %{?_smp_mflags}
 
 # Build plasma applet
@@ -86,6 +89,10 @@ rm -fr %{buildroot}%{_docdir}
 
 
 %changelog
+* Fri Jan  6 2012 Robin Lee <cheeselee at fedoraproject.org> - 1.0.1-2
+- Rebuild against GCC 4.7
+- Incorporate a patch to solve GLib 2.31 compatibility
+
 * Mon Dec  5 2011 Robin Lee <cheeselee at fedoraproject.org> - 1.0.1-1
 - Update to 1.0.1