[arch-commits] Commit in lxqt-config (6 files)

Wed Jul 29 22:10:43 UTC 2015

Date: Thursday, July 30, 2015 @ 00:10:43
  Author: bgyorgy
Revision: 137600

Fix build with qt 5.5

Added:
  lxqt-config/repos/community-i686/fix-build.patch
  lxqt-config/repos/community-x86_64/fix-build.patch
  lxqt-config/trunk/fix-build.patch
Modified:
  lxqt-config/repos/community-i686/PKGBUILD
  lxqt-config/repos/community-x86_64/PKGBUILD
  lxqt-config/trunk/PKGBUILD

----------------------------------------+
 repos/community-i686/PKGBUILD          |   13 +++++++++++--
 repos/community-i686/fix-build.patch   |   21 +++++++++++++++++++++
 repos/community-x86_64/PKGBUILD        |   13 +++++++++++--
 repos/community-x86_64/fix-build.patch |   21 +++++++++++++++++++++
 trunk/PKGBUILD                         |   13 +++++++++++--
 trunk/fix-build.patch                  |   21 +++++++++++++++++++++
 6 files changed, 96 insertions(+), 6 deletions(-)

Modified: repos/community-i686/PKGBUILD
===================================================================

--- repos/community-i686/PKGBUILD	2015-07-29 16:43:35 UTC (rev 137599)
+++ repos/community-i686/PKGBUILD	2015-07-29 22:10:43 UTC (rev 137600)
@@ -11,10 +11,19 @@
 license=("GPL2")
 depends=("liblxqt" "libxcursor" "xorg-xrandr")
 makedepends=("cmake" "qt5-tools")
-source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz")
-sha256sums=("9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913")
+source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz"
+        "fix-build.patch")
+sha256sums=('9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913'
+            '276f04a31089e724793fae278238a397d5a1409fd8348cf529f3e75b47da94cc')
 
+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

Added: repos/community-i686/fix-build.patch
===================================================================
--- repos/community-i686/fix-build.patch	                        (rev 0)
+++ repos/community-i686/fix-build.patch	2015-07-29 22:10:43 UTC (rev 137600)
@@ -0,0 +1,21 @@
+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>

Modified: repos/community-x86_64/PKGBUILD
===================================================================
--- repos/community-x86_64/PKGBUILD	2015-07-29 16:43:35 UTC (rev 137599)
+++ repos/community-x86_64/PKGBUILD	2015-07-29 22:10:43 UTC (rev 137600)
@@ -11,10 +11,19 @@
 license=("GPL2")
 depends=("liblxqt" "libxcursor" "xorg-xrandr")
 makedepends=("cmake" "qt5-tools")
-source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz")
-sha256sums=("9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913")
+source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz"
+        "fix-build.patch")
+sha256sums=('9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913'
+            '276f04a31089e724793fae278238a397d5a1409fd8348cf529f3e75b47da94cc')
 
+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

Added: repos/community-x86_64/fix-build.patch
===================================================================
--- repos/community-x86_64/fix-build.patch	                        (rev 0)
+++ repos/community-x86_64/fix-build.patch	2015-07-29 22:10:43 UTC (rev 137600)
@@ -0,0 +1,21 @@
+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>

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2015-07-29 16:43:35 UTC (rev 137599)
+++ trunk/PKGBUILD	2015-07-29 22:10:43 UTC (rev 137600)
@@ -11,10 +11,19 @@
 license=("GPL2")
 depends=("liblxqt" "libxcursor" "xorg-xrandr")
 makedepends=("cmake" "qt5-tools")
-source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz")
-sha256sums=("9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913")
+source=("http://downloads.lxqt.org/lxqt/$pkgver/$pkgname-$pkgver.tar.xz"
+        "fix-build.patch")
+sha256sums=('9d6b0d21846ac5d9c62c5806ce04383b92708ab7bd095b46d0ac9fbb3f84b913'
+            '276f04a31089e724793fae278238a397d5a1409fd8348cf529f3e75b47da94cc')
 
+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

Added: trunk/fix-build.patch
===================================================================
--- trunk/fix-build.patch	                        (rev 0)
+++ trunk/fix-build.patch	2015-07-29 22:10:43 UTC (rev 137600)
@@ -0,0 +1,21 @@
+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>

