From eebfa6ebe1522831767019e496b0c094b2e15a5c Mon Sep 17 00:00:00 2001 From: root Date: Fri, 15 Mar 2013 00:04:20 -0700 Subject: Fri Mar 15 00:04:19 PDT 2013 --- ...tps-github.com-ruby-gnome2-ruby-gnome2-co.patch | 55 ++++++++++++++++++++++ community/ruby-gtk2/PKGBUILD | 52 ++++++++++++++------ 2 files changed, 92 insertions(+), 15 deletions(-) create mode 100644 community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (limited to 'community/ruby-gtk2') diff --git a/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch b/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch new file mode 100644 index 000000000..6e0088ea4 --- /dev/null +++ b/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch @@ -0,0 +1,55 @@ +From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +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 + diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index ca6a3f1a5..40eb4807e 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 # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -8,22 +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') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') -makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') -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() { @@ -31,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() { @@ -39,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() { @@ -47,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() { @@ -55,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() { @@ -64,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() { @@ -72,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: -- cgit v1.2.3-54-g00ecf