[SCM] Kross interpreters packaging branch, master, updated. debian/4.11.3-1-2-gdfe4e23
Pino Toscano
pino at moszumanska.debian.org
Fri Jan 10 08:52:40 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kross-interpreters.git;a=commitdiff;h=dfe4e23
The following commit has been merged in the master branch:
commit dfe4e2379303e055c7c7ac92167cdac82b064b8e
Author: Pino Toscano <pino at debian.org>
Date: Fri Jan 10 09:51:45 2014 +0100
add krossruby back (#693533)
- copy control snippet and krossruby.install from the old kdebindings
packaging
- add the ruby and ruby-dev build dependencies
- backport upstream commit cc551d8feeed74ee923c53587ee08859560c3300
to fix build of krossruby with -Werror=format-security
---
debian/changelog | 8 +++
debian/control | 16 ++++-
debian/krossruby.install | 1 +
debian/patches/series | 1 +
...am_ruby-fix-rb_raise-calls-with-arguments.patch | 69 ++++++++++++++++++++++
5 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4489223..1bdfa97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
kross-interpreters (4:4.11.3-2) UNRELEASED; urgency=low
+ [ Pino Toscano ]
+ * Add krossruby back: (Closes: #693533)
+ - copy control snippet and krossruby.install from the old kdebindings
+ packaging
+ - add the ruby and ruby-dev build dependencies
+ - backport upstream commit cc551d8feeed74ee923c53587ee08859560c3300 to fix
+ build of krossruby with -Werror=format-security; patch
+ upstream_ruby-fix-rb_raise-calls-with-arguments.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 10 Jan 2014 09:43:48 +0100
diff --git a/debian/control b/debian/control
index deb6ca4..3174cea 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Build-Depends: kde-sc-dev-latest (>= 4:4.11),
debhelper (>= 9), cmake, pkg-kde-tools (>= 0.12), kdelibs5-dev (>= 4:4.11),
- python-dev
+ python-dev,
+ ruby, ruby-dev,
Uploaders: Modestas Vainius <modax at debian.org>,
Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>
@@ -25,3 +26,16 @@ Description: Python module for Kross
.
Kross itself is a part of KDELibs, this package contains the Kross Python
plugin.
+
+Package: krossruby
+Section: ruby
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Breaks: libkde4-ruby1.8 (<< 4:4.2.60)
+Replaces: libkde4-ruby1.8 (<< 4:4.2.60)
+Description: Ruby module for Kross
+ Kross is a scripting framework to enable scripting in various languages in all
+ kinds of KDE applications.
+ .
+ Kross itself is a part of KDELibs, this package contains the Kross Ruby
+ plugin.
diff --git a/debian/krossruby.install b/debian/krossruby.install
new file mode 100644
index 0000000..6b764f7
--- /dev/null
+++ b/debian/krossruby.install
@@ -0,0 +1 @@
+usr/lib/kde4/krossruby.so
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fbc3321
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..58a86a5
--- /dev/null
+++ b/debian/patches/upstream_ruby-fix-rb_raise-calls-with-arguments.patch
@@ -0,0 +1,69 @@
+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
More information about the pkg-kde-commits
mailing list