From aff2d7ae5ee491edfa7d531d5b88ac7269228564 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 20 Apr 2012 09:08:39 +0200
Subject: [PATCH] lightdm: update to 1.2.2; the greeters are distributed in
 external pkgs now.

---
 srcpkgs/lightdm-gtk-greeter                  |  1 -
 srcpkgs/lightdm-qt-greeter                   |  1 -
 srcpkgs/lightdm/liblightdm-gobject.rshlibs   |  4 ----
 srcpkgs/lightdm/liblightdm-gobject.template  |  1 -
 srcpkgs/lightdm/liblightdm-qt.rshlibs        |  2 +-
 srcpkgs/lightdm/liblightdm-qt.template       |  1 -
 srcpkgs/lightdm/lightdm-gtk-greeter.rshlibs  | 10 ---------
 srcpkgs/lightdm/lightdm-gtk-greeter.template | 19 ----------------
 srcpkgs/lightdm/lightdm-qt-greeter.rshlibs   |  6 -----
 srcpkgs/lightdm/lightdm-qt-greeter.template  | 13 -----------
 srcpkgs/lightdm/lightdm.rshlibs              |  1 -
 srcpkgs/lightdm/template                     | 23 ++++++++------------
 srcpkgs/mousepad/template                    | 12 +++++-----
 13 files changed, 15 insertions(+), 79 deletions(-)
 delete mode 120000 srcpkgs/lightdm-gtk-greeter
 delete mode 120000 srcpkgs/lightdm-qt-greeter
 delete mode 100644 srcpkgs/lightdm/lightdm-gtk-greeter.rshlibs
 delete mode 100644 srcpkgs/lightdm/lightdm-gtk-greeter.template
 delete mode 100644 srcpkgs/lightdm/lightdm-qt-greeter.rshlibs
 delete mode 100644 srcpkgs/lightdm/lightdm-qt-greeter.template

diff --git a/srcpkgs/lightdm-gtk-greeter b/srcpkgs/lightdm-gtk-greeter
deleted file mode 120000
index af96b29785e..00000000000
--- a/srcpkgs/lightdm-gtk-greeter
+++ /dev/null
@@ -1 +0,0 @@
-lightdm
\ No newline at end of file
diff --git a/srcpkgs/lightdm-qt-greeter b/srcpkgs/lightdm-qt-greeter
deleted file mode 120000
index af96b29785e..00000000000
--- a/srcpkgs/lightdm-qt-greeter
+++ /dev/null
@@ -1 +0,0 @@
-lightdm
\ No newline at end of file
diff --git a/srcpkgs/lightdm/liblightdm-gobject.rshlibs b/srcpkgs/lightdm/liblightdm-gobject.rshlibs
index 21bce16db48..416f62647ca 100644
--- a/srcpkgs/lightdm/liblightdm-gobject.rshlibs
+++ b/srcpkgs/lightdm/liblightdm-gobject.rshlibs
@@ -1,11 +1,7 @@
 libgio-2.0.so.0
-libgmodule-2.0.so.0
 libxklavier.so.16
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
-libxml2.so.2
 libX11.so.6
 libpthread.so.0
 libc.so.6
diff --git a/srcpkgs/lightdm/liblightdm-gobject.template b/srcpkgs/lightdm/liblightdm-gobject.template
index 0a30ee1f108..f4ce68a64ca 100644
--- a/srcpkgs/lightdm/liblightdm-gobject.template
+++ b/srcpkgs/lightdm/liblightdm-gobject.template
@@ -1,6 +1,5 @@
 # Template file for 'liblightdm-gobject'.
 #
-revision=2
 short_desc="${short_desc} - GObject support library"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/lightdm/liblightdm-qt.rshlibs b/srcpkgs/lightdm/liblightdm-qt.rshlibs
index 1eeafcab977..840e825d51a 100644
--- a/srcpkgs/lightdm/liblightdm-qt.rshlibs
+++ b/srcpkgs/lightdm/liblightdm-qt.rshlibs
@@ -1,9 +1,9 @@
 libQtDBus.so.4
 libQtXml.so.4
-libQtNetwork.so.4
 libQtGui.so.4
 libQtCore.so.4
 libstdc++.so.6
 libm.so.6
 libc.so.6
 libgcc_s.so.1
+liblightdm-gobject-1.so.0
diff --git a/srcpkgs/lightdm/liblightdm-qt.template b/srcpkgs/lightdm/liblightdm-qt.template
index 3348faf7f99..4ccda2adee6 100644
--- a/srcpkgs/lightdm/liblightdm-qt.template
+++ b/srcpkgs/lightdm/liblightdm-qt.template
@@ -1,6 +1,5 @@
 # Template file for 'liblightdm-qt'.
 #
-revision=1
 short_desc="${short_desc} - QT support library"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/lightdm/lightdm-gtk-greeter.rshlibs b/srcpkgs/lightdm/lightdm-gtk-greeter.rshlibs
