[arch-commits] Commit in gtk/repos/extra-i686 (6 files)

[Eric Bélanger]

    Date: Monday, September 12, 2011 @ 06:53:22
  Author: eric
Revision: 137904

archrelease: copy trunk to extra-i686

Added:
  gtk/repos/extra-i686/PKGBUILD
    (from rev 137903, gtk/trunk/PKGBUILD)
  gtk/repos/extra-i686/aclocal-fixes.patch
    (from rev 137903, gtk/trunk/aclocal-fixes.patch)
  gtk/repos/extra-i686/gtk.install
    (from rev 137903, gtk/trunk/gtk.install)
Deleted:
  gtk/repos/extra-i686/PKGBUILD
  gtk/repos/extra-i686/aclocal-fixes.patch
  gtk/repos/extra-i686/gtk.install

---------------------+
 PKGBUILD            |   78 ++++++++++++++++++++++++--------------------------
 aclocal-fixes.patch |   22 +++++++-------
 gtk.install         |   40 ++++++++++++-------------
 3 files changed, 69 insertions(+), 71 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-12 10:52:29 UTC (rev 137903)
+++ PKGBUILD	2011-09-12 10:53:22 UTC (rev 137904)
@@ -1,40 +0,0 @@
-# $Id$
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=gtk
-pkgver=1.2.10
-pkgrel=11
-pkgdesc="The GTK+ toolkit"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('LGPL')
-depends=('libxi' 'glib' 'sh')
-makedepends=('libxt')
-options=('!libtool')
-install=gtk.install
-source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz"
-        'aclocal-fixes.patch')
-md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20'
-         'c59d4906602d99a7468f7334b6fc3b4e')
-
-build() {
-	cd ${srcdir}/gtk+-${pkgver}
-	if [ "${CARCH}" = "x86_64" ]; then
-		rm config.guess config.sub
-		ln -s /usr/share/libtool/config/config.guess config.guess
-		ln -s /usr/share/libtool/config/config.sub config.sub
-	fi
-	patch -Np0 -i ${srcdir}/aclocal-fixes.patch
-
-	./configure --prefix=/usr --sysconfdir=/etc \
-		--mandir=/usr/share/man --infodir=/usr/share/info \
-		--with-xinput=xfree
-	make
-}
-
-package() {
-	cd ${srcdir}/gtk+-${pkgver}
-	make DESTDIR=${pkgdir} install
-}

Copied: gtk/repos/extra-i686/PKGBUILD (from rev 137903, gtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2011-09-12 10:53:22 UTC (rev 137904)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gtk
+pkgver=1.2.10
+pkgrel=11
+pkgdesc="The GTK+ toolkit"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+license=('LGPL')
+depends=('libxi' 'glib' 'sh')
+makedepends=('libxt')
+options=('!libtool')
+install=gtk.install
+source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz"
+        'aclocal-fixes.patch')
+md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20'
+         'c59d4906602d99a7468f7334b6fc3b4e')
+
+build() {
+  cd "${srcdir}/gtk+-${pkgver}"
+  if [ "${CARCH}" = "x86_64" ]; then
+    rm config.guess config.sub
+    ln -s /usr/share/libtool/config/config.guess config.guess
+    ln -s /usr/share/libtool/config/config.sub config.sub
+  fi
+  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --mandir=/usr/share/man --infodir=/usr/share/info \
+    --with-xinput=xfree
+  make
+}
+
+package() {
+  cd "${srcdir}/gtk+-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: aclocal-fixes.patch
===================================================================
--- aclocal-fixes.patch	2011-09-12 10:52:29 UTC (rev 137903)
+++ aclocal-fixes.patch	2011-09-12 10:53:22 UTC (rev 137904)
@@ -1,11 +0,0 @@
---- gtk.m4.orig	2006-03-05 13:18:09.000000000 +0000
-+++ gtk.m4	2006-03-05 13:18:20.000000000 +0000
-@@ -4,7 +4,7 @@
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
- dnl Get the cflags and libraries from the gtk-config script
- dnl

Copied: gtk/repos/extra-i686/aclocal-fixes.patch (from rev 137903, gtk/trunk/aclocal-fixes.patch)
===================================================================
--- aclocal-fixes.patch	                        (rev 0)
+++ aclocal-fixes.patch	2011-09-12 10:53:22 UTC (rev 137904)
@@ -0,0 +1,11 @@
+--- gtk.m4.orig	2006-03-05 13:18:09.000000000 +0000
++++ gtk.m4	2006-03-05 13:18:20.000000000 +0000
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK],
+ [dnl 
+ dnl Get the cflags and libraries from the gtk-config script
+ dnl

Deleted: gtk.install
===================================================================
--- gtk.install	2011-09-12 10:52:29 UTC (rev 137903)
+++ gtk.install	2011-09-12 10:53:22 UTC (rev 137904)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(gdk.info.gz gtk.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: gtk/repos/extra-i686/gtk.install (from rev 137903, gtk/trunk/gtk.install)
===================================================================
--- gtk.install	                        (rev 0)
+++ gtk.install	2011-09-12 10:53:22 UTC (rev 137904)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gdk.info.gz gtk.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}