karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

kdebindings: Updated (3.5.10 -> 4.2.2)

user/karasz/test/ecn
Aldas Nabazas 16 years ago committed by Alejandro Mery
parent
c902e244c4
commit
2715b9f4c6
7 changed files with 22 additions and 635 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 383
      kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch.disable
  2. 47
      kde/kdebindings/kdebindings.cache
  3. 24
      kde/kdebindings/kdebindings.conf
  4. 9
      kde/kdebindings/kdebindings.desc
  5. 93
      kde/kdebindings/kdepy.patch
  6. 27
      kde/kdebindings/ruby-args-fix.patch.disable
  7. 74
      kde/kdebindings/ruby_const-fix.patch

383
kde/kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch.disable
Unescape View File

@ -1,383 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../kdebindings/kdebindings-3.5.6-build-against-python-before-2.5.patch.disable
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Index: python/pykde/sip/kio/global.sip
===================================================================
--- ./python/pykde/sip/kio/global.sip (Revision 626831)
+++ ./python/pykde/sip/kio/global.sip (Revision 626832)
@@ -675,7 +675,7 @@
QMap<QString,QString> *cppmap = new QMap<QString,QString>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *acpp;
QString *bcpp;
Index: python/pykde/sip/kio/authinfo.sip
===================================================================
--- ./python/pykde/sip/kio/authinfo.sip (Revision 626831)
+++ ./python/pykde/sip/kio/authinfo.sip (Revision 626832)
@@ -176,7 +176,7 @@
QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *sKey;
QStringList *sData;
Index: python/pykde/sip/kio/kservicetype.sip
===================================================================
--- ./python/pykde/sip/kio/kservicetype.sip (Revision 626831)
+++ ./python/pykde/sip/kio/kservicetype.sip (Revision 626832)
@@ -184,7 +184,7 @@
QMap<QString,QVariant::Type> *cppmap = new QMap<QString,QVariant::Type>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *acpp;
QVariant::Type bcpp;
Index: python/pykde/sip/kmdi/kmdichildfrm.sip
===================================================================
--- ./python/pykde/sip/kmdi/kmdichildfrm.sip (Revision 626831)
+++ ./python/pykde/sip/kmdi/kmdichildfrm.sip (Revision 626832)
@@ -245,7 +245,7 @@
QDict<QWidget::FocusPolicy>* qdict = new QDict<QWidget::FocusPolicy>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *a0;
QWidget::FocusPolicy a1;
Index: python/pykde/sip/kdeui/kkeydialog.sip
===================================================================
--- ./python/pykde/sip/kdeui/kkeydialog.sip (Revision 626831)
+++ ./python/pykde/sip/kdeui/kkeydialog.sip (Revision 626832)
@@ -231,7 +231,7 @@
QDict<int>* qdict = new QDict<int>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *a0;
int a1;
Index: python/pykde/sip/kparts/browserextension.sip
===================================================================
--- ./python/pykde/sip/kparts/browserextension.sip (Revision 626831)
+++ ./python/pykde/sip/kparts/browserextension.sip (Revision 626832)
@@ -404,7 +404,7 @@
QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QCString *acpp;
QCString *bcpp;
@@ -487,7 +487,7 @@
QMap<QCString,int> *cppmap = new QMap<QCString,int>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QCString *acpp;
int bcpp;
Index: python/pykde/sip/kdecore/bytearray.sip
===================================================================
--- ./python/pykde/sip/kdecore/bytearray.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/bytearray.sip (Revision 626832)
@@ -620,7 +620,7 @@
QMap<QCString,DCOPRef> *cppmap = new QMap<QCString,DCOPRef>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QCString *acpp;
DCOPRef *bcpp;
@@ -705,7 +705,7 @@
QMap<QString,DCOPRef> *cppmap = new QMap<QString,DCOPRef>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *acpp;
DCOPRef *bcpp;
Index: python/pykde/sip/kdecore/kconfigdata.sip
===================================================================
--- ./python/pykde/sip/kdecore/kconfigdata.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/kconfigdata.sip (Revision 626832)
@@ -141,7 +141,7 @@
QMap<KEntryKey,KEntry> *cppmap = new QMap<KEntryKey,KEntry>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
KEntryKey *acpp;
KEntry *bcpp;
Index: python/pykde/sip/kdecore/kaccel.sip
===================================================================
--- ./python/pykde/sip/kdecore/kaccel.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/kaccel.sip (Revision 626832)
@@ -209,7 +209,7 @@
QMap<int,QString> *map = new QMap<int,QString>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
int iKey;
QString *sData;
Index: python/pykde/sip/kdecore/kcompletion.sip
===================================================================
--- ./python/pykde/sip/kdecore/kcompletion.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/kcompletion.sip (Revision 626832)
@@ -201,7 +201,7 @@
QMap<KCompletionBase::KeyBindingType,KShortcut> *kbmap = new QMap<KCompletionBase::KeyBindingType,KShortcut>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
KShortcut *cValue;
int iserr;
Index: python/pykde/sip/kdecore/kmacroexpander.sip
===================================================================
--- ./python/pykde/sip/kdecore/kmacroexpander.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/kmacroexpander.sip (Revision 626832)
@@ -169,7 +169,7 @@
QMap<QChar,QString> *map = new QMap<QChar,QString>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QChar *cKey;
QString *sData;
@@ -255,7 +255,7 @@
QMap<QString, QStringList> *map = new QMap<QString, QStringList>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *sKey;
QStringList *slData;
@@ -343,7 +343,7 @@
QMap<QChar,QStringList> *map = new QMap<QChar,QStringList>;
PyObject *key, *value;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QChar *cKey;
QStringList *slData;
Index: python/pykde/sip/kdecore/kurl.sip
===================================================================
--- ./python/pykde/sip/kdecore/kurl.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/kurl.sip (Revision 626832)
@@ -234,7 +234,7 @@
void __setitem__ (int, const KURL&);
%MethodCode
//takes index | (int) | value | (KURL)
- ssize_t len;
+ _SIP_SSIZE_T len;
len = sipCpp -> count();
@@ -248,7 +248,7 @@
%MethodCode
//takes range | (a Python slice) | urlList | (KURL.List)
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> count();
@@ -278,7 +278,7 @@
void __delitem__ (int);
%MethodCode
//takes index | (int)
- ssize_t len;
+ _SIP_SSIZE_T len;
len = sipCpp -> count();
@@ -291,7 +291,7 @@
void __delitem__ (SIP_PYSLICE);
%MethodCode
//takes range | (a Python slice)
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> count();
if (sipConvertFromSliceObject(a0,len,&start,&stop,&step,&slicelength) < 0)
@@ -308,7 +308,7 @@
%MethodCode
//returns (KURL)
//takes index | (int)
- ssize_t len;
+ _SIP_SSIZE_T len;
len = sipCpp -> count();
@@ -322,7 +322,7 @@
%MethodCode
//returns (KURL.List)
//takes range | (a Python slice)
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> count();
Index: python/pykde/sip/kdecore/kconfig.sip
===================================================================
--- ./python/pykde/sip/kdecore/kconfig.sip (Revision 626831)
+++ ./python/pykde/sip/kdecore/kconfig.sip (Revision 626832)
@@ -158,7 +158,7 @@
QMap<QString,QString> *cppmap = new QMap<QString,QString>;
PyObject *aelem, *belem;
- ssize_t pos = 0;
+ _SIP_SSIZE_T pos = 0;
QString *acpp;
QString *bcpp;
Index: python/pyqt/sip/qt/qstring.sip
===================================================================
--- ./python/pyqt/sip/qt/qstring.sip (Revision 626831)
+++ ./python/pyqt/sip/qt/qstring.sip (Revision 626832)
@@ -746,7 +746,7 @@
QString operator[](SIP_PYSLICE) const;
%MethodCode
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> length();
Index: python/pyqt/sip/qt/qdir.sip
===================================================================
--- ./python/pyqt/sip/qt/qdir.sip (Revision 626831)
+++ ./python/pyqt/sip/qt/qdir.sip (Revision 626832)
@@ -238,7 +238,7 @@
QString operator[](int) const;
%MethodCode
- ssize_t len;
+ _SIP_SSIZE_T len;
Py_BEGIN_ALLOW_THREADS
len = sipCpp -> count();
@@ -256,7 +256,7 @@
QStringList operator[](SIP_PYSLICE) const;
%MethodCode
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
Py_BEGIN_ALLOW_THREADS
len = sipCpp -> count();
Index: python/pyqt/sip/qt/qstringlist.sip
===================================================================
--- ./python/pyqt/sip/qt/qstringlist.sip (Revision 626831)
+++ ./python/pyqt/sip/qt/qstringlist.sip (Revision 626832)
@@ -99,7 +99,7 @@
void __setitem__(int,const QString &);
%MethodCode
- ssize_t len;
+ _SIP_SSIZE_T len;
len = sipCpp -> count();
@@ -111,7 +111,7 @@
void __setitem__(SIP_PYSLICE,const QStringList &);
%MethodCode
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> count();
@@ -142,7 +142,7 @@
void __delitem__(int);
%MethodCode
- ssize_t len;
+ _SIP_SSIZE_T len;
len = sipCpp -> count();
@@ -154,7 +154,7 @@
void __delitem__(SIP_PYSLICE);
%MethodCode
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> count();
@@ -170,7 +170,7 @@
QString operator[](int);
%MethodCode
- ssize_t len;
+ _SIP_SSIZE_T len;
len = sipCpp -> count();
@@ -182,7 +182,7 @@
QStringList operator[](SIP_PYSLICE);
%MethodCode
- ssize_t len, start, stop, step, slicelength;
+ _SIP_SSIZE_T len, start, stop, step, slicelength;
len = sipCpp -> count();
Index: dcoppython/shell/marshaller.cpp
===================================================================
--- ./dcoppython/shell/marshaller.cpp (Revision 626831)
+++ ./dcoppython/shell/marshaller.cpp (Revision 626832)
@@ -24,6 +24,10 @@
#include <kurl.h>
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#endif
+
namespace PythonDCOP {
#include "marshal_funcs.h"
@@ -124,7 +128,7 @@
if (!PyDict_Check(obj)) return false;
- ssize_t c=0;
+ Py_ssize_t c=0;
PyObject *key, *val;
while (PyDict_Next(obj, &c, &key, &val)==1)
if (!key_type.isMarshallable(key) ||

47
kde/kdebindings/kdebindings.cache
Unescape View File

@ -1,68 +1,57 @@
[TIMESTAMP] 1181118041 Wed Jun 6 11:20:41 2007 [TIMESTAMP] 1239877360 Thu Apr 16 13:22:40 2009
[BUILDTIME] 425 (5) [BUILDTIME] 105 (5) ERROR
[SIZE] 19.78 MB, 119 files [SIZE] 0.02 MB, 7 files
[DEP] 00-dirtree [DEP] automoc4
[DEP] arts
[DEP] autoconf
[DEP] automake
[DEP] bash [DEP] bash
[DEP] binutils [DEP] binutils
[DEP] bzip2 [DEP] bzip2
[DEP] cmake
[DEP] coreutils [DEP] coreutils
[DEP] diffutils [DEP] diffutils
[DEP] e2fsprogs
[DEP] expat [DEP] expat
[DEP] gamin [DEP] fhs
[DEP] findutils [DEP] findutils
[DEP] fontconfig [DEP] fontconfig
[DEP] freetype [DEP] freetype
[DEP] gawk [DEP] gawk
[DEP] gcc [DEP] gcc
[DEP] gettext [DEP] glib
[DEP] glibc [DEP] glibc
[DEP] grep [DEP] grep
[DEP] imake
[DEP] kdelibs [DEP] kdelibs
[DEP] libart_lgpl23
[DEP] libdrm [DEP] libdrm
[DEP] libice [DEP] libice
[DEP] libidn
[DEP] libjpeg
[DEP] libpng [DEP] libpng
[DEP] libpthread-stubs
[DEP] libsm [DEP] libsm
[DEP] libx11 [DEP] libx11
[DEP] libxau [DEP] libxau
[DEP] libxcb [DEP] libxcb
[DEP] libxcursor [DEP] libxdamage
[DEP] libxdmcp
[DEP] libxext [DEP] libxext
[DEP] libxfixes [DEP] libxfixes
[DEP] libxft [DEP] libxft
[DEP] libxinerama [DEP] libxpm
[DEP] libxmu
[DEP] libxrandr
[DEP] libxrender [DEP] libxrender
[DEP] libxt [DEP] libxt
[DEP] libxxf86vm [DEP] libxxf86vm
[DEP] linux-header [DEP] linux-header
[DEP] m4
[DEP] make [DEP] make
[DEP] mesa [DEP] mesa
[DEP] mktemp [DEP] mono
[DEP] openssl [DEP] nas
[DEP] patch [DEP] numpy
[DEP] pcre
[DEP] perl [DEP] perl
[DEP] phonon
[DEP] pkgconfig
[DEP] python [DEP] python
[DEP] qt3 [DEP] qt4
[DEP] ruby [DEP] ruby
[DEP] sed [DEP] sed
[DEP] soprano
[DEP] sysfiles [DEP] sysfiles
[DEP] tar [DEP] tar
[DEP] tcl
[DEP] tk
[DEP] util-linux [DEP] util-linux
[DEP] xorg-cf-files
[DEP] xproto
[DEP] zlib

24
kde/kdebindings/kdebindings.conf
Unescape View File

@ -1,24 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../kdebindings/kdebindings.conf
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2004 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
pkginstalled mono || var_append confopt " " "--without-mcs"
# use host python
export DO_NOT_COMPILE="python"
export LIBPYTHON="-lpython2.4 -ltk -ltcl"
# requires unbelievable ammounts of memory for this package ...
var_remove confopt " " "--enable-final"

9
kde/kdebindings/kdebindings.desc
Unescape View File

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../kdebindings/kdebindings.desc [COPY] Filename: package/.../kdebindings/kdebindings.desc
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] Copyright (C) 2006 - 2009 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2004 Clifford Wolf [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
[COPY] [COPY]
@ -30,11 +29,11 @@
[M] Nagy Karoly Gabriel <nagy.karoly@opensde.org> [M] Nagy Karoly Gabriel <nagy.karoly@opensde.org>
[C] extra/development extra/desktop/kde [C] extra/development extra/desktop/kde
[F] NOPARALLEL KDE QT3-PLUGIN [F] KDE
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 3.5.10 [V] 4.2.2
[P] X -----5---9 155.000 [P] X -----5---9 155.000
[D] 2977858355 kdebindings-3.5.10.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/ [D] 3963574478 kdebindings-4.2.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/4.2.2/src/

93
kde/kdebindings/kdepy.patch
Unescape View File

@ -1,93 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../kdebindings/kdepy.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2004 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- kdebindings-3.2.1/dcoppython/lib/pydcop.py.orig 2004-04-09 14:22:19.645982533 +0100
+++ kdebindings-3.2.1/dcoppython/lib/pydcop.py 2004-04-09 14:23:00.486753945 +0100
@@ -32,10 +32,10 @@
return pcop.disconnect_dcop_signal(sender,senderObj,signal,receiverObj,slot)
class DCOPApplication(object):
- def __init__( self, name ):
- self.name = name
+ def __init__( self, name ):
+ self.name = name
- def __getattr__( self, item ):
+ def __getattr__( self, item ):
if item == "__repr__":
return object.__repr__
if item == "__str__":
@@ -44,15 +44,15 @@
return object.__call__
if item == "_objects_":
return pcop.obj_list(self.name)
- return DCOPObject( self.name, item )
+ return DCOPObject( self.name, item )
def _object_(self, object):
return DCOPObject( self.name, object )
class DCOPObject(object):
- def __init__( self, appname, name ):
- self.appname = appname
- self.name = name
+ def __init__( self, appname, name ):
+ self.appname = appname
+ self.name = name
def __repr__( self ):
return "DCOPObject(%s,%s)" % ( self.appname, self.name )
@@ -60,7 +60,7 @@
def __str__( self ):
return "DCOPObject(%s,%s)" % ( self.appname, self.name )
- def __getattr__( self, item ):
+ def __getattr__( self, item ):
if item == "__repr__":
return object.__repr__
if item == "__str__":
@@ -69,16 +69,16 @@
return object.__call__
if item == "_methods_":
return pcop.method_list( self.appname, self.name )
- return DCOPMethod( self.appname, self.name, item )
+ return DCOPMethod( self.appname, self.name, item )
def _method_(self, method):
return DCOPMethod( self.appname, self.name, method )
class DCOPMethod(object):
- def __init__( self, appname, objname, name ):
- self.appname = appname
- self.objname = objname
- self.name = name
+ def __init__( self, appname, objname, name ):
+ self.appname = appname
+ self.objname = objname
+ self.name = name
def __repr__( self ):
return "DCOPMethod(%s,%s,%s)" % ( self.appname, self.objname, self.name )
@@ -86,7 +86,7 @@
def __str__( self ):
return "DCOPMethod(%s,%s,%s)" % ( self.appname, self.objname, self.name )
- def __call__( self, *args ):
+ def __call__( self, *args ):
return pcop.dcop_call( self.appname, self.objname, self.name, args )
class DCOPServer(object):

27
kde/kdebindings/ruby-args-fix.patch.disable
Unescape View File

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../kdebindings/ruby-args-fix.patch.disable
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- kdebindings-3.3.1/configure.orig 2004-11-10 14:39:43.084325976 +0100
+++ kdebindings-3.3.1/configure 2004-11-10 14:40:24.383047616 +0100
@@ -47602,7 +47602,7 @@
RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitearchdir"])'`
RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitelibdir"])'`
RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["libdir"])'`
- RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["LIBRUBYARG_SHARED"])'`
+ RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s %s",Config::CONFIG["LIBRUBYARG"],Config::CONFIG["LIBS"])'`
echo "$as_me:$LINENO: result: archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG" >&5
echo "${ECHO_T}archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG" >&6

