From cbb34ca605f6ae9cbdd3727025eeeee6b774a0a5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 18 May 2011 12:25:00 +0200 Subject: [PATCH] lightdm: update to 0.3.3. --- srcpkgs/{lightdm-webkit => lightdm-pygtk} | 0 srcpkgs/lightdm-qt | 1 + srcpkgs/lightdm-vala | 1 + srcpkgs/lightdm/liblightdm-gobject.template | 2 -- srcpkgs/lightdm/lightdm-pygtk.template | 22 ++++++++++++++++++ srcpkgs/lightdm/lightdm-qt.template | 23 +++++++++++++++++++ ...-webkit.template => lightdm-vala.template} | 13 +++++------ .../lightdm/patches/themes_gnome_gtkrc.patch | 13 ----------- srcpkgs/lightdm/template | 13 ++++------- xbps-src/common/mapping_shlib_binpkg.txt | 2 +- 10 files changed, 59 insertions(+), 31 deletions(-) rename srcpkgs/{lightdm-webkit => lightdm-pygtk} (100%) create mode 120000 srcpkgs/lightdm-qt create mode 120000 srcpkgs/lightdm-vala create mode 100644 srcpkgs/lightdm/lightdm-pygtk.template create mode 100644 srcpkgs/lightdm/lightdm-qt.template rename srcpkgs/lightdm/{lightdm-webkit.template => lightdm-vala.template} (53%) delete mode 100644 srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch diff --git a/srcpkgs/lightdm-webkit b/srcpkgs/lightdm-pygtk similarity index 100% rename from srcpkgs/lightdm-webkit rename to srcpkgs/lightdm-pygtk diff --git a/srcpkgs/lightdm-qt b/srcpkgs/lightdm-qt new file mode 120000 index 0000000000..af96b29785 --- /dev/null +++ b/srcpkgs/lightdm-qt @@ -0,0 +1 @@ +lightdm \ No newline at end of file diff --git a/srcpkgs/lightdm-vala b/srcpkgs/lightdm-vala new file mode 120000 index 0000000000..af96b29785 --- /dev/null +++ b/srcpkgs/lightdm-vala @@ -0,0 +1 @@ +lightdm \ No newline at end of file diff --git a/srcpkgs/lightdm/liblightdm-gobject.template b/srcpkgs/lightdm/liblightdm-gobject.template index 06c2cea3c4..af3cdfd265 100644 --- a/srcpkgs/lightdm/liblightdm-gobject.template +++ b/srcpkgs/lightdm/liblightdm-gobject.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains the GObject support library for LightDM." -revision=1 - Add_dependency run glibc Add_dependency run dbus-libs Add_dependency run glib diff --git a/srcpkgs/lightdm/lightdm-pygtk.template b/srcpkgs/lightdm/lightdm-pygtk.template new file mode 100644 index 0000000000..c3cf4dd916 --- /dev/null +++ b/srcpkgs/lightdm/lightdm-pygtk.template @@ -0,0 +1,22 @@ +# Template file for 'lightdm-pygtk" +# +short_desc="${short_desc} - PyGTK greeter support" +long_desc="${long_desc} + + This package contains the LightDM PyGTK greeter files." + +noarch=yes + +Add_dependency run lightdm +Add_dependency run pygtk + +do_install() +{ + mkdir -p ${DESTDIR}/usr/share/lightdm/themes + mkdir -p ${DESTDIR}/usr/libexec + + mv ${SRCPKGDESTDIR}//usr/libexec/lightdm-example-python-gtk-greeter \ + ${DESTDIR}/usr/libexec + mv ${SRCPKGDESTDIR}/usr/share/lightdm/themes/example-python-* \ + ${DESTDIR}/usr/share/lightdm/themes +} diff --git a/srcpkgs/lightdm/lightdm-qt.template b/srcpkgs/lightdm/lightdm-qt.template new file mode 100644 index 0000000000..1a2f2b9c16 --- /dev/null +++ b/srcpkgs/lightdm/lightdm-qt.template @@ -0,0 +1,23 @@ +# Template file for 'lightdm-qt" +# +short_desc="${short_desc} - QT greeter support" +long_desc="${long_desc} + + This package contains the LightDM QT greeter files." + +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run qt +Add_dependency run liblightdm-qt + +do_install() +{ + mkdir -p ${DESTDIR}/usr/share/lightdm/themes + mkdir -p ${DESTDIR}/usr/libexec + + mv ${SRCPKGDESTDIR}//usr/libexec/lightdm-example-qt-greeter \ + ${DESTDIR}/usr/libexec + mv ${SRCPKGDESTDIR}/usr/share/lightdm/themes/example-qt-kde \ + ${DESTDIR}/usr/share/lightdm/themes +} diff --git a/srcpkgs/lightdm/lightdm-webkit.template b/srcpkgs/lightdm/lightdm-vala.template similarity index 53% rename from srcpkgs/lightdm/lightdm-webkit.template rename to srcpkgs/lightdm/lightdm-vala.template index 1c5f417d87..216052f102 100644 --- a/srcpkgs/lightdm/lightdm-webkit.template +++ b/srcpkgs/lightdm/lightdm-vala.template @@ -1,15 +1,14 @@ -# Template file for 'lightdm-webkit" +# Template file for 'lightdm-vala" # -short_desc="${short_desc} - WebKit greeter support" +short_desc="${short_desc} - Vala greeter support" long_desc="${long_desc} - This package contains the LightDM WebKit support files." + This package contains the LightDM Vala greeter files." Add_dependency run glibc Add_dependency run glib -Add_dependency run liblightdm-gobject Add_dependency run gtk+ -Add_dependency run webkit-gtk +Add_dependency run liblightdm-gobject Add_dependency run lightdm do_install() @@ -17,8 +16,8 @@ do_install() mkdir -p ${DESTDIR}/usr/share/lightdm/themes mkdir -p ${DESTDIR}/usr/libexec - mv ${SRCPKGDESTDIR}/usr/libexec/ldm-webkit* \ + mv ${SRCPKGDESTDIR}/usr/libexec/lightdm-example-vala* \ ${DESTDIR}/usr/libexec - mv ${SRCPKGDESTDIR}/usr/share/lightdm/themes/webkit \ + mv ${SRCPKGDESTDIR}/usr/share/lightdm/themes/example-vala* \ ${DESTDIR}/usr/share/lightdm/themes } diff --git a/srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch b/srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch deleted file mode 100644 index 2d9beb1834..0000000000 --- a/srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- themes/gnome/gtkrc.orig 2011-02-16 15:30:48.425744100 +0100 -+++ themes/gnome/gtkrc 2011-02-16 15:32:41.960886724 +0100 -@@ -1,7 +1,7 @@ --gtk_theme_name = "HumanLogin" --gtk_icon_theme_name = "LoginIcons" -+gtk_theme_name = "Clearlooks" -+gtk_icon_theme_name = "gnome" - gtk_cursor_theme_name = "DMZ-White" --gtk_font_name = "UbuntuBeta 10" -+gtk_font_name = "Arial 10" - # Not working, but set to 96*1024 (=96dpi) - gtk_xft_dpi = 98304 - gtk_xft_hinting = 1 diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index 87d1941e82..8679dcede5 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,13 +1,12 @@ # Template file for 'lightdm' pkgname=lightdm -version=0.2.3 -revision=2 +version=0.3.3 distfiles="http://launchpad.net/lightdm/trunk/$version/+download/lightdm-$version.tar.gz" build_style=gnu_configure configure_args="--localstatedir=/var --with-greeter-user=lightdm" short_desc="Light Display Manager" maintainer="Juan RP " -checksum=5b925a6eeb0b670b1e9f5a1b2f5dae29eceb1c1ceb17db5bd33aea4354bfe432 +checksum=fa615276ad9d8068ac199e064a9d366f9d42f0b092e832a9a5a5717f8c2b8174 long_desc=" An X display manager that: * Has a lightweight codebase @@ -21,13 +20,12 @@ lightdm_homedir="/var/cache/lightdm" openrc_services="lightdm default true" keep_empty_dirs=yes -subpackages="liblightdm-gobject liblightdm-qt" -subpackages="${subpackages} lightdm-webkit lightdm-devel" +subpackages="liblightdm-gobject liblightdm-qt lightdm-qt" +subpackages="${subpackages} lightdm-pygtk lightdm-vala lightdm-devel" Add_dependency run glibc Add_dependency run glib Add_dependency run dbus-libs -Add_dependency run dbus-glib Add_dependency run cairo Add_dependency run libXdmcp Add_dependency run libxcb @@ -50,7 +48,6 @@ Add_dependency build libstdc++-devel Add_dependency build gtk+-devel Add_dependency build gdk-pixbuf-devel Add_dependency build cairo-devel -Add_dependency build webkit-gtk-devel Add_dependency build libxcb-devel Add_dependency build libXdmcp-devel Add_dependency build pam-devel @@ -63,7 +60,7 @@ post_install() { local xs="/usr/share/lightdm/Xsession" - # Remove provided init file use our own. + # Remove provided init file and use our own. rm -rf ${DESTDIR}/etc/init install -D -m755 ${FILESDIR}/lightdm.rc ${DESTDIR}/etc/init.d/lightdm install -D -m644 ${FILESDIR}/lightdm.pam ${DESTDIR}/etc/pam.d/lightdm diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index c7e50d1ce3..0a31186732 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -767,7 +767,7 @@ libgdk-3.so gtk+3 gtk+3-devel libgtk-3.so gtk+3 gtk+3-devel libgailutil-3.so gtk+3 gtk+3-devel liblightdm-gobject-0.so liblightdm-gobject lightdm-devel -liblightdm-qt.so liblightdm-qt lightdm-devel +liblightdm-qt-0.so liblightdm-qt lightdm-devel libcelt051.so celt051 celt051-devel libspice-server.so spice spice-devel libbrasero-burn3.so brasero brasero-devel