Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Feb 2023 22:18:15 GMT
From:      Felix Palmen <zirias@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cb5beb9b93f3 - main - sysutils/lxqt-config: Fix build after new plasma
Message-ID:  <202302202218.31KMIFhn068065@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cb5beb9b93f3896e2e439e8dbbed1b3b8da6c3b6

commit cb5beb9b93f3896e2e439e8dbbed1b3b8da6c3b6
Author:     Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2023-02-20 10:36:57 +0000
Commit:     Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2023-02-20 22:16:58 +0000

    sysutils/lxqt-config: Fix build after new plasma
    
    Approved by:            jsm (maintainer), tcberner (mentor)
    Differential Revision:  https://reviews.freebsd.org/D38692
---
 sysutils/lxqt-config/Makefile | 9 ++++++++-
 sysutils/lxqt-config/distinfo | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sysutils/lxqt-config/Makefile b/sysutils/lxqt-config/Makefile
index 00339da6c4c6..69c919215745 100644
--- a/sysutils/lxqt-config/Makefile
+++ b/sysutils/lxqt-config/Makefile
@@ -4,6 +4,9 @@ CATEGORIES=	sysutils
 MASTER_SITES=	LXQT
 DIST_SUBDIR=	lxqt
 
+PATCH_SITES=	https://github.com/lxqt/lxqt-config/commit/
+PATCHFILES=	6add4e4f0040693e7c4242fbae48c9d32007686c.patch:-p1
+
 MAINTAINER=	jsm@FreeBSD.org
 COMMENT=	LXQt system settings center
 WWW=		https://lxqt-project.org
@@ -14,7 +17,7 @@ LICENSE_COMB=	multi
 BUILD_DEPENDS=	${LOCALBASE}/lib/xorg/modules/input/libinput_drv.so:x11-drivers/xf86-input-libinput
 LIB_DEPENDS=	libudev.so:devel/libudev-devd
 
-USES=	cmake compiler:c++14-lang kde:5 localbase:ldflags lxqt qt:5 \
+USES=	cmake compiler:c++17-lang kde:5 localbase:ldflags lxqt qt:5 \
 	pkgconfig tar:xz xorg gnome
 USE_QT=	buildtools:build qmake:build concurrent core dbus \
 	gui linguisttools svg widgets x11extras xml
@@ -24,4 +27,8 @@ USE_LXQT=	buildtools lxqt
 USE_XORG=	ice sm x11 xcb xcursor xext xfixes xrandr xi
 USE_LDCONFIG=	yes
 
+# Override default of c++14 set by lxqt-buildtools
+# This is needed as KScreen introduced code requiring c++17
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF
+
 .include <bsd.port.mk>
diff --git a/sysutils/lxqt-config/distinfo b/sysutils/lxqt-config/distinfo
index 3c5a238b16eb..607b4f3b0b96 100644
--- a/sysutils/lxqt-config/distinfo
+++ b/sysutils/lxqt-config/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1669576857
+TIMESTAMP = 1676931074
 SHA256 (lxqt/lxqt-config-1.2.0.tar.xz) = 3e1c4edd6c3099aa9a15623d43ea81da6a0a7cf5bd894b1e2873dc1bac2a1640
 SIZE (lxqt/lxqt-config-1.2.0.tar.xz) = 364972
+SHA256 (lxqt/6add4e4f0040693e7c4242fbae48c9d32007686c.patch) = 3acb08d235e5e029b3c5c0286d4da63d0f188c6df0c097866eb57d4f7fdc8b07
+SIZE (lxqt/6add4e4f0040693e7c4242fbae48c9d32007686c.patch) = 2857



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302202218.31KMIFhn068065>