74
kde/kdebindings/ruby_const-fix.patch
Unescape View File

@ -1,74 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../kdebindings/ruby_const-fix.patch
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Index: kdebindings-3.5.9/qtruby/rubylib/qtruby/Qt.cpp
===================================================================
--- kdebindings-3.5.9.orig/qtruby/rubylib/qtruby/Qt.cpp 2008-06-07 00:48:29.000000000 +0000
+++ kdebindings-3.5.9/qtruby/rubylib/qtruby/Qt.cpp 2008-06-07 00:50:23.000000000 +0000
@@ -950,7 +950,7 @@
const char *
get_VALUEtype(VALUE ruby_value)
{
- char * classname = rb_obj_classname(ruby_value);
+ const char * classname = rb_obj_classname(ruby_value);
const char *r = "";
if(ruby_value == Qnil)
r = "u";
@@ -1395,7 +1395,7 @@
}
static QCString *
-find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
+find_cached_selector(int argc, VALUE * argv, VALUE klass, const char * methodName)
{
// Look in the cache
static QCString * mcid = 0;
@@ -1432,7 +1432,7 @@
static VALUE
method_missing(int argc, VALUE * argv, VALUE self)
{
- char * methodName = rb_id2name(SYM2ID(argv[0]));
+ const char * methodName = rb_id2name(SYM2ID(argv[0]));
VALUE klass = rb_funcall(self, rb_intern("class"), 0);
// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
@@ -1482,7 +1482,7 @@
VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
if (_current_method == -1) {
- char * op = rb_id2name(SYM2ID(argv[0]));
+ const char * op = rb_id2name(SYM2ID(argv[0]));
if ( qstrcmp(op, "-") == 0
|| qstrcmp(op, "+") == 0
|| qstrcmp(op, "/") == 0
@@ -1557,7 +1557,7 @@
class_method_missing(int argc, VALUE * argv, VALUE klass)
{
VALUE result = Qnil;
- char * methodName = rb_id2name(SYM2ID(argv[0]));
+ const char * methodName = rb_id2name(SYM2ID(argv[0]));
VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
temp_stack[0] = rb_str_new2("Qt");
temp_stack[1] = rb_str_new2(methodName);
@@ -1772,7 +1772,7 @@
VALUE
getmetainfo(VALUE self, int &offset, int &index)
{
- char * signalname = rb_id2name(rb_frame_last_func());
+ const char * signalname = rb_id2name(rb_frame_last_func());
VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
smokeruby_object *ometa = value_obj_info(metaObject_value);
Write Preview
Loading…
Cancel
Save