Merge remote-tracking branch 'x/master'

* x/master:
  lightdm: update to 1.0.6.
  cairo-devel: require pixman-devel again.
This commit is contained in:
davehome 2011-11-09 00:49:57 -07:00
commit d5c2e59646
17 changed files with 75 additions and 95 deletions

View File

@ -5,7 +5,7 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=5
revision=6
Add_dependency run glibc
Add_dependency run zlib
@ -17,6 +17,7 @@ Add_dependency run libpng-devel
Add_dependency run libxcb-devel
Add_dependency run libX11-devel
Add_dependency run libXrender-devel
Add_dependency run pixman-devel
Add_dependency run MesaLib-devel
do_install()

View File

@ -1 +0,0 @@
lightdm

16
srcpkgs/lightdm/INSTALL Normal file
View File

@ -0,0 +1,16 @@
case ${ACTION} in
post)
[ ! -d var/cache/lightdm ] && mkdir -p var/cache/lightdm
chown lightdm:lightdm var/cache/lightdm
cat <<_EOF
==========================================================================
To make lightdm work, a greeter package must be installed:
lightdm-gtk-greeter: for a GTK+3 greeter
lightdm-qt-greeter: for a QT greeter
To start lightdm: 'systemctl start lightdm.service'.
==========================================================================
_EOF
;;
esac

5
srcpkgs/lightdm/REMOVE Normal file
View File

@ -0,0 +1,5 @@
case ${ACTION} in
purge)
[ -d var/cache/lightdm ] && rm -rf var/cache/lightdm
;;
esac

View File

@ -1,2 +1,2 @@
abi_depends=">=0.2.1"
abi_depends=">=1.0.6"
api_depends="${abi_depends}"

View File

@ -4,7 +4,8 @@ Requires=dev-tty7.device
After=dev-tty7.device systemd-user-sessions.service
[Service]
ExecStart=/usr/bin/lightdm
ExecStart=/usr/sbin/lightdm --log-dir=/var/log/lightdm --run-dir=/run/lightdm \
--cache-dir=/var/cache/lightdm
[Install]
WantedBy=graphical.target

View File

@ -15,7 +15,6 @@ Add_dependency run libxklavier
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/liblightdm-gobject*.so* ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
vmove "usr/lib/liblightdm-gobject*.so*" usr/lib
vmove usr/lib/girepository-1.0 usr/lib
}

View File

@ -12,6 +12,5 @@ Add_dependency run qt
do_install()
{
mkdir -p ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/liblightdm-qt*.so* ${DESTDIR}/usr/lib
vmove "usr/lib/liblightdm-qt*.so*" usr/lib
}

View File

@ -6,20 +6,6 @@ long_desc="${long_desc}
This package contains headers, static libs, etc for LightDM."
Add_dependency run glib-devel
Add_dependency run dbus-glib-devel
Add_dependency run dbus-devel
Add_dependency run glibc-devel
Add_dependency run libxklavier-devel
Add_dependency run libxml2-devel
Add_dependency run libX11-devel
Add_dependency run qt-devel
Add_dependency run gtk+-devel
Add_dependency run gdk-pixbuf-devel
Add_dependency run cairo-devel
Add_dependency run webkit-gtk-devel
Add_dependency run libxcb-devel
Add_dependency run libXdmcp-devel
Add_dependency run pam-devel
do_install()
{

View File

@ -0,0 +1,25 @@
# Template file for 'lightdm-gtk-greeter"
#
short_desc="${short_desc} - GTK+3 greeter support"
long_desc="${long_desc}
This package contains the LightDM GTK+3 greeter files."
conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
Add_dependency run liblightdm-gobject
Add_dependency run gtk+3
Add_dependency run gdk-pixbuf
Add_dependency run cairo
Add_dependency run glib
Add_dependency run glibc
Add_dependency run libX11
do_install()
{
vmove usr/sbin/$pkgname usr/sbin
vmove usr/share/xgreeters/$pkgname.desktop \
usr/share/xgreeters
vmove usr/share/$pkgname usr/share
vmove etc/lightdm/$pkgname.conf etc/lightdm
}

View File

@ -1,22 +0,0 @@
# 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
}

View File

@ -13,11 +13,6 @@ 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
vmove usr/sbin/$pkgname usr/sbin
vmove usr/share/xgreeters/$pkgname.desktop usr/share/xgreeters
}

View File

