[arch-commits] Commit in kdepimlibs4/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sun Sep 13 21:20:35 UTC 2015
Date: Sunday, September 13, 2015 @ 23:20:34
Author: arojas
Revision: 246017
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdepimlibs4/repos/extra-i686/PKGBUILD
(from rev 246016, kdepimlibs4/trunk/PKGBUILD)
kdepimlibs4/repos/extra-i686/kdepimlibs4.install
(from rev 246016, kdepimlibs4/trunk/kdepimlibs4.install)
kdepimlibs4/repos/extra-x86_64/PKGBUILD
(from rev 246016, kdepimlibs4/trunk/PKGBUILD)
kdepimlibs4/repos/extra-x86_64/kdepimlibs4.install
(from rev 246016, kdepimlibs4/trunk/kdepimlibs4.install)
Deleted:
kdepimlibs4/repos/extra-i686/PKGBUILD
kdepimlibs4/repos/extra-i686/kdepimlibs4.install
kdepimlibs4/repos/extra-x86_64/PKGBUILD
kdepimlibs4/repos/extra-x86_64/kdepimlibs4.install
----------------------------------+
/PKGBUILD | 104 +++++++++++++++++++++++++++++++++++++
/kdepimlibs4.install | 22 +++++++
extra-i686/PKGBUILD | 43 ---------------
extra-i686/kdepimlibs4.install | 11 ---
extra-x86_64/PKGBUILD | 43 ---------------
extra-x86_64/kdepimlibs4.install | 11 ---
6 files changed, 126 insertions(+), 108 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-09-13 21:19:36 UTC (rev 246016)
+++ extra-i686/PKGBUILD 2015-09-13 21:20:34 UTC (rev 246017)
@@ -1,43 +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=kdepimlibs4
-pkgver=4.14.10
-_kdeappver=15.04.3
-pkgrel=3
-pkgdesc="KDE4 PIM Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepimlibs'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'libakonadi-qt4' 'libical' 'prison' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'akonadi-qt4')
-conflicts=('kdepimlibs')
-provides=('kdepimlibs')
-replaces=('kdepimlibs')
-install='kdepimlibs4.install'
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepimlibs-${pkgver}.tar.xz")
-sha1sums=('8db2f59b8a33f4d1bbebfdff8b772d30669c9932')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kdepimlibs-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-
-# Conflicts with KF5
- rm -r "$pkgdir"/usr/{bin,share/config.kcfg}
-}
Copied: kdepimlibs4/repos/extra-i686/PKGBUILD (from rev 246016, kdepimlibs4/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-09-13 21:20:34 UTC (rev 246017)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepimlibs4
+pkgver=4.14.10
+_kdeappver=15.04.3
+pkgrel=4
+pkgdesc="KDE4 PIM Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdepimlibs'
+license=('GPL' 'LGPL')
+depends=('kdelibs' 'gpgme' 'libakonadi-qt4' 'libical' 'prison' 'qjson')
+makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'akonadi-qt4')
+conflicts=('kdepimlibs')
+provides=('kdepimlibs')
+replaces=('kdepimlibs')
+install='kdepimlibs4.install'
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepimlibs-${pkgver}.tar.xz"
+ kdepimlibs4-bug338658-1.patch::"https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain"
+ kdepimlibs4-bug338658-2.patch::"https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain")
+sha1sums=('8db2f59b8a33f4d1bbebfdff8b772d30669c9932'
+ '453bc1b79453336c6a02babfc44ce8381eebc40a'
+ '0df47345dd630aa2f31a62f8cf0c062df3c25c67')
+
+prepare() {
+ mkdir -p build
+
+# Fix https://bugs.kde.org/show_bug.cgi?id=338658
+ cd kdepimlibs-$pkgver
+ patch -p1 -i ../kdepimlibs4-bug338658-1.patch
+ patch -p1 -i ../kdepimlibs4-bug338658-2.patch
+}
+
+build() {
+ cd build
+ cmake ../kdepimlibs-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+# Conflicts with KF5
+ rm -r "$pkgdir"/usr/{bin,share/config.kcfg}
+}
Deleted: extra-i686/kdepimlibs4.install
===================================================================
--- extra-i686/kdepimlibs4.install 2015-09-13 21:19:36 UTC (rev 246016)
+++ extra-i686/kdepimlibs4.install 2015-09-13 21:20:34 UTC (rev 246017)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
\ No newline at end of file
Copied: kdepimlibs4/repos/extra-i686/kdepimlibs4.install (from rev 246016, kdepimlibs4/trunk/kdepimlibs4.install)
===================================================================
--- extra-i686/kdepimlibs4.install (rev 0)
+++ extra-i686/kdepimlibs4.install 2015-09-13 21:20:34 UTC (rev 246017)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
\ No newline at end of file
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-09-13 21:19:36 UTC (rev 246016)
+++ extra-x86_64/PKGBUILD 2015-09-13 21:20:34 UTC (rev 246017)
@@ -1,43 +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=kdepimlibs4
-pkgver=4.14.10
-_kdeappver=15.04.3
-pkgrel=3
-pkgdesc="KDE4 PIM Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepimlibs'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'libakonadi-qt4' 'libical' 'prison' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'akonadi-qt4')
-conflicts=('kdepimlibs')
-provides=('kdepimlibs')
-replaces=('kdepimlibs')
-install='kdepimlibs4.install'
-source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepimlibs-${pkgver}.tar.xz")
-sha1sums=('8db2f59b8a33f4d1bbebfdff8b772d30669c9932')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../kdepimlibs-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-
-# Conflicts with KF5
- rm -r "$pkgdir"/usr/{bin,share/config.kcfg}
-}
Copied: kdepimlibs4/repos/extra-x86_64/PKGBUILD (from rev 246016, kdepimlibs4/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-09-13 21:20:34 UTC (rev 246017)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepimlibs4
+pkgver=4.14.10
+_kdeappver=15.04.3
+pkgrel=4
+pkgdesc="KDE4 PIM Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdepimlibs'
+license=('GPL' 'LGPL')
+depends=('kdelibs' 'gpgme' 'libakonadi-qt4' 'libical' 'prison' 'qjson')
+makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'akonadi-qt4')
+conflicts=('kdepimlibs')
+provides=('kdepimlibs')
+replaces=('kdepimlibs')
+install='kdepimlibs4.install'
+source=("http://download.kde.org/stable/applications/${_kdeappver}/src/kdepimlibs-${pkgver}.tar.xz"
+ kdepimlibs4-bug338658-1.patch::"https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=4429619&o=plain"
+ kdepimlibs4-bug338658-2.patch::"https://quickgit.kde.org/?p=kdepimlibs.git&a=commitdiff&h=d8b5da7&o=plain")
+sha1sums=('8db2f59b8a33f4d1bbebfdff8b772d30669c9932'
+ '453bc1b79453336c6a02babfc44ce8381eebc40a'
+ '0df47345dd630aa2f31a62f8cf0c062df3c25c67')
+
+prepare() {
+ mkdir -p build
+
+# Fix https://bugs.kde.org/show_bug.cgi?id=338658
+ cd kdepimlibs-$pkgver
+ patch -p1 -i ../kdepimlibs4-bug338658-1.patch
+ patch -p1 -i ../kdepimlibs4-bug338658-2.patch
+}
+
+build() {
+ cd build
+ cmake ../kdepimlibs-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+# Conflicts with KF5
+ rm -r "$pkgdir"/usr/{bin,share/config.kcfg}
+}
Deleted: extra-x86_64/kdepimlibs4.install
===================================================================
--- extra-x86_64/kdepimlibs4.install 2015-09-13 21:19:36 UTC (rev 246016)
+++ extra-x86_64/kdepimlibs4.install 2015-09-13 21:20:34 UTC (rev 246017)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
\ No newline at end of file
Copied: kdepimlibs4/repos/extra-x86_64/kdepimlibs4.install (from rev 246016, kdepimlibs4/trunk/kdepimlibs4.install)
===================================================================
--- extra-x86_64/kdepimlibs4.install (rev 0)
+++ extra-x86_64/kdepimlibs4.install 2015-09-13 21:20:34 UTC (rev 246017)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
\ No newline at end of file
More information about the arch-commits
mailing list