[arch-commits] Commit in gnome-desktop/trunk (PKGBUILD randr-fix.patch)

[Ionut Biru]

    Date: Tuesday, May 24, 2011 @ 03:38:40
  Author: ibiru
Revision: 124748

update to 3.0.2

Modified:
  gnome-desktop/trunk/PKGBUILD
Deleted:
  gnome-desktop/trunk/randr-fix.patch

-----------------+
 PKGBUILD        |   12 ++++--------
 randr-fix.patch |   26 --------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-24 07:36:11 UTC (rev 124747)
+++ PKGBUILD	2011-05-24 07:38:40 UTC (rev 124748)
@@ -2,8 +2,8 @@
 # Maintainer:  Jan de Groot <jan at archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc="Library with common API for various GNOME modules"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -12,16 +12,12 @@
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        randr-fix.patch)
-sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3'
-            '815a36c39d07eea48cb836bf25389c7057605239cb30b425d6c98763aeee4b89')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('0ac9b4a358c6d92d20283cf56a9817262ff3ce038013cbb5d98e4ab97aa2c9a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/randr-fix.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --with-gnome-distributor="Arch Linux" \

Deleted: randr-fix.patch
===================================================================
--- randr-fix.patch	2011-05-24 07:36:11 UTC (rev 124747)
+++ randr-fix.patch	2011-05-24 07:38:40 UTC (rev 124748)
@@ -1,26 +0,0 @@
-From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Sun, 01 May 2011 00:48:03 +0000
-Subject: Don't fall over if RANDR is missing
-
-When RANDR is not present, the screen object never gets an info,
-and since screen_info_free asserts, we must not call it unconditionally
-in finalize.
-This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
----
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index 4a9d98e..eb3d735 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
- 
-     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
- 
--    screen_info_free (screen->priv->info);
-+    if (screen->priv->info)
-+      screen_info_free (screen->priv->info);
- 
-     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
- }
---
-cgit v0.9