Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
List overview
Download
perl-devel
February 2017
----- 2024 -----
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
perl-devel@lists.fedoraproject.org
7 participants
4703 discussions
Start a n
N
ew thread
sergiomb pushed to perl-Qt (epel7). "Mandatory Perl build-requires added <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 49a2ec5e06ba2d71a8d2d89f2a2bb7086d7d6a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> Date: Fri, 24 Jun 2016 09:27:17 +0200 Subject: Mandatory Perl build-requires added <
https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
> --- perl-Qt.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-Qt.spec b/perl-Qt.spec index 13a1bc7..283abc7 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -28,6 +28,7 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: perl BuildRequires: perl-devel +BuildRequires: perl-generators # Perl modules used by qtcore/src/doxsubpp.pl and cmake/FindPerlMore.cmake BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) -- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=49a2ec5e0…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "Fix code generation with "puic4 -x""
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 0cb05ee05116fb65f48da7cd73db03da57e5b009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> Date: Tue, 22 Mar 2016 15:38:37 +0100 Subject: Fix code generation with "puic4 -x" --- ...Fix-problems-with-puic4-x-code-generation.patch | 129 +++++++++++++++++++++ perl-Qt.spec | 4 + 2 files changed, 133 insertions(+) create mode 100644 Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.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 new file mode 100644 index 0000000..1d3a9a7 --- /dev/null +++ b/Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch @@ -0,0 +1,129 @@ +From 94492c83232701ebc95d739f884f6457a96475f5 Mon Sep 17 00:00:00 2001 +From: Olivier Lahaye <olivier.lahaye(a)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.lahaye(a)cea.fr> +Date: Fri Jun 19 08:11:36 2015 -0700 + + Fix problems with puic4 -x code generation. + +Signed-off-by: Petr Písař <ppisar(a)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/perl-Qt.spec b/perl-Qt.spec index 65e81bc..18047a0 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -23,6 +23,8 @@ Patch4: perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.pa Patch5: Qt-0.96.0-Initialize-smokeperl_object-properly.patch # Adjust to smokeqt's QChar, in upstream after 4.8.0 Patch6: Qt-0.96.0-Fix-uchar-test.patch +# Fix code generation with "puic4 -x", bug #1118240, in upstream after 4.14.3 +Patch7: Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch BuildRequires: coreutils BuildRequires: cmake # gcc for C standard library headers @@ -95,6 +97,7 @@ Development files for perl-Qt. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 mkdir build @@ -169,6 +172,7 @@ export PERL5LIB="$PWD/blib/lib:$PWD/blib/arch" * Tue Mar 22 2016 Petr Pisar <ppisar(a)redhat.com> - 0.96.0-19 - Modernize spec file - Run X11 tests +- Fix code generation with "puic4 -x" (bug #1118240) * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.96.0-18 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=0cb05ee05…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 66a76464b3d00cb835fd3db416061c23bc486030 Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson(a)fedoraproject.org> Date: Sun, 17 Aug 2014 17:18:01 +0000 Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--- perl-Qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Qt.spec b/perl-Qt.spec index 5528655..afd9843 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,6 +1,6 @@ Name: perl-Qt Version: 0.96.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Perl bindings for Qt # Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia # exceptions or GPLv3+. The Nokia files only appear in -devel subpackage. @@ -116,6 +116,9 @@ make test %{_datadir}/perlqt %changelog +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.0-11 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.0-10 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=66a76464b…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From b86f86d299a1a0d620724300f17874825cdfe2ab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore <dennis(a)ausil.us> Date: Sat, 3 Aug 2013 19:34:27 -0500 Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
--- perl-Qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Qt.spec b/perl-Qt.spec index c5c2b36..f85557e 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,6 +1,6 @@ Name: perl-Qt Version: 0.96.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Perl bindings for Qt # Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia # exceptions or GPLv3+. The Nokia files only appear in -devel subpackage. @@ -109,6 +109,9 @@ make test %{_datadir}/perlqt %changelog +* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.0-8 +- Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ * Fri Jul 26 2013 Petr Pisar <ppisar(a)redhat.com> - 0.96.0-7 - Perl 5.18 rebuild -- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=b86f86d29…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "Perl 5.18 rebuild"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 28046a7b882e3eb7a801a85cb88e0af8e3e945eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> Date: Fri, 26 Jul 2013 21:12:09 +0200 Subject: Perl 5.18 rebuild --- perl-Qt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-Qt.spec b/perl-Qt.spec index 1dbf558..c5c2b36 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,6 +1,6 @@ Name: perl-Qt Version: 0.96.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Perl bindings for Qt # Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia # exceptions or GPLv3+. The Nokia files only appear in -devel subpackage. @@ -109,6 +109,9 @@ make test %{_datadir}/perlqt %changelog +* Fri Jul 26 2013 Petr Pisar <ppisar(a)redhat.com> - 0.96.0-7 +- Perl 5.18 rebuild + * Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.0-6 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=28046a7b8…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "build against db5"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From fecc9837bf999d591bc3719ee7252f786e5caa28 Mon Sep 17 00:00:00 2001 From: Iain Arnell <iarnell(a)gmail.com> Date: Thu, 19 Apr 2012 07:49:33 -0600 Subject: build against db5 --- perl-Qt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/perl-Qt.spec b/perl-Qt.spec index bc195ff..f0e5e71 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,6 +1,6 @@ Name: perl-Qt Version: 0.96.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Perl bindings for Qt # Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia # exceptions or GPLv3+. The Nokia files only appear in -devel subpackage. @@ -12,7 +12,7 @@ Source0:
http://www.cpan.org/modules/by-module/Qt/Qt-%{version}.tar.gz
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: cmake -BuildRequires: db4-devel +BuildRequires: libdb-devel BuildRequires: gdbm-devel BuildRequires: phonon-devel BuildRequires: qimageblitz-devel @@ -109,6 +109,9 @@ make test %{_datadir}/perlqt %changelog +* Thu Apr 19 2012 Iain Arnell <iarnell(a)gmail.com> 0.96.0-3 +- build against db5 (rhbz#814083) + * Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.0-2 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=fecc9837b…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "4.14.3 bump"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 436fb243c979bbf016363a8568286b598d3245af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> Date: Wed, 23 Mar 2016 14:09:24 +0100 Subject: 4.14.3 bump --- .gitignore | 1 + .rpmlint | 3 + 0001-Changes-to-support-perl-5.18.0.patch | 480 --------------------- 0002-Fixes-for-perl-5.18.patch | 153 ------- ...l-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch | 67 --- ...96.0-Initialize-smokeperl_object-properly.patch | 37 -- perl-Qt.spec | 65 ++- ...copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch | 42 -- ...14.3-Initialize-smokeperl_object-properly.patch | 36 ++ sources | 2 +- 10 files changed, 72 insertions(+), 814 deletions(-) create mode 100644 .rpmlint delete mode 100644 0001-Changes-to-support-perl-5.18.0.patch delete mode 100644 0002-Fixes-for-perl-5.18.patch delete mode 100644 Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch delete mode 100644 Qt-0.96.0-Initialize-smokeperl_object-properly.patch delete mode 100644 perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch create mode 100644 perlqt-4.14.3-Initialize-smokeperl_object-properly.patch diff --git a/.gitignore b/.gitignore index d4cc362..0caa298 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Qt-0.96.0.tar.gz +/perlqt-4.14.3.tar.xz diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..6e84d5a --- /dev/null +++ b/.rpmlint @@ -0,0 +1,3 @@ +from Config import * +addFilter("file-not-utf8 .*/encodedfiles/iso-8859-.*\.txt"); +addFilter("wrong-script-interpreter /usr/share/doc/perl-Qt-devel/examples/linguist/hellotr/hellotr.pro"); diff --git a/0001-Changes-to-support-perl-5.18.0.patch b/0001-Changes-to-support-perl-5.18.0.patch deleted file mode 100644 index 96ba9c9..0000000 --- a/0001-Changes-to-support-perl-5.18.0.patch +++ /dev/null @@ -1,480 +0,0 @@ -From aa2083b40c83fad6b931a2088ae69bc206a7edc7 Mon Sep 17 00:00:00 2001 -From: Chris Burel <chrisburel(a)gmail.com> -Date: Fri, 23 Aug 2013 12:04:01 -0700 -Subject: [PATCH 1/2] Changes to support perl 5.18.0. - -Perl no longer calls the AUTOLOAD method for DESTROY. So that has to be defined explicitly. -It also didn't like bless \shift, $package, so I've changed that as well. -defined @array is deprecated, update that code. -Also remove spurious breakpoints in example code. -Also, CMake seems to have changed, so the prove "macro" is now a function, because functions support actual scope on cmake variables. ---- - cmake/MacroProve.cmake | 4 +- - qtcore/lib/QtCore4.pm | 85 ++++----- - qtcore/src/QtCore4.xs | 2 + - qtcore/src/util.cpp | 190 ++++++++++++--------- - qtcore/src/util.h | 1 + - qtcore/t/d_sigslot.t | 1 - - qtcore/t/qabstractitemmodel.t | 1 - - qtgui/examples/tools/customcompleter/TextEdit.pm | 1 - - .../tools/settingseditor/VariantDelegate.pm | 1 - - qtgui/t/itemviewspuzzle.t | 2 - - 10 files changed, 154 insertions(+), 134 deletions(-) - -SKIP diff --git a/cmake/MacroProve.cmake b/cmake/MacroProve.cmake -SKIP index 13387af..489878a 100644 -SKIP --- a/cmake/MacroProve.cmake -SKIP +++ b/cmake/MacroProve.cmake -SKIP @@ -1,5 +1,5 @@ -SKIP -SKIP -MACRO( MACRO_PROVE _testname _path) -SKIP +FUNCTION( MACRO_PROVE _testname _path) -SKIP -SKIP if(WIN32) -SKIP set(prove_cmd "prove.bat") -SKIP @@ -20,4 +20,4 @@ MACRO( MACRO_PROVE _testname _path) -SKIP endif(_workingdir) -SKIP -SKIP add_test(${_testname} ${prove_cmd} ${prove_args} ${escaped_path}) -SKIP -ENDMACRO( MACRO_PROVE _testname _path ) -SKIP +ENDFUNCTION( MACRO_PROVE _testname _path ) -diff --git a/qtcore/lib/QtCore4.pm b/qtcore/lib/QtCore4.pm -index b14e817..0459dd8 100644 ---- a/qtcore/lib/QtCore4.pm -+++ b/qtcore/lib/QtCore4.pm -@@ -1301,12 +1301,15 @@ sub init_class { - - foreach my $sp ('', ' ') { - my $where = $sp . $perlClassName; -- installautoload($where); -- # Putting this in one package gives XS_AUTOLOAD one spot to look for -- # the autoload variable -- package Qt::AutoLoad; -- my $autosub = \&{$where . '::_UTOLOAD'}; -- Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} ); -+ -+ if (!exists &{$where . '::AUTOLOAD'}) { -+ installautoload($where); -+ # Putting this in one package gives XS_AUTOLOAD one spot to look for -+ # the autoload variable -+ package Qt::AutoLoad; -+ my $autosub = \&{$where . '::_UTOLOAD'}; -+ Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} ); -+ } - } - - installSub("$perlClassName\::NEW", sub { -@@ -1417,9 +1420,9 @@ sub makeMetaData { - my $signals = $meta->{signals}; - my $slots = $meta->{slots}; - -- @{$classinfos} = () if !defined @{$classinfos}; -- @{$signals} = () if !defined @{$signals}; -- @{$slots} = () if !defined @{$slots}; -+ @{$classinfos} = () if !defined $classinfos; -+ @{$signals} = () if !defined $signals; -+ @{$slots} = () if !defined $slots; - - # Each entry in 'stringdata' corresponds to a string in the - # qt_meta_stringdata_<classname> structure. -@@ -1805,67 +1808,67 @@ Qt::_internal::installSub(' Qt::Variant::value', sub { - }); - - sub String { -- if ( @_ ) { -- return bless \shift, 'Qt::String'; -- } else { -- return bless '', 'Qt::String'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::String'; - } - - sub CString { -- if ( @_ ) { -- return bless \shift, 'Qt::CString'; -- } else { -- return bless '', 'Qt::CString'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::CString'; - } - - sub Int { -- if ( @_ ) { -- return bless \shift, 'Qt::Int'; -- } else { -- return bless '', 'Qt::Int'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::Int'; - } - - sub Uint { -- if ( @_ ) { -- return bless \shift, 'Qt::Uint'; -- } else { -- return bless '', 'Qt::Uint'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::Uint'; - } - - sub Bool { -- if ( @_ ) { -- return bless \shift, 'Qt::Bool'; -- } else { -- return bless '', 'Qt::Bool'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::Bool'; - } - - sub Short { -- if ( @_ ) { -- return bless \shift, 'Qt::Short'; -- } else { -- return bless '', 'Qt::Short'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::Short'; - } - - sub Ushort { -- if ( @_ ) { -- return bless \shift, 'Qt::Ushort'; -- } else { -- return bless '', 'Qt::Ushort'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::Ushort'; - } - - sub Uchar { -- if ( @_ ) { -- return bless \shift, 'Qt::Uchar'; -- } else { -- return bless '', 'Qt::Uchar'; -+ my ($val) = @_; -+ if ( !$val ) { -+ $val = ''; - } -+ return bless \$val, 'Qt::Uchar'; - } - - 1; -diff --git a/qtcore/src/QtCore4.xs b/qtcore/src/QtCore4.xs -index fd219c5..a699132 100644 ---- a/qtcore/src/QtCore4.xs -+++ b/qtcore/src/QtCore4.xs -@@ -249,6 +249,8 @@ installautoload( package ) - char* autoload = new char[strlen(package) + 11]; - sprintf(autoload, "%s::_UTOLOAD", package); - newXS(autoload, XS_AUTOLOAD, __FILE__); -+ sprintf(autoload, "%s::DESTROY", package); -+ newXS(autoload, XS_DESTROY, __FILE__); - delete[] autoload; - - void -diff --git a/qtcore/src/util.cpp b/qtcore/src/util.cpp -index f66fb6b..a163e7e 100644 ---- a/qtcore/src/util.cpp -+++ b/qtcore/src/util.cpp -@@ -1939,6 +1939,109 @@ XS(XS_qvariant_from_value) { - XSRETURN(1); - } - -+XS(XS_DESTROY) { -+ dXSARGS; -+ PERL_SET_CONTEXT(PL_curinterp); -+ char* package = HvNAME(SvSTASH(SvRV(ST(0)))); -+ ++package; -+ -+#ifdef PERLQTDEBUG -+ if( do_debug && ( do_debug & qtdb_autoload ) ) { -+ fprintf(stderr, "In XS DESTROY for %s", package); -+ if((do_debug & qtdb_verbose)) { -+ smokeperl_object *o = sv_obj_info(ST(0)); -+ if(o) -+ fprintf(stderr, " - SV*: %p this: (%s)%p\n", ST(0), o->smoke->classes[o->classId].className, o->ptr); -+ else -+ fprintf(stderr, " - this: (unknown)(nil)\n"); -+ } -+ else { -+ fprintf(stderr, "\n"); -+ } -+ } -+#endif -+ -+ // For anything we do here where withObject is true, sv_this should be set -+ // to the first argument on the stack, since that's where perl puts it. -+ // Wherever we return, be sure to restore sv_this. -+ SV* old_this = 0; -+ old_this = sv_this; -+ sv_this = newSVsv(ST(0)); -+ -+ smokeperl_object* o = sv_obj_info(sv_this); -+ -+ // Check to see that o exists (has a smokeperl_object in sv_this), has -+ // a valid pointer, and (is allocated or has an entry in the pointer -+ // map). If all of that's true, or we're in global destruction, we -+ // don't really care what happens. -+ if( PL_dirty ) { -+ // This block will be repeated a lot to clean stuff up. -+ // Restore sv_this -+ SvREFCNT_dec(sv_this); -+ sv_this = old_this; -+ XSRETURN_YES; -+ } -+ if( !(o && o->ptr && (o->allocated || getPointerObject(o->ptr))) ) { -+ // This block will be repeated a lot to clean stuff up. -+ // Restore sv_this -+ SvREFCNT_dec(sv_this); -+ sv_this = old_this; -+ XSRETURN_YES; -+ } -+ -+ // Check to see if a delete of this object has been tried before, by -+ // seeing if the object's hash has the "has been hidden" key -+ static const char* key = "has been hidden"; -+ U32 klen = 15; -+ SV** svp = 0; -+ if( SvROK(sv_this) && SvTYPE(SvRV(sv_this)) == SVt_PVHV ) { -+ HV* hv = (HV*)SvRV(sv_this); -+ svp = hv_fetch( hv, key, klen, 0); -+ } -+ if(svp) { -+ // Found "has been hidden", so don't do anything, just clean up -+ // Restore sv_this -+ SvREFCNT_dec(sv_this); -+ sv_this = old_this; -+ XSRETURN_YES; -+ } -+ -+#ifdef PERLQTDEBUG -+ // The following perl call seems to stomp on the package name, let's copy it -+ char* packagecpy = new char[strlen(package)+1]; -+ strcpy( packagecpy, package ); -+#endif -+ -+ // Call the ON_DESTROY method, that stores a reference (increasing the -+ // refcnt) if necessary -+ HV* stash = gv_stashpv(package, TRUE); -+ GV* gv = gv_fetchmethod_autoload(stash, "ON_DESTROY", 0); -+ int retval = 0; -+ if( gv ) { -+ PUSHMARK(SP); -+ int count = call_sv((SV*)GvCV(gv), G_SCALAR|G_NOARGS); -+ SPAGAIN; -+ if (count != 1) { -+ // Restore sv_this -+ SvREFCNT_dec(sv_this); -+ sv_this = old_this; -+ croak( "Corrupt ON_DESTROY return value: Got %d value(s), expected 1\n", count ); -+ } -+ retval = POPi; -+ PUTBACK; -+ } -+ -+#ifdef PERLQTDEBUG -+ if( do_debug && retval && (do_debug & qtdb_gc) ) -+ fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", packagecpy, o->ptr); -+ delete[] packagecpy; -+#endif -+ -+ // Now clean up -+ SvREFCNT_dec(sv_this); -+ sv_this = old_this; -+} -+ - XS(XS_AUTOLOAD) { - dXSARGS; - PERL_SET_CONTEXT(PL_curinterp); -@@ -2045,95 +2148,12 @@ XS(XS_AUTOLOAD) { - else - XSRETURN(count); - } -- else if( !strcmp( methodname, "DESTROY" ) ) { -- smokeperl_object* o = sv_obj_info(sv_this); -- -- // Check to see that o exists (has a smokeperl_object in sv_this), has -- // a valid pointer, and (is allocated or has an entry in the pointer -- // map). If all of that's true, or we're in global destruction, we -- // don't really care what happens. -- if( PL_dirty ) { -- // This block will be repeated a lot to clean stuff up. -- if( withObject ) { -- // Restore sv_this -- SvREFCNT_dec(sv_this); -- sv_this = old_this; -- } -- XSRETURN_YES; -- } -- if( !(o && o->ptr && (o->allocated || getPointerObject(o->ptr))) ) { -- // This block will be repeated a lot to clean stuff up. -- if( withObject ) { -- // Restore sv_this -- SvREFCNT_dec(sv_this); -- sv_this = old_this; -- } -- XSRETURN_YES; -- } -- -- // Check to see if a delete of this object has been tried before, by -- // seeing if the object's hash has the "has been hidden" key -- static const char* key = "has been hidden"; -- U32 klen = 15; -- SV** svp = 0; -- if( SvROK(sv_this) && SvTYPE(SvRV(sv_this)) == SVt_PVHV ) { -- HV* hv = (HV*)SvRV(sv_this); -- svp = hv_fetch( hv, key, klen, 0); -- } -- if(svp) { -- // Found "has been hidden", so don't do anything, just clean up -- if( withObject ) { -- // Restore sv_this -- SvREFCNT_dec(sv_this); -- sv_this = old_this; -- } -- XSRETURN_YES; -- } -- --#ifdef PERLQTDEBUG -- // The following perl call seems to stomp on the package name, let's copy it -- char* packagecpy = new char[strlen(package)+1]; -- strcpy( packagecpy, package ); --#endif -- -- // Call the ON_DESTROY method, that stores a reference (increasing the -- // refcnt) if necessary -- if( !stash ) -- stash = gv_stashpv(package, TRUE); -- gv = gv_fetchmethod_autoload(stash, "ON_DESTROY", 0); -- int retval = 0; -- if( gv ) { -- PUSHMARK(SP); -- int count = call_sv((SV*)GvCV(gv), G_SCALAR|G_NOARGS); -- SPAGAIN; -- if (count != 1) { -- if( withObject ) { -- // Restore sv_this -- SvREFCNT_dec(sv_this); -- sv_this = old_this; -- } -- croak( "Corrupt ON_DESTROY return value: Got %d value(s), expected 1\n", count ); -- } -- retval = POPi; -- PUTBACK; -- } -- --#ifdef PERLQTDEBUG -- if( do_debug && retval && (do_debug & qtdb_gc) ) -- fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", packagecpy, o->ptr); -- delete[] packagecpy; --#endif -- -- // Now clean up -- if( withObject ) { -- SvREFCNT_dec(sv_this); -- sv_this = old_this; -- } -- } - else { - // We're calling a c++ method - - // Get the classId (eventually converting SUPER to the right Qt4 class) -+ if (super && strcmp( super, "SUPER" ) == 0) -+ package[strlen(package)-7] = 0; - SV* moduleIdRef = package_classId( package ); - Smoke::ModuleIndex mi; - -diff --git a/qtcore/src/util.h b/qtcore/src/util.h -index bd4bf31..430a8eb 100644 ---- a/qtcore/src/util.h -+++ b/qtcore/src/util.h -@@ -98,6 +98,7 @@ XS(XS_qdatastream_readrawdata); - XS(XS_qvariant_value); - XS(XS_qvariant_from_value); - -+XS(XS_DESTROY); - XS(XS_AUTOLOAD); - XS(XS_qt_metacall); - XS(XS_signal); -diff --git a/qtcore/t/d_sigslot.t b/qtcore/t/d_sigslot.t -index eea16c8..3d02f2e 100644 ---- a/qtcore/t/d_sigslot.t -+++ b/qtcore/t/d_sigslot.t -@@ -30,7 +30,6 @@ sub NEW { - emit signal( 5, 4 ); - - # 3) Emit a signal, but missing an argument. Should fail. -- $DB::single=1; - eval{ emit signalWithBadArg() }; - like( $@, qr/Wrong number of arguments in signal call/, 'Missing arguments in signal' ); - } -diff --git a/qtcore/t/qabstractitemmodel.t b/qtcore/t/qabstractitemmodel.t -index ae1174c..3e2baba 100644 ---- a/qtcore/t/qabstractitemmodel.t -+++ b/qtcore/t/qabstractitemmodel.t -@@ -4,7 +4,6 @@ package TestModel; - - use strict; - use warnings; --use blib; - use QtCore4; - use QtCore4::isa qw( Qt::AbstractItemModel ); - -diff --git a/qtgui/examples/tools/customcompleter/TextEdit.pm b/qtgui/examples/tools/customcompleter/TextEdit.pm -index 9b4e26f..3e82ae4 100644 ---- a/qtgui/examples/tools/customcompleter/TextEdit.pm -+++ b/qtgui/examples/tools/customcompleter/TextEdit.pm -@@ -61,7 +61,6 @@ sub insertCompletion - return; - } - my $tc = textCursor(); -- $DB::single=1; - my $extra = length($completion) - length(c->completionPrefix()); - $tc->movePosition(Qt::TextCursor::Left()); - $tc->movePosition(Qt::TextCursor::EndOfWord()); -diff --git a/qtgui/examples/tools/settingseditor/VariantDelegate.pm b/qtgui/examples/tools/settingseditor/VariantDelegate.pm -index 5d91d3f..e450efb 100644 ---- a/qtgui/examples/tools/settingseditor/VariantDelegate.pm -+++ b/qtgui/examples/tools/settingseditor/VariantDelegate.pm -@@ -197,7 +197,6 @@ sub setModelData - } - - my $text = $lineEdit->text(); -- $DB::single=1; - my $validator = $lineEdit->validator(); - if ($validator) { - my $pos; -SKIP diff --git a/qtgui/t/itemviewspuzzle.t b/qtgui/t/itemviewspuzzle.t -SKIP index 4a6b623..ea1c07e 100644 -SKIP --- a/qtgui/t/itemviewspuzzle.t -SKIP +++ b/qtgui/t/itemviewspuzzle.t -SKIP @@ -85,8 +85,6 @@ sub initTestCase { -SKIP Qt::Test::qWaitForWindowShown( $window ); -SKIP this->{window} = $window; -SKIP pass( 'Window shown' ); -SKIP - $DB::single=1; -SKIP - 1; -SKIP } -SKIP -SKIP package main; -SKIP -- -SKIP 1.8.3.1 -SKIP diff --git a/0002-Fixes-for-perl-5.18.patch b/0002-Fixes-for-perl-5.18.patch deleted file mode 100644 index a1a71e0..0000000 --- a/0002-Fixes-for-perl-5.18.patch +++ /dev/null @@ -1,153 +0,0 @@ -From d4627fb5f3a571212457df22e2ab861b890fc992 Mon Sep 17 00:00:00 2001 -From: Chris Burel <chrisburel(a)gmail.com> -Date: Fri, 23 Aug 2013 14:56:37 -0700 -Subject: [PATCH 2/2] Fixes for perl 5.18 - -I'm not really sure how this was working before, but perl 5.18 really wasn't -happy. The way these functions work is really tricky, because the marshallers -expect to be able to set the scalar ref's returned from them. My previous fix -didn't allow the refs to be set correctly. ---- - qtcore/lib/QtCore4.pm | 90 +++++++++++++++++++++++++++++++++------------------ - 1 file changed, 58 insertions(+), 32 deletions(-) - -diff --git a/qtcore/lib/QtCore4.pm b/qtcore/lib/QtCore4.pm -index 0459dd8..1a5e454 100644 ---- a/qtcore/lib/QtCore4.pm -+++ b/qtcore/lib/QtCore4.pm -@@ -1649,6 +1649,8 @@ package Qt; - use strict; - use warnings; - -+use Scalar::Util; -+ - # Called in the DESTROY method for all QObjects to see if they still have a - # parent, and avoid deleting them if they do. - sub Qt::Object::ON_DESTROY { -@@ -1808,67 +1810,91 @@ Qt::_internal::installSub(' Qt::Variant::value', sub { - }); - - sub String { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::String'; -+ } -+ return bless \shift, 'Qt::String'; - } -- return bless \$val, 'Qt::String'; -+ return bless '', 'Qt::String'; - } - - sub CString { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::CString'; -+ } -+ return bless \shift, 'Qt::CString'; - } -- return bless \$val, 'Qt::CString'; -+ return bless '', 'Qt::CString'; - } - - sub Int { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::Int'; -+ } -+ return bless \shift, 'Qt::Int'; - } -- return bless \$val, 'Qt::Int'; -+ return bless '', 'Qt::Int'; - } - - sub Uint { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::Uint'; -+ } -+ return bless \shift, 'Qt::Uint'; - } -- return bless \$val, 'Qt::Uint'; -+ return bless '', 'Qt::Uint'; - } - - sub Bool { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::Bool'; -+ } -+ return bless \shift, 'Qt::Bool'; - } -- return bless \$val, 'Qt::Bool'; -+ return bless '', 'Qt::Bool'; - } - - sub Short { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::Short'; -+ } -+ return bless \shift, 'Qt::Short'; - } -- return bless \$val, 'Qt::Short'; -+ return bless '', 'Qt::Short'; - } - - sub Ushort { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::Ushort'; -+ } -+ return bless \shift, 'Qt::Ushort'; - } -- return bless \$val, 'Qt::Ushort'; -+ return bless '', 'Qt::Ushort'; - } - - sub Uchar { -- my ($val) = @_; -- if ( !$val ) { -- $val = ''; -+ if ( scalar @_ ) { -+ if ( Scalar::Util::readonly( $_[0] ) ) { -+ my $val = shift; -+ return bless \$val, 'Qt::Uchar'; -+ } -+ return bless \shift, 'Qt::Uchar'; - } -- return bless \$val, 'Qt::Uchar'; -+ return bless '', 'Qt::Uchar'; - } - - 1; --- -1.8.3.1 - diff --git a/Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch b/Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch deleted file mode 100644 index 441c064..0000000 --- a/Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1f62c5d8dd589e7131df0b378513148375e41317 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> -Date: Thu, 11 Sep 2014 16:48:39 +0200 -Subject: [PATCH] Bundle Devel::Peel::SvREFCNT_inc removed from perl-5.20.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Patch taken from Ubuntu: - -perlqt (4:4.14.0-0ubuntu4) utopic; urgency=medium - - * Devel::Peek in Perl 5.20 no longer exports SvREFCNT_inc, so put a copy - in QtGui4::_internal instead. Fixes perlkde build. - - -- Colin Watson <cjwatson(a)ubuntu.com> Tue, 26 Aug 2014 14:13:07 -0700 - -CPAN RT#98790 - -Signed-off-by: Petr Písař <ppisar(a)redhat.com> ---- - qtgui/lib/QtGui4.pm | 3 +-- - qtgui/src/QtGui4.xs | 7 +++++++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/qtgui/lib/QtGui4.pm b/qtgui/lib/QtGui4.pm -index a33f66a..2fae3d7 100644 ---- a/qtgui/lib/QtGui4.pm -+++ b/qtgui/lib/QtGui4.pm -@@ -22,7 +22,6 @@ use warnings; - - use QtCore4; - use base qw(Qt::_internal); --use Devel::Peek qw( SvREFCNT_inc ); - - sub init { - @Qt::_internal::vectorTypes{qw(Qt::Polygon Qt::PolygonF Qt::ItemSelection)} -@@ -76,7 +75,7 @@ sub Qt::GraphicsObject::ON_DESTROY { - } - - sub Qt::UndoCommand::ON_DESTROY { -- Devel::Peek::SvREFCNT_inc( Qt::this() ); -+ QtGui4::_internal->SvREFCNT_inc( Qt::this() ); - # XXX is there a better solution here? - return 1; - } -diff --git a/qtgui/src/QtGui4.xs b/qtgui/src/QtGui4.xs -index e1a0783..3a23ad4 100644 ---- a/qtgui/src/QtGui4.xs -+++ b/qtgui/src/QtGui4.xs -@@ -91,6 +91,13 @@ getEnumList() - OUTPUT: - RETVAL - -+SV* -+SvREFCNT_inc(sv) -+ SV* sv -+ PPCODE: -+ RETVAL = SvREFCNT_inc(sv); -+ PUSHs(RETVAL); -+ - MODULE = QtGui4 PACKAGE = QtGui4 - - PROTOTYPES: ENABLE --- -1.9.3 - diff --git a/Qt-0.96.0-Initialize-smokeperl_object-properly.patch b/Qt-0.96.0-Initialize-smokeperl_object-properly.patch deleted file mode 100644 index 279c524..0000000 --- a/Qt-0.96.0-Initialize-smokeperl_object-properly.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1d30fbbd8fad3d9ee87f1b524384bb337c559d88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> -Date: Mon, 1 Feb 2016 16:31:45 +0100 -Subject: [PATCH] Initialize smokeperl_object properly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch fixes this build failure with GCC 6: - -/builddir/build/BUILD/Qt-0.96.0/qtcore/src/util.cpp:2248:59: error: cannot convert 'bool' to 'void*' in initialization - static smokeperl_object nothis = { 0, 0, 0, false }; - ^ - -CPAN RT#111630 - -Signed-off-by: Petr Písař <ppisar(a)redhat.com> ---- - qtcore/src/util.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtcore/src/util.cpp b/qtcore/src/util.cpp -index 0c94e32..4857573 100644 ---- a/qtcore/src/util.cpp -+++ b/qtcore/src/util.cpp -@@ -2225,7 +2225,7 @@ XS(XS_AUTOLOAD) { - methcache.insert(mcid, new Smoke::ModuleIndex(mi)); - } - -- static smokeperl_object nothis = { 0, 0, 0, false }; -+ static smokeperl_object nothis = { 0, 0, 0, NULL }; - smokeperl_object* call_this = 0; - if ( SvOK(sv_this) ) { - call_this = sv_obj_info( sv_this ); --- -2.5.0 - diff --git a/perl-Qt.spec b/perl-Qt.spec index 5f24070..034d365 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,30 +1,25 @@ %global use_x11_tests 1 Name: perl-Qt -Version: 0.96.0 -Release: 19%{?dist} +Version: 4.14.3 +Release: 1%{?dist} Summary: Perl bindings for Qt -# Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia -# exceptions or GPLv3+. The Nokia files only appear in -devel subpackage. -# QtCore4.pm is 'same terms as Perl itself'. The rest is GPLv2+. +# qtcore/lib/QtCore4.pm: GPL+ or Artistic +# other files: GPLv2+ +## devel subpackage +# qtcore/tools: LGPLv2+ with Nokia exceptions or GPLv3+ +# qtcore/tools/puic/perl/plwriteinitialization.h: +# GPLv2 or GPLv3+ with Trolltech exception +# qtdbus/tools: LGPLv2.1+ with Nokia exceptions or GPLv3+ +# qtgui/examples/draganddrop/delayedencoding/images/example.svg: +# LGPLv2 with Nokia exception or GPLv3+ +# qtgui/examples/xml/htmlinfo/apache_org.html: ASL 2.0 License: GPLv2+ and (GPL+ or Artistic) Group: Development/Libraries -URL:
http://search.cpan.org/dist/Qt/
-Source0:
http://www.cpan.org/modules/by-module/Qt/Qt-%{version}.tar.gz
-Patch1: 0001-Changes-to-support-perl-5.18.0.patch -Patch2: 0002-Fixes-for-perl-5.18.patch -# Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790, in new upstream -# <
git://anongit.kde.org/perlqt
> -Patch3: Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch -# Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790, in new upstream -# <
git://anongit.kde.org/perlqt
> -Patch4: perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch -# Adjust to GCC 6, bug #1303658, CPAN RT#111630 -Patch5: Qt-0.96.0-Initialize-smokeperl_object-properly.patch -# Adjust to smokeqt's QChar, in upstream after 4.8.0 -Patch6: Qt-0.96.0-Fix-uchar-test.patch -# Fix code generation with "puic4 -x", bug #1118240, in upstream after 4.14.3 -Patch7: Qt-0.96.0-Fix-problems-with-puic4-x-code-generation.patch +URL:
https://techbase.kde.org/Languages/Perl
+Source0:
http://download.kde.org/stable/%{version}/src/perlqt-%{version}.tar.xz
+# Adjust to GCC 6, bug #1303658, KDE bug #360844, CPAN RT#111630 +Patch1: perlqt-4.14.3-Initialize-smokeperl_object-properly.patch BuildRequires: coreutils BuildRequires: cmake # gcc for C standard library headers @@ -33,7 +28,7 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: perl BuildRequires: perl-devel -# Perl module used by qtcore/src/doxsubpp.pl and cmake/FindPerlMore.cmake +# Perl modules used by qtcore/src/doxsubpp.pl and cmake/FindPerlMore.cmake BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) @@ -81,23 +76,15 @@ This module provides Perl bindings for the Qt 4 libraries. %package devel Summary: Development files for perl-Qt -License: GPLv2+ and (GPL+ or Artistic) and (LGPLv2+ with exceptions or GPLv3+) +License: GPLv2+ and (GPL+ or Artistic) and (LGPLv2+ with exceptions or GPLv3+) and (LGPLv2 with exception or GPLv3+) and ASL 2.0 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development files for perl-Qt. %prep -%setup -q -n Qt-%{version} - -# Fixes from upstream for Perl 5.18 +%setup -q -n perlqt-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 mkdir build @@ -138,6 +125,11 @@ sed -i \ -e '/perlqt_mainwindowsmdi/d' \ qtgui/t/CMakeLists.txt +# This test hangs, <
https://bugs.kde.org/show_bug.cgi?id=360899
> +sed -i \ + -e '/perlqt_itemviewspuzzle/d' \ + qtgui/t/CMakeLists.txt + %ifarch armv7hl # perlqt_qtcore4_handlers fails on armv7hl sed -i \ @@ -156,7 +148,7 @@ make %{?_smp_mflags} %install cd build -make install DESTDIR=%{buildroot} +make install/fast DESTDIR=%{buildroot} %{_fixperms} %{buildroot}/* @@ -170,7 +162,7 @@ export PERL5LIB="$PWD/blib/lib:$PWD/blib/arch" %endif %files -%license LICENSE +%license LICENSE* %doc README %{perl_vendorarch}/* %exclude %dir %{perl_vendorarch}/auto/ @@ -182,6 +174,11 @@ export PERL5LIB="$PWD/blib/lib:$PWD/blib/arch" %{_datadir}/perlqt %changelog +* Wed Mar 23 2016 Petr Pisar <ppisar(a)redhat.com> - 4.14.3-1 +- 4.14.3 bump (upstream changed from CPAN to KDE) +- perl-Qt-devel license changed to (GPLv2+ and (GPL+ or Artistic) and (LGPLv2+ + with exceptions or GPLv3+) and (LGPLv2 with exception or GPLv3+) and ASL 2.0) + * Tue Mar 22 2016 Petr Pisar <ppisar(a)redhat.com> - 0.96.0-19 - Modernize spec file - Run X11 tests diff --git a/perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch b/perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch deleted file mode 100644 index 7acb6d8..0000000 --- a/perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1b665848e178301344386717c658386d160d222a Mon Sep 17 00:00:00 2001 -From: Chris Burel <chrisburel(a)gmail.com> -Date: Fri, 31 Oct 2014 11:23:18 -0700 -Subject: [PATCH] Use a copy of the Qt::AutoLoad::AUTOLOAD variable. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This appears to be a change in Perl's behavior. The way the operator -overloading in PerlQt works is that it first tries to find an operator method -on the class itself, and then next it tries to find one in the so-called -QGlobalSpace, which is a place defined by the smoke library for global Qt -functions. Perl passes the underlying XS code the full package and function -being called, which PerlQt splits into 2 strings, one for the package name, and -one for the method name. PerlQt null-terminates the package name string, and -in previous versions of Perl, this modification did not affect the source -$AUTOLOAD variable. In Perl 5.20.0, it does update the Perl variable, and then -causes confusion down the line. - -https://bugzilla.redhat.com/show_bug.cgi?id=1136340 -https://bugs.kde.org/show_bug.cgi?id=340518 -Signed-off-by: Petr Písař <ppisar(a)redhat.com> ---- - qtcore/src/util.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtcore/src/util.cpp b/qtcore/src/util.cpp -index a163e7e..b913af3 100644 ---- a/qtcore/src/util.cpp -+++ b/qtcore/src/util.cpp -@@ -2047,7 +2047,7 @@ XS(XS_AUTOLOAD) { - PERL_SET_CONTEXT(PL_curinterp); - // Figure out which package and method is being called, based on the - // autoload variable -- SV* autoload = get_sv( "Qt::AutoLoad::AUTOLOAD", TRUE ); -+ SV* autoload = sv_mortalcopy( get_sv( "Qt::AutoLoad::AUTOLOAD", TRUE ) ); - char* package = SvPV_nolen( autoload ); - char* methodname = 0; - // Splits off the method name from the package --- -1.9.3 - diff --git a/perlqt-4.14.3-Initialize-smokeperl_object-properly.patch b/perlqt-4.14.3-Initialize-smokeperl_object-properly.patch new file mode 100644 index 0000000..69a2e48 --- /dev/null +++ b/perlqt-4.14.3-Initialize-smokeperl_object-properly.patch @@ -0,0 +1,36 @@ +From 70100c1865985e0cabbba5716cb9a6df8099b377 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> +Date: Tue, 22 Mar 2016 11:27:24 +0100 +Subject: [PATCH] Initialize smokeperl_object properly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch fixes this build failure with GCC 6: + +/builddir/build/BUILD/Qt-0.96.0/qtcore/src/util.cpp:2248:59: error: cannot convert 'bool' to 'void*' in initialization + static smokeperl_object nothis = { 0, 0, 0, false }; + ^ +CPAN RT#111630 + +Signed-off-by: Petr Písař <ppisar(a)redhat.com> +--- + qtcore/src/util.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtcore/src/util.cpp b/qtcore/src/util.cpp +index b913af3..4c94e2c 100644 +--- a/qtcore/src/util.cpp ++++ b/qtcore/src/util.cpp +@@ -2251,7 +2251,7 @@ XS(XS_AUTOLOAD) { + methcache.insert(mcid, new Smoke::ModuleIndex(mi)); + } + +- static smokeperl_object nothis = { 0, 0, 0, false }; ++ static smokeperl_object nothis = { 0, 0, 0, NULL }; + smokeperl_object* call_this = 0; + if ( SvOK(sv_this) ) { + call_this = sv_obj_info( sv_this ); +-- +2.5.5 + diff --git a/sources b/sources index 79dc168..577069e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -300aa694926f07e53a8ffd99350a247c Qt-0.96.0.tar.gz +d410c5b95680d1c56d037d22ef984479 perlqt-4.14.3.tar.xz -- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=436fb243c…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "Run X11 tests"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 6a86bb1b9235dfac0605f704c81fb1e692409496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> Date: Tue, 22 Mar 2016 12:42:48 +0100 Subject: Run X11 tests --- Qt-0.96.0-Fix-uchar-test.patch | 37 +++++++++++++++++++++++++++++++++++++ perl-Qt.spec | 26 +++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 Qt-0.96.0-Fix-uchar-test.patch diff --git a/Qt-0.96.0-Fix-uchar-test.patch b/Qt-0.96.0-Fix-uchar-test.patch new file mode 100644 index 0000000..0857b9c --- /dev/null +++ b/Qt-0.96.0-Fix-uchar-test.patch @@ -0,0 +1,37 @@ +From 5c1433a05cea92e3b1f73afdb488543299eadcf1 Mon Sep 17 00:00:00 2001 +From: Chris Burel <cburel(a)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 <cburel(a)rhythm.com> +Date: Sun Feb 12 15:59:01 2012 -0800 + +Signed-off-by: Petr Písař <ppisar(a)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 + diff --git a/perl-Qt.spec b/perl-Qt.spec index acc4e50..65e81bc 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,3 +1,5 @@ +%global use_x11_tests 1 + Name: perl-Qt Version: 0.96.0 Release: 19%{?dist} @@ -19,6 +21,8 @@ Patch3: Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.p Patch4: perlqt-4.14.2-Use-a-copy-of-the-Qt-AutoLoad-AUTOLOAD-variable.patch # Adjust to GCC 6, bug #1303658, CPAN RT#111630 Patch5: Qt-0.96.0-Initialize-smokeperl_object-properly.patch +# Adjust to smokeqt's QChar, in upstream after 4.8.0 +Patch6: Qt-0.96.0-Fix-uchar-test.patch BuildRequires: coreutils BuildRequires: cmake # gcc for C standard library headers @@ -58,6 +62,11 @@ BuildRequires: perl(Devel::Peek) BuildRequires: perl(lib) BuildRequires: perl(Test::More) BuildRequires: perl(utf8) +%if %{use_x11_tests} +# X11 tests: +BuildRequires: xorg-x11-server-Xvfb +BuildRequires: font(:lang=en) +%endif Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %?perl_default_filter @@ -85,12 +94,14 @@ Development files for perl-Qt. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 mkdir build # fix smoke qwt detection sed -i -e 's/SMOKE_Qwt5_Qt4_FOUND/SMOKE_QWT_FOUND/' CMakeLists.txt +%if !%{use_x11_tests} # these tests require running X server sed -i -e '/perlqt_qtcore4_qapp/d' \ -e '/perlqt_qtcore4_sigslot/d' \ @@ -109,6 +120,14 @@ sed -i -e '/perlqt_itemviewspixelator/d' \ -e '/perlqt_sqlquerymodel/d' \ -e '/perlqt_widgetscalculator/d' \ -e '/perlqt_xmlstreambookmarks/d' qtgui/t/CMakeLists.txt +%endif + +# These tests fail even in latest upstream code, +# <
https://bugs.kde.org/show_bug.cgi?id=360846
> +sed -i \ + -e '/perlqt_helpcontextsensitivehelp/d' \ + -e '/perlqt_mainwindowsmdi/d' \ + qtgui/t/CMakeLists.txt %build cd build @@ -128,7 +147,11 @@ make install DESTDIR=%{buildroot} %check cd build export PERL5LIB="$PWD/blib/lib:$PWD/blib/arch" -make test +%if %{use_x11_tests} + xvfb-run -a make test +%else + make test +%endif %files %license LICENSE @@ -145,6 +168,7 @@ make test %changelog * Tue Mar 22 2016 Petr Pisar <ppisar(a)redhat.com> - 0.96.0-19 - Modernize spec file +- Run X11 tests * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.96.0-18 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=6a86bb1b9…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "Bundle-Devel-Peel-SvREFCNT_inc patch accepted"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 9d47cd4fbecf64e47a0f0011a62b500a762a8b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar(a)redhat.com> Date: Mon, 3 Nov 2014 10:12:40 +0100 Subject: Bundle-Devel-Peel-SvREFCNT_inc patch accepted --- perl-Qt.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-Qt.spec b/perl-Qt.spec index 3e79e7f..e2fc261 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -11,7 +11,8 @@ URL:
http://search.cpan.org/dist/Qt/
Source0:
http://www.cpan.org/modules/by-module/Qt/Qt-%{version}.tar.gz
Patch1: 0001-Changes-to-support-perl-5.18.0.patch Patch2: 0002-Fixes-for-perl-5.18.patch -# Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790 +# Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790, in new upstream +# <
git://anongit.kde.org/perlqt
> Patch3: Qt-0.96.0-Bundle-Devel-Peel-SvREFCNT_inc-removed-from-perl-5.2.patch # Adjust to perl-5.20.0, bug #1136340, CPAN RT#98790, in new upstream # <
git://anongit.kde.org/perlqt
> -- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=9d47cd4fb…
1
0
0
0
sergiomb pushed to perl-Qt (epel7). "Add some fixes from upstream git for Perl 5.18 compatibility"
by notifications@fedoraproject.org
03 Feb '17
03 Feb '17
From 11aa26b42e96b72be098e3abac53f22a4090bb8e Mon Sep 17 00:00:00 2001 From: Paul Howarth <paul(a)city-fan.org> Date: Fri, 30 Aug 2013 19:35:57 +0100 Subject: Add some fixes from upstream git for Perl 5.18 compatibility --- 0001-Changes-to-support-perl-5.18.0.patch | 480 ++++++++++++++++++++++++++++++ 0002-Fixes-for-perl-5.18.patch | 153 ++++++++++ perl-Qt.spec | 12 +- 3 files changed, 644 insertions(+), 1 deletion(-) create mode 100644 0001-Changes-to-support-perl-5.18.0.patch create mode 100644 0002-Fixes-for-perl-5.18.patch diff --git a/0001-Changes-to-support-perl-5.18.0.patch b/0001-Changes-to-support-perl-5.18.0.patch new file mode 100644 index 0000000..96ba9c9 --- /dev/null +++ b/0001-Changes-to-support-perl-5.18.0.patch @@ -0,0 +1,480 @@ +From aa2083b40c83fad6b931a2088ae69bc206a7edc7 Mon Sep 17 00:00:00 2001 +From: Chris Burel <chrisburel(a)gmail.com> +Date: Fri, 23 Aug 2013 12:04:01 -0700 +Subject: [PATCH 1/2] Changes to support perl 5.18.0. + +Perl no longer calls the AUTOLOAD method for DESTROY. So that has to be defined explicitly. +It also didn't like bless \shift, $package, so I've changed that as well. +defined @array is deprecated, update that code. +Also remove spurious breakpoints in example code. +Also, CMake seems to have changed, so the prove "macro" is now a function, because functions support actual scope on cmake variables. +--- + cmake/MacroProve.cmake | 4 +- + qtcore/lib/QtCore4.pm | 85 ++++----- + qtcore/src/QtCore4.xs | 2 + + qtcore/src/util.cpp | 190 ++++++++++++--------- + qtcore/src/util.h | 1 + + qtcore/t/d_sigslot.t | 1 - + qtcore/t/qabstractitemmodel.t | 1 - + qtgui/examples/tools/customcompleter/TextEdit.pm | 1 - + .../tools/settingseditor/VariantDelegate.pm | 1 - + qtgui/t/itemviewspuzzle.t | 2 - + 10 files changed, 154 insertions(+), 134 deletions(-) + +SKIP diff --git a/cmake/MacroProve.cmake b/cmake/MacroProve.cmake +SKIP index 13387af..489878a 100644 +SKIP --- a/cmake/MacroProve.cmake +SKIP +++ b/cmake/MacroProve.cmake +SKIP @@ -1,5 +1,5 @@ +SKIP +SKIP -MACRO( MACRO_PROVE _testname _path) +SKIP +FUNCTION( MACRO_PROVE _testname _path) +SKIP +SKIP if(WIN32) +SKIP set(prove_cmd "prove.bat") +SKIP @@ -20,4 +20,4 @@ MACRO( MACRO_PROVE _testname _path) +SKIP endif(_workingdir) +SKIP +SKIP add_test(${_testname} ${prove_cmd} ${prove_args} ${escaped_path}) +SKIP -ENDMACRO( MACRO_PROVE _testname _path ) +SKIP +ENDFUNCTION( MACRO_PROVE _testname _path ) +diff --git a/qtcore/lib/QtCore4.pm b/qtcore/lib/QtCore4.pm +index b14e817..0459dd8 100644 +--- a/qtcore/lib/QtCore4.pm ++++ b/qtcore/lib/QtCore4.pm +@@ -1301,12 +1301,15 @@ sub init_class { + + foreach my $sp ('', ' ') { + my $where = $sp . $perlClassName; +- installautoload($where); +- # Putting this in one package gives XS_AUTOLOAD one spot to look for +- # the autoload variable +- package Qt::AutoLoad; +- my $autosub = \&{$where . '::_UTOLOAD'}; +- Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} ); ++ ++ if (!exists &{$where . '::AUTOLOAD'}) { ++ installautoload($where); ++ # Putting this in one package gives XS_AUTOLOAD one spot to look for ++ # the autoload variable ++ package Qt::AutoLoad; ++ my $autosub = \&{$where . '::_UTOLOAD'}; ++ Qt::_internal::installSub( $where.'::AUTOLOAD', sub{&$autosub} ); ++ } + } + + installSub("$perlClassName\::NEW", sub { +@@ -1417,9 +1420,9 @@ sub makeMetaData { + my $signals = $meta->{signals}; + my $slots = $meta->{slots}; + +- @{$classinfos} = () if !defined @{$classinfos}; +- @{$signals} = () if !defined @{$signals}; +- @{$slots} = () if !defined @{$slots}; ++ @{$classinfos} = () if !defined $classinfos; ++ @{$signals} = () if !defined $signals; ++ @{$slots} = () if !defined $slots; + + # Each entry in 'stringdata' corresponds to a string in the + # qt_meta_stringdata_<classname> structure. +@@ -1805,67 +1808,67 @@ Qt::_internal::installSub(' Qt::Variant::value', sub { + }); + + sub String { +- if ( @_ ) { +- return bless \shift, 'Qt::String'; +- } else { +- return bless '', 'Qt::String'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::String'; + } + + sub CString { +- if ( @_ ) { +- return bless \shift, 'Qt::CString'; +- } else { +- return bless '', 'Qt::CString'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::CString'; + } + + sub Int { +- if ( @_ ) { +- return bless \shift, 'Qt::Int'; +- } else { +- return bless '', 'Qt::Int'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::Int'; + } + + sub Uint { +- if ( @_ ) { +- return bless \shift, 'Qt::Uint'; +- } else { +- return bless '', 'Qt::Uint'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::Uint'; + } + + sub Bool { +- if ( @_ ) { +- return bless \shift, 'Qt::Bool'; +- } else { +- return bless '', 'Qt::Bool'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::Bool'; + } + + sub Short { +- if ( @_ ) { +- return bless \shift, 'Qt::Short'; +- } else { +- return bless '', 'Qt::Short'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::Short'; + } + + sub Ushort { +- if ( @_ ) { +- return bless \shift, 'Qt::Ushort'; +- } else { +- return bless '', 'Qt::Ushort'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::Ushort'; + } + + sub Uchar { +- if ( @_ ) { +- return bless \shift, 'Qt::Uchar'; +- } else { +- return bless '', 'Qt::Uchar'; ++ my ($val) = @_; ++ if ( !$val ) { ++ $val = ''; + } ++ return bless \$val, 'Qt::Uchar'; + } + + 1; +diff --git a/qtcore/src/QtCore4.xs b/qtcore/src/QtCore4.xs +index fd219c5..a699132 100644 +--- a/qtcore/src/QtCore4.xs ++++ b/qtcore/src/QtCore4.xs +@@ -249,6 +249,8 @@ installautoload( package ) + char* autoload = new char[strlen(package) + 11]; + sprintf(autoload, "%s::_UTOLOAD", package); + newXS(autoload, XS_AUTOLOAD, __FILE__); ++ sprintf(autoload, "%s::DESTROY", package); ++ newXS(autoload, XS_DESTROY, __FILE__); + delete[] autoload; + + void +diff --git a/qtcore/src/util.cpp b/qtcore/src/util.cpp +index f66fb6b..a163e7e 100644 +--- a/qtcore/src/util.cpp ++++ b/qtcore/src/util.cpp +@@ -1939,6 +1939,109 @@ XS(XS_qvariant_from_value) { + XSRETURN(1); + } + ++XS(XS_DESTROY) { ++ dXSARGS; ++ PERL_SET_CONTEXT(PL_curinterp); ++ char* package = HvNAME(SvSTASH(SvRV(ST(0)))); ++ ++package; ++ ++#ifdef PERLQTDEBUG ++ if( do_debug && ( do_debug & qtdb_autoload ) ) { ++ fprintf(stderr, "In XS DESTROY for %s", package); ++ if((do_debug & qtdb_verbose)) { ++ smokeperl_object *o = sv_obj_info(ST(0)); ++ if(o) ++ fprintf(stderr, " - SV*: %p this: (%s)%p\n", ST(0), o->smoke->classes[o->classId].className, o->ptr); ++ else ++ fprintf(stderr, " - this: (unknown)(nil)\n"); ++ } ++ else { ++ fprintf(stderr, "\n"); ++ } ++ } ++#endif ++ ++ // For anything we do here where withObject is true, sv_this should be set ++ // to the first argument on the stack, since that's where perl puts it. ++ // Wherever we return, be sure to restore sv_this. ++ SV* old_this = 0; ++ old_this = sv_this; ++ sv_this = newSVsv(ST(0)); ++ ++ smokeperl_object* o = sv_obj_info(sv_this); ++ ++ // Check to see that o exists (has a smokeperl_object in sv_this), has ++ // a valid pointer, and (is allocated or has an entry in the pointer ++ // map). If all of that's true, or we're in global destruction, we ++ // don't really care what happens. ++ if( PL_dirty ) { ++ // This block will be repeated a lot to clean stuff up. ++ // Restore sv_this ++ SvREFCNT_dec(sv_this); ++ sv_this = old_this; ++ XSRETURN_YES; ++ } ++ if( !(o && o->ptr && (o->allocated || getPointerObject(o->ptr))) ) { ++ // This block will be repeated a lot to clean stuff up. ++ // Restore sv_this ++ SvREFCNT_dec(sv_this); ++ sv_this = old_this; ++ XSRETURN_YES; ++ } ++ ++ // Check to see if a delete of this object has been tried before, by ++ // seeing if the object's hash has the "has been hidden" key ++ static const char* key = "has been hidden"; ++ U32 klen = 15; ++ SV** svp = 0; ++ if( SvROK(sv_this) && SvTYPE(SvRV(sv_this)) == SVt_PVHV ) { ++ HV* hv = (HV*)SvRV(sv_this); ++ svp = hv_fetch( hv, key, klen, 0); ++ } ++ if(svp) { ++ // Found "has been hidden", so don't do anything, just clean up ++ // Restore sv_this ++ SvREFCNT_dec(sv_this); ++ sv_this = old_this; ++ XSRETURN_YES; ++ } ++ ++#ifdef PERLQTDEBUG ++ // The following perl call seems to stomp on the package name, let's copy it ++ char* packagecpy = new char[strlen(package)+1]; ++ strcpy( packagecpy, package ); ++#endif ++ ++ // Call the ON_DESTROY method, that stores a reference (increasing the ++ // refcnt) if necessary ++ HV* stash = gv_stashpv(package, TRUE); ++ GV* gv = gv_fetchmethod_autoload(stash, "ON_DESTROY", 0); ++ int retval = 0; ++ if( gv ) { ++ PUSHMARK(SP); ++ int count = call_sv((SV*)GvCV(gv), G_SCALAR|G_NOARGS); ++ SPAGAIN; ++ if (count != 1) { ++ // Restore sv_this ++ SvREFCNT_dec(sv_this); ++ sv_this = old_this; ++ croak( "Corrupt ON_DESTROY return value: Got %d value(s), expected 1\n", count ); ++ } ++ retval = POPi; ++ PUTBACK; ++ } ++ ++#ifdef PERLQTDEBUG ++ if( do_debug && retval && (do_debug & qtdb_gc) ) ++ fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", packagecpy, o->ptr); ++ delete[] packagecpy; ++#endif ++ ++ // Now clean up ++ SvREFCNT_dec(sv_this); ++ sv_this = old_this; ++} ++ + XS(XS_AUTOLOAD) { + dXSARGS; + PERL_SET_CONTEXT(PL_curinterp); +@@ -2045,95 +2148,12 @@ XS(XS_AUTOLOAD) { + else + XSRETURN(count); + } +- else if( !strcmp( methodname, "DESTROY" ) ) { +- smokeperl_object* o = sv_obj_info(sv_this); +- +- // Check to see that o exists (has a smokeperl_object in sv_this), has +- // a valid pointer, and (is allocated or has an entry in the pointer +- // map). If all of that's true, or we're in global destruction, we +- // don't really care what happens. +- if( PL_dirty ) { +- // This block will be repeated a lot to clean stuff up. +- if( withObject ) { +- // Restore sv_this +- SvREFCNT_dec(sv_this); +- sv_this = old_this; +- } +- XSRETURN_YES; +- } +- if( !(o && o->ptr && (o->allocated || getPointerObject(o->ptr))) ) { +- // This block will be repeated a lot to clean stuff up. +- if( withObject ) { +- // Restore sv_this +- SvREFCNT_dec(sv_this); +- sv_this = old_this; +- } +- XSRETURN_YES; +- } +- +- // Check to see if a delete of this object has been tried before, by +- // seeing if the object's hash has the "has been hidden" key +- static const char* key = "has been hidden"; +- U32 klen = 15; +- SV** svp = 0; +- if( SvROK(sv_this) && SvTYPE(SvRV(sv_this)) == SVt_PVHV ) { +- HV* hv = (HV*)SvRV(sv_this); +- svp = hv_fetch( hv, key, klen, 0); +- } +- if(svp) { +- // Found "has been hidden", so don't do anything, just clean up +- if( withObject ) { +- // Restore sv_this +- SvREFCNT_dec(sv_this); +- sv_this = old_this; +- } +- XSRETURN_YES; +- } +- +-#ifdef PERLQTDEBUG +- // The following perl call seems to stomp on the package name, let's copy it +- char* packagecpy = new char[strlen(package)+1]; +- strcpy( packagecpy, package ); +-#endif +- +- // Call the ON_DESTROY method, that stores a reference (increasing the +- // refcnt) if necessary +- if( !stash ) +- stash = gv_stashpv(package, TRUE); +- gv = gv_fetchmethod_autoload(stash, "ON_DESTROY", 0); +- int retval = 0; +- if( gv ) { +- PUSHMARK(SP); +- int count = call_sv((SV*)GvCV(gv), G_SCALAR|G_NOARGS); +- SPAGAIN; +- if (count != 1) { +- if( withObject ) { +- // Restore sv_this +- SvREFCNT_dec(sv_this); +- sv_this = old_this; +- } +- croak( "Corrupt ON_DESTROY return value: Got %d value(s), expected 1\n", count ); +- } +- retval = POPi; +- PUTBACK; +- } +- +-#ifdef PERLQTDEBUG +- if( do_debug && retval && (do_debug & qtdb_gc) ) +- fprintf(stderr, "Increasing refcount in DESTROY for %s=%p (still has a parent)\n", packagecpy, o->ptr); +- delete[] packagecpy; +-#endif +- +- // Now clean up +- if( withObject ) { +- SvREFCNT_dec(sv_this); +- sv_this = old_this; +- } +- } + else { + // We're calling a c++ method + + // Get the classId (eventually converting SUPER to the right Qt4 class) ++ if (super && strcmp( super, "SUPER" ) == 0) ++ package[strlen(package)-7] = 0; + SV* moduleIdRef = package_classId( package ); + Smoke::ModuleIndex mi; + +diff --git a/qtcore/src/util.h b/qtcore/src/util.h +index bd4bf31..430a8eb 100644 +--- a/qtcore/src/util.h ++++ b/qtcore/src/util.h +@@ -98,6 +98,7 @@ XS(XS_qdatastream_readrawdata); + XS(XS_qvariant_value); + XS(XS_qvariant_from_value); + ++XS(XS_DESTROY); + XS(XS_AUTOLOAD); + XS(XS_qt_metacall); + XS(XS_signal); +diff --git a/qtcore/t/d_sigslot.t b/qtcore/t/d_sigslot.t +index eea16c8..3d02f2e 100644 +--- a/qtcore/t/d_sigslot.t ++++ b/qtcore/t/d_sigslot.t +@@ -30,7 +30,6 @@ sub NEW { + emit signal( 5, 4 ); + + # 3) Emit a signal, but missing an argument. Should fail. +- $DB::single=1; + eval{ emit signalWithBadArg() }; + like( $@, qr/Wrong number of arguments in signal call/, 'Missing arguments in signal' ); + } +diff --git a/qtcore/t/qabstractitemmodel.t b/qtcore/t/qabstractitemmodel.t +index ae1174c..3e2baba 100644 +--- a/qtcore/t/qabstractitemmodel.t ++++ b/qtcore/t/qabstractitemmodel.t +@@ -4,7 +4,6 @@ package TestModel; + + use strict; + use warnings; +-use blib; + use QtCore4; + use QtCore4::isa qw( Qt::AbstractItemModel ); + +diff --git a/qtgui/examples/tools/customcompleter/TextEdit.pm b/qtgui/examples/tools/customcompleter/TextEdit.pm +index 9b4e26f..3e82ae4 100644 +--- a/qtgui/examples/tools/customcompleter/TextEdit.pm ++++ b/qtgui/examples/tools/customcompleter/TextEdit.pm +@@ -61,7 +61,6 @@ sub insertCompletion + return; + } + my $tc = textCursor(); +- $DB::single=1; + my $extra = length($completion) - length(c->completionPrefix()); + $tc->movePosition(Qt::TextCursor::Left()); + $tc->movePosition(Qt::TextCursor::EndOfWord()); +diff --git a/qtgui/examples/tools/settingseditor/VariantDelegate.pm b/qtgui/examples/tools/settingseditor/VariantDelegate.pm +index 5d91d3f..e450efb 100644 +--- a/qtgui/examples/tools/settingseditor/VariantDelegate.pm ++++ b/qtgui/examples/tools/settingseditor/VariantDelegate.pm +@@ -197,7 +197,6 @@ sub setModelData + } + + my $text = $lineEdit->text(); +- $DB::single=1; + my $validator = $lineEdit->validator(); + if ($validator) { + my $pos; +SKIP diff --git a/qtgui/t/itemviewspuzzle.t b/qtgui/t/itemviewspuzzle.t +SKIP index 4a6b623..ea1c07e 100644 +SKIP --- a/qtgui/t/itemviewspuzzle.t +SKIP +++ b/qtgui/t/itemviewspuzzle.t +SKIP @@ -85,8 +85,6 @@ sub initTestCase { +SKIP Qt::Test::qWaitForWindowShown( $window ); +SKIP this->{window} = $window; +SKIP pass( 'Window shown' ); +SKIP - $DB::single=1; +SKIP - 1; +SKIP } +SKIP +SKIP package main; +SKIP -- +SKIP 1.8.3.1 +SKIP diff --git a/0002-Fixes-for-perl-5.18.patch b/0002-Fixes-for-perl-5.18.patch new file mode 100644 index 0000000..a1a71e0 --- /dev/null +++ b/0002-Fixes-for-perl-5.18.patch @@ -0,0 +1,153 @@ +From d4627fb5f3a571212457df22e2ab861b890fc992 Mon Sep 17 00:00:00 2001 +From: Chris Burel <chrisburel(a)gmail.com> +Date: Fri, 23 Aug 2013 14:56:37 -0700 +Subject: [PATCH 2/2] Fixes for perl 5.18 + +I'm not really sure how this was working before, but perl 5.18 really wasn't +happy. The way these functions work is really tricky, because the marshallers +expect to be able to set the scalar ref's returned from them. My previous fix +didn't allow the refs to be set correctly. +--- + qtcore/lib/QtCore4.pm | 90 +++++++++++++++++++++++++++++++++------------------ + 1 file changed, 58 insertions(+), 32 deletions(-) + +diff --git a/qtcore/lib/QtCore4.pm b/qtcore/lib/QtCore4.pm +index 0459dd8..1a5e454 100644 +--- a/qtcore/lib/QtCore4.pm ++++ b/qtcore/lib/QtCore4.pm +@@ -1649,6 +1649,8 @@ package Qt; + use strict; + use warnings; + ++use Scalar::Util; ++ + # Called in the DESTROY method for all QObjects to see if they still have a + # parent, and avoid deleting them if they do. + sub Qt::Object::ON_DESTROY { +@@ -1808,67 +1810,91 @@ Qt::_internal::installSub(' Qt::Variant::value', sub { + }); + + sub String { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::String'; ++ } ++ return bless \shift, 'Qt::String'; + } +- return bless \$val, 'Qt::String'; ++ return bless '', 'Qt::String'; + } + + sub CString { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::CString'; ++ } ++ return bless \shift, 'Qt::CString'; + } +- return bless \$val, 'Qt::CString'; ++ return bless '', 'Qt::CString'; + } + + sub Int { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::Int'; ++ } ++ return bless \shift, 'Qt::Int'; + } +- return bless \$val, 'Qt::Int'; ++ return bless '', 'Qt::Int'; + } + + sub Uint { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::Uint'; ++ } ++ return bless \shift, 'Qt::Uint'; + } +- return bless \$val, 'Qt::Uint'; ++ return bless '', 'Qt::Uint'; + } + + sub Bool { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::Bool'; ++ } ++ return bless \shift, 'Qt::Bool'; + } +- return bless \$val, 'Qt::Bool'; ++ return bless '', 'Qt::Bool'; + } + + sub Short { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::Short'; ++ } ++ return bless \shift, 'Qt::Short'; + } +- return bless \$val, 'Qt::Short'; ++ return bless '', 'Qt::Short'; + } + + sub Ushort { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::Ushort'; ++ } ++ return bless \shift, 'Qt::Ushort'; + } +- return bless \$val, 'Qt::Ushort'; ++ return bless '', 'Qt::Ushort'; + } + + sub Uchar { +- my ($val) = @_; +- if ( !$val ) { +- $val = ''; ++ if ( scalar @_ ) { ++ if ( Scalar::Util::readonly( $_[0] ) ) { ++ my $val = shift; ++ return bless \$val, 'Qt::Uchar'; ++ } ++ return bless \shift, 'Qt::Uchar'; + } +- return bless \$val, 'Qt::Uchar'; ++ return bless '', 'Qt::Uchar'; + } + + 1; +-- +1.8.3.1 + diff --git a/perl-Qt.spec b/perl-Qt.spec index f85557e..bbb28e0 100644 --- a/perl-Qt.spec +++ b/perl-Qt.spec @@ -1,6 +1,6 @@ Name: perl-Qt Version: 0.96.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Perl bindings for Qt # Files under qtcore/tools/ and qtdbus/tools/ are LGPLv2.1+ with Nokia # exceptions or GPLv3+. The Nokia files only appear in -devel subpackage. @@ -9,6 +9,8 @@ License: GPLv2+ and (GPL+ or Artistic) Group: Development/Libraries URL:
http://search.cpan.org/dist/Qt/
Source0:
http://www.cpan.org/modules/by-module/Qt/Qt-%{version}.tar.gz
+Patch1: 0001-Changes-to-support-perl-5.18.0.patch +Patch2: 0002-Fixes-for-perl-5.18.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildRequires: cmake @@ -53,6 +55,11 @@ Development files for perl-Qt. %prep %setup -q -n Qt-%{version} + +# Fixes from upstream for Perl 5.18 +%patch1 -p1 +%patch2 -p1 + mkdir build # fix smoke qwt detection @@ -109,6 +116,9 @@ make test %{_datadir}/perlqt %changelog +* Fri Aug 30 2013 Paul Howarth <paul(a)city-fan.org> - 0.96.0-9 +- Add some fixes from upstream git for Perl 5.18 compatibility + * Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.0-8 - Rebuilt for
https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-- cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=epel7&id=11aa26b42…
1
0
0
0
← Newer
1
...
449
450
451
452
453
454
455
...
471
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
Results per page:
10
25
50
100
200