[arch-commits] Commit in ksystemlog/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Fri Mar 25 18:24:36 UTC 2016
Date: Friday, March 25, 2016 @ 19:24:36
Author: arojas
Revision: 262551
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ksystemlog/repos/extra-i686/PKGBUILD
(from rev 262550, ksystemlog/trunk/PKGBUILD)
ksystemlog/repos/extra-i686/ksystemlog-journald.patch
(from rev 262550, ksystemlog/trunk/ksystemlog-journald.patch)
ksystemlog/repos/extra-x86_64/PKGBUILD
(from rev 262550, ksystemlog/trunk/PKGBUILD)
ksystemlog/repos/extra-x86_64/ksystemlog-journald.patch
(from rev 262550, ksystemlog/trunk/ksystemlog-journald.patch)
Deleted:
ksystemlog/repos/extra-i686/PKGBUILD
ksystemlog/repos/extra-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 86 +++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 38 -------------
extra-i686/ksystemlog-journald.patch | 11 +++
extra-x86_64/PKGBUILD | 38 -------------
extra-x86_64/ksystemlog-journald.patch | 11 +++
5 files changed, 108 insertions(+), 76 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-03-25 18:23:45 UTC (rev 262550)
+++ extra-i686/PKGBUILD 2016-03-25 18:24:36 UTC (rev 262551)
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 250288 2015-11-09 21:13:39Z arojas $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=ksystemlog
-pkgver=15.12.3
-pkgrel=1
-pkgdesc='System log viewer tool'
-url='http://kde.org/applications/system/ksystemlog/'
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdeadmin)
-depends=(kio)
-makedepends=(extra-cmake-modules kdoctools)
-conflicts=(kdeadmin-ksystemlog)
-replaces=(kdeadmin-ksystemlog)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-sha1sums=('990dec653a88244730092a2dbf4a939bb9cefd58')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: ksystemlog/repos/extra-i686/PKGBUILD (from rev 262550, ksystemlog/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-03-25 18:24:36 UTC (rev 262551)
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 250288 2015-11-09 21:13:39Z arojas $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=ksystemlog
+pkgver=15.12.3
+pkgrel=2
+pkgdesc='System log viewer tool'
+url='http://kde.org/applications/system/ksystemlog/'
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdeadmin)
+depends=(kio)
+makedepends=(extra-cmake-modules kdoctools)
+conflicts=(kdeadmin-ksystemlog)
+replaces=(kdeadmin-ksystemlog)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" ksystemlog-journald.patch)
+sha1sums=('990dec653a88244730092a2dbf4a939bb9cefd58'
+ 'd6b038965066374a71cb1d215e55769f9652c7f4')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Fix journald detection
+ patch -p1 -i ../ksystemlog-journald.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: ksystemlog/repos/extra-i686/ksystemlog-journald.patch (from rev 262550, ksystemlog/trunk/ksystemlog-journald.patch)
===================================================================
--- extra-i686/ksystemlog-journald.patch (rev 0)
+++ extra-i686/ksystemlog-journald.patch 2016-03-25 18:24:36 UTC (rev 262551)
@@ -0,0 +1,11 @@
+--- ksystemlog-15.12.3/cmake/FindJournald.cmake.orig 2016-03-25 18:16:30.817009024 +0000
++++ ksystemlog-15.12.3/cmake/FindJournald.cmake 2016-03-25 18:16:45.643603099 +0000
+@@ -15,7 +15,7 @@
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+-pkg_check_modules(PC_JOURNALD QUIET libsystemd-journal)
++pkg_check_modules(PC_JOURNALD QUIET libsystemd)
+
+ set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
+ set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-03-25 18:23:45 UTC (rev 262550)
+++ extra-x86_64/PKGBUILD 2016-03-25 18:24:36 UTC (rev 262551)
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 250288 2015-11-09 21:13:39Z arojas $
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=ksystemlog
-pkgver=15.12.3
-pkgrel=1
-pkgdesc='System log viewer tool'
-url='http://kde.org/applications/system/ksystemlog/'
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdeadmin)
-depends=(kio)
-makedepends=(extra-cmake-modules kdoctools)
-conflicts=(kdeadmin-ksystemlog)
-replaces=(kdeadmin-ksystemlog)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-sha1sums=('990dec653a88244730092a2dbf4a939bb9cefd58')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DBUILD_TESTING=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: ksystemlog/repos/extra-x86_64/PKGBUILD (from rev 262550, ksystemlog/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-03-25 18:24:36 UTC (rev 262551)
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 250288 2015-11-09 21:13:39Z arojas $
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=ksystemlog
+pkgver=15.12.3
+pkgrel=2
+pkgdesc='System log viewer tool'
+url='http://kde.org/applications/system/ksystemlog/'
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdeadmin)
+depends=(kio)
+makedepends=(extra-cmake-modules kdoctools)
+conflicts=(kdeadmin-ksystemlog)
+replaces=(kdeadmin-ksystemlog)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz" ksystemlog-journald.patch)
+sha1sums=('990dec653a88244730092a2dbf4a939bb9cefd58'
+ 'd6b038965066374a71cb1d215e55769f9652c7f4')
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+# Fix journald detection
+ patch -p1 -i ../ksystemlog-journald.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TESTING=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: ksystemlog/repos/extra-x86_64/ksystemlog-journald.patch (from rev 262550, ksystemlog/trunk/ksystemlog-journald.patch)
===================================================================
--- extra-x86_64/ksystemlog-journald.patch (rev 0)
+++ extra-x86_64/ksystemlog-journald.patch 2016-03-25 18:24:36 UTC (rev 262551)
@@ -0,0 +1,11 @@
+--- ksystemlog-15.12.3/cmake/FindJournald.cmake.orig 2016-03-25 18:16:30.817009024 +0000
++++ ksystemlog-15.12.3/cmake/FindJournald.cmake 2016-03-25 18:16:45.643603099 +0000
+@@ -15,7 +15,7 @@
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+-pkg_check_modules(PC_JOURNALD QUIET libsystemd-journal)
++pkg_check_modules(PC_JOURNALD QUIET libsystemd)
+
+ set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
+ set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
More information about the arch-commits
mailing list