[arch-commits] Commit in fast-user-switch-applet/trunk (4 files)

Jan de Groot jgc at archlinux.org
Mon Oct 13 07:36:56 EDT 2008


    Date: Monday, October 13, 2008 @ 07:36:56
  Author: jgc
Revision: 15365

upgpkg: fast-user-switch-applet 2.24.0-1

Modified:
  fast-user-switch-applet/trunk/PKGBUILD
  fast-user-switch-applet/trunk/fusa.install
Deleted:
  fast-user-switch-applet/trunk/fast-user-switch-applet-2.17.4-socket-check.patch
  fast-user-switch-applet/trunk/startx.patch

---------------------------------------------------+
 PKGBUILD                                          |   30 +++----
 fast-user-switch-applet-2.17.4-socket-check.patch |   20 -----
 fusa.install                                      |    4 -
 startx.patch                                      |   76 --------------------
 4 files changed, 12 insertions(+), 118 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-13 11:29:02 UTC (rev 15364)
+++ PKGBUILD	2008-10-13 11:36:56 UTC (rev 15365)
@@ -3,36 +3,30 @@
 # Contributor: Mark Rosenstand <mark at borkware.net>
 
 pkgname=fast-user-switch-applet
-pkgver=2.20.0
-pkgrel=2
+pkgver=2.24.0
+pkgrel=1
 pkgdesc="An applet for the GNOME panel which provides a menu to switch between users."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://ignore-your.tv/fusa/"
-depends=('gnome-panel>=2.20.0' 'libxmu' 'gdm>=2.20.0')
+depends=('gnome-panel>=2.24.0' 'libxmu' 'gdm>=2.20.8')
 makedepends=('perlxml' 'pkgconfig')
 options=(!emptydirs)
 install=fusa.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/fast-user-switch-applet/2.20/${pkgname}-${pkgver}.tar.bz2
-	fast-user-switch-applet-2.17.4-socket-check.patch
-	startx.patch)
-md5sums=('1d1fd25b5599f7656e3fa89aa913137c'
-         '4af91d6f78a87d8e126ad88b0ff399ea'
-         '36b9bf8dac0c0187eefc122b84f09d3d')
+source=(http://ftp.gnome.org/pub/GNOME/sources/fast-user-switch-applet/2.24/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('001ef5a6a03ba6a0f4857bc3b05ec8f1')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/startx.patch || return 1
-  patch -Np1 -i ${startdir}/src/fast-user-switch-applet-2.17.4-socket-check.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/fast-user-switch-applet \
               --localstatedir=/var --disable-scrollkeeper \
-              --with-gdm-setup=/usr/sbin/gdmsetup \
-              --with-gdm-config=/etc/gdm/custom.conf
+              --with-gdm-setup="/usr/bin/gksu /usr/sbin/gdmsetup" \
+              --with-gdm-config=/etc/gdm/custom.conf || return 1
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
-  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Deleted: fast-user-switch-applet-2.17.4-socket-check.patch
===================================================================
--- fast-user-switch-applet-2.17.4-socket-check.patch	2008-10-13 11:29:02 UTC (rev 15364)
+++ fast-user-switch-applet-2.17.4-socket-check.patch	2008-10-13 11:36:56 UTC (rev 15365)
@@ -1,20 +0,0 @@
---- fast-user-switch-applet-2.17.4/src/gdm-queue.c.socket-check	2007-03-30 16:09:50.000000000 -0400
-+++ fast-user-switch-applet-2.17.4/src/gdm-queue.c	2007-03-30 16:10:35.000000000 -0400
-@@ -201,7 +201,7 @@
- 
-   if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
-     strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
--  if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-+  else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-     strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
-   else
-     return FALSE;
-@@ -265,7 +265,7 @@
- 
-         if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
-           strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
--        if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-+        else if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-           strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
-         else
-           g_error ("Can't find gdm socket!");

Modified: fusa.install
===================================================================
--- fusa.install	2008-10-13 11:29:02 UTC (rev 15364)
+++ fusa.install	2008-10-13 11:36:56 UTC (rev 15365)
@@ -15,7 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-op=$1
-shift
-$op $*

Deleted: startx.patch
===================================================================
--- startx.patch	2008-10-13 11:29:02 UTC (rev 15364)
+++ startx.patch	2008-10-13 11:36:56 UTC (rev 15365)
@@ -1,76 +0,0 @@
---- fast-user-switch-applet-2.17.4/src/gdm-queue.c.startx	2007-02-22 18:28:42.000000000 -0500
-+++ fast-user-switch-applet-2.17.4/src/gdm-queue.c	2007-03-28 16:24:34.000000000 -0400
-@@ -190,6 +190,34 @@
-   gdm_socket_status = GDM_SOCKET_CLOSED;
- }
- 
-+gboolean
-+gdm_is_running (void)
-+{ 
-+  struct sockaddr_un addr;
-+  struct stat file_stat;
-+  int fd;
-+  
-+  fd = socket (PF_LOCAL, SOCK_STREAM, 0);
-+
-+  if (stat (GDM_NEW_SOCKET_FILENAME, &file_stat) == 0)
-+    strcpy (addr.sun_path, GDM_NEW_SOCKET_FILENAME);
-+  if (stat (GDM_OLD_SOCKET_FILENAME, &file_stat) == 0)
-+    strcpy (addr.sun_path, GDM_OLD_SOCKET_FILENAME);
-+  else
-+    return FALSE;
-+
-+  addr.sun_family = AF_UNIX;
-+
-+  if (connect (fd, (struct sockaddr *)&addr, sizeof (addr)) < 0) {
-+    VE_IGNORE_EINTR (close (fd));
-+    return FALSE;
-+  }
-+
-+  VE_IGNORE_EINTR (close (fd));
-+
-+  return TRUE;
-+}
-+         
- /* This is the function which gets called repeatedly while we're idle
-  * to remove messages from the queue and send them to GDM.
-  */
---- fast-user-switch-applet-2.17.4/src/applet.c.startx	2007-03-28 16:24:34.000000000 -0400
-+++ fast-user-switch-applet-2.17.4/src/applet.c	2007-03-28 16:24:53.000000000 -0400
-@@ -60,6 +60,7 @@
- #include "fusa-manager.h"
- #include "fusa-user-menu-item.h"
- #include "fusa-utils.h"
-+#include "gdm-queue.h"
- 
- 
- /* **************** *
-@@ -296,6 +297,9 @@
-   if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") != 0)
-     return FALSE;
- 
-+  if (!gdm_is_running ())
-+    return TRUE;
-+
-   /* Global FusaManager */
-   if (!first_time)
-     {
-@@ -325,6 +329,7 @@
-       gtk_window_set_default_icon_name ("stock_people");
-     }
- 
-+  
-   adata = g_new0 (FusaAppletData, 1);
-   adata->applet = applet;
- 
---- fast-user-switch-applet-2.17.4/src/gdm-queue.h.startx	2007-02-02 18:17:07.000000000 -0500
-+++ fast-user-switch-applet-2.17.4/src/gdm-queue.h	2007-03-28 16:24:34.000000000 -0400
-@@ -102,6 +102,8 @@
- /* This just gets a cookie of MIT-MAGIC-COOKIE-1 type */
- gchar *get_mit_magic_cookie (GdkScreen *screen, gboolean binary);
- 
-+gboolean gdm_is_running (void);
-+
- G_END_DECLS
- 
- #endif /* !__GDM_QUEUE_H__ */




More information about the arch-commits mailing list