[DRE-commits] r2513 - packages/libqt4-ruby/trunk/debian/patches
fourmond at alioth.debian.org
fourmond at alioth.debian.org
Mon Mar 10 20:26:24 UTC 2008
Author: fourmond
Date: 2008-03-10 20:26:23 +0000 (Mon, 10 Mar 2008)
New Revision: 2513
Removed:
packages/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch
packages/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch
packages/libqt4-ruby/trunk/debian/patches/10-kalyptus.dpatch
packages/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
packages/libqt4-ruby/trunk/debian/patches/20-visibility.dpatch
packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
Modified:
packages/libqt4-ruby/trunk/debian/patches/00list
Log:
[libqt4-ruby] Remove old unused patches
Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/00list 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,13 +1,7 @@
-# 01-fix-rpath
-# 02-qtruby-makefile
10-fix-ruby-install-path
-# 10-kalyptus
-# 15-fix-install
-# 20-visibility
25-fix-hppa-build
28-optimization
30-qt_enum
40-fix-gcc-snapshot
-# 31-constants-warning
97-soname
99-smoke-qt4
Deleted: packages/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/01-fix-rpath.dpatch 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-fix-rpath.dpatch by <fourmond at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the -rpath problem for generated binaries.
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.7~/configure.in libqt4-ruby-1.4.7/configure.in
---- libqt4-ruby-1.4.7~/configure.in 2006-10-30 18:09:06.000000000 +0100
-+++ libqt4-ruby-1.4.7/configure.in 2007-03-19 20:44:52.000000000 +0100
-@@ -31,6 +31,15 @@
- AC_ENABLE_STATIC(no)
- KDE_PROG_LIBTOOL
-
-+# by Marcelo Magallon <mmagallo at efis.ucr.ac.cr>
-+# Turn around -rpath problem with libtool 1.0c
-+# This define should be improbable enough to not conflict with anything
-+AC_MSG_RESULT([Fixing libtool for -rpath problems.])
-+sed < libtool > libtool-2 \
-+'s/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
-+mv libtool-2 libtool
-+chmod 755 libtool
-+
- AC_PATH_QT()
- AC_SUBST(all_includes)
- AC_SUBST(all_libraries)
Deleted: packages/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/02-qtruby-makefile.dpatch 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-qtruby-makefile.dpatch by <vincent.fourmond at 9online.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Added library dependency on ruby's lib.
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/Makefile.am libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/Makefile.am
---- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/Makefile.am 2006-10-30 17:52:52.000000000 +0100
-+++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/Makefile.am 2006-12-31 16:25:14.000000000 +0100
-@@ -9,10 +9,11 @@
-
- rubylibdir = $(RUBY_SITEARCHDIR)
- rubylib_LTLIBRARIES = qtruby4.la
--qtruby4_la_SOURCES =
-+qtruby4_la_SOURCES = dummy.cpp
- qtruby4_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
- qtruby4_la_LIBADD = libqtrubyinternal.la $(LIB_QTCORE) $(LIB_QTGUI) $(LIB_QTNETWORK) \
- $(LIB_QTOPENGL) $(LIB_QTSQL) $(LIB_QTCORE) $(LIB_QTXML) \
-- $(top_builddir)/smoke/qt/libsmokeqt.la
-+ $(top_builddir)/smoke/qt/libsmokeqt.la \
-+ $(RUBY_LIBRUBYARG) -L$(RUBY_LIBDIR)
-
- SUBDIRS = lib
-diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/dummy.cpp libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/dummy.cpp
---- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/dummy.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/dummy.cpp 2006-12-31 16:25:14.000000000 +0100
-@@ -0,0 +1 @@
-+/* Dummy file to force automake to treat Qt.so as a C++ library - and not a C one */
Deleted: packages/libqt4-ruby/trunk/debian/patches/10-kalyptus.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/10-kalyptus.dpatch 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/10-kalyptus.dpatch 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,121 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-kalyptus.dpatch by <vincent.fourmond at 9online.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes broken parsing of Qt 4.1 headers files in kalyptus.
-
- at DPATCH@
-diff -urNad qt4-qtruby-1.4.6~/kalyptus/kalyptus qt4-qtruby-1.4.6/kalyptus/kalyptus
---- qt4-qtruby-1.4.6~/kalyptus/kalyptus 2006-10-10 16:02:42.000000000 +0200
-+++ qt4-qtruby-1.4.6/kalyptus/kalyptus 2006-10-10 16:07:18.000000000 +0200
-@@ -496,6 +496,8 @@
- $p =~ s/KDOM_FORWARDPUT/bool putforward();/;
- $p =~ s/KDOM_BASECLASS/virtual KJS::Value cache();/;
- $p =~ s/KDOM_CAST/KJS::Value cast();/;
-+ $p =~ s/Q_DECLARE_BUILTIN_METATYPE[^\)]*\)//;
-+ $p =~ s/Q_[A-Z]+_EXPORT_INLINE//;
- if ( $p =~ m/KDOM_DEFINE_PROTOTYPE\((\w+)\)/ ) {
- push @inputqueue, split('\n',"namespace KDOM {\nclass $1 {\n};\n};");
- }
-@@ -574,6 +576,7 @@
- $p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or
- $p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or
- $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or
-+ $p =~ m/^#\s*ifdef\s+qdoc/ or
- $p =~ m/^#\s*ifndef\s+QT_NO_MEMBER_TEMPLATES/ or
- $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
- $p =~ m/^#if\s*defined\(Q_INTERNAL_QAPP_SRC\)/ or
-diff -urNad qt4-qtruby-1.4.6~/kalyptus/kalyptusCxxToSmoke.pm qt4-qtruby-1.4.6/kalyptus/kalyptusCxxToSmoke.pm
---- qt4-qtruby-1.4.6~/kalyptus/kalyptusCxxToSmoke.pm 2006-10-10 16:02:38.000000000 +0200
-+++ qt4-qtruby-1.4.6/kalyptus/kalyptusCxxToSmoke.pm 2006-10-10 16:07:18.000000000 +0200
-@@ -229,6 +229,32 @@
- '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',
- );
-
- $headerSubdirectories = "kio/|kdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff|dbus-1.0/dbus/"
-@@ -416,11 +442,15 @@
- $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 '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
-@@ -615,6 +645,10 @@
- || ($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')
-@@ -663,6 +697,8 @@
- || ($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'
-@@ -686,6 +722,7 @@
- $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')
- || ($name eq 'qDBusMetaTypeId')
- || ($m->{ReturnType} =~ /QT3_SUPPORT/) ) )
-
-@@ -980,13 +1017,6 @@
- die if $incl eq '';
- print $fh "#include <$incl>\n";
- }
-- if ( $main::qt4
-- and ( defined $includes{"qtreewidget.h"}
-- or defined $includes{"qlistwidget.h"}
-- or defined $includes{"qtablewidget.h"} ) )
-- {
-- # print $fh "#include \"qwidgetitemdata_p.h\"\n";
-- }
- print $fh "\n";
- for my $c( 0..$#code )
- {
Deleted: packages/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/15-fix-install.dpatch 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15-fix-install.dpatch by <vincent.fourmond at 9online.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove the symlink stuff, as it make the installation fail miserably
-
- at DPATCH@
-diff -urNad libqt4-ruby-1.4.7~/qtruby/bin/Makefile.am libqt4-ruby-1.4.7/qtruby/bin/Makefile.am
---- libqt4-ruby-1.4.7~/qtruby/bin/Makefile.am 2006-10-30 17:52:46.000000000 +0100
-+++ libqt4-ruby-1.4.7/qtruby/bin/Makefile.am 2007-01-01 17:19:00.000000000 +0100
-@@ -9,8 +9,8 @@
- bin_SCRIPTS = rbqtapi rbqtsh
-
- install-exec-local:
-- @-rm -f $(DESTDIR)$(bindir)/rbqt3api
-- @$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbqt3api
-+# @-rm -f $(DESTDIR)$(bindir)/rbqt3api
-+# @$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbqt3api
- @-rm -f $(DESTDIR)$(bindir)/rbqt4api
- @$(LN_S) rbqtapi $(DESTDIR)$(bindir)/rbqt4api
-
-diff -urNad libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/lib/Makefile.am libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Makefile.am
---- libqt4-ruby-1.4.7~/qtruby/rubylib/qtruby/lib/Makefile.am 2006-10-30 17:52:51.000000000 +0100
-+++ libqt4-ruby-1.4.7/qtruby/rubylib/qtruby/lib/Makefile.am 2007-01-01 17:17:54.000000000 +0100
-@@ -4,6 +4,4 @@
- rubylib_DATA = Qt4.rb Qt3.rb
-
- install-data-local:
-- @-rm -f $(RUBY_SITEDIR)/Qt.rb
-- @$(LN_S) $(RUBY_SITEDIR)/Qt4.rb $(RUBY_SITEDIR)/Qt.rb
-
Deleted: packages/libqt4-ruby/trunk/debian/patches/20-visibility.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/20-visibility.dpatch 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/20-visibility.dpatch 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-visibility.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 qt4-qtruby-1.4.5~/qtruby/rubylib/qtruby/marshall_types.cpp qt4-qtruby-1.4.5/qtruby/rubylib/qtruby/marshall_types.cpp
---- qt4-qtruby-1.4.5~/qtruby/rubylib/qtruby/marshall_types.cpp 2006-04-20 20:23:36.000000000 +0200
-+++ qt4-qtruby-1.4.5/qtruby/rubylib/qtruby/marshall_types.cpp 2006-07-17 14:29:14.000000000 +0200
-@@ -16,6 +16,7 @@
- * *
- ***************************************************************************/
-
-+#pragma GCC visibility push(default)
- #include "marshall_types.h"
-
- MethodReturnValueBase::MethodReturnValueBase(Smoke *smoke, Smoke::Index meth, Smoke::Stack stack) :
-@@ -609,3 +610,4 @@
- invokeSlot();
- }
-
-+#pragma GCC visibility pop
Deleted: packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch 2008-03-08 03:44:53 UTC (rev 2512)
+++ packages/libqt4-ruby/trunk/debian/patches/31-constants-warning.dpatch 2008-03-10 20:26:23 UTC (rev 2513)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 31-constants-warning.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~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.7/ruby/qtruby/src/lib/Qt/qtruby4.rb
---- libqt4-ruby-1.4.7~/ruby/qtruby/src/lib/Qt/qtruby4.rb 2007-01-16 12:03:53.000000000 +0100
-+++ libqt4-ruby-1.4.7/ruby/qtruby/src/lib/Qt/qtruby4.rb 2007-01-16 12:04:28.000000000 +0100
-@@ -1425,6 +1425,8 @@
- class Variant < Qt::Base
- String = 10
- Time = 15
-+ DateTime = 16
-+ Date = 14
-
- def to_a
- return toStringList()
More information about the Pkg-ruby-extras-commits
mailing list