[arch-commits] Commit in gnome-screensaver/trunk (4 files)

Jan de Groot jgc at archlinux.org
Wed Oct 8 16:47:44 EDT 2008


    Date: Wednesday, October 8, 2008 @ 16:47:44
  Author: jgc
Revision: 14657

upgpkg: gnome-screensaver 2.24.0-1
    Setup gnome-keyring pam modules

Added:
  gnome-screensaver/trunk/gnome-screensaver.pam
Modified:
  gnome-screensaver/trunk/PKGBUILD
Deleted:
  gnome-screensaver/trunk/archify-pam.patch
  gnome-screensaver/trunk/gs-fade.patch

-----------------------+
 PKGBUILD              |   29 ++++++++++++------------
 archify-pam.patch     |   25 ---------------------
 gnome-screensaver.pam |    3 ++
 gs-fade.patch         |   57 ------------------------------------------------
 4 files changed, 18 insertions(+), 96 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-08 20:47:24 UTC (rev 14656)
+++ PKGBUILD	2008-10-08 20:47:44 UTC (rev 14657)
@@ -2,26 +2,25 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=2.23.3
+pkgver=2.24.0
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://live.gnome.org/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
-depends=('gnome-menus>=2.23.6' 'libxxf86misc' 'libgnomekbd>=2.23.2' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.23.90')
+depends=('gnome-menus>=2.24.0' 'libxxf86misc' 'libgnomekbd>=2.24.0' 'libxss' 'libgl' 'libnotify' 'gnome-desktop>=2.24.0')
 makedepends=('pkgconfig' 'gettext' 'perlxml' 'mesa' 'xscreensaver')
 groups=('gnome')
 options=(!emptydirs)
 install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.23/${pkgname}-${pkgver}.tar.bz2
-        archify-pam.patch)
-md5sums=('c66d729a9b3317edcd58c567a18c2ffa'
-	 '18c417676f6e8ef16ca2a10be74578a5')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
+	gnome-screensaver.pam)
+md5sums=('aef361edcc32468d8dc50cf710d9bb80'
+         '4b4d2672a787e0d2ed792b4c308ccf8d')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/archify-pam.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-screensaver \
               --localstatedir=/var --with-gdm-config=/usr/share/gdm/defaults.conf \
@@ -29,13 +28,15 @@
 	      --with-xscreensaverhackdir=/usr/lib/xscreensaver \
 	      --with-dpms-ext || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
+  install -m644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" || return 1
+
   #Migrate xscreensaver configuration files
-  cd ${startdir}/pkg/usr/share/applications/screensavers
-  ${startdir}/src/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml || return 1
+  cd "${pkgdir}/usr/share/applications/screensavers"
+  "${srcdir}/${pkgname}-${pkgver}/data/migrate-xscreensaver-config.sh" /usr/share/xscreensaver/config/*.xml || return 1
   
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  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 || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Deleted: archify-pam.patch
===================================================================
--- archify-pam.patch	2008-10-08 20:47:24 UTC (rev 14656)
+++ archify-pam.patch	2008-10-08 20:47:44 UTC (rev 14657)
@@ -1,25 +0,0 @@
-=== modified file 'data/gnome-screensaver'
---- data/gnome-screensaver
-+++ data/gnome-screensaver
-@@ -1,13 +1,16 @@
- #%PAM-1.0
- 
- # Fedora Core
--auth       include	system-auth
--account    include	system-auth
--password   include	system-auth
--session    include	system-auth
-+#auth       include	system-auth
-+#account    include	system-auth
-+#password   include	system-auth
-+#session    include	system-auth
- 
- # SuSE/Novell
- #auth       include      common-auth
- #account    include      common-account
- #password   include      common-password
- #session    include      common-session
-+
-+# Arch Linux
-+auth        required     pam_unix_auth.so
-

Added: gnome-screensaver.pam
===================================================================
--- gnome-screensaver.pam	                        (rev 0)
+++ gnome-screensaver.pam	2008-10-08 20:47:44 UTC (rev 14657)
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth        required     pam_unix_auth.so
+auth        optional     pam_gnome_keyring.so

Deleted: gs-fade.patch
===================================================================
--- gs-fade.patch	2008-10-08 20:47:24 UTC (rev 14656)
+++ gs-fade.patch	2008-10-08 20:47:44 UTC (rev 14657)
@@ -1,57 +0,0 @@
-Index: src/gs-fade.c
-===================================================================
---- src/gs-fade.c	(revision 1322)
-+++ src/gs-fade.c	(working copy)
-@@ -296,6 +296,10 @@
-         }
- # endif
- 
-+        if (fade->priv->gamma_info) {
-+                return TRUE;
-+        }
-+
-         info = g_new0 (xf86_gamma_info, fade->priv->num_screens);
-         fade->priv->gamma_info = info;
- 
-@@ -402,8 +406,10 @@
-         int      screen;
-         gboolean res;
- 
--        for (screen = 0; screen < fade->priv->num_screens; screen++) {
--                res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
-+        if (fade->priv->gamma_info) {
-+                for (screen = 0; screen < fade->priv->num_screens; screen++) {
-+                        res = xf86_whack_gamma (screen, &fade->priv->gamma_info [screen], alpha);
-+                }
-         }
- 
-         return TRUE;
-@@ -523,6 +529,8 @@
- 
-         g_return_if_fail (GS_IS_FADE (fade));
- 
-+        gamma_info_init (fade);
-+
-         if (fade->priv->timer_id > 0) {
-                 gs_fade_stop (fade);
-         }
-@@ -641,6 +649,8 @@
-         fade->priv->current_alpha = 1.0;
- 
-         gs_fade_set_alpha (fade, fade->priv->current_alpha);
-+
-+        gamma_info_free (fade);
- }
- 
- static void
-@@ -681,7 +691,9 @@
-         display = gdk_display_get_default ();
-         fade->priv->num_screens = gdk_display_get_n_screens (display);
- 
--        gamma_info_init (fade);
-+#ifdef HAVE_XF86VMODE_GAMMA
-+        fade->priv->gamma_info = NULL;
-+#endif
- }
- 
- static void




More information about the arch-commits mailing list