[arch-commits] Commit in gtk3/repos (8 files)

Ionut Biru ibiru at archlinux.org
Mon Apr 23 05:08:04 EDT 2012


    Date: Monday, April 23, 2012 @ 05:08:04
  Author: ibiru
Revision: 156874

db-move: moved gtk3 from [testing] to [extra] (x86_64)

Added:
  gtk3/repos/extra-x86_64/PKGBUILD
    (from rev 156695, gtk3/repos/testing-x86_64/PKGBUILD)
  gtk3/repos/extra-x86_64/gtk3.install
    (from rev 156695, gtk3/repos/testing-x86_64/gtk3.install)
  gtk3/repos/extra-x86_64/settings.ini
    (from rev 156695, gtk3/repos/testing-x86_64/settings.ini)
Deleted:
  gtk3/repos/extra-x86_64/PKGBUILD
  gtk3/repos/extra-x86_64/empty_grid.patch
  gtk3/repos/extra-x86_64/gtk3.install
  gtk3/repos/extra-x86_64/settings.ini
  gtk3/repos/testing-x86_64/

------------------+
 PKGBUILD         |   78 +++++++++++++++++++++++++----------------------------
 empty_grid.patch |   29 -------------------
 gtk3.install     |   31 ++++++++++-----------
 settings.ini     |    4 +-
 4 files changed, 55 insertions(+), 87 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-04-23 09:08:02 UTC (rev 156873)
+++ extra-x86_64/PKGBUILD	2012-04-23 09:08:04 UTC (rev 156874)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=gtk3
-pkgver=3.2.3
-pkgrel=3
-pkgdesc="GTK+ is a multi-platform toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
-makedepends=('gobject-introspection')
-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')
-
-build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/empty_grid.patch"
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "$srcdir/gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}

Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 156695, gtk3/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-04-23 09:08:04 UTC (rev 156874)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=gtk3
+pkgver=3.4.1
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
+makedepends=('gobject-introspection')
+options=('!libtool')
+backup=(etc/gtk-3.0/settings.ini)
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
+        settings.ini)
+sha256sums=('0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
+build() {
+    cd "gtk+-$pkgver"
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-gtk2-dependency \
+        --disable-schemas-compile
+    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    make
+}
+
+package() {
+    cd "gtk+-$pkgver"
+    make DESTDIR="$pkgdir" install
+
+    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+}

Deleted: extra-x86_64/empty_grid.patch
===================================================================
--- extra-x86_64/empty_grid.patch	2012-04-23 09:08:02 UTC (rev 156873)
+++ extra-x86_64/empty_grid.patch	2012-04-23 09:08:04 UTC (rev 156874)
@@ -1,29 +0,0 @@
-From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at 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

Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install	2012-04-23 09:08:02 UTC (rev 156873)
+++ extra-x86_64/gtk3.install	2012-04-23 09:08:04 UTC (rev 156874)
@@ -1,15 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    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
-}

Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 156695, gtk3/repos/testing-x86_64/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install	                        (rev 0)
+++ extra-x86_64/gtk3.install	2012-04-23 09:08:04 UTC (rev 156874)
@@ -0,0 +1,16 @@
+post_install() {
+    /usr/bin/gtk-query-immodules-3.0 --update-cache
+    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    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
+}

Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini	2012-04-23 09:08:02 UTC (rev 156873)
+++ extra-x86_64/settings.ini	2012-04-23 09:08:04 UTC (rev 156874)
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome

Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 156695, gtk3/repos/testing-x86_64/settings.ini)
===================================================================
--- extra-x86_64/settings.ini	                        (rev 0)
+++ extra-x86_64/settings.ini	2012-04-23 09:08:04 UTC (rev 156874)
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome



More information about the arch-commits mailing list