[arch-commits] Commit in kservice/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Sat Sep 19 09:05:19 UTC 2015
Date: Saturday, September 19, 2015 @ 11:05:18
Author: arojas
Revision: 246567
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
kservice/repos/testing-i686/PKGBUILD
(from rev 246566, kservice/trunk/PKGBUILD)
kservice/repos/testing-i686/timestamp.patch
(from rev 246566, kservice/trunk/timestamp.patch)
kservice/repos/testing-x86_64/PKGBUILD
(from rev 246566, kservice/trunk/PKGBUILD)
kservice/repos/testing-x86_64/timestamp.patch
(from rev 246566, kservice/trunk/timestamp.patch)
Deleted:
kservice/repos/testing-i686/PKGBUILD
kservice/repos/testing-x86_64/PKGBUILD
--------------------------------+
/PKGBUILD | 82 +++++++++++++++++++++++++++++++++++++++
testing-i686/PKGBUILD | 36 -----------------
testing-i686/timestamp.patch | 27 ++++++++++++
testing-x86_64/PKGBUILD | 36 -----------------
testing-x86_64/timestamp.patch | 27 ++++++++++++
5 files changed, 136 insertions(+), 72 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2015-09-19 09:04:43 UTC (rev 246566)
+++ testing-i686/PKGBUILD 2015-09-19 09:05:18 UTC (rev 246567)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kservice
-pkgver=5.14.2
-pkgrel=1
-pkgdesc='Advanced plugin and service introspection'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kservice'
-license=('LGPL')
-depends=('ki18n' 'kconfig' 'kcrash' 'kdbusaddons')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('eca764e18afbcef5496183c96c613c91')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kservice/repos/testing-i686/PKGBUILD (from rev 246566, kservice/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-09-19 09:05:18 UTC (rev 246567)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kservice
+pkgver=5.14.2
+pkgrel=2
+pkgdesc='Advanced plugin and service introspection'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kservice'
+license=('LGPL')
+depends=('ki18n' 'kconfig' 'kcrash' 'kdbusaddons')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+groups=('kf5')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" timestamp.patch)
+md5sums=('eca764e18afbcef5496183c96c613c91'
+ 'b77b056fb6bb5adba72702fddf0feff8')
+
+prepare() {
+ mkdir -p build
+
+# Fix kbuildsycoca infinite loop https://bugs.kde.org/show_bug.cgi?id=352854
+ cd $pkgname-$pkgver
+ patch -p1 -i ../timestamp.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kservice/repos/testing-i686/timestamp.patch (from rev 246566, kservice/trunk/timestamp.patch)
===================================================================
--- testing-i686/timestamp.patch (rev 0)
+++ testing-i686/timestamp.patch 2015-09-19 09:05:18 UTC (rev 246567)
@@ -0,0 +1,27 @@
+diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
+index 827ac96..6d34235 100644
+--- a/src/kbuildsycoca/kbuildsycoca.cpp
++++ b/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -515,7 +515,7 @@ void KBuildSycoca::save(QDataStream *str)
+ (*str) << qint32(0); // No more factories.
+ // Write XDG_DATA_DIRS
+ (*str) << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).join(QString(QLatin1Char(':')));
+- (*str) << (quint32)newTimestamp / 1000; // TODO just newTimestamp when using a new filename
++ (*str) << (quint32)(newTimestamp / 1000); // TODO just newTimestamp when using a new filename
+ (*str) << QLocale().bcp47Name();
+ // This makes it possible to trigger a ksycoca update for all users (KIOSK feature)
+ (*str) << calcResourceHash(QStringLiteral("kservices5"), QStringLiteral("update_ksycoca"));
+diff --git a/src/sycoca/ksycoca.cpp b/src/sycoca/ksycoca.cpp
+index 81c875d..44984fa 100644
+--- a/src/sycoca/ksycoca.cpp
++++ b/src/sycoca/ksycoca.cpp
+@@ -505,7 +505,7 @@ KSycoca::KSycocaHeader KSycocaPrivate::readSycocaHeader()
+ KSycocaUtilsPrivate::read(*str, header.prefixes);
+ quint32 oldTimeStamp; // compat code --> TODO remove this when switching to a different fileName
+ *str >> oldTimeStamp;
+- header.timeStamp = oldTimeStamp * 1000;
++ header.timeStamp = static_cast<quint64>(oldTimeStamp) * 1000;
+ KSycocaUtilsPrivate::read(*str, header.language);
+ *str >> header.updateSignature;
+ KSycocaUtilsPrivate::read(*str, allResourceDirs);
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2015-09-19 09:04:43 UTC (rev 246566)
+++ testing-x86_64/PKGBUILD 2015-09-19 09:05:18 UTC (rev 246567)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kservice
-pkgver=5.14.2
-pkgrel=1
-pkgdesc='Advanced plugin and service introspection'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kservice'
-license=('LGPL')
-depends=('ki18n' 'kconfig' 'kcrash' 'kdbusaddons')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('eca764e18afbcef5496183c96c613c91')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kservice/repos/testing-x86_64/PKGBUILD (from rev 246566, kservice/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-09-19 09:05:18 UTC (rev 246567)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kservice
+pkgver=5.14.2
+pkgrel=2
+pkgdesc='Advanced plugin and service introspection'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kservice'
+license=('LGPL')
+depends=('ki18n' 'kconfig' 'kcrash' 'kdbusaddons')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+groups=('kf5')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" timestamp.patch)
+md5sums=('eca764e18afbcef5496183c96c613c91'
+ 'b77b056fb6bb5adba72702fddf0feff8')
+
+prepare() {
+ mkdir -p build
+
+# Fix kbuildsycoca infinite loop https://bugs.kde.org/show_bug.cgi?id=352854
+ cd $pkgname-$pkgver
+ patch -p1 -i ../timestamp.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kservice/repos/testing-x86_64/timestamp.patch (from rev 246566, kservice/trunk/timestamp.patch)
===================================================================
--- testing-x86_64/timestamp.patch (rev 0)
+++ testing-x86_64/timestamp.patch 2015-09-19 09:05:18 UTC (rev 246567)
@@ -0,0 +1,27 @@
+diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
+index 827ac96..6d34235 100644
+--- a/src/kbuildsycoca/kbuildsycoca.cpp
++++ b/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -515,7 +515,7 @@ void KBuildSycoca::save(QDataStream *str)
+ (*str) << qint32(0); // No more factories.
+ // Write XDG_DATA_DIRS
+ (*str) << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).join(QString(QLatin1Char(':')));
+- (*str) << (quint32)newTimestamp / 1000; // TODO just newTimestamp when using a new filename
++ (*str) << (quint32)(newTimestamp / 1000); // TODO just newTimestamp when using a new filename
+ (*str) << QLocale().bcp47Name();
+ // This makes it possible to trigger a ksycoca update for all users (KIOSK feature)
+ (*str) << calcResourceHash(QStringLiteral("kservices5"), QStringLiteral("update_ksycoca"));
+diff --git a/src/sycoca/ksycoca.cpp b/src/sycoca/ksycoca.cpp
+index 81c875d..44984fa 100644
+--- a/src/sycoca/ksycoca.cpp
++++ b/src/sycoca/ksycoca.cpp
+@@ -505,7 +505,7 @@ KSycoca::KSycocaHeader KSycocaPrivate::readSycocaHeader()
+ KSycocaUtilsPrivate::read(*str, header.prefixes);
+ quint32 oldTimeStamp; // compat code --> TODO remove this when switching to a different fileName
+ *str >> oldTimeStamp;
+- header.timeStamp = oldTimeStamp * 1000;
++ header.timeStamp = static_cast<quint64>(oldTimeStamp) * 1000;
+ KSycocaUtilsPrivate::read(*str, header.language);
+ *str >> header.updateSignature;
+ KSycocaUtilsPrivate::read(*str, allResourceDirs);
+
More information about the arch-commits
mailing list