Date: Sunday, March 10, 2013 @ 17:16:07 Author: td123 Revision: 85969
archrelease: copy trunk to community-staging-x86_64, community-staging-i686 Added: ruby-gtk2/repos/community-staging-i686/ ruby-gtk2/repos/community-staging-i686/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (from rev 85968, ruby-gtk2/trunk/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch) ruby-gtk2/repos/community-staging-i686/PKGBUILD (from rev 85968, ruby-gtk2/trunk/PKGBUILD) ruby-gtk2/repos/community-staging-x86_64/ ruby-gtk2/repos/community-staging-x86_64/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (from rev 85968, ruby-gtk2/trunk/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch) ruby-gtk2/repos/community-staging-x86_64/PKGBUILD (from rev 85968, ruby-gtk2/trunk/PKGBUILD) ------------------------------------------------------------------------------------------+ community-staging-i686/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch | 55 +++++ community-staging-i686/PKGBUILD | 97 ++++++++++ community-staging-x86_64/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch | 55 +++++ community-staging-x86_64/PKGBUILD | 97 ++++++++++ 4 files changed, 304 insertions(+) Copied: ruby-gtk2/repos/community-staging-i686/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (from rev 85968, ruby-gtk2/trunk/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch) =================================================================== --- community-staging-i686/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (rev 0) +++ community-staging-i686/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch 2013-03-10 16:16:07 UTC (rev 85969) @@ -0,0 +1,55 @@ +From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@gmail.com> +Date: Sun, 10 Mar 2013 08:51:02 -0700 +Subject: [PATCH] backport + https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df + to fix syntax errors with NIL_P + +--- + gtk2/ext/gtk2/rbgdkevent.c | 2 +- + gtk2/ext/gtk2/rbgdkscreen.c | 2 +- + gtk2/ext/gtk2/rbgtkcalendar.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gtk2/ext/gtk2/rbgdkevent.c b/gtk2/ext/gtk2/rbgdkevent.c +index 783ec72..63b1502 100644 +--- a/gtk2/ext/gtk2/rbgdkevent.c ++++ b/gtk2/ext/gtk2/rbgdkevent.c +@@ -387,7 +387,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gtk2/ext/gtk2/rbgdkscreen.c b/gtk2/ext/gtk2/rbgdkscreen.c +index 243ed92..3095e38 100644 +--- a/gtk2/ext/gtk2/rbgdkscreen.c ++++ b/gtk2/ext/gtk2/rbgdkscreen.c +@@ -210,7 +210,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gtk2/ext/gtk2/rbgtkcalendar.c b/gtk2/ext/gtk2/rbgtkcalendar.c +index e895f81..f9b0666 100644 +--- a/gtk2/ext/gtk2/rbgtkcalendar.c ++++ b/gtk2/ext/gtk2/rbgtkcalendar.c +@@ -105,7 +105,7 @@ rg_display_options(int argc, VALUE *argv, VALUE self) + VALUE flags; + rb_scan_args(argc, argv, "01", &flags); + +- if NIL_P(flags){ ++ if (NIL_P(flags)){ + #if GTK_CHECK_VERSION(2,4,0) + return GFLAGS2RVAL(gtk_calendar_get_display_options(_SELF(self)), + GTK_TYPE_CALENDAR_DISPLAY_OPTIONS); +-- +1.8.1.5 + Copied: ruby-gtk2/repos/community-staging-i686/PKGBUILD (from rev 85968, ruby-gtk2/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-03-10 16:16:07 UTC (rev 85969) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Eric Bélanger <e...@archlinux.org> +# Contributor: Brad Fanella <bradfane...@archlinux.us> +# Contributor: Bjorn Lindeijer <bj...@lindeijer.nl> +# Contributor: kritoke <krit...@nospam.gmail.com> + +pkgbase=ruby-gtk2 +pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' + 'ruby-pango') +pkgver=1.2.1 +pkgrel=3 +arch=('x86_64' 'i686') +url='http://ruby-gnome2.sourceforge.jp/' +license=('LGPL') +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=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125' + '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch + #find . -name extconf.rb -exec sed -i 's/glib2/glib-2.0/' {} \; + #sed -i 's/glib2/glib-2.0/' extconf.rb + 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" + mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/1.9.1/x86_64-linux" + export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make +} + +package_ruby-atk() { + pkgdesc='Ruby bindings for atk' + depends=("ruby-glib2=$pkgver" 'atk') + + cd "$srcdir/ruby-gtk2-$pkgver/atk" + 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() { + pkgdesc='Ruby bindings for gdkpixbuf2' + depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') + + cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" + 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() { + pkgdesc='Ruby bindings for gio2' + depends=("ruby-glib2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gio2" + export CXXFLAGS="$CXXFLAGS -lglib-2.0" + export CFLAGS="$CFLAGS -lglib-2.0" + make includedir="/usr/include" DESTDIR="$pkgdir/" install +} + +package_ruby-glib2() { + pkgdesc='Ruby bindings for glib2' + depends=('glib2' 'ruby') + + cd "$srcdir/ruby-gtk2-$pkgver/glib2" + export CXXFLAGS="$CXXFLAGS -lglib-2.0" + export CFLAGS="$CFLAGS -lglib-2.0" + make includedir="/usr/include" DESTDIR="$pkgdir/" install +} + +package_ruby-gtk2() { + pkgdesc='Ruby bindings for gtk2' + depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" + "ruby-gdkpixbuf2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gtk2" + 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() { + pkgdesc='Ruby bindings for pango' + depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') + + cd "$srcdir/ruby-gtk2-$pkgver/pango" + 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: Copied: ruby-gtk2/repos/community-staging-x86_64/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (from rev 85968, ruby-gtk2/trunk/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch) =================================================================== --- community-staging-x86_64/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (rev 0) +++ community-staging-x86_64/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch 2013-03-10 16:16:07 UTC (rev 85969) @@ -0,0 +1,55 @@ +From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@gmail.com> +Date: Sun, 10 Mar 2013 08:51:02 -0700 +Subject: [PATCH] backport + https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df + to fix syntax errors with NIL_P + +--- + gtk2/ext/gtk2/rbgdkevent.c | 2 +- + gtk2/ext/gtk2/rbgdkscreen.c | 2 +- + gtk2/ext/gtk2/rbgtkcalendar.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gtk2/ext/gtk2/rbgdkevent.c b/gtk2/ext/gtk2/rbgdkevent.c +index 783ec72..63b1502 100644 +--- a/gtk2/ext/gtk2/rbgdkevent.c ++++ b/gtk2/ext/gtk2/rbgdkevent.c +@@ -387,7 +387,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gtk2/ext/gtk2/rbgdkscreen.c b/gtk2/ext/gtk2/rbgdkscreen.c +index 243ed92..3095e38 100644 +--- a/gtk2/ext/gtk2/rbgdkscreen.c ++++ b/gtk2/ext/gtk2/rbgdkscreen.c +@@ -210,7 +210,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gtk2/ext/gtk2/rbgtkcalendar.c b/gtk2/ext/gtk2/rbgtkcalendar.c +index e895f81..f9b0666 100644 +--- a/gtk2/ext/gtk2/rbgtkcalendar.c ++++ b/gtk2/ext/gtk2/rbgtkcalendar.c +@@ -105,7 +105,7 @@ rg_display_options(int argc, VALUE *argv, VALUE self) + VALUE flags; + rb_scan_args(argc, argv, "01", &flags); + +- if NIL_P(flags){ ++ if (NIL_P(flags)){ + #if GTK_CHECK_VERSION(2,4,0) + return GFLAGS2RVAL(gtk_calendar_get_display_options(_SELF(self)), + GTK_TYPE_CALENDAR_DISPLAY_OPTIONS); +-- +1.8.1.5 + Copied: ruby-gtk2/repos/community-staging-x86_64/PKGBUILD (from rev 85968, ruby-gtk2/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2013-03-10 16:16:07 UTC (rev 85969) @@ -0,0 +1,97 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Eric Bélanger <e...@archlinux.org> +# Contributor: Brad Fanella <bradfane...@archlinux.us> +# Contributor: Bjorn Lindeijer <bj...@lindeijer.nl> +# Contributor: kritoke <krit...@nospam.gmail.com> + +pkgbase=ruby-gtk2 +pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' + 'ruby-pango') +pkgver=1.2.1 +pkgrel=3 +arch=('x86_64' 'i686') +url='http://ruby-gnome2.sourceforge.jp/' +license=('LGPL') +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=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125' + '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch + #find . -name extconf.rb -exec sed -i 's/glib2/glib-2.0/' {} \; + #sed -i 's/glib2/glib-2.0/' extconf.rb + 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" + mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/1.9.1/x86_64-linux" + export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make +} + +package_ruby-atk() { + pkgdesc='Ruby bindings for atk' + depends=("ruby-glib2=$pkgver" 'atk') + + cd "$srcdir/ruby-gtk2-$pkgver/atk" + 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() { + pkgdesc='Ruby bindings for gdkpixbuf2' + depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') + + cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" + 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() { + pkgdesc='Ruby bindings for gio2' + depends=("ruby-glib2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gio2" + export CXXFLAGS="$CXXFLAGS -lglib-2.0" + export CFLAGS="$CFLAGS -lglib-2.0" + make includedir="/usr/include" DESTDIR="$pkgdir/" install +} + +package_ruby-glib2() { + pkgdesc='Ruby bindings for glib2' + depends=('glib2' 'ruby') + + cd "$srcdir/ruby-gtk2-$pkgver/glib2" + export CXXFLAGS="$CXXFLAGS -lglib-2.0" + export CFLAGS="$CFLAGS -lglib-2.0" + make includedir="/usr/include" DESTDIR="$pkgdir/" install +} + +package_ruby-gtk2() { + pkgdesc='Ruby bindings for gtk2' + depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" + "ruby-gdkpixbuf2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gtk2" + 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() { + pkgdesc='Ruby bindings for pango' + depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') + + cd "$srcdir/ruby-gtk2-$pkgver/pango" + 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: