pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

liblxqt-0.14.1, fix build with Qt5>=5.14



Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Fri Jan 31 10:01:21 2020 +0100
Changeset:	669f5bfd8b50bf8626ab8dd167f92d49005d18db

Modified Files:
	liblxqt/Makefile
	liblxqt/buildlink3.mk
	liblxqt/distinfo
	libqtxdg/Makefile
Added Files:
	liblxqt/patches/patch-lxqtpowermanager.cpp

Log Message:
liblxqt-0.14.1, fix build with Qt5>=5.14

Fix build with Qt5>=5.14.
Remove unnecessary dependencies.
Add maintainer.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=669f5bfd8b50bf8626ab8dd167f92d49005d18db

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 liblxqt/Makefile                           |  4 ++--
 liblxqt/buildlink3.mk                      |  1 -
 liblxqt/distinfo                           |  1 +
 liblxqt/patches/patch-lxqtpowermanager.cpp | 14 ++++++++++++++
 libqtxdg/Makefile                          |  2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diffs:
diff --git a/liblxqt/Makefile b/liblxqt/Makefile
index 9cd3b39580..8f60d96453 100644
--- a/liblxqt/Makefile
+++ b/liblxqt/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	x11
 MASTER_SITES=	https://downloads.lxqt.org/downloads/liblxqt/0.14.1/
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	voidpin%protonmail.com@localhost
 HOMEPAGE=	https://lxqt.org/
 COMMENT=	Core utility library for all LXQt components
 LICENSE=	gnu-lgpl-v2.1
@@ -23,9 +23,9 @@ 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 "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../x11/kwindowsystem/buildlink3.mk"
 .include "../../wip/libqtxdg/buildlink3.mk"
diff --git a/liblxqt/buildlink3.mk b/liblxqt/buildlink3.mk
index 3be7b05264..486c11f6d6 100644
--- a/liblxqt/buildlink3.mk
+++ b/liblxqt/buildlink3.mk
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.liblxqt+=	liblxqt>=0.14.1
 BUILDLINK_PKGSRCDIR.liblxqt?=	../../wip/liblxqt
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../x11/kwindowsystem/buildlink3.mk"
 .include "../../wip/libqtxdg/buildlink3.mk"
diff --git a/liblxqt/distinfo b/liblxqt/distinfo
index cf199b2b89..31faeb7a68 100644
--- a/liblxqt/distinfo
+++ b/liblxqt/distinfo
@@ -4,3 +4,4 @@ SHA1 (liblxqt-0.14.1.tar.xz) = 7f6f777bae5fb09cd7b4de9de9ac94c18c3348af
 RMD160 (liblxqt-0.14.1.tar.xz) = 00c02fcfbd211fbaac060d862b4c9cab6e6c4a9a
 SHA512 (liblxqt-0.14.1.tar.xz) = 28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba
 Size (liblxqt-0.14.1.tar.xz) = 81704 bytes
+SHA1 (patch-lxqtpowermanager.cpp) = 953b450872c6d641e4da55b5135174191c050a8e
diff --git a/liblxqt/patches/patch-lxqtpowermanager.cpp b/liblxqt/patches/patch-lxqtpowermanager.cpp
new file mode 100644
index 0000000000..81a53f7c25
--- /dev/null
+++ b/liblxqt/patches/patch-lxqtpowermanager.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix build with Qt>=5.14
+
+--- lxqtpowermanager.cpp.orig	2019-02-24 00:13:58.000000000 +0000
++++ lxqtpowermanager.cpp
+@@ -31,6 +31,7 @@
+ #include <QMessageBox>
+ #include <QApplication>
+ #include <QDesktopWidget>
++#include <QFile>
+ #include <QtDebug>
+ #include "lxqttranslator.h"
+ #include "lxqtglobals.h"
diff --git a/libqtxdg/Makefile b/libqtxdg/Makefile
index d6049c52cc..c95b1c30eb 100644
--- a/libqtxdg/Makefile
+++ b/libqtxdg/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	x11
 MASTER_SITES=	https://downloads.lxqt.org/downloads/libqtxdg/3.4.0/
 EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	voidpin%protonmail.com@localhost
 HOMEPAGE=	https://lxqt.org/
 COMMENT=	Qt implementation of freedesktop.org xdg specs
 LICENSE=	gnu-lgpl-v2.1


Home | Main Index | Thread Index | Old Index