diff --git a/common/shlibs b/common/shlibs index c4e838564e..90243960ec 100644 --- a/common/shlibs +++ b/common/shlibs @@ -713,6 +713,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1 libgailutil-3.so.0 gtk+3-3.0.0_1 liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1 liblightdm-qt-3.so.0 liblightdm-qt-1.10.1_1 +liblightdm-qt5-3.so.0 liblightdm-qt5-1.12.2_3 libcelt051.so.0 celt051-0.5.1.3_1 libcelt0.so.2 celt-0.11.1_1 libspice-server.so.1 spice-0.6.4_1 diff --git a/srcpkgs/liblightdm-qt5 b/srcpkgs/liblightdm-qt5 new file mode 120000 index 0000000000..af96b29785 --- /dev/null +++ b/srcpkgs/liblightdm-qt5 @@ -0,0 +1 @@ +lightdm \ No newline at end of file diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index c6d8a11114..a2fa624c7d 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.12.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-greeter-session=lightdm-gtk-greeter --with-greeter-user=lightdm --disable-static --disable-tests @@ -35,8 +35,9 @@ subpackages="liblightdm-gobject lightdm-devel" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" - makedepends+=" qt-devel" - subpackages+=" liblightdm-qt" + configure_args="MOC4=/usr/lib/qt/bin/moc MOC5=/usr/lib/qt5/bin/moc" + makedepends+=" qt-devel qt5-devel" + subpackages+=" liblightdm-qt liblightdm-qt5" fi post_install() { @@ -69,13 +70,20 @@ liblightdm-gobject_package() { liblightdm-qt_package() { short_desc+=" - QT 4.x support library" pkg_install() { - vmove "usr/lib/liblightdm-qt*.so.*" + 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" pkg_install() {