[arch-commits] Commit in kdebindings/trunk (PKGBUILD fix-ruby-bindings.patch)

[Andrea Scarpino]

    Date: Wednesday, November 3, 2010 @ 03:21:50
  Author: andrea
Revision: 98024

new tarball includes the ruby patch

Modified:
  kdebindings/trunk/PKGBUILD
Deleted:
  kdebindings/trunk/fix-ruby-bindings.patch

-------------------------+
 PKGBUILD                |    9 +++------
 fix-ruby-bindings.patch |   24 ------------------------
 2 files changed, 3 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-03 04:55:50 UTC (rev 98023)
+++ PKGBUILD	2010-11-03 07:21:50 UTC (rev 98024)
@@ -15,17 +15,14 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt' 'kdepim-runtime' 'mono'
 	'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-	'fix-pyqt4-build.patch'
-	'fix-ruby-bindings.patch')
-sha1sums=('60be241397a7c79bf87f7b388c619e7026701904'
-          '36b52d147fee24a65c756baaad00e3d1ac081d3d'
-          '2ef4d19581ce1365162cef6516f335efa391b62c')
+	'fix-pyqt4-build.patch')
+sha1sums=('84a86395cf0dfb328111a5492e78a1967f6a1146'
+          '36b52d147fee24a65c756baaad00e3d1ac081d3d')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	patch -Np0 -i ${srcdir}/fix-pyqt4-build.patch
-	patch -Np3 -i ${srcdir}/fix-ruby-bindings.patch
 
 	# fix ruby
 	for f in `find ruby -name CMakeLists.txt`; do

Deleted: fix-ruby-bindings.patch
===================================================================
--- fix-ruby-bindings.patch	2010-11-03 04:55:50 UTC (rev 98023)
+++ fix-ruby-bindings.patch	2010-11-03 07:21:50 UTC (rev 98024)
@@ -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());