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

[Jan de Groot]

    Date: Monday, June 1, 2009 @ 09:18:52
  Author: jgc
Revision: 40950

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

........
  r40949 | jgc | 2009-06-01 13:18:37 +0000 (Mon, 01 Jun 2009) | 1 line
  
  upgpkg: gtk2 2.16.2-1
........

Modified:
  gtk2/repos/extra-x86_64/	(properties)
  gtk2/repos/extra-x86_64/PKGBUILD
Deleted:
  gtk2/repos/extra-x86_64/gtkclipboard-check.patch

--------------------------+
 PKGBUILD                 |   13 ++++---------
 gtkclipboard-check.patch |   11 -----------
 2 files changed, 4 insertions(+), 20 deletions(-)


Property changes on: gtk2/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtk2/trunk:1-35328
   + /gtk2/trunk:1-40949

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-01 13:18:37 UTC (rev 40949)
+++ extra-x86_64/PKGBUILD	2009-06-01 13:18:52 UTC (rev 40950)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtk2
-pkgver=2.16.1
+pkgver=2.16.2
 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.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')
+depends=('atk>=1.26.0' 'pango>=1.24.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')
@@ -16,16 +16,11 @@
 options=('!libtool' '!docs')
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/gtk+-${pkgver}.tar.bz2
-	gtkclipboard-check.patch)
-md5sums=('74e35ff3e6e02c960fe2117a4b6b102f'
-         '4025d3c15d6c6f73a032f403ffd4ff1c')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.16/gtk+-${pkgver}.tar.bz2)
+md5sums=('396e98df15f6e4005e360b5710660ce3')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
-  # Workaround patch for flash
-  patch -Np1 -i "${srcdir}/gtkclipboard-check.patch" || return 1
-
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --with-xinput=yes \
 	      --without-libjasper \

Deleted: extra-x86_64/gtkclipboard-check.patch
===================================================================
--- extra-x86_64/gtkclipboard-check.patch	2009-06-01 13:18:37 UTC (rev 40949)
+++ extra-x86_64/gtkclipboard-check.patch	2009-06-01 13:18:52 UTC (rev 40950)
@@ -1,11 +0,0 @@
---- gtk+-2.11.6/gtk/gtkclipboard.c.orig	2007-08-18 13:48:22.000000000 +0000
-+++ gtk+-2.11.6/gtk/gtkclipboard.c	2007-08-18 13:49:08.000000000 +0000
-@@ -287,6 +287,8 @@
- gtk_clipboard_get_for_display (GdkDisplay *display, 
- 			       GdkAtom     selection)
- {
-+  if (display == NULL)
-+	  return NULL;
-   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-   g_return_val_if_fail (!display->closed, NULL);
-