summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2022-05-22 19:18:20 +0200
committerFlorian Franzmann2022-05-23 18:01:26 +0200
commita94d6266569c6b1378006657794636155b92789a (patch)
treec908ee216d3f0d011f998306162d1853f77a4df1
parent97f6f96aff42b5a134a73f596bf6a95820be088e (diff)
x11/lightdm: remove dependency on qt4
-rwxr-xr-xx11/lightdm/BUILD7
-rwxr-xr-xx11/lightdm/DEPENDS8
-rw-r--r--x11/lightdm/HISTORY3
3 files changed, 7 insertions, 11 deletions
diff --git a/x11/lightdm/BUILD b/x11/lightdm/BUILD
index d3fcd72d2e..1343cad6ff 100755
--- a/x11/lightdm/BUILD
+++ b/x11/lightdm/BUILD
@@ -1,16 +1,15 @@
create_account lightdm &&
+
OPTS+=" --disable-dependency-tracking" &&
OPTS+=" --disable-static" &&
OPTS+=" --disable-tests" &&
OPTS+=" --with-user-session=lightdm-xsession" &&
OPTS+=" --with-greeter-user=lightdm" &&
OPTS+=" --with-html-dir=${INSTALL_ROOT}/usr/share/doc/${SPELL}/html" &&
-if is_depends_enabled $SPELL qt4;then
- export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
- export PATH+=":$QT4DIR/bin"
-fi &&
+
if is_depends_enabled $SPELL qtbase;then
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
export PATH+=":$QT5DIR/bin"
fi &&
+
default_build
diff --git a/x11/lightdm/DEPENDS b/x11/lightdm/DEPENDS
index c0ee2c50a8..7eec8948fb 100755
--- a/x11/lightdm/DEPENDS
+++ b/x11/lightdm/DEPENDS
@@ -25,13 +25,7 @@ optional_depends qtbase \
if is_depends_enabled $SPELL qtbase; then
depends -sub CXX gcc
fi &&
-optional_depends qt4 \
- '--enable-liblightdm-qt' \
- '--disable-liblightdm-qt' \
- 'enable LightDM client QT4 libraries' &&
-if is_depends_enabled $SPELL qt4; then
- depends -sub CXX gcc
-fi &&
+
optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \
'to build documentation' &&
optional_depends gobject-introspection \
diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY
index 38e3105d63..96dc597e62 100644
--- a/x11/lightdm/HISTORY
+++ b/x11/lightdm/HISTORY
@@ -1,3 +1,6 @@
+2022-05-22 Florian Franzmann <bwlf@bandrate.org>
+ * DEPENDS, BUILD: remove optional dependency on qt4
+
2019-06-09 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.30.0
* BUILD: fix build