[arch-commits] Commit in licq/trunk (PKGBUILD licq-gcc6.patch)

[Antonio Rojas]

    Date: Thursday, May 12, 2016 @ 17:31:13
  Author: arojas
Revision: 267881

Fix build with GCC 6

Added:
  licq/trunk/licq-gcc6.patch
Modified:
  licq/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    8 ++++++--
 licq-gcc6.patch |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-12 14:14:01 UTC (rev 267880)
+++ PKGBUILD	2016-05-12 15:31:13 UTC (rev 267881)
@@ -10,8 +10,9 @@
 license=('GPL')
 depends=('boost-libs' 'gpgme' 'libxss' 'qt4')
 makedepends=('cmake' 'boost' 'optipng')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('46af2bc95865ee61a103d27812fe6e6a')
+source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2 licq-gcc6.patch)
+md5sums=('46af2bc95865ee61a103d27812fe6e6a'
+         '8af303d8d31573246470f0ba0ccba428')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,6 +22,9 @@
   # Fix invalid PNG images to work with libpng 1.6
   # https://github.com/licq-im/licq/pull/32
   optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png
+
+  # Fix build with GCC 6
+  patch -p1 -i ../licq-gcc6.patch
 }
 
 build() {

Added: licq-gcc6.patch
===================================================================
--- licq-gcc6.patch	                        (rev 0)
+++ licq-gcc6.patch	2016-05-12 15:31:13 UTC (rev 267881)
@@ -0,0 +1,24 @@
+--- licq-1.8.2/src/licq.cpp.orig	2016-05-12 15:27:35.927500283 +0000
++++ licq-1.8.2/src/licq.cpp	2016-05-12 15:28:01.107415744 +0000
+@@ -568,18 +568,18 @@
+         if (!licqConf.get(szKey, pluginName))
+           continue;
+ 
+-        bool loaded = LoadPlugin(pluginName, argc, argv);
++        bool loaded= (bool)LoadPlugin(pluginName, argc, argv);
+ 
+         // Make upgrade from 1.3.x and older easier by automatically switching from kde/qt-gui to kde4/qt4-gui
+         if (!loaded && pluginName == "kde-gui")
+         {
+           gLog.warning(tr("Plugin kde-gui is no longer available, trying to load kde4-gui instead."));
+-          loaded = LoadPlugin("kde4-gui", argc, argv);
++          loaded= (bool)LoadPlugin("kde4-gui", argc, argv);
+         }
+         if (!loaded && (pluginName == "qt-gui" || pluginName == "kde-gui"))
+         {
+           gLog.warning(tr("Plugin %s is no longer available, trying to load qt4-gui instead."), pluginName.c_str());
+-          loaded = LoadPlugin("qt4-gui", argc, argv);
++          loaded= (bool)LoadPlugin("qt4-gui", argc, argv);
+         }
+ 
+         if (!loaded)