From eebfa6ebe1522831767019e496b0c094b2e15a5c Mon Sep 17 00:00:00 2001
From: root
Date: Fri, 15 Mar 2013 00:04:20 -0700
Subject: Fri Mar 15 00:04:19 PDT 2013
---
community/lightdm-gtk2-greeter/PKGBUILD | 40 ---
.../lightdm-gtk2-greeter/onscreen-keyboard.patch | 306 ---------------------
2 files changed, 346 deletions(-)
delete mode 100755 community/lightdm-gtk2-greeter/PKGBUILD
delete mode 100755 community/lightdm-gtk2-greeter/onscreen-keyboard.patch
(limited to 'community/lightdm-gtk2-greeter')
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
deleted file mode 100755
index 153294933..000000000
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 86201 2013-03-13 00:23:53Z alucryd $
-# Maintainer: Maxime Gauduin
-# Contributor: Padfoot
-
-pkgname=lightdm-gtk2-greeter
-pkgver=1.5.1
-pkgrel=3
-pkgdesc="GTK+ greeter for LightDM"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/lightdm-gtk-greeter"
-license=('GPL3' 'LGPL3')
-depends=('gtk2' 'lightdm')
-makedepends=('exo' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
-provides=("${pkgname/2/}")
-conflicts=("${pkgname/2/3}")
-backup=('etc/lightdm/lightdm-gtk-greeter.conf')
-source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz"
- "onscreen-keyboard.patch")
-sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621'
- '381c4da15ed2482800aaf3258217cd48c2313aee5da4f7ade77f7ef55659d0b9')
-
-build() {
- cd "${srcdir}"/${pkgname/2/}-${pkgver}
-
-# Patch
- patch -Np1 -i ../onscreen-keyboard.patch
-
-# Build
- AUTOMAKE=automake ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname/2/}-${pkgver}
-
-# Install
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/community/lightdm-gtk2-greeter/onscreen-keyboard.patch b/community/lightdm-gtk2-greeter/onscreen-keyboard.patch
deleted file mode 100755
index 6db01d3f6..000000000
--- a/community/lightdm-gtk2-greeter/onscreen-keyboard.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-diff -aur lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf
---- lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf 2013-02-11 00:19:17.000000000 +1100
-+++ lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf 2013-02-20 19:17:39.382817993 +1100
-@@ -9,6 +9,7 @@
- # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
- # show-language-selector (true or false)
- # show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. indicator-sound.so)
-+# keyboard = Command to launch on screen keyboard. Ensure it does not steal focus.
- #
- [greeter]
- #background=
-@@ -21,3 +22,4 @@
- #xft-rgba=
- #show-language-selector=
- #show-indicators=
-+#keyboard=
-diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c
---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c 2013-02-11 00:48:21.000000000 +1100
-+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c 2013-02-20 20:09:30.219150045 +1100
-@@ -23,6 +23,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef HAVE_LIBINDICATOR
- #include
-@@ -44,6 +45,7 @@
- static GtkComboBox *user_combo;
- static GtkComboBox *session_combo;
- static GtkComboBox *language_combo;
-+static GtkCheckMenuItem *keyboard_menuitem;
- static gchar *default_font_name, *default_theme_name, *default_icon_theme_name;
- static GdkPixbuf *default_background_pixbuf = NULL;
- #if GTK_CHECK_VERSION (3, 0, 0)
-@@ -52,6 +54,10 @@
- static GdkColor *default_background_color = NULL;
- #endif
- static gboolean cancelling = FALSE, prompted = FALSE;
-+static gchar **a11y_keyboard_command;
-+static int a11y_kbd_pid = 0;
-+static GPid *a11y_keyboard_pid = &a11y_kbd_pid;
-+static GError *a11y_keyboard_error;
-
-
- #ifdef HAVE_LIBINDICATOR
-@@ -649,7 +655,10 @@
- if (lightdm_greeter_get_is_authenticated (greeter))
- {
- if (prompted)
-- start_session ();
-+ {
-+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), FALSE);
-+ start_session ();
-+ }
- }
- else
- {
-@@ -864,6 +873,32 @@
- }
- }
-
-+void a11y_keyboard_cb (GtkWidget *widget);
-+G_MODULE_EXPORT
-+void
-+a11y_keyboard_cb (GtkWidget *widget)
-+{
-+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
-+ {
-+ if (!g_spawn_async(NULL, a11y_keyboard_command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, a11y_keyboard_pid, &a11y_keyboard_error))
-+ {
-+ g_debug ("a11y keyboard command error : '%s'", a11y_keyboard_error->message);
-+ a11y_kbd_pid = 0;
-+ g_clear_error(&a11y_keyboard_error);
-+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), FALSE);
-+ }
-+ }
-+ else
-+ {
-+ if (a11y_kbd_pid != 0)
-+ {
-+ kill (a11y_kbd_pid, SIGTERM);
-+ g_spawn_close_pid(*a11y_keyboard_pid);
-+ a11y_kbd_pid = 0;
-+ }
-+ }
-+}
-+
- static void
- sigterm_cb (int signum)
- {
-@@ -1190,6 +1225,13 @@
- g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL);
- g_free (value);
-
-+ /* Get a11y on screen keyboard command*/
-+ gint argp;
-+ value = g_key_file_get_value (config, "greeter", "keyboard", NULL);
-+ g_debug ("a11y keyboard command is '%s'", value);
-+ g_shell_parse_argv (value, &argp, &a11y_keyboard_command, NULL);
-+ g_free (value);
-+
- builder = gtk_builder_new ();
- if (!gtk_builder_add_from_string (builder, lightdm_gtk_greeter_ui,
- lightdm_gtk_greeter_ui_length, &error))
-@@ -1212,6 +1254,7 @@
- language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox"));
- panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window"));
- user_avatar = GTK_IMAGE (gtk_builder_get_object (builder, "user_avatar"));
-+ keyboard_menuitem = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "keyboard_menuitem"));
-
- gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), lightdm_get_hostname ());
-
-@@ -1264,7 +1307,7 @@
- #endif
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (menuitem), hbox);
-- image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_MENU);
-+ image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
-
-@@ -1276,7 +1319,7 @@
- #endif
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (menuitem), hbox);
-- image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_MENU);
-+ image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
-
-@@ -1377,6 +1420,11 @@
- gtk_widget_show (GTK_WIDGET (login_window));
- gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (login_window)), GDK_CURRENT_TIME);
-
-+ if (a11y_keyboard_command)
-+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), TRUE);
-+ else
-+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_menuitem")));
-+
- gtk_main ();
-
- if (default_background_pixbuf)
-diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade
---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade 2013-02-10 23:48:19.000000000 +1100
-+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade 2013-02-20 17:11:01.968469713 +1100
-@@ -215,6 +215,7 @@
-
-
-+
-+
-+
-
-
-
-diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h
---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h 2013-02-11 01:46:04.000000000 +1100
-+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h 2013-02-20 17:52:56.172967000 +1100
-@@ -108,66 +108,73 @@
- "\">3<"
- "placeholder/>
TrueFalseFalse<"
-- "/property>Suspend<"
-- "object class=\"GtkMenuItem\" id=\"a11y_menuitem\">a11y_menuitemTrueFalse
FalseFa"
-- "lse<"
-- "/columns>"
-+ "operty name=\"label\" translatable=\"yes\">Shutdown..."
-+ "child>"
-+ ""
- };
-
--static const unsigned lightdm_gtk_greeter_ui_length = 10699u;
-+static const unsigned lightdm_gtk_greeter_ui_length = 11147u;
-
--
cgit v1.2.3-54-g00ecf