From bfa4f9e98ed411f1eeab361dd18cc6790898df55 Mon Sep 17 00:00:00 2001
From: arcan1s <i@arcanis.me>
Date: Thu, 7 Apr 2016 16:52:05 +0300
Subject: [PATCH] Some small changes

* changelog update
* version metadata update
* bump required Qt version to 5.6 and update patch accordinly
* fix invalid cast in update dialog
---
 CHANGELOG                                        |  4 ++++
 CHANGELOG-RU                                     |  4 ++++
 patches/qt5.6-qversionnumber.patch               | 13 +++++++++++++
 sources/awesome-widget/package/metadata.desktop  |  2 +-
 sources/awesome-widget/plugin/awupdatehelper.cpp |  6 +++---
 sources/desktop-panel/package/metadata.desktop   |  2 +-
 sources/libraries.cmake                          |  2 +-
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 59f3563..9a88633 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Ver.3.1.1:
+- fix broken gcc build (#87)
+* translation update
+
 Ver.3.1.0:
 + implement templates support (#71)
 + implement special functions (#71)
diff --git a/CHANGELOG-RU b/CHANGELOG-RU
index 7b604a6..801ee3f 100644
--- a/CHANGELOG-RU
+++ b/CHANGELOG-RU
@@ -1,3 +1,7 @@
+Вер.3.1.1:
+- исправлена сборка (#87)
+* обновлены переводы
+
 Вер.3.1.0:
 + добавлена поддержка шаблонов (#71)
 + добавлена поддержка специальных функций (#71)
diff --git a/patches/qt5.6-qversionnumber.patch b/patches/qt5.6-qversionnumber.patch
index 3520369..9f622ba 100644
--- a/patches/qt5.6-qversionnumber.patch
+++ b/patches/qt5.6-qversionnumber.patch
@@ -132,3 +132,16 @@ index 359cdb2..9c6a42d 100644
      QString m_genericConfig;
  };
  
+diff --git a/sources/libraries.cmake b/sources/libraries.cmake
+index 33192f7..339bb58 100644
+--- a/sources/libraries.cmake
++++ b/sources/libraries.cmake
+@@ -2,7 +2,7 @@
+ find_package(Gettext REQUIRED)
+ 
+ # main qt libraries
+-find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
++find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
+ add_definitions(
+         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
+         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop
index 2571be5..d749b63 100644
--- a/sources/awesome-widget/package/metadata.desktop
+++ b/sources/awesome-widget/package/metadata.desktop
@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=3.1.0
+X-KDE-PluginInfo-Version=3.1.1
 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
index 3698602..3ea5bc2 100644
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
@@ -123,15 +123,15 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version)
 
 void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
 {
-    int ret = static_cast<QMessageBox *>(sender())->buttonRole(button);
+    QMessageBox::ButtonRole ret = static_cast<QMessageBox *>(sender())->buttonRole(button);
     qCInfo(LOG_AW) << "User select" << ret;
 
     switch (ret) {
-    case QMessageBox::Ok:
+    case QMessageBox::AcceptRole:
         QDesktopServices::openUrl(QString(RELEASES)
                                   + m_foundVersion.toString());
         break;
-    case QMessageBox::Cancel:
+    case QMessageBox::RejectRole:
     default:
         break;
     }
diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop
index 550ae9a..ce1adc0 100644
--- a/sources/desktop-panel/package/metadata.desktop
+++ b/sources/desktop-panel/package/metadata.desktop
@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
-X-KDE-PluginInfo-Version=3.1.0
+X-KDE-PluginInfo-Version=3.1.1
 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
index 33192f7..339bb58 100644
--- a/sources/libraries.cmake
+++ b/sources/libraries.cmake
@@ -2,7 +2,7 @@
 find_package(Gettext REQUIRED)
 
 # main qt libraries
-find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
+find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 add_definitions(
         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}