[arch-commits] Commit in kdepim-runtime/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Thu May 11 22:33:02 UTC 2017
Date: Thursday, May 11, 2017 @ 22:33:02
Author: arojas
Revision: 295851
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdepim-runtime/repos/extra-i686/PKGBUILD
(from rev 295850, kdepim-runtime/trunk/PKGBUILD)
kdepim-runtime/repos/extra-i686/kdebug-379733.patch
(from rev 295850, kdepim-runtime/trunk/kdebug-379733.patch)
kdepim-runtime/repos/extra-x86_64/PKGBUILD
(from rev 295850, kdepim-runtime/trunk/PKGBUILD)
kdepim-runtime/repos/extra-x86_64/kdebug-379733.patch
(from rev 295850, kdepim-runtime/trunk/kdebug-379733.patch)
Deleted:
kdepim-runtime/repos/extra-i686/PKGBUILD
kdepim-runtime/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 38 ---------------
extra-i686/kdebug-379733.patch | 12 +++++
extra-x86_64/PKGBUILD | 38 ---------------
extra-x86_64/kdebug-379733.patch | 12 +++++
5 files changed, 112 insertions(+), 76 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-05-11 22:32:27 UTC (rev 295850)
+++ extra-i686/PKGBUILD 2017-05-11 22:33:02 UTC (rev 295851)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=17.04.1
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://community.kde.org/KDE_PIM'
-license=('GPL' 'LGPL' 'FDL')
-depends=(libkgapi libkolab kdav akonadi-calendar knotifyconfig kalarmcal kmbox kimap hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
-conflicts=(kio-pim)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('421c040d0228c3ac280a4ceb97daf52a2fd06c4c7c9527cb94960940d3f9921f'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kdepim-runtime/repos/extra-i686/PKGBUILD (from rev 295850, kdepim-runtime/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-05-11 22:33:02 UTC (rev 295851)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepim-runtime
+pkgver=17.04.1
+pkgrel=2
+pkgdesc='Extends the functionality of kdepim'
+arch=('i686' 'x86_64')
+url='https://community.kde.org/KDE_PIM'
+license=('GPL' 'LGPL' 'FDL')
+depends=(libkgapi libkolab kdav akonadi-calendar knotifyconfig kalarmcal kmbox kimap hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
+conflicts=(kio-pim)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+ kdebug-379733.patch)
+sha256sums=('421c040d0228c3ac280a4ceb97daf52a2fd06c4c7c9527cb94960940d3f9921f'
+ 'SKIP'
+ '284871629f04bcf4a26b2d3ce7d60ef59b80f3afbc78f0d53b9987f22b665857')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+
+# fix crash on account configuration
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kdebug-379733.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kdepim-runtime/repos/extra-i686/kdebug-379733.patch (from rev 295850, kdepim-runtime/trunk/kdebug-379733.patch)
===================================================================
--- extra-i686/kdebug-379733.patch (rev 0)
+++ extra-i686/kdebug-379733.patch 2017-05-11 22:33:02 UTC (rev 295851)
@@ -0,0 +1,12 @@
+diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
+index 5ad65390a..9ef15f1c1 100644
+--- a/resources/imap/setupserver.cpp
++++ b/resources/imap/setupserver.cpp
+@@ -34,6 +34,7 @@
+ #include "serverinfodialog.h"
+ #include "folderarchivesettingpage.h"
+ #include "utils.h"
++#include "config.h"
+
+ #include <mailtransport/transport.h>
+ #include <mailtransport/servertest.h>
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-05-11 22:32:27 UTC (rev 295850)
+++ extra-x86_64/PKGBUILD 2017-05-11 22:33:02 UTC (rev 295851)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=17.04.1
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://community.kde.org/KDE_PIM'
-license=('GPL' 'LGPL' 'FDL')
-depends=(libkgapi libkolab kdav akonadi-calendar knotifyconfig kalarmcal kmbox kimap hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
-conflicts=(kio-pim)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('421c040d0228c3ac280a4ceb97daf52a2fd06c4c7c9527cb94960940d3f9921f'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: kdepim-runtime/repos/extra-x86_64/PKGBUILD (from rev 295850, kdepim-runtime/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-05-11 22:33:02 UTC (rev 295851)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepim-runtime
+pkgver=17.04.1
+pkgrel=2
+pkgdesc='Extends the functionality of kdepim'
+arch=('i686' 'x86_64')
+url='https://community.kde.org/KDE_PIM'
+license=('GPL' 'LGPL' 'FDL')
+depends=(libkgapi libkolab kdav akonadi-calendar knotifyconfig kalarmcal kmbox kimap hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
+conflicts=(kio-pim)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+ kdebug-379733.patch)
+sha256sums=('421c040d0228c3ac280a4ceb97daf52a2fd06c4c7c9527cb94960940d3f9921f'
+ 'SKIP'
+ '284871629f04bcf4a26b2d3ce7d60ef59b80f3afbc78f0d53b9987f22b665857')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+
+# fix crash on account configuration
+ cd $pkgname-$pkgver
+ patch -p1 -i ../kdebug-379733.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: kdepim-runtime/repos/extra-x86_64/kdebug-379733.patch (from rev 295850, kdepim-runtime/trunk/kdebug-379733.patch)
===================================================================
--- extra-x86_64/kdebug-379733.patch (rev 0)
+++ extra-x86_64/kdebug-379733.patch 2017-05-11 22:33:02 UTC (rev 295851)
@@ -0,0 +1,12 @@
+diff --git a/resources/imap/setupserver.cpp b/resources/imap/setupserver.cpp
+index 5ad65390a..9ef15f1c1 100644
+--- a/resources/imap/setupserver.cpp
++++ b/resources/imap/setupserver.cpp
+@@ -34,6 +34,7 @@
+ #include "serverinfodialog.h"
+ #include "folderarchivesettingpage.h"
+ #include "utils.h"
++#include "config.h"
+
+ #include <mailtransport/transport.h>
+ #include <mailtransport/servertest.h>
More information about the arch-commits
mailing list