diff --git a/srcpkgs/liblightdm-qt b/srcpkgs/liblightdm-qt deleted file mode 120000 index af96b29785e..00000000000 --- a/srcpkgs/liblightdm-qt +++ /dev/null @@ -1 +0,0 @@ -lightdm \ No newline at end of file diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index a3a087a5f6d..5a417f21a4c 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.26.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter --with-greeter-user=lightdm --disable-static --disable-tests @@ -19,7 +19,7 @@ makedepends="dbus-glib-devel libxklavier-devel libxml2-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel libgcrypt-devel accountsservice-devel" depends="dbus accountsservice ConsoleKit2 upower" -conf_files="/etc/$pkgname/*.conf /etc/pam.d/*" +conf_files="/etc/${pkgname}/*.conf /etc/pam.d/*" system_accounts="lightdm" lightdm_homedir="/var/lib/lightdm" subpackages="liblightdm-gobject lightdm-devel" @@ -29,9 +29,9 @@ make_dirs=" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" - configure_args+=" MOC4=/usr/lib/qt/bin/moc MOC5=/usr/lib/qt5/bin/moc" - makedepends+=" qt-devel qt5-devel" - subpackages+=" liblightdm-qt liblightdm-qt5" + configure_args+=" MOC5=/usr/lib/qt5/bin/moc" + makedepends+=" qt5-devel" + subpackages+=" liblightdm-qt5" fi post_install() { @@ -57,22 +57,17 @@ liblightdm-gobject_package() { fi } } -liblightdm-qt_package() { - short_desc+=" - QT 4.x support library" - pkg_install() { - vmove "usr/lib/liblightdm-qt-3.so.*" - } -} + liblightdm-qt5_package() { short_desc+=" - QT 5.x support library" pkg_install() { vmove "usr/lib/liblightdm-qt5*.so.*" } } + lightdm-devel_package() { depends="libglib-devel liblightdm-gobject-${version}_${revision}" if [ -z "$CROSS_BUILD" ]; then - depends+=" liblightdm-qt-${version}_${revision}" depends+=" liblightdm-qt5-${version}_${revision}" fi short_desc+=" - development files"