Download raw body.
[update/wip] x11/lxqt 2.0.0
On Fri May 17, 2024 at 02:07:00PM GMT, Landry Breuil wrote:
> Le Thu, Apr 18, 2024 at 07:48:01PM +0200, Landry Breuil a écrit :
> > hi,
> >
> > so our lxqt port is quite outdated/unmaintained. rafael had a wip in
> > https://github.com/sizeofvoid/wip-ports/commit/79f5e47c05c4a8341e7873dd850e2077ca5e7293
> >
> > upstream just released the new qt6-based version:
> > https://lxqt-project.org/release/2024/04/15/release-lxqt-2-0-0/
> >
> > so i've taken rafael's work and updated it for qt6, so find attached:
> > - 4 new ports for new dependencies, build-tools2 is
> > https://github.com/lxqt/lxqt-build-tools/releases/tag/2.0.0 used by
> > all the components that migrated to qt6
> > - libdbusmenu is an lxqt fork of the qt5 libdbusmenu we have
> > - build-tools is kept for now because some bits haven't migrated away
> > from qt5 (the terminal, etc..)
> > - a large gzipped diff from x11/lxqt
>
> new version of the large gzipped diff with some 2.0.1/2.0.2 bugfix
> versions applied.
I Tested 2.0.0, Sorry!
>
> up-to-date wip packages still at
> doas env PKG_PATH=https://packages.rhaalovely.net/wip/%a/:installpath pkg_add lxqt lxqt-extras
>
> oks for the new ports (also attached) welcome !
>
> Landry
Tested with -current and it works for me. The following diff uses an
explicit LIB_DEPENDS list instead of an implicit one. For me this is
better to find errors. I leave it up to you to use it or not. I think
it's helpful and useful!
OK rsadowski to import new packages and update the current one.
Cheers, Rafael
diff --git a/x11/lxqt/about/Makefile b/x11/lxqt/about/Makefile
index 86553de641d..d9b66491037 100644
--- a/x11/lxqt/about/Makefile
+++ b/x11/lxqt/about/Makefile
@@ -6,7 +6,11 @@ WANTLIB += ${COMPILER_LIBCXX} GL KF6WindowSystem Qt6Core Qt6DBus
WANTLIB += Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml
WANTLIB += X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt m
-LIB_DEPENDS = x11/lxqt/liblxqt
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/config/Makefile b/x11/lxqt/config/Makefile
index a240d97f125..cdbd9626c61 100644
--- a/x11/lxqt/config/Makefile
+++ b/x11/lxqt/config/Makefile
@@ -8,8 +8,11 @@ WANTLIB += Qt6Xdg Qt6XdgIconLoader Qt6Xml SM X11 Xcursor Xext
WANTLIB += Xfixes c gio-2.0 glib-2.0 gobject-2.0 lxqt m xcb xcb-randr
WANTLIB += z
-LIB_DEPENDS = x11/kde-plasma/libkscreen \
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/kde-plasma/libkscreen \
x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2 \
diff --git a/x11/lxqt/globalkeys/Makefile b/x11/lxqt/globalkeys/Makefile
index d8217219a25..c027af3ff5f 100644
--- a/x11/lxqt/globalkeys/Makefile
+++ b/x11/lxqt/globalkeys/Makefile
@@ -9,7 +9,11 @@ WANTLIB += ${COMPILER_LIBCXX} GL ICE KF6WindowSystem Qt6Core Qt6DBus
WANTLIB += Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml
WANTLIB += SM X11 Xext c gio-2.0 glib-2.0 gobject-2.0 lxqt m
-LIB_DEPENDS = x11/lxqt/liblxqt
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/liblxqt/Makefile b/x11/lxqt/liblxqt/Makefile
index 1dc96ef507c..28a2d0778c1 100644
--- a/x11/lxqt/liblxqt/Makefile
+++ b/x11/lxqt/liblxqt/Makefile
@@ -8,8 +8,10 @@ WANTLIB += ${COMPILER_LIBCXX} GL KF6WindowSystem Qt6Core Qt6DBus
WANTLIB += Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml
WANTLIB += X11 Xss c gio-2.0 glib-2.0 gobject-2.0 m
-LIB_DEPENDS = devel/kf6/kwindowsystem \
- x11/lxqt/libqtxdg>=4.0.0
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/lxqt/libqtxdg>=4.0.0 \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2 \
x11/polkit-qt
diff --git a/x11/lxqt/libqtxdg/Makefile b/x11/lxqt/libqtxdg/Makefile
index 1a290f3d4e7..b327c1bb0e7 100644
--- a/x11/lxqt/libqtxdg/Makefile
+++ b/x11/lxqt/libqtxdg/Makefile
@@ -10,7 +10,8 @@ SHARED_LIBS += Qt6XdgIconLoader 0.0 # 3.8
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Svg
WANTLIB += Qt6Widgets Qt6Xml gio-2.0 glib-2.0 gobject-2.0 m
-LIB_DEPENDS = x11/qt6/qtsvg
+LIB_DEPENDS = devel/glib2 \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/notificationd/Makefile b/x11/lxqt/notificationd/Makefile
index f0405a6f5d2..eb1cc47b702 100644
--- a/x11/lxqt/notificationd/Makefile
+++ b/x11/lxqt/notificationd/Makefile
@@ -6,9 +6,12 @@ WANTLIB += ${COMPILER_LIBCXX} GL KF6WindowSystem LayerShellQtInterface
WANTLIB += Qt6Core Qt6DBus Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader
WANTLIB += Qt6Xml X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt m
-LIB_DEPENDS = x11/lxqt/liblxqt \
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
x11/kde-plasma/layer-shell-qt \
- devel/kf6/kwindowsystem
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/obconf-qt/Makefile b/x11/lxqt/obconf-qt/Makefile
index 947cc3c7bc7..c74c68af655 100644
--- a/x11/lxqt/obconf-qt/Makefile
+++ b/x11/lxqt/obconf-qt/Makefile
@@ -11,8 +11,18 @@ WANTLIB += intl m obrender obt pango-1.0 pangoft2-1.0 pangoxft-1.0
WANTLIB += rsvg-2 xml2
MODULES += x11/qt5 devel/cmake
-LIB_DEPENDS = x11/qt5/qtx11extras \
- x11/openbox
+
+LIB_DEPENDS = devel/gettext,-runtime \
+ devel/glib2 \
+ devel/harfbuzz \
+ devel/pango \
+ graphics/cairo \
+ graphics/gdk-pixbuf2 \
+ graphics/imlib2 \
+ textproc/libxml \
+ x11/gnome/librsvg \
+ x11/openbox \
+ x11/qt5/qtx11extras
BUILD_DEPENDS = x11/lxqt/build-tools
diff --git a/x11/lxqt/openssh-askpass/Makefile b/x11/lxqt/openssh-askpass/Makefile
index 0c94dc5a4fe..0d9e62db656 100644
--- a/x11/lxqt/openssh-askpass/Makefile
+++ b/x11/lxqt/openssh-askpass/Makefile
@@ -6,7 +6,11 @@ WANTLIB += ${COMPILER_LIBCXX} GL KF6WindowSystem Qt6Core Qt6DBus
WANTLIB += Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml
WANTLIB += X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt m
-LIB_DEPENDS = x11/lxqt/liblxqt
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/panel/Makefile b/x11/lxqt/panel/Makefile
index 00e6190082d..2cf7b950eed 100644
--- a/x11/lxqt/panel/Makefile
+++ b/x11/lxqt/panel/Makefile
@@ -10,14 +10,19 @@ WANTLIB += m pulse statgrab sysstat-qt6 xcb xcb-composite xcb-damage
WANTLIB += xcb-image xcb-randr xcb-render xcb-shape xcb-shm xcb-util
WANTLIB += xcb-xfixes xcb-xkb xkbcommon xkbcommon-x11
-LIB_DEPENDS = x11/lxqt/liblxqt>=2.0.0 \
+LIB_DEPENDS = audio/pulseaudio \
+ devel/glib2 \
+ devel/kf6/kwindowsystem \
+ devel/kf6/solid \
+ sysutils/libstatgrab \
+ x11/kde-plasma/layer-shell-qt \
x11/lxqt/globalkeys>=2.0.0 \
- x11/lxqt/libsysstat \
x11/lxqt/libdbusmenu \
- x11/kde-plasma/layer-shell-qt \
- sysutils/libstatgrab \
- devel/kf6/solid \
- audio/pulseaudio
+ x11/lxqt/liblxqt>=2.0.0 \
+ x11/lxqt/libqtxdg \
+ x11/lxqt/libsysstat \
+ x11/qt6/qtsvg \
+ x11/xkbcommon
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/pavucontrol-qt/Makefile b/x11/lxqt/pavucontrol-qt/Makefile
index d19521f971a..d7a181ec20c 100644
--- a/x11/lxqt/pavucontrol-qt/Makefile
+++ b/x11/lxqt/pavucontrol-qt/Makefile
@@ -5,7 +5,9 @@ NAME = pavucontrol-qt
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Widgets c glib-2.0
WANTLIB += intl m pulse pulse-mainloop-glib
-LIB_DEPENDS = audio/pulseaudio
+LIB_DEPENDS = audio/pulseaudio \
+ devel/gettext,-runtime \
+ devel/glib2
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/pcmanfm-qt/Makefile b/x11/lxqt/pcmanfm-qt/Makefile
index 8a158fef149..f06a6338d79 100644
--- a/x11/lxqt/pcmanfm-qt/Makefile
+++ b/x11/lxqt/pcmanfm-qt/Makefile
@@ -12,7 +12,10 @@ WANTLIB += xcb-screensaver xcb-shape xcb-shm xcb-sync xcb-util
WANTLIB += xcb-xf86dri xcb-xfixes xcb-xinerama xcb-xinput xcb-xkb
WANTLIB += xcb-xtest xcb-xv xcb-xvmc
-LIB_DEPENDS = x11/kde-plasma/layer-shell-qt \
+LIB_DEPENDS = devel/gettext,-runtime \
+ devel/glib2 \
+ graphics/libexif \
+ x11/kde-plasma/layer-shell-qt \
x11/lxqt/libfm-qt
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/policykit/Makefile b/x11/lxqt/policykit/Makefile
index 79b43481c84..c91f81e771b 100644
--- a/x11/lxqt/policykit/Makefile
+++ b/x11/lxqt/policykit/Makefile
@@ -7,8 +7,13 @@ WANTLIB += Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml
WANTLIB += X11 c gio-2.0 glib-2.0 gobject-2.0 intl lxqt m polkit-agent-1
WANTLIB += polkit-gobject-1 polkit-qt6-agent-1 polkit-qt6-core-1
-LIB_DEPENDS = x11/lxqt/liblxqt \
- x11/polkit-qt
+LIB_DEPENDS = devel/gettext,-runtime \
+ devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/polkit-qt \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/powermanagement/Makefile b/x11/lxqt/powermanagement/Makefile
index 13abc8fd1d2..7a323f8350d 100644
--- a/x11/lxqt/powermanagement/Makefile
+++ b/x11/lxqt/powermanagement/Makefile
@@ -7,11 +7,13 @@ WANTLIB += Qt6Core Qt6DBus Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader
WANTLIB += Qt6Xml X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt lxqt-globalkeys
WANTLIB += m xcb xcb-dpms xcb-screensaver
-LIB_DEPENDS = devel/kf6/kidletime \
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kidletime \
devel/kf6/kwindowsystem \
devel/kf6/solid \
x11/lxqt/globalkeys \
x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/qtplugin/patches/patch-src_lxqtplatformtheme_cpp b/x11/lxqt/qtplugin/patches/patch-src_lxqtplatformtheme_cpp
index 201416dd93c..9b501ee787c 100644
--- a/x11/lxqt/qtplugin/patches/patch-src_lxqtplatformtheme_cpp
+++ b/x11/lxqt/qtplugin/patches/patch-src_lxqtplatformtheme_cpp
@@ -1,7 +1,7 @@
Index: src/lxqtplatformtheme.cpp
--- src/lxqtplatformtheme.cpp.orig
+++ src/lxqtplatformtheme.cpp
-@@ -498,7 +498,7 @@ QStringList LXQtPlatformTheme::xdgIconThemePaths() con
+@@ -516,7 +516,7 @@ QStringList LXQtPlatformTheme::xdgIconThemePaths() con
QString xdgDataDirs = QFile::decodeName(qgetenv("XDG_DATA_DIRS"));
if (xdgDataDirs.isEmpty())
diff --git a/x11/lxqt/qtxdg-tools/Makefile b/x11/lxqt/qtxdg-tools/Makefile
index 1643e759c24..4c0dd340188 100644
--- a/x11/lxqt/qtxdg-tools/Makefile
+++ b/x11/lxqt/qtxdg-tools/Makefile
@@ -8,7 +8,8 @@ WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6DBus Qt6Gui Qt6Svg
WANTLIB += Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml c gio-2.0
WANTLIB += glib-2.0 gobject-2.0 m
-LIB_DEPENDS = x11/qt6/qtsvg \
+LIB_DEPENDS = devel/glib2 \
+ x11/qt6/qtsvg \
x11/lxqt/libqtxdg
BUILD_DEPENDS = x11/lxqt/build-tools2
diff --git a/x11/lxqt/runner/Makefile b/x11/lxqt/runner/Makefile
index 710b7682c57..e03de20a5b4 100644
--- a/x11/lxqt/runner/Makefile
+++ b/x11/lxqt/runner/Makefile
@@ -7,10 +7,14 @@ WANTLIB += Qt6Core Qt6DBus Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader
WANTLIB += Qt6Xml X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt lxqt-globalkeys
WANTLIB += lxqt-globalkeys-ui m muparser
-LIB_DEPENDS = x11/lxqt/globalkeys \
- x11/kde-plasma/layer-shell-qt \
+LIB_DEPENDS = devel/glib2 \
devel/kf6/kwindowsystem \
- math/muparser
+ math/muparser \
+ x11/kde-plasma/layer-shell-qt \
+ x11/lxqt/globalkeys \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2 \
x11/menu-cache
diff --git a/x11/lxqt/runner/pkg/PLIST b/x11/lxqt/runner/pkg/PLIST
index a0c7590c446..58f791ea8d0 100644
--- a/x11/lxqt/runner/pkg/PLIST
+++ b/x11/lxqt/runner/pkg/PLIST
@@ -7,8 +7,6 @@ share/examples/lxqt-runner/xdg/
share/examples/lxqt-runner/xdg/autostart/
share/examples/lxqt-runner/xdg/autostart/lxqt-runner.desktop
@sample ${SYSCONFDIR}/xdg/autostart/lxqt-runner.desktop
-share/lxqt/
-share/lxqt/translations/
share/lxqt/translations/lxqt-runner/
share/lxqt/translations/lxqt-runner/lxqt-runner_ar.qm
share/lxqt/translations/lxqt-runner/lxqt-runner_arn.qm
diff --git a/x11/lxqt/screengrab/Makefile b/x11/lxqt/screengrab/Makefile
index 3bbb357dcfa..83c38617e6c 100644
--- a/x11/lxqt/screengrab/Makefile
+++ b/x11/lxqt/screengrab/Makefile
@@ -11,9 +11,10 @@ WANTLIB += Qt6Gui Qt6Network Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader
WANTLIB += Qt6Xml SM X11 X11-xcb Xext c gio-2.0 glib-2.0 gobject-2.0
WANTLIB += m xcb xcb-shape xcb-xfixes
-LIB_DEPENDS = x11/qt6/qtsvg \
+LIB_DEPENDS = devel/glib \
+ devel/kf6/kwindowsystem \
x11/lxqt/libqtxdg \
- devel/kf6/kwindowsystem
+ x11/qt6/qtsvg
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
diff --git a/x11/lxqt/session/Makefile b/x11/lxqt/session/Makefile
index 1c1188fa535..eeb4eb7679d 100644
--- a/x11/lxqt/session/Makefile
+++ b/x11/lxqt/session/Makefile
@@ -7,11 +7,14 @@ WANTLIB += Qt6Core Qt6DBus Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader
WANTLIB += Qt6Xml SM X11 Xext c gio-2.0 glib-2.0 gobject-2.0 lxqt
WANTLIB += m
-LIB_DEPENDS = x11/lxqt/liblxqt \
- x11/kde-plasma/layer-shell-qt
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/kde-plasma/layer-shell-qt \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg>=4.0 \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/qtxdg-tools \
- x11/lxqt/libqtxdg>=4.0 \
x11/lxqt/build-tools2 \
devel/xdg-user-dirs
diff --git a/x11/lxqt/sudo/Makefile b/x11/lxqt/sudo/Makefile
index 394ed9dc6bb..af016f01d6f 100644
--- a/x11/lxqt/sudo/Makefile
+++ b/x11/lxqt/sudo/Makefile
@@ -6,7 +6,11 @@ WANTLIB += ${COMPILER_LIBCXX} GL KF6WindowSystem Qt6Core Qt6DBus
WANTLIB += Qt6Gui Qt6Svg Qt6Widgets Qt6Xdg Qt6XdgIconLoader Qt6Xml
WANTLIB += X11 c gio-2.0 glib-2.0 gobject-2.0 lxqt m util
-LIB_DEPENDS = x11/lxqt/liblxqt
+LIB_DEPENDS = devel/glib2 \
+ devel/kf6/kwindowsystem \
+ x11/lxqt/liblxqt \
+ x11/lxqt/libqtxdg \
+ x11/qt6/qtsvg
BUILD_DEPENDS = x11/lxqt/build-tools2
[update/wip] x11/lxqt 2.0.0