Date: Saturday, October 30, 2010 @ 08:58:36
Author: andrea
Revision: 97468
KDE 4.5.3
Added:
kdebindings/trunk/fix-ruby-bindings.patch
Modified:
kdebindings/trunk/PKGBUILD
Deleted:
kdebindings/trunk/fix-generator-segfaults.patch
kdebindings/trunk/mono-2.8.patch
-------------------------------+
PKGBUILD | 35 +++++++++++++---------
fix-generator-segfaults.patch | 63 ----------------------------------------
fix-ruby-bindings.patch | 24 +++++++++++++++
mono-2.8.patch | 21 -------------
4 files changed, 45 insertions(+), 98 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-10-30 12:58:30 UTC (rev 97467)
+++ PKGBUILD 2010-10-30 12:58:36 UTC (rev 97468)
@@ -5,32 +5,33 @@
pkgbase=kdebindings
pkgname=('kdebindings-csharp'
'kdebindings-python'
+ 'kdebindings-ruby'
'kdebindings-smoke')
-pkgver=4.5.2
-pkgrel=8
+pkgver=4.5.3
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'pyqt' 'kdepim-runtime' 'mono'
- 'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla')
+ '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-generator-segfaults.patch'
- 'mono-2.8.patch')
-sha1sums=('108fd6e3dbb341adc0e90487d1b681534968f1d2'
- '36b52d147fee24a65c756baaad00e3d1ac081d3d'
- 'c0045f5b57fb62e6b0a9443548938f93af501b9d'
- '9fdcab702f4e0ac8adec40a4a97208f18d5b826a')
+ 'fix-ruby-bindings.patch')
+sha1sums=('60be241397a7c79bf87f7b388c619e7026701904'
+ '36b52d147fee24a65c756baaad00e3d1ac081d3d'
+ '2ef4d19581ce1365162cef6516f335efa391b62c')
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
+ sed -i "s|\${RUBY_INCLUDE_PATH}|\${RUBY_INCLUDE_PATH}
/usr/include/ruby-1.9.1/${_ARCHITECTURE}-linux|" "${f}"
+ done
- # Already fixed in 4.5.3
- patch -Np4 -i ${srcdir}/fix-generator-segfaults.patch
- patch -Np3 -i ${srcdir}/mono-2.8.patch
-
export MONO_SHARED_DIR="${srcdir}/build/.mono"
mkdir -p "$MONO_SHARED_DIR"
cd ${srcdir}/build
@@ -40,7 +41,6 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_falcon=OFF \
-DBUILD_java=OFF \
- -DBUILD_ruby=OFF \
-DBUILD_php=OFF \
-DWITH_PolkitQt=OFF
make
@@ -65,6 +65,13 @@
find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env
python|#!/usr/bin/env python2|'
}
+package_kdebindings-ruby() {
+ pkgdesc='KDE Bindings for ruby'
+ depends=('kdebindings-smoke' 'ruby')
+ cd $srcdir/build/ruby
+ make DESTDIR=$pkgdir install
+}
+
package_kdebindings-smoke() {
pkgdesc='Language independent library for Qt and KDE bindings'
depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime')
Deleted: fix-generator-segfaults.patch
===================================================================
--- fix-generator-segfaults.patch 2010-10-30 12:58:30 UTC (rev 97467)
+++ fix-generator-segfaults.patch 2010-10-30 12:58:36 UTC (rev 97468)
@@ -1,63 +0,0 @@
---- branches/KDE/4.5/kdebindings/generator/generators/smoke/helpers.cpp
2010/10/09 06:54:13 1184023
-+++ branches/KDE/4.5/kdebindings/generator/generators/smoke/helpers.cpp
2010/10/09 06:57:13 1184024
-@@ -131,10 +131,10 @@
- // map this method to the function, so we can later retrieve the
header it was defined in
- globalFunctionMap[&parent->methods().last()] = &fn;
-
-- int methIndex = parent->methods().length() - 1;
-+ int methIndex = parent->methods().size() - 1;
- addOverloads(meth);
- // handle the methods appended by addOverloads()
-- for (int i = parent->methods().length() - 1; i > methIndex; --i)
-+ for (int i = parent->methods().size() - 1; i > methIndex; --i)
- globalFunctionMap[&parent->methods()[i]] = &fn;
-
- (*usedTypes) << meth.type();
-@@ -458,7 +458,11 @@
- return munge(&resolved);
- }
-
-- if (type->pointerDepth() > 1 || (type->getClass() &&
type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode &&
type->getClass()->name() != "QFlags"))) ||
-+ if (type->name().contains("long long") || type->name() == "size_t") {
-+ // Special case 'long long' types as '$'.
-+ // Hack: 'size_t' isn't being fully resolved for some reason.
-+ return '$';
-+ } else if (type->pointerDepth() > 1 || (type->getClass() &&
type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode &&
type->getClass()->name() != "QFlags"))) ||
- (Options::voidpTypes.contains(type->name()) &&
!Options::scalarTypes.contains(type->name())) )
- {
- // QString and QStringList are both mapped to Smoke::t_voidp, but
QString is a scalar as well
---- branches/KDE/4.5/kdebindings/generator/type_compiler.cpp 2010/10/09
06:54:13 1184023
-+++ branches/KDE/4.5/kdebindings/generator/type_compiler.cpp 2010/10/09
06:57:13 1184024
-@@ -182,7 +182,7 @@
- TypeCompiler tc(m_session, m_visitor);
- tc.run(node->type_specifier, node->declarator);
- NameCompiler name_cc(m_session, m_visitor);
-- if (tc.type().isFunctionPointer())
-+ if (tc.type().isFunctionPointer() && node->declarator &&
node->declarator->sub_declarator)
- name_cc.run(node->declarator->sub_declarator->id);
- else if (node->declarator)
- name_cc.run(node->declarator->id);
---- branches/KDE/4.5/kdebindings/generator/parser/rpp/pp-macro-expander.cpp
2010/10/09 06:54:13 1184023
-+++ branches/KDE/4.5/kdebindings/generator/parser/rpp/pp-macro-expander.cpp
2010/10/09 06:57:13 1184024
-@@ -268,10 +268,10 @@
- output << '\"';
-
- while (!is.atEnd()) {
-- if (input == '"') {
-+ if (is == '"') {
- output << '\\' << is;
-
-- } else if (input == '\n') {
-+ } else if (is == '\n') {
- output << '"' << is << '"';
-
- } else {
-@@ -338,7 +338,7 @@
-
- skip_blanks(input, devnull());
- //Omit paste tokens behind empty used actuals, else we will merge
with the previous text
-- if(input == '#' && (++input) == '#') {
-+ if(!input.atEnd() && input == '#' && !(++input).atEnd() && input
== '#') {
- ++input;
- //We have skipped a paste token
- }else{
Added: fix-ruby-bindings.patch
===================================================================
--- fix-ruby-bindings.patch (rev 0)
+++ fix-ruby-bindings.patch 2010-10-30 12:58:36 UTC (rev 97468)
@@ -0,0 +1,24 @@
+--- 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());
Deleted: mono-2.8.patch
===================================================================
--- mono-2.8.patch 2010-10-30 12:58:30 UTC (rev 97467)
+++ mono-2.8.patch 2010-10-30 12:58:36 UTC (rev 97468)
@@ -1,21 +0,0 @@
---- trunk/KDE/kdebindings/csharp/kimono/CMakeLists.txt 2010/05/19 22:20:26
1128672
-+++ trunk/KDE/kdebindings/csharp/kimono/CMakeLists.txt 2010/10/09 14:30:30
1184234
-@@ -22,7 +22,7 @@
- ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
-
- # write FindPackage modules for these
--pkg_search_module(LIBMONO mono)
-+pkg_search_module(LIBMONO mono-2 mono)
- pkg_search_module(GLIB2 glib-2.0)
-
- macro_log_feature(LIBMONO_FOUND "libmono" "Mono library"
"http://www.mono-project.com"; FALSE "" "Required to compile
kimonopluginfactory")
---- trunk/KDE/kdebindings/csharp/kimono/src/kimonopluginfactory.cpp
2010/10/09 14:25:41 1184233
-+++ trunk/KDE/kdebindings/csharp/kimono/src/kimonopluginfactory.cpp
2010/10/09 14:30:30 1184234
-@@ -42,6 +42,7 @@
- #include <mono/metadata/assembly.h>
- #include <mono/metadata/debug-helpers.h>
- #include <mono/metadata/mono-config.h>
-+#include <glib.h>
-
- #include <stdlib.h>
- #include <stdio.h>
