[DRE-commits] r2710 - in packages/libqt4-ruby/trunk/debian: . patches
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Fri May 9 21:54:05 UTC 2008
Author: fourmond
Date: 2008-05-09 21:54:03 +0000 (Fri, 09 May 2008)
New Revision: 2710
Added:
packages/libqt4-ruby/trunk/debian/patches/05-smoke-links-to-qtwebkit.dpatch
Removed:
packages/libqt4-ruby/trunk/debian/patches/05-kalyptus.dpatch
packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch
packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch
packages/libqt4-ruby/trunk/debian/patches/98-soname.dpatch
Modified:
packages/libqt4-ruby/trunk/debian/changelog
packages/libqt4-ruby/trunk/debian/control
packages/libqt4-ruby/trunk/debian/patches/00list
packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch
packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
packages/libqt4-ruby/trunk/debian/rules
Log:
[libqt4-ruby] New upstream release
Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/changelog 2008-05-09 21:54:03 UTC (rev 2710)
@@ -1,8 +1,15 @@
-libqt4-ruby (1.4.9-13) UNRELEASED; urgency=low
+libqt4-ruby (1.4.10-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release
+ * Disabled 05-kalyptus, not needed anymore
+ * Updated 10-fix-ruby-install-path to cope for the new way ruby things
+ are installed upstream.
+ * Disabled 40-fix-gcc-snapshot, not needed anymore, apparently
+ * 05-smoke-links-to-qtwebkit to force the smoke library to link to the
+ QtWebkit component (this is required)
+ * Disabled 35-fix-class-std-segfault, not needed anymore
- -- Vincent Fourmond <fourmond at debian.org> Tue, 29 Apr 2008 21:17:29 +0200
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 09 May 2008 23:49:46 +0200
libqt4-ruby (1.4.9-12) unstable; urgency=low
Modified: packages/libqt4-ruby/trunk/debian/control
===================================================================
--- packages/libqt4-ruby/trunk/debian/control 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/control 2008-05-09 21:54:03 UTC (rev 2710)
@@ -5,7 +5,8 @@
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), dpatch,
libqt4-dev (>= 4.3), ruby1.8-dev, ruby, ruby1.8, cmake (> 2.4.7),
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
+ libqt4-webkit
Standards-Version: 3.7.3
Homepage: http://developer.kde.org/language-bindings/ruby/index.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/packages/libqt4-ruby/trunk
Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/00list 2008-05-09 21:54:03 UTC (rev 2710)
@@ -1,10 +1,10 @@
-05-kalyptus
+05-smoke-links-to-qtwebkit
10-fix-ruby-install-path
25-fix-hppa-build
28-optimization
30-qt_enum
-35-fix-class-std-segfault
-40-fix-gcc-snapshot
+# 35-fix-class-std-segfault
+# 40-fix-gcc-snapshot
50-rbqtapi-ruby1.8
97-soname
99-smoke-qt4
Deleted: packages/libqt4-ruby/trunk/debian/patches/05-kalyptus.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/05-kalyptus.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/05-kalyptus.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -1,1154 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-kalyptus.dpatch by <fourmond at debian.org>
-##
-## DP: New kaplyptus from sv -r 780626
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/kalyptus/kalyptus libqt4-ruby-1.4.9/kalyptus/kalyptus
---- libqt4-ruby-1.4.9~/kalyptus/kalyptus 2007-06-02 19:15:00.000000000 +0200
-+++ libqt4-ruby-1.4.9/kalyptus/kalyptus 2008-04-15 00:51:05.000000000 +0200
-@@ -2,7 +2,7 @@
-
- # KDOC -- C++ and CORBA IDL interface documentation tool.
- # Sirtaj Singh Kang <taj at kde.org>, Jan 1999.
--# $Id: kalyptus 670846 2007-06-02 17:13:48Z rdale $
-+# $Id$
-
- # All files in this project are distributed under the GNU General
- # Public License. This is Free Software.
-@@ -217,7 +217,7 @@
- # Otherwise, compile the default ones. Used for filtering in readCxxLine.
- if ( my @qt_defines = map { ($_=~m/^QT_(.*)/)[0] } keys %defines)
- {
-- my $regexp = "m/^#\\s*if\\s*[n!]?\\s*def(ined\\()?\\s*QT_(?:" . join('|', map { "\$qt_defines[$_]" } 0..$#qt_defines).")/o";
-+ my $regexp = "m/^#\\s*if\\s*[n!]?\\s*def(ined\\()?\\s*QT_(?:" . join('|', map { "${qt_defines[$_]}" } 0..$#qt_defines).")/o";
- $match_qt_defines = eval "sub { my \$s=shift;
- \$s=~/^#\\s*if\\s*([n!])?\s*def(ined\\()?\\s*QT_/ || return 0;
- if(!\$1) { return \$s=~$regexp ? 0:1 }
-@@ -446,7 +446,7 @@
- }
- }
-
-- if ( $p =~ /^\s*Q_OBJECT/ ) {
-+ if ( $p =~ /^\s*Q_OBJECT/ && $cNode->{astNodeName} ne 'Qt') {
- if ($qt_embedded) {
- push @inputqueue, @qte_codeqobject;
- } elsif ($qt4) {
-@@ -457,20 +457,26 @@
- next;
- }
- # Hack, waiting for real handling of preprocessor defines
-+ $p =~ s/Q_OBJECT//;
-+ $p =~ s/Q_PACKED//;
- $p =~ s/Q_REQUIRED_RESULT//;
- $p =~ s/QT_FASTCALL//;
- $p =~ s/QT_ASCII_CAST_WARN//;
- $p =~ s/QT_BEGIN_HEADER//;
- $p =~ s/QT_END_HEADER//;
-+ $p =~ s/QT_BEGIN_NAMESPACE//;
-+ $p =~ s/QT_END_NAMESPACE//;
- $p =~ s/QT_MODULE\(\w+\)//;
- $p =~ s/QT_WEAK_SYMBOL//;
- $p =~ s/QT_MOC_COMPAT//;
- $p =~ s/Q_EXPORT_CODECS_BIG5//;
- $p =~ s/Q_DECL_DEPRECATED//;
- $p =~ s/Q_SCRIPTABLE//;
-+ $p =~ s/Q_INVOKABLE//;
- $p =~ s/QT_STATIC_CONST_IMPL/const/;
- $p =~ s/QT_STATIC_CONST/static const/;
- $p =~ s/QT_COMPAT / /;
-+ $p =~ s/#ifdef QT_GUI_LIB//;
- $p =~ s/Q_CLASSINFO\(.*\)//;
- $p =~ s/Q_DISABLE_COPY\(\s*(\w+)\s*\)/$1(const $1 &);\n$1 &operator=(const $1 &);/;
- $p =~ s/QWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck!
-@@ -502,6 +508,7 @@
- $p =~ s/Q_DECLARE_BUILTIN_METATYPE[^\)]*\)//;
- $p =~ s/Q_[A-Z]+_EXPORT_INLINE//;
- $p =~ s/mutable\s+bool/bool/;
-+ $p =~ s/KLibFactory/KPluginFactory/;
- if ( $p =~ m/KDOM_DEFINE_PROTOTYPE\((\w+)\)/ ) {
- push @inputqueue, split('\n',"namespace KDOM {\nclass $1 {\n};\n};");
- }
-@@ -514,7 +521,6 @@
-
- next if ( $p =~ /^\s*Q_ENUMS/ # ignore Q_ENUMS
- || $p =~ /^\s*Q_FLAGS/ # and Q_FLAGS
-- || $p =~ /^\s*Q_DECLARE_FLAGS/ # and Q_DECLARE_FLAGS
- # || $p =~ /^\s*QDOC_PROPERTY/
- || $p =~ /^\s*Q_GADGET/
- || $p =~ /^\s*Q_OVERRIDE/ # and Q_OVERRIDE
-@@ -524,7 +530,6 @@
- || $p =~ /^\s*K_SYCOCAFACTORY/ #
- || $p =~ /^\s*KSVG_/ # and KSVG stuff ;)
- || $p =~ /^\s*KDOM_/ # and KDOM stuff :(
-- || $p =~ /^\s*Q_DECLARE_FLAGS/
- || $p =~ /^\s*Q_DECLARE_OPERATORS_FOR_FLAGS/
- || $p =~ /^\s*Q_DECLARE_PRIVATE/
- || $p =~ /^\s*Q_DECLARE_TYPEINFO/
-@@ -573,11 +578,16 @@
- $p =~ m/^#\s*ifdef\s+QT_COMPAT/ or
- $p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or
- $p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or
-+ $p =~ m/^#\s*ifdef\s+Q_COMPILER_MANGLES_RETURN_TYPE/ or
-+ $p =~ m/^#ifndef\s+QT_NO_CAST_TO_ASCII/ or
-+ $p =~ m/^#if\s+\(defined\(__arm__\)\s+\|\|\s+defined\(__ARMEL__\)\)/ or
-+ $p =~ m/^#\s*ifdef\s+Q_MAC_COMPAT_GL_FUNCTIONS/ or
- $p =~ m/^#\s*ifdef\s+QT3_SUPPORT/ or
- $p =~ m/^#\s*ifdef\s+KDE3_SUPPORT/ or
- $p =~ m/^#\s*ifdef\s+Q_WS_WIN/ or
- $p =~ m/^#if\s*!?defined\(Q_WS_WIN\)/ or
- $p =~ m/^#if\s*!?defined\(Q_OS_WIN32\)/ or
-+ $p =~ m/^#\s*ifdef\s+Q_OS_WINCE/ or
- $p =~ m/^#\s*ifdef\s+Q_OS_UNIX/ or
- $p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or
- $p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or
-@@ -587,6 +597,7 @@
- $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
- $p =~ m/^#if\s*defined\(Q_INTERNAL_QAPP_SRC\)/ or
- ($p =~ m/^#if\s*QT_VERSION\s*<\s*0x040000/ and $qt4) or
-+ ($p =~ m/^#if\s*QT_VERSION\s*<\s*0x040400/ and $qt4) or
- &$match_qt_defines( $p ) or
- $p =~ m/^#\s*if\s+0\s+/ ) {
- my $if_depth = 1;
-@@ -713,8 +724,9 @@
- elsif ( $l =~ m#^\s*/\*\*# ) { # doc comment
- $declNodeType = "c";
- return $l;
-- }
-- elsif ( $l =~ /Q(DOC)?_PROPERTY/ ) { # property
-+ } elsif ( $l =~ /Q_DECLARE_FLAGS/ ) { # flags
-+ return $l;
-+ } elsif ( $l =~ /Q(DOC)?_PROPERTY/ ) { # property
- do {
- $decl .= $l;
- my $lparens = kdocUtil::countReg( $decl, '\(' );
-@@ -800,15 +812,15 @@
- undef $docNode;
- }
-
-- }
-- elsif ( $declNodeType eq "a" ) {
-+ } elsif ( $declNodeType eq "a" ) {
- newAccess( $decl );
-- }
-- elsif ( $declNodeType eq "k" ) {
-- $cNode->AddProp( "DcopExported", 1 );
-- }
-+ } elsif ( $declNodeType eq "k" ) {
-+ $cNode->AddProp( "DcopExported", 1 );
- # properties
-- elsif ( $decl =~ s/Q(DOC)?_PROPERTY// ) {
-+ } elsif ( $decl =~ s/Q_DECLARE_FLAGS\(([^\)]+)\)// ) {
-+ print "Flags: <$1>\n" if $debug;
-+ $newNode = newFlags( $1 );
-+ } elsif ( $decl =~ s/Q(DOC)?_PROPERTY// ) {
- print "Property: <$1>\n" if $debug;
-
- $newNode = newProperty( $decl );
-@@ -967,8 +979,8 @@
- $skipBlock = 1; # FIXME check end token before doing this!
- }
- # Using: import namespace
-- elsif ( $decl =~ /^\s*using\s+namespace\s+(\w+)/ ) {
-- newNamespace( $1 );
-+ elsif ( $decl =~ /^\s*using(\s+namespace)?\s+(\w+)/ ) {
-+ newNamespace( $2 );
-
- }
-
-@@ -1053,7 +1065,7 @@
- $inExtern = 0;
- }
- # end of an in-block declaration
-- elsif ( $decl =~ /^\s*}\s*(.*?)\s*;\s*$/ || ($decl =~ /^\s*}\s*$/ && $inNamespace) ) {
-+ elsif ( $decl =~ /^\s*}\s*(.*?)\s*;\s*$/ || ($decl =~ /^\s*}\s*$/) ) {
- if ( $cNode->{astNodeName} eq "--" ) {
- # structure typedefs should have no name preassigned.
- # If they do, then the name in
-@@ -1180,9 +1192,8 @@
- my( $name, $end, $params ) = @_;
-
- ($name = $end) if $name eq "" && $end ne "";
--
- $params =~ s#\s+# #sg; # no newlines
-- $params =~ s#\s*/\*([^\*]/|\*[^/]|[^\*/])*\*/##g; # strip out comments
-+ $params =~ s#\s*/\*\*?([^\*]/|\*[^/]|[^\*/])*\*?\*/##g; # strip out comments
- $params = $1 if $params =~ /^\s*{?(.*)}/;
- $params =~ s/,\s*$/ /;
- print "$name params: [$params]\n" if $debug;
-@@ -1675,7 +1686,7 @@
-
- # The RE below reads as: = ( string constant or char or cast to numeric literal
- # or some word/number, with optional bitwise shifts, OR'ed or +'ed flags, and/or function call ).
-- if ( $arg =~ s/\s*=\s*(("[^\"]*")|\([^)]*\)\s*[\+-]?\s*[0-9]+|(\'.\')|(([-\w:~]*)\s*([<>\|\+-]*\s*[\w:._]*\s*)*(\([^(]*\))?))// ) {
-+ if ( $arg =~ s/\s*=\s*(("[^\"]*")|\([^)]*\)\s*[\+-]?\s*[0-9]+|(\'.\')|(([-\w:~]*)\s*((\*|[<>\|\+-])*\s*[\w:._]*\s*)*(\([^(]*\))?))// ) {
- $defaultparam = $1;
- }
-
-@@ -1784,7 +1795,7 @@
- $property =~ s/^\s+|\s+$//g;
- $property =~ s/\(\s+/(/g;
- $property =~ s/\s+\)/)/g;
-- my @items = split(/ /,$property);
-+ my @items = split(/\s+/,$property);
-
- do {
- my ( $node ) = Ast::New( "Q_PROPERTY_" . $items[1] );
-@@ -1806,6 +1817,36 @@
- } if defined $items[1];
- }
-
-+=head2 newFlags
-+
-+ Parameters: flags, enum
-+
-+ Handles a Q_DECLARE_FLAGS macro
-+
-+=cut
-+
-+sub newFlags
-+{
-+ my ( $flags ) = @_;
-+
-+ $flags =~ s/^\s+//g;
-+ $flags =~ s/\s+$/)/g;
-+ my @items = split(/\s*,\s*/, $flags);
-+
-+ do {
-+ my $type = $items[0];
-+ my $enum = $items[1];
-+ my ( $node ) = Ast::New( $type );
-+ $node->AddProp( "NodeType", "flags" );
-+ $node->AddProp( "Type", $type );
-+ $node->AddProp( "Enum", $enum );
-+
-+ $cNode->{KidAccess} = "public";
-+ kdocAstUtil::attachChild( $cNode, $node );
-+ return $node;
-+
-+ } if defined $items[1];
-+}
-
- =head2 show_usage
-
-diff -urNad libqt4-ruby-1.4.9~/kalyptus/kalyptusCxxToSmoke.pm libqt4-ruby-1.4.9/kalyptus/kalyptusCxxToSmoke.pm
---- libqt4-ruby-1.4.9~/kalyptus/kalyptusCxxToSmoke.pm 2007-06-04 00:44:16.000000000 +0200
-+++ libqt4-ruby-1.4.9/kalyptus/kalyptusCxxToSmoke.pm 2008-04-15 00:54:50.000000000 +0200
-@@ -89,183 +89,83 @@
- 'qulonglong' => '$',
- 'WId' => '$',
- 'Q_PID' => '$',
-+ 'KMimeType::Ptr' => '#',
-+ 'KMimeType::Ptr&' => '#',
-+ 'KServiceGroup::Ptr' => '#',
-+ 'KServiceGroup::Ptr&' => '#',
-+ 'KService::Ptr' => '#',
-+ 'KService::Ptr&' => '#',
-+ 'KServiceType::Ptr' => '#',
-+ 'KServiceType::Ptr&' => '#',
-+ 'KSharedConfig::Ptr' => '#',
-+ 'KSharedConfig::Ptr&' => '#',
-+ 'KSharedConfigPtr' => '#',
-+ 'KSharedConfigPtr&' => '#',
-+ 'KSharedPtr<KConfigBackend>' => '#',
-+ 'KSharedPtr<KConfigBackend>&' => '#',
-+ 'KSycocaEntry::Ptr' => '#',
-+ 'KSycocaEntry::Ptr&' => '#',
-+ 'Plasma::PackageStructure::Ptr' => '#',
-+ 'Plasma::PackageStructure::Ptr&' => '#',
- );
-
- # Yes some of this is in kalyptusDataDict's ctypemap
- # but that one would need to be separated (builtins vs normal classes)
- %typedeflist =
- (
-- 'signed char' => 'char',
-- 'unsigned char' => 'uchar',
-- 'signed short' => 'short',
-- 'unsigned short' => 'ushort',
-- 'signed' => 'int',
-- 'signed int' => 'int',
-- 'unsigned' => 'uint',
-- 'unsigned int' => 'uint',
-- 'signed long' => 'long',
-- 'unsigned long' => 'ulong',
--
--# Anything that is not known is mapped to void*, so no need for those here anymore
--# 'QWSEvent*' => 'void*',
--# 'QDiskFont*' => 'void*',
--# 'XEvent*' => 'void*',
--# 'QStyleHintReturn*' => 'void*',
--# 'FILE*' => 'void*',
--# 'QUnknownInterface*' => 'void*',
--# 'GDHandle' => 'void*',
--# '_NPStream*' => 'void*',
--# 'QTextFormat*' => 'void*',
--# 'QTextDocument*' => 'void*',
--# 'QTextCursor*' => 'void*',
--# 'QTextParag**' => 'void*',
--# 'QTextParag*' => 'void*',
--# 'QRemoteInterface*' => 'void*',
--# 'QSqlRecordPrivate*' => 'void*',
--# 'QTSMFI' => 'void*', # QTextStream's QTSManip
--# 'const GUID&' => 'void*',
--# 'QWidgetMapper*' => 'void*',
-- 'MSG*' => 'void*',
--# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates)
--
-- 'QPtrCollection::Item' => 'void*', # to avoid a warning
--
-- 'void(* )()' => 'void*',
-- 'void (*)(void* )' => 'void*',
-- 'mode_t' => 'long',
-- 'QProcess::PID' => 'long',
-- 'size_type' => 'int', # QSqlRecordInfo
-- 'Qt::ComparisonFlags' => 'uint',
-- 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it
-- 'QIODevice::Offset' => 'ulong',
-- 'WState' => 'int',
-- 'QRgb' => 'uint',
-+ 'GLenum' => 'int',
-+ 'GLint' => 'int',
-+ 'GLuint' => 'uint',
- 'ksocklen_t' => 'uint',
-+ 'mode_t' => 'long',
-+ 'MSG*' => 'void*',
-+ 'pid_t' => 'int',
- 'QCOORD' => 'int',
-- 'QTSMFI' => 'int',
-- 'Qt::WState' => 'int',
-- 'Qt::WFlags' => 'int',
-- 'Qt::HANDLE' => 'uint',
-- 'QEventLoop::ProcessEventsFlags' => 'uint',
-- 'QStyle::SCFlags' => 'int',
-- 'QStyle::SFlags' => 'int',
-- 'Q_INT16' => 'short',
-+ 'QImageReader::ImageReaderError' => 'int',
- 'qint16' => 'short',
-- 'Q_INT32' => 'int',
-+ 'Q_INT16' => 'short',
- 'qint32' => 'int',
- 'qint32&' => 'int&',
-- 'Q_INT8' => 'char',
-+ 'Q_INT32' => 'int',
- 'qint8' => 'char',
-+ 'Q_INT8' => 'char',
- 'Q_LONG' => 'long',
-- 'Q_UINT16' => 'ushort',
-+ 'qreal' => 'double',
-+ 'QRgb' => 'uint',
-+ 'Qt::HANDLE' => 'uint',
-+ 'QTSMFI' => 'int',
-+ 'Qt::WFlags' => 'uint',
-+ 'Qt::WState' => 'int',
- 'quint16' => 'ushort',
-- 'Q_UINT32' => 'uint',
-+ 'Q_UINT16' => 'ushort',
- 'quint32' => 'uint',
-- 'Q_UINT8' => 'uchar',
-+ 'Q_UINT32' => 'uint',
- 'quint8' => 'uchar',
-+ 'Q_UINT8' => 'uchar',
- 'Q_ULONG' => 'long',
-- 'qreal' => 'double',
-- 'pid_t' => 'int',
-- 'size_t' => 'int',
-- 'pid_t' => 'int',
-- 'time_t' => 'int',
- 'short int' => 'short',
-+ 'signed char' => 'char',
-+ 'signed' => 'int',
-+ 'signed int' => 'int',
- 'signed long int' => 'long',
-+ 'signed long' => 'long',
-+ 'signed short' => 'short',
-+ 'size_t' => 'int',
-+ 'size_type' => 'int', # QSqlRecordInfo
-+ 'time_t' => 'int',
-+ 'unsigned char' => 'uchar',
-+ 'unsigned int' => 'uint',
- 'unsigned long int' => 'ulong',
-+ 'unsigned long' => 'ulong',
- 'unsigned short int' => 'ushort',
-- 'Qt::Alignment' => 'int',
-- 'Qt::Orientations' => 'int',
-- 'Qt::DockWidgetAreas' => 'int',
-- 'Qt::DropActions' => 'int',
-- 'Qt::ImageConversionFlags' => 'int',
-- 'Qt::ItemFlags' => 'int',
-- 'Qt::KeyboardModifiers' => 'int',
-- 'Qt::MatchFlags' => 'int',
-- 'Qt::MouseButtons' => 'int',
-- 'Qt::ToolBarAreas' => 'int',
-- 'Qt::WindowFlags' => 'int',
-- 'Qt::WindowStates' => 'int',
-- 'AutoFormatting' => 'int',
-- 'DirtyFlags' => 'int',
-- 'EditTriggers' => 'int',
-- 'FindFlags' => 'int',
-- 'Flags' => 'int',
-- 'FormattingOptions' => 'int',
-- 'GLenum' => 'int',
-- 'GLint' => 'int',
-- 'GLuint' => 'uint',
-- 'LoadOperator' => 'int',
-- 'NumberFlags' => 'int',
-- 'OpenMode' => 'int',
-- 'Options' => 'int',
-- 'PaintEngineFeatures' => 'int',
-- 'Permissions' => 'int',
-- 'PrintDialogOptions' => 'int',
-- 'ProcessEventsFlags' => 'int',
-- 'QDir::Filters' => 'int',
-- 'QDir::SortFlags' => 'int',
-- 'QFile::Permissions' => 'int',
-- 'QGL::FormatOptions' => 'int',
-- 'QIODevice::OpenMode' => 'int',
-- 'QImageReader::ImageReaderError' => 'int',
-- 'QItemSelectionModel::SelectionFlags' => 'int',
-- 'QPaintEngine::DirtyFlags' => 'int',
-- 'QPainter::RenderHints' => 'int',
-- 'QSql::ParamType' => 'int',
-- 'QTextDocument::FindFlags' => 'int',
-- 'Qt::DropActions' => 'int',
-- 'Qt::ImageConversionFlags' => 'int',
-- 'Qt::ItemFlags' => 'int',
-- 'Qt::KeyboardModifiers' => 'int',
-- 'Qt::MatchFlags' => 'int',
-- 'Qt::MouseButtons' => 'int',
-- 'Qt::ToolBarAreas' => 'int',
-- 'Qt::WindowFlags' => 'int',
-- 'Qt::WindowStates' => 'int',
-- 'RenderFlags' => 'int',
-- 'RenderHints' => 'int',
-- 'SortFlags' => 'int',
-- 'StepEnabled' => 'int',
-- 'Sections' => 'int',
-- 'Filters' => 'int',
-- 'SortFlags' => 'int',
-- 'QDir::Filters' => 'int',
-- 'QDir::SortFlags' => 'int',
-- 'QStyle::State' => 'int',
-- 'QValidator::State' => 'int',
-- 'QAbstractSpinBox::StepEnabled' => 'int',
-- 'QDockWidget::DockWidgetFeatures' => 'int',
-- 'QStyle::SubControls' => 'int',
-- 'RegisterOptions' => 'int',
-- 'BindMode' => 'int',
-- 'ButtonFeatures' => 'int',
-- 'CacheMode' => 'int',
-- 'CheckType' => 'int',
-- 'CornerWidgets' => 'int',
-- 'DockWidgetFeatures' => 'int',
-- 'FileFlags' => 'int',
-- 'FontFilters' => 'int',
-- 'FrameFeatures' => 'int',
-- 'GraphicsItemFlags' => 'int',
-- 'InterfaceFlags' => 'int',
-- 'IteratorFlags' => 'int',
-- 'MenuItemType' => 'int',
-- 'NumberOptions' => 'int',
-- 'PageBreakFlags' => 'int',
-- 'Qt::TextInteractionFlags' => 'int',
-- 'Relation' => 'int',
-- 'SectionPosition' => 'int',
-- 'SelectedPosition' => 'int',
-- 'StandardButtons' => 'int',
-- 'State' => 'int',
-- 'TabPosition' => 'int',
-- 'ToolBarFeatures' => 'int',
-- 'ToolBarPosition' => 'int',
-- 'ToolButtonFeatures' => 'int',
-- 'ViewItemFeatures' => 'int',
-+ 'unsigned short' => 'ushort',
-+ 'unsigned' => 'uint',
-+ 'void(* )()' => 'void*',
-+ 'void (*)(void* )' => 'void*',
-+ 'WState' => 'int',
- );
-
--$headerSubdirectories = "kio/|phonon/ui/|kmediaplayer/|dnssd/|solid/|solid/ifaces/|phonon/|sonnet/|kdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff/|dbus-1.0/dbus/"
-+$headerSubdirectories = "kio/|phonon/ui/|kmediaplayer/|dnssd/|solid/|solid/ifaces/|phonon/|sonnet/|kdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff/|plasma/|plasma/widgets/|kresources|soprano|nepomuk/"
-
- }
-
-@@ -293,6 +193,9 @@
- print STDERR "Preparsing...\n";
-
- # Preparse everything, to prepare some additional data in the classes and methods
-+ Iter::LocalCompounds( $rootnode, sub { preParseFlags( shift ); } );
-+
-+ # Preparse everything, to prepare some additional data in the classes and methods
- Iter::LocalCompounds( $rootnode, sub { preParseClass( shift ); } );
-
- # Have a look at each class again, to propagate CanBeCopied
-@@ -334,6 +237,33 @@
- print STDERR "Done.\n";
- }
-
-+
-+=head2 preParseFlags
-+ Called for each class, looks for Q_DECLARE_FLAGS, and maps them to uints
-+=cut
-+sub preParseFlags
-+{
-+ my( $classNode ) = @_;
-+ my $className = join( "::", kdocAstUtil::heritage($classNode) );
-+
-+ Iter::MembersByType ( $classNode, undef,
-+ sub {
-+ my( $classNode, $m ) = @_;
-+
-+ if ( $m->{NodeType} eq 'flags' ) {
-+ my $fullFlagsName = $className."::".$m->{astNodeName};
-+
-+ if (exists $typedeflist{$fullFlagsName}) {
-+ print("typemap for $fullFlagsName exists\n");
-+ }
-+
-+ $typedeflist{$fullFlagsName} = 'uint';
-+ registerType( $fullFlagsName );
-+ }
-+ }, undef );
-+
-+}
-+
- =head2 preParseClass
- Called for each class
- =cut
-@@ -342,189 +272,98 @@
- my( $classNode ) = @_;
- my $className = join( "::", kdocAstUtil::heritage($classNode) );
-
-- if( $#{$classNode->{Kids}} < 0 ||
-- $classNode->{Access} eq "private" ||
-- $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData
-- exists $classNode->{Tmpl} ||
-- # Don't generate standard bindings for QString, this class is handled as a native type
-- $className eq 'QString' ||
-- $className eq 'QStringData' ||
-- $className eq 'QLatin1String' ||
-- $className eq 'QTLWExtra' ||
-- $className eq 'QWExtra' ||
-- $className eq 'QBig5Codec' ||
-- $className eq 'QBig5hkscsCodec' ||
-- $className eq 'QPtrCollection' ||
-- $className eq 'QGCache' ||
-- $className eq 'QConstString' ||
-- $className eq 'QCString' ||
-- # Don't map classes which are really arrays
-- $className eq 'QStringList' ||
-- $className eq 'QCanvasItemList' ||
-- $className eq 'QWidgetList' ||
-- $className eq 'QObjectList' ||
-- $className eq 'QStrList' ||
-- $className eq 'KCmdLineOptions' ||
-- # Those are template related
-- $className eq 'QTSManip' || # cause compiler errors with several gcc versions
-- $className eq 'QGDict' ||
-- $className eq 'QGList' ||
-- $className eq 'QGArray' ||
-- $className eq 'QGVector' ||
-- $className eq 'QStrIList' ||
-- $className eq 'QStrIVec' ||
-- $className eq 'QMapData' ||
-- $className eq 'QMetaEnum::Item' ||
-- $className eq 'QWidgetContainerPlugin' ||
-- $className eq 'QGArray::array_data' ||
-- ($className eq 'QMenuItem' and $main::qt_embedded) ||
-- ($className eq 'QSignal' and $main::qt_embedded) ||
-- ($className eq 'QWSEvent' and $main::qt_embedded) ||
-- ($className eq 'QMetaObjectInit' and $main::qt_embedded) ||
-- ($className eq 'QKoi8Codec' and $main::qt_embedded) ||
-- $className eq 'KAccelGen' ||
-- ($className eq 'QAbstractUndoItem' and $main::qt4) ||
-- ($className eq 'QDebug' and $main::qt4) ||
-- ($className eq 'QNoDebug' and $main::qt4) ||
-- ($className eq 'QObjectData' and $main::qt4) ||
-- ($className eq 'QSysInfo' and $main::qt4) ||
-- ($className eq 'QPNGImageWriter' and $main::qt4) ||
-- ($className eq 'QPNGImagePacker' and $main::qt4) ||
-- ($className eq 'QSqlRelationalDelegate' and $main::qt4) ||
-- ($className eq 'QTextCodec::ConverterState' and $main::qt4) ||
-- ($className eq 'QTextLayout::Selection' and $main::qt4) ||
-- ($className eq 'QTextStreamManipulator' and $main::qt4) ||
-- $className eq 'DCOPArg' ||
-- $className eq 'DCOPReply' ||
-- $className eq 'KAboutContributor' ||
-- $className eq 'KBookmarkMenu::DynMenuInfo' ||
-- $className eq 'KDateTime::Spec' ||
-- $className eq 'KEncodingFileDialog::Result' ||
-- $className eq 'KDE' ||
-- $className eq 'KDEDesktopMimeType::Service' ||
-- $className eq 'KDialogButtonBox' ||
-- $className eq 'KEntry' ||
-- $className eq 'KEntryKey' ||
-- $className eq 'KGlobalSettings::KMouseSettings' ||
-- $className eq 'KMimeType::Format' ||
-- $className eq 'KNotifyClient::Instance' ||
-- $className eq 'KParts::ComponentFactory' ||
-- $className eq 'KParts::Plugin::PluginInfo' ||
-- $className eq 'KParts::MainWindow' ||
-- $className eq 'KProtocolInfo::ExtraField' ||
-- $className eq 'KXMLGUIClient::StateChange' ||
-- $className eq 'KIconTheme' ||
-- $className eq 'KEditListBox::CustomEditor' ||
-- $className eq 'KIO::KBookmarkMenuNSImporter' ||
-- $className eq 'KIO::NetRC' ||
-- $className eq 'KExtendedSocket' ||
-- $className eq 'KSettings::PluginPage' ||
-- $className eq 'KSocket' ||
-- $className eq 'KPerDomainSettings' ||
-- $className eq 'KApplicationPropsPlugin' ||
-- $className eq 'KOpenWithHandler' ||
-- $className eq 'KFileOpenWithHandler' ||
-- $className eq 'KBindingPropsPlugin' ||
-- $className eq 'KPropsDlgPlugin' ||
-- $className eq 'KFileSharePropsPlugin' ||
-- $className eq 'KBookmarkMenuNSImporter' ||
-- $className eq 'KDevicePropsPlugin' ||
-- $className eq 'KDEDModule' ||
-- $className eq 'KFileMetaInfoProvider' ||
-- $className eq 'KFileMimeTypeInfo' ||
-- $className eq 'KMimeTypeChooserDialog' ||
-- $className eq 'KExecPropsPlugin' ||
-- $className eq 'KFilePermissionsPropsPlugin' ||
-- $className eq 'KImageFilePreview' ||
-- $className eq 'KBookmarkManager' ||
-- $className eq 'KBookmarkNotifier' ||
-- $className eq 'KOCRDialogFactory' ||
-- $className eq 'KExtendedBookmarkOwner' ||
-- $className eq 'KSharedPixmap' ||
-- $className eq 'KLibrary' ||
-- $className eq 'KScanDialogFactory' ||
-- $className eq 'KTimeZone::Transition' ||
-- $className eq 'KTipDatabase' ||
-- $className eq 'KBufferedIO' ||
-- $className eq 'KDictSpellingHighlighter' ||
-- $className eq 'KPropertiesDialog' ||
-- $className eq 'ProgressItem' ||
-- $className eq 'KIO::ChmodInfo' ||
-- $className eq 'KUrl::List' ||
-- $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
-- $className eq 'khtml::MouseDoubleClickEvent' ||
-- $className eq 'khtml::MouseMoveEvent' ||
-- $className eq 'khtml::MousePressEvent' ||
-- $className eq 'khtml::MouseReleaseEvent' ||
-- $className eq 'khtml::MouseEvent' ||
-- $className eq 'khtml' ||
-- $className eq 'KURL::List' ||
-- $className eq 'KWin::Info' ||
-- $className eq 'TerminalInterface' ||
-- $className eq 'QAccessibleBridgePlugin' || # Qt4
-- $className eq 'QForeachContainerBase' || # Qt4
-- $className eq 'QInputMethodEvent::Attribute' || # Qt4
-- $className eq 'QAbstractUndoItem' || # Qt4
-- $className eq 'QAbstractTextDocumentLayout::PaintContext' || # Qt4
-- $className eq 'QAbstractTextDocumentLayout::Selection' || # Qt4
-- $className eq 'QBrushData' || # Qt4
-- $className eq 'QDBusObjectPath' || # Qt4
-- $className eq 'QDBusSignature' || # Qt4
-- $className eq 'QDBusVariant' || # Qt4
-- $className eq 'QIPv6Address' || # Qt4
-- $className eq 'QImageTextKeyLang' || # Qt4
-- $className eq 'QMap' || # Qt4
-- $className eq 'QMap::const_iterator' || # Qt4
-- $className eq 'QMap::iterator' || # Qt4
-- $className eq 'QMapData' || # Qt4
-- $className eq 'QMapData::Node' || # Qt4
-- $className eq 'QObjectData' || # Qt4
-- $className eq 'QProxyModel' || # Obsolete Qt4
-- $className eq 'QSharedData' || # Qt4
-- $className eq 'QPainterPath::Element' || # Qt4
-- $className eq 'QThreadStorageData' || # Qt4
-- $className eq 'QVFbHeader' || # Qt4
-- $className eq 'QStyleOptionQ3DockWindow' || # Qt4
-- $className eq 'QStyleOptionQ3ListView' || # Qt4
-- $className eq 'QStyleOptionQ3ListViewItem' || # Qt4
-- $className eq 'QStyleOptionQ3ListView' || # Qt4
-- $className eq 'QUpdateLaterEvent' || # Qt4
-- $className eq 'QVFbKeyData' || # Qt4
-- $className eq 'QVariant::Handler' || # Qt4
-- $className eq 'QVariant::PrivateShared' || # Qt4
-- $className eq 'QVectorData' || # Qt4
-- $className eq 'QWidgetData' || # Qt4
-- $className eq 'QThread' || # Qt4
-- $className eq 'QThreadStorage' || # Qt4
-- $className eq 'QMutex' || # Qt4
-- $className eq 'QMutexLocker' || # Qt4
-- $className eq 'QSemaphore' || # Qt4
-- $className eq 'QWaitCondition' || # Qt4
-- $className eq 'QReadWriteLock' || # Qt4
-- $className eq 'QReadLocker' || # Qt4
-- $className eq 'QX11Info' || # Qt4
-- $className eq 'QWriteLocker' ||
-- $className =~ /.*Private$/ || # Ignore any classes which aren't for public consumption
-- $className =~ /.*Impl$/ ||
-- $className =~ /.*Internal.*/ ||
-- $classNode->{Deprecated} ||
-- $classNode->{NodeType} eq 'union' || # Skip unions for now, e.g. QPDevCmdParam
-- $className eq 'KImportedBookmarkMenu' || # KDE4
-- $className eq 'KUndoRedoAction' || # KDE4
-- $className eq 'KTzfileTimeZoneData' || # KDE4
-- $className eq 'KUndoRedoAction' || # KDE4
-- $className eq 'KCombiView' || # KDE4
-- $className eq 'KDirOperator' || # KDE4
-- $className eq 'KDirSelectDialog' || # KDE4
-- $className eq 'KFileFilterCombo' || # KDE4
-- $className eq 'KFileMetaInfo' || # KDE4
-- $className eq 'KFileMetaInfoGroup' || # KDE4
-- $className eq 'KFilePreview' || # KDE4
-- $className eq 'KFileTreeBranch' || # KDE4
-- $className eq 'KFileView' || # KDE4
-- $className eq 'KFileViewSignaler' || # KDE4
-- $className eq 'KServiceTypeProfile' # KDE4
-- ) {
-+ if ( $classNode->{Deprecated}
-+ || $classNode->{NodeType} eq 'union'
-+ || $#{$classNode->{Kids}} < 0
-+ || $classNode->{Access} eq "private"
-+ || $classNode->{Access} eq "protected" # e.g. QPixmap::QPixmapData
-+ || $className =~ /.*Private$/ # Ignore any classes which aren't for public consumption
-+ || $className =~ /.*Impl$/
-+ || $className =~ /.*Internal.*/
-+ || exists $classNode->{Tmpl}
-+ || $className eq 'KAccelGen'
-+ || $className eq 'KDE'
-+ || $className eq 'KDEDModule'
-+# || $className eq 'KDialogButtonBox'
-+ || $className eq 'KDirOperator'
-+ || $className eq 'KDirSelectDialog'
-+ || $className eq 'KEditListBox::CustomEditor'
-+ || $className eq 'KEncodingFileDialog::Result'
-+ || $className eq 'KFileFilterCombo'
-+ || $className eq 'KFileMetaInfo'
-+ || $className eq 'KFileMetaInfoGroup'
-+ || $className eq 'KFileTreeBranch'
-+ || $className eq 'KFileView'
-+ || $className eq 'KFileViewSignaler'
-+ || $className eq 'KGlobalSettings::KMouseSettings'
-+ || $className eq 'khtml'
-+ || $className eq 'khtml::DrawContentsEvent'
-+ || $className eq 'khtml::MouseDoubleClickEvent'
-+ || $className eq 'khtml::MouseEvent'
-+ || $className eq 'khtml::MouseMoveEvent'
-+ || $className eq 'khtml::MousePressEvent'
-+ || $className eq 'khtml::MouseReleaseEvent'
-+ || $className eq 'KIconTheme'
-+ || $className eq 'KIO::NetRC'
-+ || $className eq 'KMimeTypeChooserDialog'
-+ || $className eq 'KParts::ComponentFactory'
-+ || $className eq 'KParts::Plugin::PluginInfo'
-+ || $className eq 'KProtocolInfo::ExtraField'
-+ || $className eq 'KServiceTypeProfile'
-+ || $className eq 'KSettings::PluginPage'
-+ || $className eq 'KSettings::PluginPage'
-+ || $className eq 'KSystemTimeZoneData'
-+ || $className eq 'KTimeZone::Transition'
-+ || $className eq 'KTipDatabase'
-+ || $className eq 'KTzfileTimeZoneData'
-+ || $className eq 'KUrl::List'
-+ || $className eq 'KXMLGUIClient::StateChange'
-+ || $className eq 'Plasma::Containment::StyleOption'
-+ || $className eq 'QAbstractTextDocumentLayout::PaintContext'
-+ || $className eq 'QAbstractTextDocumentLayout::Selection'
-+ || $className eq 'QAbstractUndoItem'
-+ || $className eq 'QAccessibleBridgePlugin'
-+ || $className eq 'QBrushData'
-+ || $className eq 'QDBusObjectPath'
-+ || $className eq 'QDBusSignature'
-+ || $className eq 'QDBusVariant'
-+ || $className eq 'QDebug'
-+ || $className eq 'QImageTextKeyLang'
-+ || $className eq 'QInputMethodEvent::Attribute'
-+ || $className eq 'QIPv6Address'
-+ || $className eq 'QLatin1String'
-+ || $className eq 'QMap::const_iterator'
-+ || $className eq 'QMapData'
-+ || $className eq 'QMapData::Node'
-+ || $className eq 'QMap::iterator'
-+ || $className eq 'QMutex'
-+ || $className eq 'QMutexLocker'
-+ || $className eq 'QObjectData'
-+ || $className eq 'QPainterPath::Element'
-+ || $className eq 'QProxyModel'
-+ || $className eq 'QReadLocker'
-+ || $className eq 'QReadWriteLock'
-+ || $className eq 'QSemaphore'
-+ || $className eq 'QSharedData'
-+ || $className eq 'QString'
-+ || $className eq 'QStringList'
-+ || $className eq 'QStyleOptionQ3DockWindow'
-+ || $className eq 'QStyleOptionQ3ListView'
-+ || $className eq 'QStyleOptionQ3ListViewItem'
-+ || $className eq 'QSysInfo'
-+ || $className eq 'QTextCodec::ConverterState'
-+ || $className eq 'QTextStreamManipulator'
-+ || $className eq 'QThread'
-+ || $className eq 'QThreadStorageData'
-+ || $className eq 'QUpdateLaterEvent'
-+ || $className eq 'QVariant::Handler'
-+ || $className eq 'QVariant::PrivateShared'
-+ || $className eq 'QVectorData'
-+ || $className eq 'QWaitCondition'
-+ || $className eq 'QWidgetData'
-+ || $className eq 'QWriteLocker'
-+ || $className eq 'QX11Info' )
-+ {
- print STDERR "Skipping $className\n" if ($debug);
- print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union');
- $skippedClasses{$className} = 1;
-@@ -552,6 +391,7 @@
-
- my $doPrivate = $main::doPrivate;
- $main::doPrivate = 1;
-+
- # Look at each class member (looking for methods and enums in particular)
- Iter::MembersByType ( $classNode, undef,
- sub {
-@@ -609,193 +449,47 @@
- next if ( $m->{Access} =~ /private/ );
- # Don't generate code for deprecated methods,
- # or where the code won't compile/link for obscure reasons. Or even obvious reasons..
-- if ( ($classNode->{astNodeName} eq 'KCharSelectTable' and $name eq 'paintCell')
-- # KDE4
-- || ($name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /KDateTime::Spec/ )
-- || ($name eq 'operator>>' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /KDateTime::Spec/ )
-- || ($name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /const KDateTime/ )
-- || ($name eq 'operator>>' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /KDateTime/ )
-+
-+ if ( $m->{Deprecated}
-+ # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro
-+ || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
-+ || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
-+ || $m->{ReturnType} =~ /template/
-+ || $m->{ReturnType} =~ /QT3_SUPPORT/
-+ || $name eq 'qt_metacast'
-+ || $name eq 'virtual_hook'
-+ || $name eq 'handle'
-+ || $name eq 'qWarning'
-+ || $name eq 'qCritical'
-+ || $name eq 'qDebug'
-+ || $name eq 'qFindString'
-+ || $name eq 'qFindStringBoyerMoore'
-+ # qHash() gives problems with building the Qwt lib
-+ || $name eq 'qHash'
-+ || ($#{$m->{ParamList}} > -1 && $m->{ParamList}[0]->{ArgType} =~ /Private/)
-+ || ($classNode->{astNodeName} eq 'QGraphicsLinearLayout' and $name eq 'dump')
- || ($classNode->{astNodeName} eq 'TextEvent' and $name eq 'data')
-- || ($classNode->{astNodeName} eq 'KApplication' and $name eq 'startKdeinit')
-+ || ($classNode->{astNodeName} eq 'KConfigGroup' and $name eq 'groupImpl')
- || ($classNode->{astNodeName} eq 'KConfigGroup' and $name eq 'setReadDefaults')
-- || ($classNode->{astNodeName} eq 'Slave' and $name eq 'Slave')
-- || ($classNode->{astNodeName} eq 'KIcon' and $name eq 'setOverlays')
-- || ($classNode->{astNodeName} eq 'KResolver' and $name eq 'setError')
-- || ($classNode->{astNodeName} eq 'Entry' and $name eq 'setCompatibility')
-- || ($classNode->{astNodeName} eq 'KTimeZone' and $name eq 'source')
-- || ($classNode->{astNodeName} eq 'KTzfileTimeZoneSource' and $name eq 'location')
-- || ($classNode->{astNodeName} eq 'Wallet' and $name eq 'Wallet')
-- # end KDE4
-- || ($classNode->{astNodeName} eq 'KAnimWidget' and $name eq 'KAnimWidget' and @{$m->{ParamList}} == 2)
-- || ($classNode->{astNodeName} eq 'KCModuleLoader' and $name eq 'errorModule')
-- || ($classNode->{astNodeName} eq 'KDCOPActionProxy' and $name eq 'actions')
-- || ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'insertActive')
-- || ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'removeActive')
-- || ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'moveActive')
-- || ($classNode->{astNodeName} eq 'KFileDialog' and $name eq 'addDirEntry')
-- || ($classNode->{astNodeName} eq 'KFileDialog' and $name eq 'getDirEntry')
-- || ($classNode->{astNodeName} eq 'KFileItem' and $name eq 'extraData')
-- || ($classNode->{astNodeName} eq 'KFileView' and $name eq 'selectionMode')
-- || ($classNode->{astNodeName} eq 'KFind' and $name eq 'KFind' and @{$m->{ParamList}} == 4)
-- || ($classNode->{astNodeName} eq 'KGlobalAccel' and $name eq 'setEnabled')
-- || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage')
-- || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger')
-- || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'checkCachedAuthentication')
-- || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'cacheAuthentication')
-+ || ($classNode->{astNodeName} eq 'KConfigGroup' and $name eq 'KConfigGroup' && $#{$m->{ParamList}} == 1 && $m->{ParamList}[0]->{ArgType} =~ /const KConfigBase/)
-+ || ($name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDebug/ )
-+ || ($name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /KDateTime::Spec/ )
-+ || ($name eq 'operator>>' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /KDateTime::Spec/ )
-+ || ($name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /const KDateTime/ )
-+ || ($name eq 'operator>>' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ /KDateTime/ )
- || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getDouble')
-- || ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'enable')
-- || ($classNode->{astNodeName} eq 'KToolBar' and $name eq 'changeEvent')
-- || ($classNode->{astNodeName} eq 'KAccel' and $name eq 'insert' and @{$m->{ParamList}} == 2)
-- || ($classNode->{astNodeName} eq 'KAccel' and $name eq 'autoupdate')
-- || ($classNode->{astNodeName} eq 'KAccel' and $name eq 'getAutoUpdate')
-- || ($classNode->{astNodeName} eq 'KAction' and $name eq 'activated')
-- || ($classNode->{astNodeName} eq 'KAction' and $name eq 'actionOfType')
-- || ($classNode->{astNodeName} eq 'KAction' and $name eq 'actionsOfType')
-- || ($classNode->{astNodeName} eq 'KActionCollection' and $name eq 'add')
-- || ($classNode->{astNodeName} eq 'KStdAccel' and $name eq 'insert')
-- || ($classNode->{astNodeName} eq 'KBookmarkMenu' and $name eq 'invalid')
-- || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages')
-- || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions')
-- || ($classNode->{astNodeName} eq 'KDialogButtonBox' and $name eq 'using')
-- || ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit')
-- || ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets')
-- || ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/)
-- || ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt')
-- || ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative')
-- || ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init')
-- || ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'setTriggerOnRelease')
-- || ($classNode->{astNodeName} eq 'KEMailSettings' and $name eq 'getExtendedSetting')
-- || ($classNode->{astNodeName} eq 'KEMailSettings' and $name eq 'setExtendedSetting')
-- || ($classNode->{astNodeName} eq 'KProtocolManager' and $name eq 'defaultConnectTimeout')
-- || ($classNode->{astNodeName} eq 'KMD4' and $name eq 'transform')
-- || ($classNode->{astNodeName} eq 'KMD5' and $name eq 'transform')
-- || ($classNode->{astNodeName} eq 'KSSLCertificate' and $name eq 'operator!=')
-- || ($classNode->{astNodeName} eq 'KSSLPKCS7' and $name eq 'validate')
-- || ($classNode->{astNodeName} eq 'KSSLPKCS7' and $name eq 'revalidate')
-- || ($classNode->{astNodeName} eq 'KSSLSession' and $name eq 'KSSLSession' and @{$m->{ParamList}} == 1)
-- || ($classNode->{astNodeName} eq 'KSimpleFileFilter' and $name eq 'nameFilters')
-- || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'isTabReorderingEnabled')
-- || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButton')
-- || ($classNode->{astNodeName} eq 'KTabWidget' and $name eq 'hoverCloseButtonDelayed')
-- || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl')
-- || ($classNode->{astNodeName} eq 'KJob' and $name eq 'description')
-+ || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger')
- || ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
-- || ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteClipboard')
-- || ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteData')
-- || ($classNode->{astNodeName} eq 'KIO' and $name eq 'pasteDataAsync')
-- || ($classNode->{astNodeName} eq 'KIO' and $name eq 'isClipboardEmpty')
-- || ($classNode->{astNodeName} eq 'KIO::NetRC' and $name eq 'lookup')
-- || ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'callExt')
-- || ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'call')
-- || ($classNode->{astNodeName} eq 'DCOPRef' and $name eq 'send')
-- || ($classNode->{astNodeName} eq 'DOM' and $name eq 'operator<<') # Avoid kdbgstream debugging method
-- || ($name eq 'initgroups')
-- || ($name eq 'qInitJpegIO' and $main::qt4)
-- || ($name eq 'qInitPngIO' and $main::qt4)
-- || ($name eq 'qt_metacast' and $main::qt4)
-- || ($name eq 'virtual_hook')
-- || ($name eq 'handle')
-- || ($name eq 'qHash')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'setFillBrush')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'fillBrush')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'setFillColor')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'fillColor')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'setAlarmBrush')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'alarmBrush')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'setAlarmColor')
-- || ($classNode->{astNodeName} eq 'QwtThermo' and $name eq 'alarmColor')
-- || ($classNode->{astNodeName} eq 'QwtWheel' and $name eq 'getScrollMode')
-- || ($classNode->{astNodeName} eq 'QwtSpline' and $name eq 'points')
-- || ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'drawItems')
-- || ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'printCanvas')
-- || ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'drawItems')
-- || ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'setCanvasBackground')
-- || ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'canvasBackground')
-- || ($classNode->{astNodeName} eq 'QwtPlotLayout' and $name eq 'expandLineBreaks')
-- || ($classNode->{astNodeName} eq 'QwtPlotLayout' and $name eq 'alignScales')
-- || ($classNode->{astNodeName} eq 'QwtData' and $name eq 'operator=')
-- || ($classNode->{astNodeName} eq 'QwtScaleTransformation' and $name eq 'double')
-- || ($classNode->{astNodeName} eq 'QwtScaleDiv' and $name eq 'QwtScaleDiv' and @{$m->{ParamList}} > 0)
-- # Obsolete
-- || ($classNode->{astNodeName} eq 'QTextStream' and $name eq 'QTextStream'
-- and @{$m->{ParamList}} == 2 and $m->{ParamList}[0]->{ArgType} eq 'QString&')
--
-- # Various methods to skip in Qt/E (Qt 2.3.x)
-- || ($main::qt_embedded
-- && ( ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/)
-- || ($classNode->{astNodeName} eq 'QApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/)
-- || ($classNode->{astNodeName} eq 'QPrinter' and $name =~ /^setIdle$|^setActive$/)
-- || ($classNode->{astNodeName} eq 'QDragObject' and $name eq 'dragLink')
-- || ($classNode->{astNodeName} eq 'QFont' and $name eq 'qwsRenderToDisk')
-- || ($classNode->{astNodeName} eq 'QFontInfo' and $name eq 'font')
-- || ($classNode->{astNodeName} eq 'QLineEdit' and $name eq 'getSelection')
-- || ($classNode->{astNodeName} eq 'QMainWindow' and $name eq 'toolBars')
-- || ($classNode->{astNodeName} eq 'QMovie' and $name eq 'setDisplayWidget')
-- || ($classNode->{astNodeName} eq 'QMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/)
-- || ($classNode->{astNodeName} eq 'QPainter' and $name eq 'pos')
-- || ($classNode->{astNodeName} eq 'QPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/)
-- || ($name eq 'handle')
-- || ($name eq 'resetInputContext')
-- || ($name eq 'propagateUpdates')
-- || ($name eq 'bytesPerLine')
-- || ($name eq 'scanLine')
-- || ($name eq 'hPal')
-- || ($name eq 'copyX11Data')
-- || ($name eq 'getX11Data')
-- || ($name eq 'setX11Data')
-- || ($name eq 'realizePal')
-- || ($name eq 'qwsDisplay')
-- || ($name eq 'fixport')
-- || ($name eq 'hack_strrchr')
-- || ($name eq 'hack_strchr')
-- || ($name eq 'hack_strstr') ) )
--
-- # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro
-- || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr')
-- || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8')
--
-- || ($main::qt4
-- && ( ($classNode->{astNodeName} eq 'QWidgetListItem' and $name eq 'operator=')
-- || ($classNode->{astNodeName} eq 'QColormap' and $name eq 'operator=')
-- || ($classNode->{astNodeName} eq 'QGraphicsLineItem' and $name eq 'QGraphicsLineItem' and $#{$m->{ParamList}} == 5)
-- || ($classNode->{astNodeName} eq 'QGraphicsEllipseItem' and $name eq 'QGraphicsEllipseItem' and $#{$m->{ParamList}} == 5)
-- || ($classNode->{astNodeName} eq 'QListWidget' and $name eq 'setItemPosition')
-- || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'operator=')
-- || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'QFontMetricsF'
-- and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const QFontMetrics&')
-- || ($classNode->{astNodeName} eq 'QAbstractItemDelegate' and $name eq 'QAbstractItemDelegate'
-- and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const QAbstractItemDelegate&')
-- || ($classNode->{astNodeName} eq 'QHttp' and $name eq 'supportedOperations')
-- || ($classNode->{astNodeName} eq 'QPrinter' and $name eq 'printRange')
-- || ($classNode->{astNodeName} eq 'QPrinter' and $name eq 'setPrintRange')
-- || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setX')
-- || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setY')
-- || ($classNode->{astNodeName} eq 'QTextObject' and $name eq 'formatType')
-- || ($classNode->{astNodeName} eq 'QUrl' and $name eq 'QUrl'
-- and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'QUrlPrivate&')
-- || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDebug/)
-- || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'qDebug')
-- || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'qWarning')
-- || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'qCritical')
-- || ($classNode->{astNodeName} eq 'QGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /QVariant::Type/)
-- || ($#{$m->{ParamList}} > 0 and $m->{ParamList}[0]->{ArgType} =~ /Private/)
-- || ($classNode->{astNodeName} eq 'QScrollArea' and $name eq 'alignment')
-- || ($classNode->{astNodeName} eq 'QScrollArea' and $name eq 'setAlignment')
-- || ($classNode->{astNodeName} eq 'QSvgGenerator' and $name eq 'fileName')
-- || ($classNode->{astNodeName} eq 'QSvgGenerator' and $name eq 'setResolution')
-- || ($classNode->{astNodeName} eq 'QDBusConnection' and $name eq 'findInterface' and
-- $m->{ReturnType} =~ /</ )
-- || ($classNode->{astNodeName} eq 'QDBusBusService' and $name eq 'RequestName')
-- || ($classNode->{astNodeName} eq 'QDBusBusService' and $name eq 'requestName')
-- || ($classNode->{astNodeName} eq 'QGLFormat' and $name eq 'openGLVersionFlags')
-- || ($classNode->{astNodeName} eq 'QAbstractUndoItem' and $name eq '~QAbstractUndoItem')
-- || ($classNode->{astNodeName} eq 'QApplication' and $name eq 'setKeypadNavigationEnabled')
-- || ($classNode->{astNodeName} eq 'QApplication' and $name eq 'keypadNavigationEnabled')
-- || ($name eq 'qDBusMetaTypeId')
-- || ($m->{ReturnType} =~ /template/)
-- || ($m->{ReturnType} =~ /QT3_SUPPORT/) ) )
--
-- || $m->{Deprecated} ) {
-+ || ($classNode->{astNodeName} eq 'KJob' and $name eq 'description')
-+ || ($classNode->{astNodeName} eq 'KJob' and $name eq 'KJob')
-+ || ($className eq 'KParts::MainWindow' and $name eq 'MainWindow' && $#{$m->{ParamList}} == 2 && $m->{ParamList}[2]->{ArgType} =~ /Qt::WindowFlags/)
-+ || ($classNode->{astNodeName} eq 'KShortcutsEditor' and $name eq 'checkGlobalShortcutsConflict')
-+ || ($classNode->{astNodeName} eq 'KShortcutsEditor' and $name eq 'checkStandardShortcutsConflict')
-+ || ($classNode->{astNodeName} eq 'KStandardShortcut' and $name eq 'insert')
-+ || ($classNode->{astNodeName} eq 'KTzfileTimeZoneSource' and $name eq 'location')
-+ || ($classNode->{astNodeName} eq 'Wallet' and $name eq 'Wallet')
-+ || ($classNode->{astNodeName} eq 'KMD5' and $name eq 'transform') )
-+ {
- $m->{NodeType} = 'deleted';
- next;
- }
-@@ -806,19 +500,6 @@
- $m->{Flags} =~ s/p//;
- }
-
-- # Hack for fixing up KDE 3.1 KLed where the no arg constructor was ambiguous
-- if ($classNode->{astNodeName} eq 'KLed' and $name eq 'KLed' && $#{$m->{ParamList}} > 0) {
-- if ($m->{ParamList}[0]->{ArgType} =~ /QColor/ && defined $m->{ParamList}[0]->{DefaultValue}) {
-- $m->{ParamList}[0]->{DefaultValue} = undef;
-- if (defined $kledAmbiguousConstructor) {
-- $kledAmbiguousConstructor->{ParamList}[0]->{DefaultValue} = undef;
-- $kledAmbiguousConstructor->{FirstDefaultParam} = 1;
-- }
-- } else {
-- $kledAmbiguousConstructor = $m;
-- }
-- }
--
- # cut the last arguments in size(), boundingRect(), both methods was ambiguous
- if ($classNode->{astNodeName} eq 'QFontMetrics' and $name eq 'boundingRect' && $#{$m->{ParamList}} == 7) {
- if ($m->{ParamList}[7]->{ArgType} =~ /int/ && defined $m->{ParamList}[7]->{DefaultValue}) {
-@@ -836,7 +517,6 @@
- }
- }
-
--
- my $argId = 0;
- my $firstDefaultParam;
- foreach my $arg ( @{$m->{ParamList}} ) {
-@@ -845,17 +525,12 @@
- $firstDefaultParam = $argId;
- }
-
-- if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments
-- or $arg->{ArgType} eq 'image_io_handler' # QImage's callback
-- or $arg->{ArgType} eq 'DecoderFn' # QFile's callback
-- or $arg->{ArgType} eq 'EncoderFn' # QFile's callback
-- or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor
-- or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer
-- or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1
-- or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think
-- or $arg->{ArgType} eq 'const KKeyNative&' #
-- or $arg->{ArgType} =~ /Node\s*\*/ #
-- ) {
-+ if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments
-+ || $arg->{ArgType} eq 'const QTextItem&' # ref to a private class
-+ || $arg->{ArgType} eq 'DecoderFn' # QFile's callback
-+ || $arg->{ArgType} eq 'EncoderFn' # QFile's callback
-+ || $arg->{ArgType} eq 'FILE*' ) # won't be able to handle that I think
-+ {
- $m->{NodeType} = 'deleted';
- }
- else
-@@ -868,6 +543,12 @@
- }
- }
- $m->AddProp( "FirstDefaultParam", $firstDefaultParam );
-+
-+ if ($className eq 'KParts::MainWindow' and $name eq 'MainWindow' && $#{$m->{ParamList}} == 1) {
-+ $m->{ParamList}[1]->{DefaultValue} = undef;
-+ $m->{FirstDefaultParam} = undef;
-+ }
-+
- $m->{ReturnType} = kalyptusDataDict::resolveType($m->{ReturnType}, $classNode, $rootnode) if ($m->{ReturnType});
- registerType( $m->{ReturnType} );
- }
-@@ -890,10 +571,10 @@
- findTypeEntry( $fullEnumName )->{isEnum} = 1;
-
- #print STDERR "$fullEnumName is an enum\n";
-- }
-- elsif( $m->{NodeType} eq 'var' ) {
-+ } elsif( $m->{NodeType} eq 'var' ) {
- if ( ($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4')
- || ($name eq 'd')
-+ || ($classNode->{astNodeName} eq 'Tab' and $name eq 'type')
- || ($classNode->{astNodeName} eq 'QObject' and $name eq 'staticMetaObject')
- || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData')
- || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') )
-@@ -902,6 +583,7 @@
- next;
- }
-
-+ $m->{Type} = kalyptusDataDict::resolveType($m->{Type}, $classNode, $rootnode);
- my $varType = $m->{Type};
- $varType =~ s/const\s+(.*)\s*&/$1/;
- $varType =~ s/^\s*//;
-@@ -1082,6 +764,12 @@
- print $fh "#include <qregexp.h>\n";
- delete $includes{"qregexp.h"};
- }
-+
-+ if (defined $includes{"qsslsocket.h"}) {
-+ print $fh "#include <qsslconfiguration.h>\n";
-+ delete $includes{"qsslconfiguration.h"};
-+ }
-+
- if ( defined $includes{"qmime.h"}
- || defined $includes{"qmetatype.h"}
- || defined $includes{"qvariant.h"}
-@@ -1527,6 +1215,7 @@
- print STDERR " Param ".$arg->{astNodeName}." type: ".$arg->{ArgType}." name:".$arg->{ArgName}." default: ".$arg->{DefaultValue}."\n" if ($debug);
-
- my $argType = $arg->{ArgType};
-+
- push @argTypeList, $argType;
-
- # Detect objects passed by value
-@@ -1592,6 +1281,7 @@
-
- $methodCode .= " ${extra}void x_$methodNumber\(Smoke::Stack x) $attr\{\n";
- my $cplusplusparams = join( ", ", @argTypeList );
-+
- $methodCode .= "\t// $name($cplusplusparams)\n";
- $methodCode .= "\t";
-
Added: packages/libqt4-ruby/trunk/debian/patches/05-smoke-links-to-qtwebkit.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/05-smoke-links-to-qtwebkit.dpatch (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/05-smoke-links-to-qtwebkit.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-smoke-links-to-qtwebkit.dpatch by <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/src/CMakeLists.txt libqt4-ruby-1.4.10/ruby/qtruby/src/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/ruby/qtruby/src/CMakeLists.txt 2007-10-31 15:16:33.000000000 +0100
++++ libqt4-ruby-1.4.10/ruby/qtruby/src/CMakeLists.txt 2008-05-09 23:40:22.000000000 +0200
+@@ -24,7 +24,7 @@
+ add_library(qtruby4 MODULE ${qtruby_LIB_SRCS})
+ #add_library(qtruby4 SHARED ${qtruby_LIB_SRCS})
+
+-target_link_libraries(qtruby4 ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokeqt)
++target_link_libraries(qtruby4 ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} -lQtWebKit smokeqt)
+
+ # target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+
+diff -urNad libqt4-ruby-1.4.10~/smoke/qt/CMakeLists.txt libqt4-ruby-1.4.10/smoke/qt/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/smoke/qt/CMakeLists.txt 2008-05-01 10:05:58.000000000 +0200
++++ libqt4-ruby-1.4.10/smoke/qt/CMakeLists.txt 2008-05-09 23:39:21.000000000 +0200
+@@ -133,7 +133,7 @@
+ ${QT_QTSVG_LIBRARY}
+ ${QT_QTUITOOLS_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+- ${QT_QTWEBKIT_LIBRARY}
++ -lQtWebKit
+ ${_smokeqt_optional_libs} )
+
+ set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
Property changes on: packages/libqt4-ruby/trunk/debian/patches/05-smoke-links-to-qtwebkit.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/10-fix-ruby-install-path.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -6,45 +6,42 @@
## DP: CMakeLists.txt
@DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/rails_support/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/rails_support/CMakeLists.txt
---- libqt4-ruby-1.4.9~/ruby/qtruby/rails_support/CMakeLists.txt 2007-04-17 17:22:55.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/rails_support/CMakeLists.txt 2007-07-25 15:58:42.000000000 +0200
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/rails_support/CMakeLists.txt libqt4-ruby-1.4.10/ruby/qtruby/rails_support/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/ruby/qtruby/rails_support/CMakeLists.txt 2007-09-16 15:21:16.000000000 +0200
++++ libqt4-ruby-1.4.10/ruby/qtruby/rails_support/CMakeLists.txt 2008-05-09 23:02:09.000000000 +0200
@@ -1 +1 @@
--install( FILES active_item_model.rb active_table_model.rb DESTINATION ${RUBY_SITE_LIB_DIR}/Qt )
+-install( FILES active_item_model.rb active_table_model.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/Qt )
+install( FILES active_item_model.rb active_table_model.rb DESTINATION ${DESTDIR}/${RUBY_RUBY_LIB_PATH}/Qt )
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/src/CMakeLists.txt
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/CMakeLists.txt 2007-04-20 13:02:49.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/CMakeLists.txt 2007-07-25 15:59:07.000000000 +0200
-@@ -29,9 +29,9 @@
- add_library(qtrubyinternal STATIC ${qtruby_LIB_SRCS})
- target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY} smokekde)
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/src/CMakeLists.txt libqt4-ruby-1.4.10/ruby/qtruby/src/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/ruby/qtruby/src/CMakeLists.txt 2007-10-31 15:16:33.000000000 +0100
++++ libqt4-ruby-1.4.10/ruby/qtruby/src/CMakeLists.txt 2008-05-09 22:59:35.000000000 +0200
+@@ -30,7 +30,7 @@
--set_target_properties(qtruby4 PROPERTIES VERSION 0.0.0 SOVERSION 0 PREFIX "")
-+set_target_properties(qtruby4 PROPERTIES PREFIX "")
+ set_target_properties(qtruby4 PROPERTIES PREFIX "")
--install(TARGETS qtruby4 DESTINATION ${RUBY_SITE_ARCH_DIR} )
+-install(TARGETS qtruby4 DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR} )
+install(TARGETS qtruby4 DESTINATION ${DESTDIR}/${RUBY_ARCH_DIR} )
if (Q_WS_MAC)
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${RUBY_SITE_ARCH_DIR}/qtruby4.so\" \"${RUBY_SITE_ARCH_DIR}/qtruby4.bundle\" )" )
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/src/lib/CMakeLists.txt
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/CMakeLists.txt 2007-04-12 19:04:54.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/CMakeLists.txt 2007-07-25 15:58:42.000000000 +0200
+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${CUSTOM_RUBY_SITE_ARCH_DIR}/qtruby4.so\" \"${CUSTOM_RUBY_SITE_ARCH_DIR}/qtruby4.bundle\" )" )
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/src/lib/CMakeLists.txt libqt4-ruby-1.4.10/ruby/qtruby/src/lib/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/ruby/qtruby/src/lib/CMakeLists.txt 2007-09-16 15:21:16.000000000 +0200
++++ libqt4-ruby-1.4.10/ruby/qtruby/src/lib/CMakeLists.txt 2008-05-09 23:00:46.000000000 +0200
@@ -1,7 +1,7 @@
add_subdirectory( Qt )
--install( FILES Qt.rb Qt4.rb Qt3.rb DESTINATION ${RUBY_SITE_LIB_DIR} )
+-install( FILES Qt.rb Qt4.rb Qt3.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR} )
+install( FILES Qt.rb Qt4.rb Qt3.rb DESTINATION ${DESTDIR}/${RUBY_RUBY_LIB_PATH} )
#original Makefile.am contents follow:
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/CMakeLists.txt libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/CMakeLists.txt
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/CMakeLists.txt 2007-04-12 19:04:54.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/CMakeLists.txt 2007-07-25 15:58:42.000000000 +0200
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/src/lib/Qt/CMakeLists.txt libqt4-ruby-1.4.10/ruby/qtruby/src/lib/Qt/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/ruby/qtruby/src/lib/Qt/CMakeLists.txt 2007-09-16 15:21:16.000000000 +0200
++++ libqt4-ruby-1.4.10/ruby/qtruby/src/lib/Qt/CMakeLists.txt 2008-05-09 23:01:34.000000000 +0200
@@ -1,5 +1,5 @@
--install( FILES qtruby4.rb DESTINATION ${RUBY_SITE_LIB_DIR}/Qt )
+-install( FILES qtruby4.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/Qt )
+install( FILES qtruby4.rb DESTINATION ${DESTDIR}/${RUBY_RUBY_LIB_PATH}/Qt )
Modified: packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/25-fix-hppa-build.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/CMakeLists.txt libqt4-ruby-1.4.9/CMakeLists.txt
---- libqt4-ruby-1.4.9~/CMakeLists.txt 2007-06-19 15:25:37.000000000 +0200
-+++ libqt4-ruby-1.4.9/CMakeLists.txt 2007-07-25 15:12:06.000000000 +0200
+diff -urNad libqt4-ruby-1.4.10~/CMakeLists.txt libqt4-ruby-1.4.10/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/CMakeLists.txt 2007-06-19 15:25:37.000000000 +0200
++++ libqt4-ruby-1.4.10/CMakeLists.txt 2008-05-09 23:03:52.000000000 +0200
@@ -18,9 +18,16 @@
FIND_PACKAGE(Perl REQUIRED)
FIND_PACKAGE (Qt4 REQUIRED)
Modified: packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/28-optimization.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/CMakeLists.txt libqt4-ruby-1.4.9/CMakeLists.txt
---- libqt4-ruby-1.4.9~/CMakeLists.txt 2007-09-19 23:28:10.000000000 +0200
-+++ libqt4-ruby-1.4.9/CMakeLists.txt 2007-09-19 23:28:36.000000000 +0200
+diff -urNad libqt4-ruby-1.4.10~/CMakeLists.txt libqt4-ruby-1.4.10/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/CMakeLists.txt 2008-05-09 23:04:20.000000000 +0200
++++ libqt4-ruby-1.4.10/CMakeLists.txt 2008-05-09 23:04:20.000000000 +0200
@@ -20,9 +20,9 @@
EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE ARCH)
Modified: packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/30-qt_enum.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -5,11 +5,11 @@
## DP: much better way.
@DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb 2007-06-18 16:06:41.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb 2007-06-30 07:49:57.000000000 +0200
-@@ -2174,11 +2174,14 @@
- t = typename.sub(/^const\s+/, '')
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.10/ruby/qtruby/src/lib/Qt/qtruby4.rb
+--- libqt4-ruby-1.4.10~/ruby/qtruby/src/lib/Qt/qtruby4.rb 2008-04-26 13:41:11.000000000 +0200
++++ libqt4-ruby-1.4.10/ruby/qtruby/src/lib/Qt/qtruby4.rb 2008-05-09 23:04:38.000000000 +0200
+@@ -2374,11 +2374,14 @@
+ t.sub!(/(::)?Ptr$/, '')
t.sub!(/[&*]$/, '')
if argtype == t
- return 1
Deleted: packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 35-fix-class-std-segfault.dpatch by <fourmond at debian.org>
-##
-## DP: Don't deal with class std in the init_class primitive, as
-## DP: this segfaults.
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb 2007-06-18 16:06:41.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb 2008-04-28 23:01:31.000000000 +0200
-@@ -2082,6 +2082,8 @@
- end
-
- def Internal.init_class(c)
-+ # Don't deal with class std !
-+ return if c =~ /std/
- classname = Qt::Internal::normalize_classname(c)
- classId = Qt::Internal.idClass(c)
- insert_pclassid(classname, classId)
Deleted: packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/40-fix-gcc-snapshot.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -1,401 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-fix-gcc-snapshot.dpatch by <fourmond at debian.org>
-##
-## DP: Fix the gcc-snapshot error message:
-## DP: error: explicit template specialization cannot have a storage class
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_basetypes.h libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_basetypes.h
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_basetypes.h 2007-04-12 19:04:54.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_basetypes.h 2007-12-11 23:09:45.000000000 +0100
-@@ -26,14 +26,14 @@
- template <class T> VALUE primitive_to_ruby(T);
-
- template <class T>
--static void marshall_from_ruby(Marshall *m)
-+void marshall_from_ruby(Marshall *m)
- {
- VALUE obj = *(m->var());
- (*smoke_ptr<T>(m)) = ruby_to_primitive<T>(obj);
- }
-
- template <class T>
--static void marshall_to_ruby(Marshall *m)
-+void marshall_to_ruby(Marshall *m)
- {
- *(m->var()) = primitive_to_ruby<T>( *smoke_ptr<T>(m) );
- }
-@@ -44,13 +44,13 @@
- // Special case marshallers
-
- template <>
--static void marshall_from_ruby<char *>(Marshall *m)
-+void marshall_from_ruby<char *>(Marshall *m)
- {
- m->item().s_voidp = ruby_to_primitive<char*>(*(m->var()));
- }
-
- template <>
--static void marshall_from_ruby<SmokeEnumWrapper>(Marshall *m)
-+void marshall_from_ruby<SmokeEnumWrapper>(Marshall *m)
- {
- VALUE v = *(m->var());
-
-@@ -65,7 +65,7 @@
- }
-
- template <>
--static void marshall_to_ruby<SmokeEnumWrapper>(Marshall *m)
-+void marshall_to_ruby<SmokeEnumWrapper>(Marshall *m)
- {
- long val = m->item().s_enum;
- *(m->var()) = rb_funcall(qt_internal_module, rb_intern("create_qenum"),
-@@ -73,7 +73,7 @@
- }
-
- template <>
--static void marshall_from_ruby<SmokeClassWrapper>(Marshall *m)
-+void marshall_from_ruby<SmokeClassWrapper>(Marshall *m)
- {
- VALUE v = *(m->var());
-
-@@ -119,7 +119,7 @@
- }
-
- template <>
--static void marshall_to_ruby<SmokeClassWrapper>(Marshall *m)
-+void marshall_to_ruby<SmokeClassWrapper>(Marshall *m)
- {
- if(m->item().s_voidp == 0) {
- *(m->var()) = Qnil;
-@@ -164,7 +164,7 @@
- }
-
- template <>
--static void marshall_to_ruby<char *>(Marshall *m)
-+void marshall_to_ruby<char *>(Marshall *m)
- {
- char *sv = (char*)m->item().s_voidp;
- VALUE obj;
-@@ -180,7 +180,7 @@
- }
-
- template <>
--static void marshall_to_ruby<unsigned char *>(Marshall *m)
-+void marshall_to_ruby<unsigned char *>(Marshall *m)
- {
- m->unsupported();
- }
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_complex.h libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_complex.h
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_complex.h 2007-04-12 19:04:54.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_complex.h 2007-12-11 23:09:45.000000000 +0100
-@@ -8,7 +8,7 @@
- ***************************************************************************/
-
- template <>
--static void marshall_from_ruby<long long>(Marshall *m)
-+void marshall_from_ruby<long long>(Marshall *m)
- {
- VALUE obj = *(m->var());
- m->item().s_voidp = new long long;
-@@ -22,7 +22,7 @@
- }
-
- template <>
--static void marshall_from_ruby<unsigned long long>(Marshall *m)
-+void marshall_from_ruby<unsigned long long>(Marshall *m)
- {
- VALUE obj = *(m->var());
- m->item().s_voidp = new unsigned long long;
-@@ -36,7 +36,7 @@
- }
-
- template <>
--static void marshall_from_ruby<int *>(Marshall *m)
-+void marshall_from_ruby<int *>(Marshall *m)
- {
- VALUE rv = *(m->var());
- int *i = new int;
-@@ -63,7 +63,7 @@
- }
-
- template <>
--static void marshall_to_ruby<int *>(Marshall *m)
-+void marshall_to_ruby<int *>(Marshall *m)
- {
- int *ip = (int*)m->item().s_voidp;
- VALUE rv = *(m->var());
-@@ -79,7 +79,7 @@
- }
-
- template <>
--static void marshall_from_ruby<bool *>(Marshall *m)
-+void marshall_from_ruby<bool *>(Marshall *m)
- {
- VALUE rv = *(m->var());
- bool * b = new bool;
-@@ -103,7 +103,7 @@
- }
-
- template <>
--static void marshall_to_ruby<bool *>(Marshall *m)
-+void marshall_to_ruby<bool *>(Marshall *m)
- {
- bool *ip = (bool*)m->item().s_voidp;
- if(!ip) {
-diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_primitives.h libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_primitives.h
---- libqt4-ruby-1.4.9~/ruby/qtruby/src/marshall_primitives.h 2007-04-12 19:04:54.000000000 +0200
-+++ libqt4-ruby-1.4.9/ruby/qtruby/src/marshall_primitives.h 2007-12-11 23:09:45.000000000 +0100
-@@ -8,7 +8,7 @@
- ***************************************************************************/
-
- template <>
--static bool ruby_to_primitive<bool>(VALUE v)
-+bool ruby_to_primitive<bool>(VALUE v)
- {
- if (TYPE(v) == T_OBJECT) {
- // A Qt::Boolean has been passed as a value
-@@ -20,61 +20,61 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<bool>(bool sv)
-+ VALUE primitive_to_ruby<bool>(bool sv)
- {
- return sv ? Qtrue : Qfalse;
- }
-
- template <>
--static signed char ruby_to_primitive<signed char>(VALUE v)
-+ signed char ruby_to_primitive<signed char>(VALUE v)
- {
- return NUM2CHR(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<signed char>(signed char sv)
-+ VALUE primitive_to_ruby<signed char>(signed char sv)
- {
- return CHR2FIX(sv);
- }
-
- template <>
--static unsigned char ruby_to_primitive<unsigned char>(VALUE v)
-+ unsigned char ruby_to_primitive<unsigned char>(VALUE v)
- {
- return NUM2CHR(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<unsigned char>(unsigned char sv)
-+ VALUE primitive_to_ruby<unsigned char>(unsigned char sv)
- {
- return CHR2FIX(sv);
- }
-
- template <>
--static short ruby_to_primitive<short>(VALUE v)
-+ short ruby_to_primitive<short>(VALUE v)
- {
- return (short)NUM2INT(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<short>(short sv)
-+ VALUE primitive_to_ruby<short>(short sv)
- {
- return INT2NUM(sv);
- }
-
- template <>
--static unsigned short ruby_to_primitive<unsigned short>(VALUE v)
-+ unsigned short ruby_to_primitive<unsigned short>(VALUE v)
- {
- return (unsigned short)NUM2UINT(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<unsigned short>(unsigned short sv)
-+ VALUE primitive_to_ruby<unsigned short>(unsigned short sv)
- {
- return UINT2NUM((unsigned int) sv);
- }
-
- template <>
--static int ruby_to_primitive<int>(VALUE v)
-+ int ruby_to_primitive<int>(VALUE v)
- {
- if (TYPE(v) == T_OBJECT) {
- return (int)NUM2INT(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
-@@ -84,13 +84,13 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<int>(int sv)
-+ VALUE primitive_to_ruby<int>(int sv)
- {
- return INT2NUM(sv);
- }
-
- template <>
--static unsigned int ruby_to_primitive<unsigned int>(VALUE v)
-+ unsigned int ruby_to_primitive<unsigned int>(VALUE v)
- {
- if (TYPE(v) == T_OBJECT) {
- return (unsigned int) NUM2UINT(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
-@@ -100,13 +100,13 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<unsigned int>(unsigned int sv)
-+ VALUE primitive_to_ruby<unsigned int>(unsigned int sv)
- {
- return UINT2NUM(sv);
- }
-
- template <>
--static long ruby_to_primitive<long>(VALUE v)
-+ long ruby_to_primitive<long>(VALUE v)
- {
- if (TYPE(v) == T_OBJECT) {
- return (long) NUM2LONG(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
-@@ -116,13 +116,13 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<long>(long sv)
-+ VALUE primitive_to_ruby<long>(long sv)
- {
- return INT2NUM(sv);
- }
-
- template <>
--static unsigned long ruby_to_primitive<unsigned long>(VALUE v)
-+ unsigned long ruby_to_primitive<unsigned long>(VALUE v)
- {
- if (TYPE(v) == T_OBJECT) {
- return (unsigned long) NUM2ULONG(rb_funcall(qt_internal_module, rb_intern("get_qinteger"), 1, v));
-@@ -132,61 +132,61 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<unsigned long>(unsigned long sv)
-+ VALUE primitive_to_ruby<unsigned long>(unsigned long sv)
- {
- return INT2NUM(sv);
- }
-
- template <>
--static long long ruby_to_primitive<long long>(VALUE v)
-+ long long ruby_to_primitive<long long>(VALUE v)
- {
- return NUM2LL(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<long long>(long long sv)
-+ VALUE primitive_to_ruby<long long>(long long sv)
- {
- return LL2NUM(sv);
- }
-
- template <>
--static unsigned long long ruby_to_primitive<unsigned long long>(VALUE v)
-+ unsigned long long ruby_to_primitive<unsigned long long>(VALUE v)
- {
- return rb_num2ull(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<unsigned long long>(unsigned long long sv)
-+ VALUE primitive_to_ruby<unsigned long long>(unsigned long long sv)
- {
- return rb_ull2inum(sv);
- }
-
- template <>
--static float ruby_to_primitive<float>(VALUE v)
-+ float ruby_to_primitive<float>(VALUE v)
- {
- return (float) NUM2DBL(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<float>(float sv)
-+ VALUE primitive_to_ruby<float>(float sv)
- {
- return rb_float_new((double) sv);
- }
-
- template <>
--static double ruby_to_primitive<double>(VALUE v)
-+ double ruby_to_primitive<double>(VALUE v)
- {
- return (double) NUM2DBL(v);
- }
-
- template <>
--static VALUE primitive_to_ruby<double>(double sv)
-+ VALUE primitive_to_ruby<double>(double sv)
- {
- return rb_float_new((double) sv);
- }
-
- template <>
--static char* ruby_to_primitive<char *>(VALUE rv)
-+ char* ruby_to_primitive<char *>(VALUE rv)
- {
- if(rv == Qnil)
- return 0;
-@@ -195,7 +195,7 @@
- }
-
- template <>
--static unsigned char* ruby_to_primitive<unsigned char *>(VALUE rv)
-+ unsigned char* ruby_to_primitive<unsigned char *>(VALUE rv)
- {
- if(rv == Qnil)
- return 0;
-@@ -208,7 +208,7 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<int*>(int* sv)
-+ VALUE primitive_to_ruby<int*>(int* sv)
- {
- if(!sv) {
- return Qnil;
-@@ -219,7 +219,7 @@
-
- #if defined(Q_OS_WIN32)
- template <>
--static WId ruby_to_primitive<WId>(VALUE v)
-+ WId ruby_to_primitive<WId>(VALUE v)
- {
- if(v == Qnil)
- return 0;
-@@ -228,13 +228,13 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<WId>(WId sv)
-+ VALUE primitive_to_ruby<WId>(WId sv)
- {
- return ULONG2NUM((unsigned long) sv);
- }
-
- template <>
--static Q_PID ruby_to_primitive<Q_PID>(VALUE v)
-+ Q_PID ruby_to_primitive<Q_PID>(VALUE v)
- {
- if(v == Qnil)
- return 0;
-@@ -243,7 +243,7 @@
- }
-
- template <>
--static VALUE primitive_to_ruby<Q_PID>(Q_PID sv)
-+ VALUE primitive_to_ruby<Q_PID>(Q_PID sv)
- {
- return ULONG2NUM((unsigned long) sv);
- }
Modified: packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/97-soname.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -5,12 +5,12 @@
## DP: No description.
@DPATCH@
-diff -urNad libqt4-ruby-1.4.9~/smoke/qt/CMakeLists.txt libqt4-ruby-1.4.9/smoke/qt/CMakeLists.txt
---- libqt4-ruby-1.4.9~/smoke/qt/CMakeLists.txt 2007-06-20 13:14:26.000000000 +0200
-+++ libqt4-ruby-1.4.9/smoke/qt/CMakeLists.txt 2007-06-29 12:12:34.000000000 +0200
-@@ -123,7 +123,7 @@
- ${QSCINTILLA_LIBRARIES}
- ${Qwt5_Qt4_LIBRARY} )
+diff -urNad libqt4-ruby-1.4.10~/smoke/qt/CMakeLists.txt libqt4-ruby-1.4.10/smoke/qt/CMakeLists.txt
+--- libqt4-ruby-1.4.10~/smoke/qt/CMakeLists.txt 2008-05-01 10:05:58.000000000 +0200
++++ libqt4-ruby-1.4.10/smoke/qt/CMakeLists.txt 2008-05-09 23:07:35.000000000 +0200
+@@ -136,7 +136,7 @@
+ ${QT_QTWEBKIT_LIBRARY}
+ ${_smokeqt_optional_libs} )
-set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
+set_target_properties(smokeqt PROPERTIES VERSION 1.3.0 SOVERSION 1 )
Deleted: packages/libqt4-ruby/trunk/debian/patches/98-soname.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/98-soname.dpatch 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/patches/98-soname.dpatch 2008-05-09 21:54:03 UTC (rev 2710)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 98-soname.dpatch by <vincent.fourmond at 9online.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.7~/smoke/qt/Makefile.am libqt4-ruby-1.4.7/smoke/qt/Makefile.am
---- libqt4-ruby-1.4.7~/smoke/qt/Makefile.am 2006-10-30 17:53:20.000000000 +0100
-+++ libqt4-ruby-1.4.7/smoke/qt/Makefile.am 2007-01-01 13:17:31.000000000 +0100
-@@ -7,7 +7,7 @@
- EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
-
- # the library search path.
--libsmokeqt_la_LDFLAGS = -version-info 2:0:0 -no-undefined $(all_libraries) $(GLINC)
-+libsmokeqt_la_LDFLAGS = -version-info 3:4:2 -no-undefined $(all_libraries) $(GLINC)
-
- # the libraries to link against.
- libsmokeqt_la_LIBADD = $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
Modified: packages/libqt4-ruby/trunk/debian/rules
===================================================================
--- packages/libqt4-ruby/trunk/debian/rules 2008-05-09 02:27:07 UTC (rev 2709)
+++ packages/libqt4-ruby/trunk/debian/rules 2008-05-09 21:54:03 UTC (rev 2710)
@@ -92,9 +92,10 @@
# Remove files conflicting with libqt0-ruby.
rm $(CURDIR)/debian/tmp/usr/lib/ruby/1.8/Qt.rb
-# Remove rbqtsh as it fails for now
+# Remove rbqtsh as it fails for now, and some other
+# (undocumented for now) binaries as well
dh_install -s --list-missing --sourcedir=debian/tmp
- cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh;
+ cd $(CURDIR)/debian/libqt4-ruby1.8/usr/bin; rm -f rbqtsh rbkde* rbplasmaapi rbqt3api;
# Manually install the smoke.h header.
mkdir -p debian/libsmokeqt4-dev/usr/include
More information about the Pkg-ruby-extras-commits
mailing list