pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
lxqt-globalkeys, fix build with Qt>=5.14
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Fri Jan 31 13:08:31 2020 +0100
Changeset: 9d105048a048340802bfb5ef023e2dd032308217
Modified Files:
lxqt-globalkeys/Makefile
lxqt-globalkeys/PLIST
lxqt-globalkeys/buildlink3.mk
lxqt-globalkeys/distinfo
Added Files:
lxqt-globalkeys/patches/patch-daemon_core.cpp
Log Message:
lxqt-globalkeys, fix build with Qt>=5.14
Fix build.
Add maintainer.
Clean Makefile.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9d105048a048340802bfb5ef023e2dd032308217
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lxqt-globalkeys/Makefile | 15 ++-------------
lxqt-globalkeys/PLIST | 2 +-
lxqt-globalkeys/buildlink3.mk | 1 -
lxqt-globalkeys/distinfo | 1 +
lxqt-globalkeys/patches/patch-daemon_core.cpp | 14 ++++++++++++++
5 files changed, 18 insertions(+), 15 deletions(-)
diffs:
diff --git a/lxqt-globalkeys/Makefile b/lxqt-globalkeys/Makefile
index 8bbb29bc43..ef60a73513 100644
--- a/lxqt-globalkeys/Makefile
+++ b/lxqt-globalkeys/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11
MASTER_SITES= https://downloads.lxqt.org/downloads/lxqt-globalkeys/0.14.3/
EXTRACT_SUFX= .tar.xz
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= voidpin%protonmail.com@localhost
HOMEPAGE= https://lxqt.org/
COMMENT= Daemon and library for global keyboard shortcuts registration
LICENSE= gnu-lgpl-v2.1
@@ -17,25 +17,14 @@ USE_LANGUAGES= c c++
CONFIGURE_DIRS= build
CMAKE_ARG_PATH= ..
-EGDIR= share/examples/lxqt-globalkeys
-PKG_SYSCONFSUBDIR= xdg
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/autostart
-CONF_FILES= ${EGDIR}/xdg/autostart/lxqt-globalkeyshortcuts.desktop \
- ${PKG_SYSCONFDIR}/autostart/lxqt-globalkeyshortcuts.desktop
-
-SUBST_CLASSES+= conf
-SUBST_FILES.conf= autostart/CMakeLists.txt
-SUBST_SED.conf= -e 's,$${LXQT_ETC_XDG_DIR}/,${EGDIR}/xdg/,'
-SUBST_STAGE.conf= pre-configure
-
INSTALLATION_DIRS+= bin lib
pre-configure:
${MKDIR} -p ${WRKSRC}/build
TOOL_DEPENDS+= lxqt-build-tools-[0-9]*:../../wip/lxqt-build-tools
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
.include "../../wip/liblxqt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lxqt-globalkeys/PLIST b/lxqt-globalkeys/PLIST
index b9748e5c69..5cb374ae81 100644
--- a/lxqt-globalkeys/PLIST
+++ b/lxqt-globalkeys/PLIST
@@ -28,7 +28,7 @@ share/cmake/lxqt-globalkeys/lxqt-globalkeys-config-version.cmake
share/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake
share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets-release.cmake
share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets.cmake
-share/examples/lxqt-globalkeys/xdg/autostart/lxqt-globalkeyshortcuts.desktop
+share/examples/lxqt/xdg/autostart/lxqt-globalkeyshortcuts.desktop
share/lxqt/globalkeyshortcuts.conf
share/lxqt/translations/lxqt-config-globalkeyshortcuts/lxqt-config-globalkeyshortcuts_ar.qm
share/lxqt/translations/lxqt-config-globalkeyshortcuts/lxqt-config-globalkeyshortcuts_ast.qm
diff --git a/lxqt-globalkeys/buildlink3.mk b/lxqt-globalkeys/buildlink3.mk
index 8626d18292..0541ccfcd4 100644
--- a/lxqt-globalkeys/buildlink3.mk
+++ b/lxqt-globalkeys/buildlink3.mk
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.lxqt-globalkeys+= lxqt-globalkeys>=0.14.3
BUILDLINK_PKGSRCDIR.lxqt-globalkeys?= ../../wip/lxqt-globalkeys
.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
.include "../../wip/liblxqt/buildlink3.mk"
.endif # LXQT_GLOBALKEYS_BUILDLINK3_MK
diff --git a/lxqt-globalkeys/distinfo b/lxqt-globalkeys/distinfo
index beb9959102..bb086659f7 100644
--- a/lxqt-globalkeys/distinfo
+++ b/lxqt-globalkeys/distinfo
@@ -4,3 +4,4 @@ SHA1 (lxqt-globalkeys-0.14.3.tar.xz) = e90b0b15f9cc3b178e7fd004c158b385fd644990
RMD160 (lxqt-globalkeys-0.14.3.tar.xz) = 66b1548582e033fd48ae71bb2d6bda7fbb6a4bcf
SHA512 (lxqt-globalkeys-0.14.3.tar.xz) = 205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c
Size (lxqt-globalkeys-0.14.3.tar.xz) = 67928 bytes
+SHA1 (patch-daemon_core.cpp) = 40af10825274060fcce20d59191eb2c9d254bc23
diff --git a/lxqt-globalkeys/patches/patch-daemon_core.cpp b/lxqt-globalkeys/patches/patch-daemon_core.cpp
new file mode 100644
index 0000000000..cb777f2012
--- /dev/null
+++ b/lxqt-globalkeys/patches/patch-daemon_core.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix build with Qt5>=5.14
+
+--- daemon/core.cpp.orig 2019-10-16 15:17:40.000000000 +0000
++++ daemon/core.cpp
+@@ -30,6 +30,7 @@
+ #include <QScopedArrayPointer>
+ #include <QSettings>
+ #include <QStandardPaths>
++#include <QFile>
+ #include <QTimer>
+ #include <QDBusConnectionInterface>
+ #include <QDBusServiceWatcher>
Home |
Main Index |
Thread Index |
Old Index