diff --git a/kdebindings/PKGBUILD b/kdebindings/PKGBUILD index 539e6eef0..f201d7656 100644 --- a/kdebindings/PKGBUILD +++ b/kdebindings/PKGBUILD @@ -44,8 +44,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt' source=($_mirror/${_origname}-$_kdever.tar.bz2 fix-ruby-bindings.patch) -md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` - 95efe147489fdd8acb421a0a450e635a) +md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`) # @@ -55,8 +54,6 @@ build() { cd ${srcdir}/${_origname}-${pkgver} - patch -Np3 -i ${srcdir}/fix-ruby-bindings.patch - #fix ruby for f in `find ruby -name CMakeLists.txt`; do sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH} /usr/include/ruby-1.9.1/${_ARCHITECTURE}-linux|" "${f}" diff --git a/kdebindings/fix-ruby-bindings.patch b/kdebindings/fix-ruby-bindings.patch deleted file mode 100644 index 830dc8ee8..000000000 --- a/kdebindings/fix-ruby-bindings.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- trunk/KDE/kdebindings/ruby/korundum/src/krubypluginfactory.cpp 2010/07/20 14:22:25 1152205 -+++ trunk/KDE/kdebindings/ruby/korundum/src/krubypluginfactory.cpp 2010/09/30 15:34:41 1181284 -@@ -52,16 +52,17 @@ - VALUE bt = rb_funcall(info, rb_intern("backtrace"), 0); - VALUE message = RARRAY_PTR(bt)[0]; - -+ VALUE obj_string = rb_obj_as_string(info); - QString errormessage = QString("%1: %2 (%3)") -- .arg( STR2CSTR(message) ) -- .arg( STR2CSTR(rb_obj_as_string(info)) ) -- .arg( rb_class2name(CLASS_OF(info)) ); -+ .arg( QString::fromLatin1(StringValuePtr(message)) ) -+ .arg( QString::fromLatin1(StringValuePtr(obj_string)) ) -+ .arg( QString::fromLatin1(rb_class2name(CLASS_OF(info))) ); - fprintf(stderr, "%s\n", errormessage.toLatin1().constData()); - - QString tracemessage; - for(int i = 1; i < RARRAY_LEN(bt); ++i) { - if( TYPE(RARRAY_PTR(bt)[i]) == T_STRING ) { -- QString s = QString("%1\n").arg( STR2CSTR(RARRAY_PTR(bt)[i]) ); -+ QString s = QString("%1\n").arg( QString::fromLatin1(StringValuePtr(RARRAY_PTR(bt)[i])) ); - Q_ASSERT( ! s.isNull() ); - tracemessage += s; - fprintf(stderr, "\t%s", s.toLatin1().constData());