From a3f5fa63b7cc81680e146cd5e89157ad5c7b5938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> Date: Thu, 24 Mar 2016 10:00:30 +0100 Subject: Remove unused patches
--- ...Fix-problems-with-puic4-x-code-generation.patch | 129 --------------------- Qt-0.96.0-Fix-uchar-test.patch | 37 ------ 2 files changed, 166 deletions(-) delete mode 100644 Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch delete mode 100644 Qt-0.96.0-Fix-uchar-test.patch diff --git a/Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch b/Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch deleted file mode 100644 index 1d3a9a7..0000000 --- a/Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 94492c83232701ebc95d739f884f6457a96475f5 Mon Sep 17 00:00:00 2001 -From: Olivier Lahaye <olivier.lah...@cea.fr> -Date: Fri, 19 Jun 2015 08:11:36 -0700 -Subject: [PATCH] Fix problems with puic4 -x code generation. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is a patch submitted for https://github.com/chrisburel/perlqt4/issues/44 "puic4 -x does not create valid perl code" - -Petr Písař: Ported to 0.96.0: - -commit e8a30b78f46a376da70fc9cc8f8166b72aea5261 -Author: Olivier Lahaye <olivier.lah...@cea.fr> -Date: Fri Jun 19 08:11:36 2015 -0700 - - Fix problems with puic4 -x code generation. - -Signed-off-by: Petr Písař <ppi...@redhat.com> ---- - qtcore/tools/puic/uic.cpp | 74 +++++++++++++++++++++++++---------------------- - 1 file changed, 39 insertions(+), 35 deletions(-) - -diff --git a/qtcore/tools/puic/uic.cpp b/qtcore/tools/puic/uic.cpp -index 996a7da..edb5538 100644 ---- a/qtcore/tools/puic/uic.cpp -+++ b/qtcore/tools/puic/uic.cpp -@@ -139,30 +139,34 @@ void Uic::writeCopyrightHeader(DomUI *ui) - { - QString comment = ui->elementComment(); - if ( this->option().generator == Option::PerlGenerator ) { -- if (comment.size()) -- out << "/*\n" << comment << "\n*/\n\n"; -+ if (comment.size()) { -+ comment.insert( 0, "# " ); -+ comment.replace( QRegExp("\n"), "\n# " ); -+ out << "################################################################################\n" -+ << comment -+ << "\n################################################################################\n\n"; -+ } - -- out << "#################################################################################\n"; -- out << "## Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; -- out << "##\n"; -- out << "## Created: " << QDateTime::currentDateTime().toString() << "\n"; -- out << "## " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -- out << "##\n"; -- out << "## WARNING! All changes made in this file will be lost when recompiling UI file!\n"; -- out << "################################################################################\n\n"; -- } -- else { -+ out << "################################################################################\n"; -+ out << "## Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; -+ out << "##\n"; -+ out << "## Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "## " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+ out << "##\n"; -+ out << "## WARNING! All changes made in this file will be lost when recompiling UI file!\n"; -+ out << "################################################################################\n\n"; -+ } else { - if (comment.size()) - out << "/*\n" << comment << "\n*/\n\n"; - -- out << "/********************************************************************************\n"; -- out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; -- out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -- out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -- out << "**\n"; -- out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; -- out << "********************************************************************************/\n\n"; -+ out << "/********************************************************************************\n"; -+ out << "** Form generated from reading UI file '" << QFileInfo(opt.inputFile).fileName() << "'\n"; -+ out << "**\n"; -+ out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** " << QString::fromLatin1("by: Qt User Interface Compiler version %1\n").arg(QLatin1String(QT_VERSION_STR)); -+ out << "**\n"; -+ out << "** WARNING! All changes made in this file will be lost when recompiling UI file!\n"; -+ out << "********************************************************************************/\n\n"; - } - } - -@@ -381,28 +385,28 @@ bool Uic::plwrite(DomUI *ui) - - if (option().useKDE) { - out << "\n\nsub main {" << endl; -- out << option().indent << "my $about = KDE::AboutData(\"" << className.toLower() << "\", \"" << className << "\", KDE.ki18n(\"\"), \"0.1\")" << endl; -- out << option().indent << "KDE::CmdLineArgs.init(\\@ARGV, $about)" << endl; -- out << option().indent << "my $a = KDE::Application" << endl; -+ out << option().indent << "my $about = KDE::AboutData(\"" << className.toLower() << "\", \"" << className << "\", KDE.ki18n(\"\"), \"0.1\");" << endl; -+ out << option().indent << "KDE::CmdLineArgs.init(\\@ARGV, $about);" << endl; -+ out << option().indent << "my $a = KDE::Application;" << endl; - parentClass.replace(QRegExp("^Q"), "Qt::"); - parentClass.replace(QRegExp("^K"), "KDE::"); -- out << option().indent << "my $w = " << parentClass << endl; -- out << option().indent << option().prefix << className << "setupUi($w)" << endl; -- out << option().indent << "$a->topWidget = $w" << endl; -- out << option().indent << "$w->show()" << endl; -- out << option().indent << "$a->exec()" << endl; -+ out << option().indent << "my $w = " << parentClass << ";" << endl; -+ out << option().indent << option().prefix << className << "setupUi($w);" << endl; -+ out << option().indent << "$a->topWidget = $w;" << endl; -+ out << option().indent << "$w->show();" << endl; -+ out << option().indent << "$a->exec();" << endl; - out << "}" << endl; -- out << "exit main()" << endl; -+ out << "exit main();" << endl; - } else { - out << "\n\nsub main {" << endl; -- out << option().indent << "my $a = Qt::Application(\\@ARGV)" << endl; -+ out << option().indent << "my $a = Qt::Application(\\@ARGV);" << endl; - parentClass.replace(QRegExp("^Q"), "Qt::"); -- out << option().indent << "my $w = " << parentClass << endl; -- out << option().indent << "my $u = " << option().prefix << className << endl; -- out << option().indent << "$w->show()" << endl; -- out << option().indent << "$a->exec()" << endl; -+ out << option().indent << "my $w = " << parentClass << ";" << endl; -+ out << option().indent << "my $u = " << option().prefix << className << ";" << endl; -+ out << option().indent << "$w->show();" << endl; -+ out << option().indent << "$a->exec();" << endl; - out << "}" << endl; -- out << "exit main()" << endl; -+ out << "exit main();" << endl; - } - } - --- -2.5.5 - diff --git a/Qt-0.96.0-Fix-uchar-test.patch b/Qt-0.96.0-Fix-uchar-test.patch deleted file mode 100644 index 0857b9c..0000000 --- a/Qt-0.96.0-Fix-uchar-test.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5c1433a05cea92e3b1f73afdb488543299eadcf1 Mon Sep 17 00:00:00 2001 -From: Chris Burel <cbu...@rhythm.com> -Date: Sun, 12 Feb 2012 15:59:01 -0800 -Subject: [PATCH] Fix uchar test. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems the smoke libs no longer recognize the QChar( uchar ) method. So use the QChar( uchar, uchar ) instead. - -Petr Písař: Ported to 0.96.0: - -commit 2b2e2d106abff67a55abd0dc38268f74f98d64da -Author: Chris Burel <cbu...@rhythm.com> -Date: Sun Feb 12 15:59:01 2012 -0800 - -Signed-off-by: Petr Písař <ppi...@redhat.com> ---- - qtcore/t/f_handlers.t | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtcore/t/f_handlers.t b/qtcore/t/f_handlers.t -index ca95423..53b7d63 100644 ---- a/qtcore/t/f_handlers.t -+++ b/qtcore/t/f_handlers.t -@@ -93,7 +93,7 @@ my $app = Qt::Application( \@ARGV ); - # Test char and uchar marshalling - my $char = Qt::Char( Qt::Int(87) ); - is ( $char->toAscii(), 87, 'signed char' ); -- $char = Qt::Char( Qt::Uchar('f') ); -+ $char = Qt::Char( Qt::Uchar('f'), Qt::Uchar("\0") ); - is ( $char->toAscii(), ord('f'), 'unsigned char' ); - $char = Qt::Char( 'f', 3 ); - is ( $char->row(), 3, 'unsigned char' ); --- -2.5.5 - -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=a3f5fa63b7cc81680e146cd5e89157ad5c7b5938 _______________________________________________ perl-devel mailing list -- perl-devel@lists.fedoraproject.org To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
