main/qt: upgrade to 4.8.5

many bug fixes. rebase the theme patch too.

2 files changed, 45 insertions, 35 deletions

diff --git a/main/qt/APKBUILD b/main/qt/APKBUILD
index f085a4b257..66e15cbd1f 100644
--- a/main/qt/APKBUILD
+++ b/main/qt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt
-pkgver=4.8.4
-pkgrel=4
+pkgver=4.8.5
+pkgrel=0
 pkgdesc="A cross-platform application and UI framework"
 url="http://qt.nokia.com/"
 arch="all"
@@ -18,7 +18,7 @@ makedepends="$depends_dev postgresql-dev mysql-dev unixodbc-dev cups-dev
 	gtk+-dev tiff-dev libmng-dev libxrandr-dev libxv-dev libxi-dev perl
 	gawk paxctl rsync freetds-dev hicolor-icon-theme"
 install=
-source="http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$pkgver.tar.gz
+source="http://download.qt-project.org/official_releases/qt/4.8/$pkgver/qt-everywhere-opensource-src-4.8.5.tar.gz
 	qt-gtk-theme-fix.patch
 	qsettings-recursive-global-mutex.patch
 	assistant.desktop
@@ -263,10 +263,24 @@ private() {
 		"$subpkgdir"/usr || return 1
 }
 
-md5sums="89c5ecba180cae74c66260ac732dc5cb  qt-everywhere-opensource-src-4.8.4.tar.gz
-91e8b5ea1e682ae51b60a27d01d7d381  qt-gtk-theme-fix.patch
+md5sums="1864987bdbb2f58f8ae8b350dfdbe133  qt-everywhere-opensource-src-4.8.5.tar.gz
+8eeac363a5d9bc1ca06501a7cbe59b08  qt-gtk-theme-fix.patch
 7467e168418c50b2737b4b2fab4448fe  qsettings-recursive-global-mutex.patch
 a445c6917086d80f1cfc1e40cb6b0132  assistant.desktop
 d457f0a0ad68a3861c3cadefe3b42ded  designer.desktop
 668331d9798a0e2b94381efb7be4c513  linguist.desktop
 c29f2993d6a0f73d756d2fa36e130e1c  qtconfig.desktop"
+sha256sums="eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138  qt-everywhere-opensource-src-4.8.5.tar.gz
+b64ea69ca9ed18f464a3810964b340432c528ebb02c9c7851ecc8e99cfe74877  qt-gtk-theme-fix.patch
+8ef97783ff93a515a31c1e27c6b3b22e2ad2fd9cf0fa94965e5c413ae579e64c  qsettings-recursive-global-mutex.patch
+1094300e3d69e55eb69d87cbaac6724f68b0618938c6eb1b0ddd22ba99c7f8a2  assistant.desktop
+74c2c5d27a1c1ad08ab01122bcf333f75d0a014b4755d3ddd8764c2425f6e320  designer.desktop
+1b9ecd839c1a5dfcec87653849287c31bf2f4044300958be802ebb943e896998  linguist.desktop
+1e5cb7c2f12d4db35d668f01548a2bef131fe92133d76c78170fb74a377d5ef8  qtconfig.desktop"
+sha512sums="47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb  qt-everywhere-opensource-src-4.8.5.tar.gz
+4be22db63c27ce2fa8c4f0af47f951b3aebb1f41c63c1ff02cec429be26d86f869ce8d137e313ea59a7540ebf1866ef2245471b754588776d20f881041141b55  qt-gtk-theme-fix.patch
+277e5ceec4fcc5d77a8591eafdb24125a54770576b7997aee6df39d85a7f1deabf8547fb42127cb118ebb8e7f81e3a3624a75d461581052dadf7abb99f1c9bd7  qsettings-recursive-global-mutex.patch
+005ed6fe50b237e4541c0f30cbd87ec5425eff7e7c8d55d2b9b24ea8469e75e1fc8a3f26296841ab4cbd566517b3f1aa1fa7b36e1a9677d284cfff615fd24614  assistant.desktop
+731aae6a0d776c1be5a49dadc5480b205ba5c8e056d108e2bb96a19dd52b6c6ca22387b37505cf97a2575228cd5dd65c773d0fde1c26299e47fdc11a49f651fd  designer.desktop
+70943d9ee9ac7ff6281079be14b741095c60428b30b27bafc42a8bb1729a6f7e8e163cff3d2b5d5a66bbdab464816eea479a3f822598ff2fe068d4025652a049  linguist.desktop
+c38af96c9519767d09c36184d43c9177522f3a9e3eaa228f76e1dab324bbc462c3c135a3d51a1c8649c764d52196f27b8dd95e3780c5e79664136c03611dc13a  qtconfig.desktop"
diff --git a/main/qt/qt-gtk-theme-fix.patch b/main/qt/qt-gtk-theme-fix.patch
index 5939b1fd1a..a9e4dc7da4 100644
--- a/main/qt/qt-gtk-theme-fix.patch
+++ b/main/qt/qt-gtk-theme-fix.patch
@@ -7,34 +7,19 @@ It still tries to detect if GTK-Qt is in use and refuse to run with that
 as it would cause obvious recursion, however that might be not always
 possible.
 
---- qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.h.orig
-+++ qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.h
-@@ -338,6 +338,7 @@
-     static bool getGConfBool(const QString &key, bool fallback = 0);
-     static QString getGConfString(const QString &key, const QString &fallback = QString());
- 
-+    static QString getThemeNameGuess();
-     static QString getThemeName();
-     virtual int getSpinboxArrowSize() const;
- 
---- qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.cpp.orig
-+++ qt-everywhere-opensource-src-4.8.0/src/gui/styles/qgtkstyle_p.cpp
-@@ -504,12 +504,9 @@
+diff -rup qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.cpp qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp
+--- qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.cpp	2013-06-07 05:16:59.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp	2013-09-25 16:37:34.703506640 +0000
+@@ -505,7 +505,7 @@ void QGtkStylePrivate::initGtkWidgets()
  
      static QString themeName;
      if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) {
 -        themeName = getThemeName();
 +        themeName = getThemeNameGuess();
  
--        if (themeName.isEmpty()) {
--            qWarning("QGtkStyle was unable to detect the current GTK+ theme.");
--            return;
--        } else if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
-+        if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
+         if (themeName == QLS("Qt") || themeName == QLS("Qt4")) {
              // Due to namespace conflicts with Qt3 and obvious recursion with Qt4,
-             // we cannot support the GTK_Qt Gtk engine
-             qWarning("QGtkStyle cannot be used together with the GTK_Qt engine.");
-@@ -650,7 +647,7 @@
+@@ -648,7 +648,7 @@ bool QGtkStylePrivate::getGConfBool(cons
      return retVal;
  }
  
@@ -43,13 +28,10 @@ possible.
  {
      QString themeName;
      // We try to parse the gtkrc file first
-@@ -684,6 +681,19 @@
-     // Fall back to gconf
-     if (themeName.isEmpty() && resolveGConf())
-         themeName = getGConfString(QLS("/desktop/gnome/interface/gtk_theme"));
-+
-+    return themeName;
-+}
+@@ -685,6 +685,19 @@ QString QGtkStylePrivate::getThemeName()
+ 
+     return themeName;
+ }
 +
 +QString QGtkStylePrivate::getThemeName()
 +{
@@ -60,6 +42,20 @@ possible.
 +    g_object_get(settings, "gtk-theme-name", &theme_name, NULL);
 +    themeName = QString::fromUtf8(theme_name);
 +    g_free(theme_name);
++
++    return themeName;
++}
+ 
+ // Get size of the arrow controls in a GtkSpinButton
+ int QGtkStylePrivate::getSpinboxArrowSize() const
+diff -rup qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.h qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.h
+--- qt-everywhere-opensource-src-4.8.5.orig/src/gui/styles/qgtkstyle_p.h	2013-06-07 05:16:59.000000000 +0000
++++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.h	2013-09-25 16:29:11.310167033 +0000
+@@ -338,6 +338,7 @@ public:
+     static bool getGConfBool(const QString &key, bool fallback = 0);
+     static QString getGConfString(const QString &key, const QString &fallback = QString());
+ 
++    static QString getThemeNameGuess();
+     static QString getThemeName();
+     virtual int getSpinboxArrowSize() const;
  
-     return themeName;
- }