kdenetwork-kopete-16.04.2-1.parabola1{,.nonprism1}: updating version

4 files changed, 8 insertions, 42 deletions

diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index 0c017d821..4b2e06514 100644
--- a/libre/kdenetwork-kopete/PKGBUILD
+++ b/libre/kdenetwork-kopete/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 267780 2016-05-11 07:07:02Z arojas $
+# $Id: PKGBUILD 269484 2016-06-14 08:32:06Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=kdenetwork-kopete
-pkgver=16.04.1
+pkgver=16.04.2
 pkgrel=1.parabola1
 pkgdesc='Instant Messenger, without nonfree Skype support'
 url='http://kde.org/applications/internet/kopete/'
@@ -16,9 +16,8 @@ conflicts=(${pkgname}-libre)
 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" 'kopete-gcc6.patch')
-sha1sums=('bbf5c00dbbdc14be87b88757d472f0651040fe7e'
-          '98bf4a261f5a8097bf9ea6ab4b5ded3d895e2695')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz")
+sha1sums=('6666e0c2b2798719232433734a0b6872d326cc25')
 
 prepare() {
   cd kopete-${pkgver}
@@ -27,10 +26,6 @@ prepare() {
   sed 's/, Skype//' -i doc/index.docbook
   cd ..
   mkdir -p build
-
-# Fix build with GCC 6 (Fedora)
-  cd kopete-$pkgver
-  patch -p1 -i ../kopete-gcc6.patch
 }
 
 build() {
diff --git a/libre/kdenetwork-kopete/kopete-gcc6.patch b/libre/kdenetwork-kopete/kopete-gcc6.patch
deleted file mode 100644
index 3c816340f..000000000
--- a/libre/kdenetwork-kopete/kopete-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD
index fadb2625b..422749a41 100644
--- a/nonprism/kdenetwork-kopete/PKGBUILD
+++ b/nonprism/kdenetwork-kopete/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 267780 2016-05-11 07:07:02Z arojas $
+# $Id: PKGBUILD 269484 2016-06-14 08:32:06Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=kdenetwork-kopete
-pkgver=16.04.1
+pkgver=16.04.2
 pkgrel=1.parabola1.nonprism1
 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
@@ -16,10 +16,9 @@ conflicts=(${pkgname}-libre ${pkgname}-libre-nonprism)
 depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'jsoncpp')
 makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer')
 optdepends=('mediastreamer: jingle support')
-source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz" 'kopete-gcc6.patch'
+source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libre-nonprism.patch')
-sha1sums=('bbf5c00dbbdc14be87b88757d472f0651040fe7e'
-          '98bf4a261f5a8097bf9ea6ab4b5ded3d895e2695'
+sha1sums=('6666e0c2b2798719232433734a0b6872d326cc25'
           'f0d7b727da1b5160f05952eec4df1bfbefab99cf')
 
 prepare() {
@@ -37,10 +36,6 @@ prepare() {
   patch -p1 -i "${srcdir}"/libre-nonprism.patch
   cd ..
   mkdir -p build
-
-# Fix build with GCC 6 (Fedora)
-  cd kopete-$pkgver
-  patch -p1 -i ../kopete-gcc6.patch
 }
 
 build() {
diff --git a/nonprism/kdenetwork-kopete/kopete-gcc6.patch b/nonprism/kdenetwork-kopete/kopete-gcc6.patch
deleted file mode 100644
index 3c816340f..000000000
--- a/nonprism/kdenetwork-kopete/kopete-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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