[arch-commits] Commit in kdenetwork-kopete/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Wed May 11 07:07:16 UTC 2016
Date: Wednesday, May 11, 2016 @ 09:07:16
Author: arojas
Revision: 267781
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdenetwork-kopete/repos/extra-i686/PKGBUILD
(from rev 267780, kdenetwork-kopete/trunk/PKGBUILD)
kdenetwork-kopete/repos/extra-i686/kopete-gcc6.patch
(from rev 267780, kdenetwork-kopete/trunk/kopete-gcc6.patch)
kdenetwork-kopete/repos/extra-x86_64/PKGBUILD
(from rev 267780, kdenetwork-kopete/trunk/PKGBUILD)
kdenetwork-kopete/repos/extra-x86_64/kopete-gcc6.patch
(from rev 267780, kdenetwork-kopete/trunk/kopete-gcc6.patch)
Deleted:
kdenetwork-kopete/repos/extra-i686/PKGBUILD
kdenetwork-kopete/repos/extra-x86_64/PKGBUILD
--------------------------------+
/PKGBUILD | 84 +++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 37 -----------------
extra-i686/kopete-gcc6.patch | 12 +++++
extra-x86_64/PKGBUILD | 37 -----------------
extra-x86_64/kopete-gcc6.patch | 12 +++++
5 files changed, 108 insertions(+), 74 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-11 07:07:02 UTC (rev 267780)
+++ extra-i686/PKGBUILD 2016-05-11 07:07:16 UTC (rev 267781)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdenetwork-kopete
-pkgver=16.04.1
-pkgrel=1
-pkgdesc='Instant Messenger'
-url='http://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdenetwork')
-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')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kopete-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=ON \
- -DWITH_Libmsn=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kdenetwork-kopete/repos/extra-i686/PKGBUILD (from rev 267780, kdenetwork-kopete/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-11 07:07:16 UTC (rev 267781)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdenetwork-kopete
+pkgver=16.04.1
+pkgrel=1
+pkgdesc='Instant Messenger'
+url='http://kde.org/applications/internet/kopete/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdenetwork')
+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')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with GCC 6 (Fedora)
+ cd kopete-$pkgver
+ patch -p1 -i ../kopete-gcc6.patch
+}
+
+build() {
+ cd build
+ cmake ../kopete-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DWITH_Libmsn=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kdenetwork-kopete/repos/extra-i686/kopete-gcc6.patch (from rev 267780, kdenetwork-kopete/trunk/kopete-gcc6.patch)
===================================================================
--- extra-i686/kopete-gcc6.patch (rev 0)
+++ extra-i686/kopete-gcc6.patch 2016-05-11 07:07:16 UTC (rev 267781)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-11 07:07:02 UTC (rev 267780)
+++ extra-x86_64/PKGBUILD 2016-05-11 07:07:16 UTC (rev 267781)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdenetwork-kopete
-pkgver=16.04.1
-pkgrel=1
-pkgdesc='Instant Messenger'
-url='http://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdenetwork')
-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')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kopete-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=ON \
- -DWITH_Libmsn=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kdenetwork-kopete/repos/extra-x86_64/PKGBUILD (from rev 267780, kdenetwork-kopete/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-11 07:07:16 UTC (rev 267781)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdenetwork-kopete
+pkgver=16.04.1
+pkgrel=1
+pkgdesc='Instant Messenger'
+url='http://kde.org/applications/internet/kopete/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdenetwork')
+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')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with GCC 6 (Fedora)
+ cd kopete-$pkgver
+ patch -p1 -i ../kopete-gcc6.patch
+}
+
+build() {
+ cd build
+ cmake ../kopete-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DWITH_Libmsn=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kdenetwork-kopete/repos/extra-x86_64/kopete-gcc6.patch (from rev 267780, kdenetwork-kopete/trunk/kopete-gcc6.patch)
===================================================================
--- extra-x86_64/kopete-gcc6.patch (rev 0)
+++ extra-x86_64/kopete-gcc6.patch 2016-05-11 07:07:16 UTC (rev 267781)
@@ -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
More information about the arch-commits
mailing list