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

[Antonio Rojas]

    Date: Wednesday, May 11, 2016 @ 09:07:02
  Author: arojas
Revision: 267780

Fix build with GCC 6 (FS#49294)

Added:
  kdenetwork-kopete/trunk/kopete-gcc6.patch
Modified:
  kdenetwork-kopete/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 +++++++--
 kopete-gcc6.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-11 07:01:56 UTC (rev 267779)
+++ PKGBUILD	2016-05-11 07:07:02 UTC (rev 267780)
@@ -13,11 +13,16 @@
 depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu')
 optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz")
-sha1sums=('bbf5c00dbbdc14be87b88757d472f0651040fe7e')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz" kopete-gcc6.patch)
+sha1sums=('bbf5c00dbbdc14be87b88757d472f0651040fe7e'
+          '98bf4a261f5a8097bf9ea6ab4b5ded3d895e2695')
 
 prepare() {
   mkdir -p build
+
+# Fix build with GCC 6 (Fedora)
+  cd kopete-$pkgver
+  patch -p1 -i ../kopete-gcc6.patch
 }
 
 build() {

Added: kopete-gcc6.patch
===================================================================
--- kopete-gcc6.patch	                        (rev 0)
+++ kopete-gcc6.patch	2016-05-11 07:07:02 UTC (rev 267780)
@@ -0,0 +1,12 @@
+diff -up kopete-15.12.2/plugins/history2/history2logger.h.than kopete-15.12.2/plugins/history2/history2logger.h
+--- kopete-15.12.2/plugins/history2/history2logger.h.than	2016-02-16 23:43:48.245204675 +0100
++++ kopete-15.12.2/plugins/history2/history2logger.h	2016-02-16 23:46:49.042349833 +0100
+@@ -94,7 +94,7 @@ public:
+ 	 * from Kopete::Contact @param c in the given @param sens
+ 	 */
+ 	QList<Kopete::Message> readMessages(int lines,
+-	                                    int offset=0, const Kopete::MetaContact *c=false, bool reverseOrder=true);
++	                                    int offset=0, const Kopete::MetaContact *c=0, bool reverseOrder=true);
+ 
+ 	/**
+ 	 * Same as the following, but for one date. I did'nt reuse the above function