Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/audex/PKGBUILD
	community/gimp-ufraw/PKGBUILD
	community/ogmrip/PKGBUILD
	community/oss/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/soundkonverter/PKGBUILD
	core/iptables/PKGBUILD
	core/libffi/PKGBUILD
	extra/clamav/PKGBUILD
	extra/ecasound/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD

1 files changed, 37 insertions, 16 deletions

diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index e49f1ac73..4be4eb028 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83903 2013-02-06 13:56:53Z arodseth $
+# $Id: PKGBUILD 86266 2013-03-14 14:33:19Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -8,23 +8,32 @@
 pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2'
          'ruby-pango')
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.2.2
+pkgrel=1
 arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
-makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz")
-sha256sums=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125')
+makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2')
+source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz"
+        '0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch')
+sha256sums=('f99ff4888fc69317e1dae61c9ca684bf2f38a20534f1f1b4b3b182c66247910c'
+            '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388')
 
 build() {
   cd "$srcdir/ruby-gtk2-$pkgver"
+
+  #patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch
   LANG="en_US.UTF-8" \
     ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor
-  #mkdir -p \
-  #  "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux"
-  make -j1
+  #mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/2.0.0/i686-linux"
+  #mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/2.0.0/x86_64-linux"
+  mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/1.9.1/i686-linux"
+  mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/1.9.1/i686-linux"
+  mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/1.9.1/i686-linux"
+  mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux"
+  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
+  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
+  make
 }
 
 package_ruby-atk() {
@@ -32,7 +41,9 @@ package_ruby-atk() {
   depends=("ruby-glib2=$pkgver" 'atk')
 
   cd "$srcdir/ruby-gtk2-$pkgver/atk"
-  make DESTDIR="$pkgdir/" install
+  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
+  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
+  make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
 package_ruby-gdkpixbuf2() {
@@ -40,7 +51,9 @@ package_ruby-gdkpixbuf2() {
   depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2')
 
   cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2"
-  make DESTDIR="$pkgdir/" install
+  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
+  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
+  make includedir="/usr/include" DESTDIR="$pkgdir" install
 }
 
 package_ruby-gio2() {
@@ -48,7 +61,9 @@ package_ruby-gio2() {
   depends=("ruby-glib2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gio2"
-  make DESTDIR="$pkgdir/" install
+  #export CXXFLAGS="$CXXFLAGS -lglib-2.0"
+  #export CFLAGS="$CFLAGS -lglib-2.0"
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 package_ruby-glib2() {
@@ -56,7 +71,9 @@ package_ruby-glib2() {
   depends=('glib2' 'ruby')
 
   cd "$srcdir/ruby-gtk2-$pkgver/glib2"
-  make DESTDIR="$pkgdir/" install
+  #export CXXFLAGS="$CXXFLAGS -lglib-2.0"
+  #export CFLAGS="$CFLAGS -lglib-2.0"
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 package_ruby-gtk2() {
@@ -65,7 +82,9 @@ package_ruby-gtk2() {
            "ruby-gdkpixbuf2=$pkgver")
 
   cd "$srcdir/ruby-gtk2-$pkgver/gtk2"
-  make DESTDIR="$pkgdir/" install
+  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
+  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 package_ruby-pango() {
@@ -73,7 +92,9 @@ package_ruby-pango() {
   depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango')
 
   cd "$srcdir/ruby-gtk2-$pkgver/pango"
-  make DESTDIR="$pkgdir/" install
+  #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`"
+  #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`"
+  make includedir="/usr/include" DESTDIR="$pkgdir/" install
 }
 
 # vim:set ts=2 sw=2 et: