[arch-commits] Commit in lxqt-config/trunk (PKGBUILD fix-build.patch)

[Jerome Leclanche]

    Date: Monday, November 2, 2015 @ 15:30:33
  Author: jleclanche
Revision: 145645

upgpkg: lxqt-config 0.10.0-2

Upstream release 0.10.0

Modified:
  lxqt-config/trunk/PKGBUILD
Deleted:
  lxqt-config/trunk/fix-build.patch

-----------------+
 PKGBUILD        |   30 +++++++++++++++---------------
 fix-build.patch |   21 ---------------------
 2 files changed, 15 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-02 14:23:47 UTC (rev 145644)
+++ PKGBUILD	2015-11-02 14:30:33 UTC (rev 145645)
@@ -2,32 +2,32 @@
 # Maintainer: Jerome Leclanche <jerome at leclan.ch>
 
 pkgname=lxqt-config
-pkgver=0.9.0
+pkgver=0.10.0
 pkgrel=2
 pkgdesc="LXQt system configuration."
 arch=("i686" "x86_64")
 groups=("lxqt")
 url="http://lxqt.org"
-license=("GPL2")
-depends=("liblxqt" "libxcursor" "xorg-xrandr")
+license=("LGPL2.1")
+depends=("liblxqt" "libkscreen" "libxcursor" "qt5-svg")
 makedepends=("cmake" "qt5-tools")
-source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz"
-        "fix-build.patch")
-sha256sums=('9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913'
-            '276f04a31089e724793fae278238a397d5a1409fd8348cf529f3e75b47da94cc')
+source=(
+	"http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz"
+	"http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz.asc"
+)
+sha256sums=(
+	"4567be4653f2f1f9ff156126250a08d7b480f627fa1410484d49f65ba5dab9b4"
+	"SKIP"
+)
+validpgpkeys=("169704C6FB490C6892C7F23C37E0AF1FDA48F373")
 
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
 
-	# fix build with qt 5.5
-	# https://github.com/lxde/lxqt-config/commit/a5045dc9
-	patch -Np1 -i ../fix-build.patch
-}
-
 build() {
 	mkdir -p build
 	cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/$pkgname-$pkgver"
+	cmake "$srcdir/$pkgname-$pkgver" \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib
 	make
 }
 

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2015-11-02 14:23:47 UTC (rev 145644)
+++ fix-build.patch	2015-11-02 14:30:33 UTC (rev 145645)
@@ -1,21 +0,0 @@
-From a5045dc99d7fc3baad364cafa5a5a06cec69e29c Mon Sep 17 00:00:00 2001
-From: rezso <rezso at rezso.net>
-Date: Sun, 5 Jul 2015 20:38:44 +0200
-Subject: [PATCH] fix build with qt 5.5
-
----
- lxqt-config-monitor/monitor.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lxqt-config-monitor/monitor.h b/lxqt-config-monitor/monitor.h
-index 9f87bc0..b5df05b 100644
---- a/lxqt-config-monitor/monitor.h
-+++ b/lxqt-config-monitor/monitor.h
-@@ -20,6 +20,7 @@
- #ifndef _MONITOR_H_
- #define _MONITOR_H_
- 
-+#include <QObject>
- #include <QStringList>
- #include <QHash>
- #include <QList>