From a6fcc2cda9da5b671163acb2de0044ab80c3da0e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 16 Apr 2020 10:58:08 +0100
Subject: lxqt-base/lxqt-globalkeys : version bump, fix building against qt
 5.14

---
 lxqt-base/lxqt-globalkeys/Manifest                 |  2 +-
 .../lxqt-globalkeys-0.14.1-qt-5.14-build.patch     | 21 +++++++++++
 .../lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild  | 40 ---------------------
 .../lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild  | 42 ++++++++++++++++++++++
 4 files changed, 64 insertions(+), 41 deletions(-)
 create mode 100644 lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
 delete mode 100644 lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
 create mode 100644 lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild

(limited to 'lxqt-base')

diff --git a/lxqt-base/lxqt-globalkeys/Manifest b/lxqt-base/lxqt-globalkeys/Manifest
index 7e71785c..e89f4520 100644
--- a/lxqt-base/lxqt-globalkeys/Manifest
+++ b/lxqt-base/lxqt-globalkeys/Manifest
@@ -1 +1 @@
-DIST lxqt-globalkeys-0.14.1.tar.xz 63496 BLAKE2B 9186b04d290260503a133f4baf9e4156abc056647687f518eaf460c8bd0e4e48d7f4639d1f51ab87f9adc1e2139f0315940eb3da5d098b3b0824e98ae97eee90 SHA512 7683971a916adb0dff8efd5567dad11e0860e48960bb6ed650aa2cd8e1bc33f7b8cbff95e19f198e00b61eea4f7492b41e7a0acf19365143c1c0ce8ea0cbb2a3
+DIST lxqt-globalkeys-0.14.3.tar.xz 67928 BLAKE2B 0298d393b17801a6dc9923299ab8ec8dc27368da0ff2514910e4e04e9a7788e09e9a6a097f4d7cb46f6e120537d4e7ebf0e50ec766086cb086bd9e871c2115b4 SHA512 205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c
diff --git a/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
new file mode 100644
index 00000000..b545f5de
--- /dev/null
+++ b/lxqt-base/lxqt-globalkeys/files/lxqt-globalkeys-0.14.1-qt-5.14-build.patch
@@ -0,0 +1,21 @@
+From c9ec69850428e599fba282c32e51868b815e3019 Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125@gmail.com>
+Date: Sun, 15 Dec 2019 09:33:12 +0800
+Subject: [PATCH] Fix building with Qt 5.14
+
+---
+ daemon/core.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/daemon/core.cpp b/daemon/core.cpp
+index 1be64ec..53bdf7b 100644
+--- a/daemon/core.cpp
++++ b/daemon/core.cpp
+@@ -33,6 +33,7 @@
+ #include <QTimer>
+ #include <QDBusConnectionInterface>
+ #include <QDBusServiceWatcher>
++#include <QFile>
+ 
+ #include <cstddef>
+ #include <cstdlib>
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
deleted file mode 100644
index 0ff7554b..00000000
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=lxqt-base/lxqt-build-tools-0.6.0
-"
-DEPEND="
-	>=dev-libs/libqtxdg-3.3.1
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	=lxqt-base/liblxqt-$(ver_cut 1-2)*
-	kde-frameworks/kwindowsystem:5
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
new file mode 100644
index 00000000..76c6d65d
--- /dev/null
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.14.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=lxqt-base/lxqt-build-tools-0.6.0
+"
+DEPEND="
+	>=dev-libs/libqtxdg-3.3.1
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	=lxqt-base/liblxqt-$(ver_cut 1-2)*
+	kde-frameworks/kwindowsystem:5
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.14.1-qt-5.14-build.patch" )
-- 
cgit v1.2.3