@ -1,23 +0,0 @@
# Template file for 'lightdm-vala"
#
short_desc="${short_desc} - Vala greeter support"
long_desc="${long_desc}
This package contains the LightDM Vala greeter files."
Add_dependency run glibc
Add_dependency run glib
Add_dependency run gtk+
Add_dependency run liblightdm-gobject
Add_dependency run lightdm
do_install()
{
mkdir -p ${DESTDIR}/usr/share/lightdm/themes
mkdir -p ${DESTDIR}/usr/libexec
mv ${SRCPKGDESTDIR}/usr/libexec/lightdm-example-vala* \
${DESTDIR}/usr/libexec
mv ${SRCPKGDESTDIR}/usr/share/lightdm/themes/example-vala* \
${DESTDIR}/usr/share/lightdm/themes
}

View File

@ -1,13 +1,14 @@
# Template file for 'lightdm'
pkgname=lightdm
version=0.3.3
revision=1
version=1.0.6
homepage="https://launchpad.net/lightdm"
distfiles="http://launchpad.net/lightdm/trunk/$version/+download/lightdm-$version.tar.gz"
build_style=gnu-configure
configure_args="--with-greeter-user=lightdm"
configure_args="--with-greeter-user=lightdm --enable-gtk-greeter"
short_desc="Light Display Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=fa615276ad9d8068ac199e064a9d366f9d42f0b092e832a9a5a5717f8c2b8174
license="GPL-3, LGPL-3"
checksum=745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae
long_desc="
An X display manager that:
* Has a lightweight codebase
@ -16,38 +17,35 @@ long_desc="
* Fully themeable (easiest with the webkit interface)
* Cross-desktop (greeters can be written in any toolkit)"
conf_files="/etc/pam.d/lightdm"
conf_files="
/etc/lightdm/keys.conf
/etc/lightdm/lightdm.conf
/etc/lightdm/users.conf"
system_accounts="lightdm"
lightdm_homedir="/var/cache/lightdm"
systemd_services="lightdm.service"
keep_empty_dirs=yes
subpackages="liblightdm-gobject liblightdm-qt lightdm-qt"
subpackages="${subpackages} lightdm-pygtk lightdm-vala lightdm-devel"
subpackages="liblightdm-gobject liblightdm-qt lightdm-qt-greeter"
subpackages="${subpackages} lightdm-gtk-greeter lightdm-devel"
Add_dependency run glibc
Add_dependency run glib
Add_dependency run dbus-libs
Add_dependency run cairo
Add_dependency run libXdmcp
Add_dependency run libxcb
Add_dependency run pam
Add_dependency run gdk-pixbuf
Add_dependency run gtk+
Add_dependency run liblightdm-gobject
Add_dependency build pkg-config
Add_dependency build intltool
Add_dependency build glib-devel
Add_dependency build dbus-glib-devel
Add_dependency build dbus-devel
Add_dependency build glibc-devel
Add_dependency build dbus-glib-devel
Add_dependency build libxklavier-devel
Add_dependency build libxml2-devel
Add_dependency build libX11-devel
Add_dependency build qt-devel
Add_dependency build libstdc++-devel
Add_dependency build gtk+-devel
Add_dependency build gtk+3-devel
Add_dependency build gdk-pixbuf-devel
Add_dependency build cairo-devel
Add_dependency build libxcb-devel
@ -70,8 +68,9 @@ post_install()
vmkdir var/cache/lightdm
# Minimum UID shall be 1000 for ordinary users.
sed -i -e "s|^\#\(minimum-uid=\).*|\11000|" ${DESTDIR}/etc/lightdm.conf
sed -i -e "s|^\#\(minimum-uid=\).*|\11000|" \
${DESTDIR}/etc/lightdm/users.conf
# Provide a working session wrapper.
sed -i -e "s|^\#\(session-wrapper=\).*|\1${xs}|" \
${DESTDIR}/etc/lightdm.conf
${DESTDIR}/etc/lightdm/lightdm.conf
}

View File

@ -763,8 +763,8 @@ libvirt-qemu.so libvirt libvirt-devel
libgdk-3.so.0 gtk+3 gtk+3-devel
libgtk-3.so.0 gtk+3 gtk+3-devel
libgailutil-3.so.0 gtk+3 gtk+3-devel
liblightdm-gobject-0.so.0 liblightdm-gobject lightdm-devel
liblightdm-qt-0.so.0 liblightdm-qt lightdm-devel
liblightdm-gobject-1.so.0 liblightdm-gobject lightdm-devel
liblightdm-qt-1.so.0 liblightdm-qt lightdm-devel
libcelt051.so.0 celt051 celt051-devel
libcelt0.so.2 celt celt-devel
libspice-server.so.1 spice spice-devel