[SCM] Kross interpreters packaging branch, kde4.12, updated. debian/4.11.5-2-2-g37c897a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kross-interpreters.git;a=commitdiff;h=37c897a

The following commit has been merged in the kde4.12 branch:
commit 37c897ac8be96eaac6b04e56c3b81f829ea639f2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Feb 8 22:47:36 2014 +0100

    Remove upstream patch: upstream_ruby-fix-rb_raise-calls-with-arguments.patch.
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 -
 ...am_ruby-fix-rb_raise-calls-with-arguments.patch | 69 ----------------------
 3 files changed, 2 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3781db..70af1a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kross-interpreters (4:4.12.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove upstream patch: upstream_ruby-fix-rb_raise-calls-with-
+    arguments.patch.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Feb 2014 19:11:10 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fbc3321..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_ruby-fix-rb_raise-calls-with-arguments.patch
diff --git a/debian/patches/upstream_ruby-fix-rb_raise-calls-with-arguments.patch b/debian/patches/upstream_ruby-fix-rb_raise-calls-with-arguments.patch
deleted file mode 100644
index 58a86a5..0000000
--- a/debian/patches/upstream_ruby-fix-rb_raise-calls-with-arguments.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From cc551d8feeed74ee923c53587ee08859560c3300 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Fri, 10 Jan 2014 09:19:13 +0100
-Subject: [PATCH] ruby: fix rb_raise calls with arguments
-
-When passing arguments to the error string for rb_raise, just pass them
-to rb_raise directly (which takes printf-like varargs) instead of
-building a QString manually
----
- ruby/rubyextension.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ruby/rubyextension.cpp b/ruby/rubyextension.cpp
-index 9afbbb2..7630058 100644
---- a/ruby/rubyextension.cpp
-+++ b/ruby/rubyextension.cpp
-@@ -278,7 +278,7 @@ VALUE RubyExtension::callConnect(int argc, VALUE *argv, VALUE self)
-             sendersignal = RubyType<QByteArray>::toVariant(argv[1]);
-             idx = 2;
-             if( argc <= idx ) {
--                rb_raise(rb_eTypeError, ::QString("Expected at least %1 arguments.").arg(idx+1).toLatin1().constData());
-+                rb_raise(rb_eTypeError, "Expected at least %d arguments.", idx+1);
-                 return Qfalse;
-             }
-         } break;
-@@ -310,7 +310,7 @@ VALUE RubyExtension::callConnect(int argc, VALUE *argv, VALUE self)
-         */
- #if(!(RUBY_API_VERSION_MAJOR==1 && RUBY_API_VERSION_MINOR==8 && RUBY_API_VERSION_TEENY==4))
-         else {
--            rb_raise(rb_eTypeError, ::QString("The argument number %1 is invalid.").arg(idx).toLatin1().constData());
-+            rb_raise(rb_eTypeError, "The argument number %d is invalid.", idx);
-             return Qfalse;
-         }
- #endif
-@@ -462,19 +462,19 @@ VALUE RubyExtension::call_method_missing(RubyExtension* extension, int argc, VAL
-         QMetaProperty property = metaobject->property( extension->d->m_properties[name] );
-         if( name.endsWith('=') ) { // setter
-             if(argc < 2) {
--                rb_raise(rb_eNameError, QString("Expected value-argument for \"%1\" setter.").arg(name.constData()).toLatin1().constData());
-+                rb_raise(rb_eNameError, "Expected value-argument for \"%s\" setter.", name.constData());
-                 return Qnil;
-             }
-             QVariant v = RubyType<QVariant>::toVariant(argv[1]);
-             if(! property.write(extension->d->m_object, v)) {
--                rb_raise(rb_eNameError, QString("Setting attribute \"%1\" failed.").arg(name.constData()).toLatin1().constData());
-+                rb_raise(rb_eNameError, "Setting attribute \"%s\" failed.", name.constData());
-                 return Qnil;
-             }
-             return Qnil;
-         }
-         else { // getter
-             if(! property.isReadable()) {
--                rb_raise(rb_eNameError, QString("Attribute \"%1\" is not readable.").arg(name.constData()).toLatin1().constData());
-+                rb_raise(rb_eNameError, "Attribute \"%s\" is not readable.", name.constData());
-                 return Qnil;
-             }
-             return RubyType<QVariant>::toVALUE( property.read(extension->d->m_object) );
-@@ -497,7 +497,7 @@ VALUE RubyExtension::call_method_missing(RubyExtension* extension, int argc, VAL
-         return RubyExtension::toVALUE( new RubyExtension(object), true /*owner*/ );
-     }
- 
--    rb_raise(rb_eNameError, QString("No such method or variable \"%1\".").arg(name.constData()).toLatin1().constData());
-+    rb_raise(rb_eNameError, "No such method or variable \"%s\".", name.constData());
-     return Qnil;
- }
- 
--- 
-1.8.5.2
-

-- 
Kross interpreters packaging