deleted file mode 100644
index f6c7f515c87..00000000000
--- a/srcpkgs/lightdm/lightdm-gtk-greeter.rshlibs
+++ /dev/null
@@ -1,10 +0,0 @@
-liblightdm-gobject-1.so.0
-libgtk-3.so.0
-libgdk-3.so.0
-libgdk_pixbuf-2.0.so.0
-libcairo.so.2
-libgobject-2.0.so.0
-libglib-2.0.so.0
-libpthread.so.0
-libc.so.6
-libX11.so.6
diff --git a/srcpkgs/lightdm/lightdm-gtk-greeter.template b/srcpkgs/lightdm/lightdm-gtk-greeter.template
deleted file mode 100644
index bd3809731b9..00000000000
--- a/srcpkgs/lightdm/lightdm-gtk-greeter.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'lightdm-gtk-greeter"
-#
-revision=1
-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"
-
-
-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
-}
diff --git a/srcpkgs/lightdm/lightdm-qt-greeter.rshlibs b/srcpkgs/lightdm/lightdm-qt-greeter.rshlibs
deleted file mode 100644
index 0d1a4cc52ce..00000000000
--- a/srcpkgs/lightdm/lightdm-qt-greeter.rshlibs
+++ /dev/null
@@ -1,6 +0,0 @@
-liblightdm-qt-1.so.0
-libQtGui.so.4
-libQtCore.so.4
-libstdc++.so.6
-libgcc_s.so.1
-libc.so.6
diff --git a/srcpkgs/lightdm/lightdm-qt-greeter.template b/srcpkgs/lightdm/lightdm-qt-greeter.template
deleted file mode 100644
index 5ec3cad62b9..00000000000
--- a/srcpkgs/lightdm/lightdm-qt-greeter.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'lightdm-qt"
-#
-revision=1
-short_desc="${short_desc} - QT greeter support"
-long_desc="${long_desc}
-
- This package contains the LightDM QT greeter files."
-
-do_install()
-{
-	vmove usr/sbin/$pkgname usr/sbin
-	vmove usr/share/xgreeters/$pkgname.desktop usr/share/xgreeters
-}
diff --git a/srcpkgs/lightdm/lightdm.rshlibs b/srcpkgs/lightdm/lightdm.rshlibs
index 6596e4f3fbd..45a3e8010db 100644
--- a/srcpkgs/lightdm/lightdm.rshlibs
+++ b/srcpkgs/lightdm/lightdm.rshlibs
@@ -1,6 +1,5 @@
 libgio-2.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
 libXdmcp.so.6
 libxcb.so.1
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index 5c6a819463e..3925dc88718 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,15 +1,14 @@
 # Template file for 'lightdm'
 pkgname=lightdm
-version=1.0.6
-revision=3
+version=1.2.2
 homepage="https://launchpad.net/lightdm"
-distfiles="http://launchpad.net/lightdm/trunk/$version/+download/lightdm-$version.tar.gz"
+distfiles="https://launchpad.net/lightdm/1.2/$version/+download/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-configure_args="--with-greeter-user=lightdm --enable-gtk-greeter"
+configure_args="--with-greeter-user=lightdm"
 short_desc="Light Display Manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3, LGPL-3"
-checksum=745f2ffe58f90ffb318527d20520e1e8f04a36dfa2ac9cc00140857ef57284ae
+checksum=772cc6a4e7da670352f6a38c05470b8fcfe50a2c1d3d424be1c9309afb0c541b
 long_desc="
  An X display manager that:
   * Has a lightweight codebase
@@ -23,31 +22,27 @@ conf_files="
 /etc/lightdm/lightdm.conf
 /etc/lightdm/users.conf"
 
+provides="display-manager-1"
+replaces="display-manager>=0"
 system_accounts="lightdm"
 lightdm_homedir="/var/cache/lightdm"
 systemd_services="lightdm.service off"
 make_dirs="/var/cache/lightdm 0755 lightdm lightdm"
 
-subpackages="liblightdm-gobject liblightdm-qt lightdm-qt-greeter"
-subpackages="${subpackages} lightdm-gtk-greeter lightdm-devel"
-
+subpackages="liblightdm-gobject liblightdm-qt lightdm-devel"
 
 Add_dependency build pkg-config
 Add_dependency build intltool
-Add_dependency build glib-devel
-Add_dependency build dbus-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 gtk+3-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
 Add_dependency build libxcb-devel
 Add_dependency build libXdmcp-devel
 Add_dependency build pam-devel
 Add_dependency build vala-devel
+Add_dependency build gobject-introspection
 
 Add_dependency full gnome-icon-theme
 Add_dependency full dbus
@@ -64,7 +59,7 @@ post_install()
 	vmkdir var/cache/lightdm
 
 	# Minimum UID shall be 1000 for ordinary users.
-	sed -i -e "s|^\#\(minimum-uid=\).*|\11000|" \
+	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}|" \
diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 5a873f7efaa..b470f956b25 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,11 +1,13 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.2.16
-revision=3
+revision=4
+homepage="http://xfce.org"
 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 short_desc="Simple text editor for Xfce based on Leafpad"
 maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
 checksum=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
 long_desc="
  Mousepad is a simple text editor for Xfce based on Leafpad.
@@ -14,15 +16,11 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
-
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gtk+-devel
 Add_dependency build libxfce4util-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build pango-devel
-Add_dependency build glib-devel
 Add_dependency build libxfcegui4-devel
 
-Add_dependency full hicolor-icon-theme
-Add_dependency full desktop-file-utils
+Add_dependency run hicolor-icon-theme
+Add_dependency run desktop-file-utils