[arch-commits] Commit in ruby-gtk2/trunk (2 files)
Thomas Dziedzic
td123 at nymeria.archlinux.org
Sun Mar 10 16:15:32 UTC 2013
Date: Sunday, March 10, 2013 @ 17:15:32
Author: td123
Revision: 85968
upgpkg: ruby-gtk2 1.2.1-3
rebuild and fix syntax errors
Added:
ruby-gtk2/trunk/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch
Modified:
ruby-gtk2/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch | 55 ++++++++++
PKGBUILD | 7 -
2 files changed, 60 insertions(+), 2 deletions(-)
Added: 0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch
===================================================================
--- 0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch (rev 0)
+++ 0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch 2013-03-10 16:15:32 UTC (rev 85968)
@@ -0,0 +1,55 @@
+From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at 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
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-10 15:23:42 UTC (rev 85967)
+++ PKGBUILD 2013-03-10 16:15:32 UTC (rev 85968)
@@ -14,11 +14,14 @@
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")
-sha256sums=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125')
+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" \
More information about the arch-commits
mailing list