[arch-commits] Commit in gtk2/repos (3 files)

[Jan de Groot]

    Date: Sunday, April 12, 2009 @ 08:46:16
  Author: jgc
Revision: 35332

Merged revisions 35328 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gtk2/trunk

........
  r35328 | jgc | 2009-04-12 11:29:54 +0000 (Sun, 12 Apr 2009) | 1 line
  
  upgpkg: gtk2 2.16.1-1
........

Modified:
  gtk2/repos/extra-i686/	(properties)
  gtk2/repos/extra-i686/PKGBUILD
Deleted:
  gtk2/repos/extra-i686/gtk2-emit-size-change.patch

-----------------------------+
 PKGBUILD                    |    6 +++---
 gtk2-emit-size-change.patch |   26 --------------------------
 2 files changed, 3 insertions(+), 29 deletions(-)


Property changes on: gtk2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtk2/trunk:1-30116
   + /gtk2/trunk:1-35331

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-12 11:43:01 UTC (rev 35331)
+++ extra-i686/PKGBUILD	2009-04-12 12:46:16 UTC (rev 35332)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.16.0
+pkgver=2.16.1
 pkgrel=1
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 install=gtk2.install
-depends=('atk>=1.26.0' 'pango>=1.23.0' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.6.4' 'shared-mime-info')
+depends=('atk>=1.26.0' 'pango>=1.24.0-2' 'libxcursor' 'libxinerama' 'libxrandr>=1.3.0' 'libxi>=1.2.1' 'libcups>=1.3.9' 'libxcomposite' 'libxdamage' 'heimdal>=1.2.1' 'gnutls>=2.6.4' 'shared-mime-info')
 makedepends=('pkgconfig')
 replaces=('gtkprint-cups' 'gail')
 conflicts=('gtkprint-cups' 'gail')
@@ -18,7 +18,7 @@
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/gtk+-${pkgver}.tar.bz2
 	gtkclipboard-check.patch)
-md5sums=('139528802794287427fd4d18875b5cf5'
+md5sums=('74e35ff3e6e02c960fe2117a4b6b102f'
          '4025d3c15d6c6f73a032f403ffd4ff1c')
 
 build() {

Deleted: extra-i686/gtk2-emit-size-change.patch
===================================================================
--- extra-i686/gtk2-emit-size-change.patch	2009-04-12 11:43:01 UTC (rev 35331)
+++ extra-i686/gtk2-emit-size-change.patch	2009-04-12 12:46:16 UTC (rev 35332)
@@ -1,26 +0,0 @@
-diff -Naur gtk+-2.14.5-old/gdk/x11/gdkscreen-x11.c gtk+-2.14.5/gdk/x11/gdkscreen-x11.c
---- gtk+-2.14.5-old/gdk/x11/gdkscreen-x11.c	2008-11-24 16:36:03.000000000 +1000
-+++ gtk+-2.14.5/gdk/x11/gdkscreen-x11.c	2008-12-03 00:39:38.000000000 +1000
-@@ -894,11 +894,6 @@
- _gdk_x11_screen_size_changed (GdkScreen *screen,
- 			      XEvent    *event)
- {
--  gint width, height;
--
--  width = gdk_screen_get_width (screen);
--  height = gdk_screen_get_height (screen);
--
- #ifdef HAVE_RANDR
-   if (!XRRUpdateConfiguration (event))
-     return;
-@@ -915,10 +910,6 @@
-     return;
- #endif
- 
--  if (width == gdk_screen_get_width (screen) && 
--      height == gdk_screen_get_height (screen))
--    return;
--
-   _gdk_x11_screen_process_monitors_change (screen);
-   g_signal_emit_by_name (screen, "size_changed");
- }