[arch-commits] Commit in gtk3/trunk (PKGBUILD empty_grid.patch gtk3.install)

[Ionut Biru]

    Date: Tuesday, March 6, 2012 @ 08:33:32
  Author: ibiru
Revision: 152288

update to 3.3.18

Modified:
  gtk3/trunk/PKGBUILD
  gtk3/trunk/gtk3.install
Deleted:
  gtk3/trunk/empty_grid.patch

------------------+
 PKGBUILD         |   19 ++++++++-----------
 empty_grid.patch |   29 -----------------------------
 gtk3.install     |    9 +++++----
 3 files changed, 13 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2012-03-06 13:21:11 UTC (rev 152287)
+++ PKGBUILD    2012-03-06 13:33:32 UTC (rev 152288)
@@ -2,8 +2,8 @@
 # Maintainer: Ionut Biru <ib...@archlinux.org>
 
 pkgname=gtk3
-pkgver=3.2.3
-pkgrel=3
+pkgver=3.3.18
+pkgrel=1
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/";
@@ -13,16 +13,13 @@
 options=('!libtool')
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-        settings.ini
-        empty_grid.patch)
-sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            'd05ccfeaf4c558668b72aaacdd11356b6419d2359def6c1b9af1b465fa5a3c25')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
+        settings.ini)
+sha256sums=('c63cc7ff19c28f73c1060f4b6168ef0f6cb359803abb990baa5c5f5a48f31f90'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/empty_grid.patch"
+    cd "gtk+-$pkgver"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
@@ -34,7 +31,7 @@
 }
 
 package() {
-    cd "$srcdir/gtk+-$pkgver"
+    cd "gtk+-$pkgver"
     make DESTDIR="$pkgdir" install
 
     install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"

Deleted: empty_grid.patch
===================================================================
--- empty_grid.patch    2012-03-06 13:21:11 UTC (rev 152287)
+++ empty_grid.patch    2012-03-06 13:33:32 UTC (rev 152288)
@@ -1,29 +0,0 @@
-From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mcla...@redhat.com>
-Date: Fri, 21 Oct 2011 20:23:03 +0000
-Subject: Fix natural/min widht calculations for empty grids
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660139
----
-diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
-index a122ad4..78ae2ff 100644
---- a/gtk/gtkgrid.c
-+++ b/gtk/gtkgrid.c
-@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request,
-   linedata = &priv->linedata[orientation];
-   lines = &request->lines[orientation];
- 
--  min = (nonempty - 1) * linedata->spacing;
--  nat = (nonempty - 1) * linedata->spacing;
-+  min = 0;
-+  nat = 0;
-+  if (nonempty > 0)
-+    {
-+      min = (nonempty - 1) * linedata->spacing;
-+      nat = (nonempty - 1) * linedata->spacing;
-+    }
- 
-   for (i = 0; i < lines->max - lines->min; i++)
-     {
---
-cgit v0.9.0.2

Modified: gtk3.install
===================================================================
--- gtk3.install        2012-03-06 13:21:11 UTC (rev 152287)
+++ gtk3.install        2012-03-06 13:33:32 UTC (rev 152288)
@@ -1,6 +1,6 @@
 post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    /usr/bin/gtk-query-immodules-3.0 --update-cache
+    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 post_upgrade() {
@@ -8,8 +8,9 @@
 }
 
 pre_remove() {
-    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
+    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
 }
+
 post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 }