From 4cc471f0752fba2574611e2f85afbfc593de5f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Thu, 8 Jun 2017 11:39:24 +0200
Subject: Restore compatibilty with Perl 5.26.0
---
perl-Qt.spec | 8 +-
...to-INC-when-loading-test-modules-from-CWD.patch | 387 +++++++++++++++++++++
2 files changed, 394 insertions(+), 1 deletion(-)
create mode 100644
perlqt-4.14.3-Add-.-to-INC-when-loading-test-modules-from-CWD.patch
diff --git a/perl-Qt.spec b/perl-Qt.spec
index 33ba3a6..53b0859 100644
--- a/perl-Qt.spec
+++ b/perl-Qt.spec
@@ -2,7 +2,7 @@
Name: perl-Qt
Version: 4.14.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Perl bindings for Qt
# qtcore/lib/QtCore4.pm: GPL+ or Artistic
# other files: GPLv2+
@@ -33,6 +33,8 @@ Patch5:
perlqt-4.14.3-Remove-unnecessary-isDerivedFrom-overload.patch
# Work around Qt::TcpSocket::connetctToHost() IPv6 deficiency,
# KDE bug #377563
Patch6:
perlqt-4.14.3-Work-around-Qt-TcpSocket-connetctToHost-IPv6-deficie.patch
+# Restore compatibilty with Perl 5.26.0, bug #1459787, KDE bug #380965
+Patch7:
perlqt-4.14.3-Add-.-to-INC-when-loading-test-modules-from-CWD.patch
BuildRequires: coreutils
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -102,6 +104,7 @@ Development files for perl-Qt.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
mkdir build
@@ -179,6 +182,9 @@ export PERL5LIB="$PWD/blib/lib:$PWD/blib/arch"
%{_datadir}/perlqt
%changelog
+* Thu Jun 08 2017 Petr Pisar <ppi...@redhat.com> - 4.14.3-9
+- Restore compatibilty with Perl 5.26.0 (bug #1459787)
+
* Mon Jun 05 2017 Jitka Plesnikova <jples...@redhat.com> - 4.14.3-8
- Perl 5.26 rebuild
diff --git
a/perlqt-4.14.3-Add-.-to-INC-when-loading-test-modules-from-CWD.patch
b/perlqt-4.14.3-Add-.-to-INC-when-loading-test-modules-from-CWD.patch
new file mode 100644
index 0000000..d895f2b
--- /dev/null
+++ b/perlqt-4.14.3-Add-.-to-INC-when-loading-test-modules-from-CWD.patch
@@ -0,0 +1,387 @@
+From 292e26919f9fc060099633a03f1d9781ee2f8248 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Thu, 8 Jun 2017 11:03:20 +0200
+Subject: [PATCH] Add . to @INC when loading test modules from CWD
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Perl 5.26.0 removed "." from @INC and some tests that relied on it
+fails now:
+
+14/42 Testing: perlqt_itemviewspixelator
+14/42 Test: perlqt_itemviewspixelator
+Command: "/usr/bin/cmake" "-E" "chdir"
"/home/test/fedora/perl-Qt/perlqt-4.14.3/qtgui/examples/itemviews/pixelator"
"prove" "/home/test/fedora/perl-Qt/perlqt-4.14.3/qtgui/t/itemviewspixelator.t"
+Directory: /home/test/fedora/perl-Qt/perlqt-4.14.3/build/qtgui/t
+"perlqt_itemviewspixelator" start time: Jun 08 10:06 CEST
+Output:
+----------------------------------------------------------
+Can't locate MainWindow.pm in @INC (you may need to install the MainWindow
module) (@INC contains: /home/test/fedora/perl-Qt/perlqt-4.14.3/build/blib/lib
/home/test/fedora/perl-Qt/perlqt-4.14.3/build/blib/arch /usr/local/lib64/perl5
/usr/local/share/perl5 /usr/lib64/perl5/vendor_perl
/usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at
/home/test/fedora/perl-Qt/perlqt-4.14.3/qtgui/t/itemviewspixelator.t line 11.
+BEGIN failed--compilation aborted at
/home/test/fedora/perl-Qt/perlqt-4.14.3/qtgui/t/itemviewspixelator.t line 11.
+/home/test/fedora/perl-Qt/perlqt-4.14.3/qtgui/t/itemviewspixelator.t ..
+Dubious, test returned 2 (wstat 512, 0x200)
+No subtests run
+
+This patch adds "." to @INC where needed.
+
+Maybe changing CMake macro_prove() to add "-I" option to prove comand would be
better.
+
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ qtgui/examples/help/contextsensitivehelp/WateringConfigDialog.pm | 1 +
+ qtgui/examples/itemviews/pixelator/MainWindow.pm | 1 +
+ qtgui/examples/itemviews/puzzle/MainWindow.pm | 1 +
+ qtgui/examples/mainwindows/mdi/MainWindow.pm | 1 +
+ qtgui/examples/mainwindows/mdi/mdi.pl | 1 +
+ qtgui/examples/network/fortuneserver/fortuneserver.pl | 1 +
+ qtgui/examples/painting/fontsampler/MainWindow.pm | 1 +
+ qtgui/examples/painting/fontsampler/fontsampler.pl | 1 +
+ qtgui/examples/richtext/calendar/calendar.pl | 1 +
+ qtgui/examples/sql/querymodel/querymodel.pl | 2 +-
+ qtgui/examples/widgets/calculator/Calculator.pm | 1 +
+ qtgui/examples/widgets/calculator/calculator.pl | 1 +
+ qtgui/examples/widgets/wiggly/Dialog.pm | 1 +
+ qtgui/examples/widgets/wiggly/wiggly.pl | 1 +
+ qtgui/examples/xml/streambookmarks/MainWindow.pm | 1 +
+ qtgui/examples/xml/streambookmarks/streambookmarks.pl | 1 +
+ qtgui/t/helpcontextsensitivehelp.t | 1 +
+ qtgui/t/itemviewspixelator.t | 1 +
+ qtgui/t/itemviewspuzzle.t | 1 +
+ qtgui/t/mainwindowsmdi.t | 1 +
+ qtgui/t/networkfortune.t | 1 +
+ qtgui/t/paintingfontsampler.t | 1 +
+ qtgui/t/richtextcalendar.t | 1 +
+ qtgui/t/sqlquerymodel.t | 1 +
+ qtgui/t/widgetscalculator.t | 1 +
+ qtgui/t/widgetswiggly.t | 1 +
+ qtgui/t/xmlstreambookmarks.t | 1 +
+ 27 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/qtgui/examples/help/contextsensitivehelp/WateringConfigDialog.pm
b/qtgui/examples/help/contextsensitivehelp/WateringConfigDialog.pm
+index 08fb0a6..838e6dd 100644
+--- a/qtgui/examples/help/contextsensitivehelp/WateringConfigDialog.pm
++++ b/qtgui/examples/help/contextsensitivehelp/WateringConfigDialog.pm
+@@ -5,6 +5,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+
++use lib '.';
+ use Ui_WateringConfigDialog;
+
+ use QtCore4::isa qw( Qt::Dialog );
+diff --git a/qtgui/examples/itemviews/pixelator/MainWindow.pm
b/qtgui/examples/itemviews/pixelator/MainWindow.pm
+index dc915df..515abaf 100644
+--- a/qtgui/examples/itemviews/pixelator/MainWindow.pm
++++ b/qtgui/examples/itemviews/pixelator/MainWindow.pm
+@@ -11,6 +11,7 @@ use QtCore4::slots
+ printImage => [],
+ showAboutBox => [],
+ updateView => [];
++use lib '.';
+ use ImageModel;
+ use PixelDelegate;
+ use List::Util qw(min);
+diff --git a/qtgui/examples/itemviews/puzzle/MainWindow.pm
b/qtgui/examples/itemviews/puzzle/MainWindow.pm
+index 6f11a5b..4da3642 100644
+--- a/qtgui/examples/itemviews/puzzle/MainWindow.pm
++++ b/qtgui/examples/itemviews/puzzle/MainWindow.pm
+@@ -9,6 +9,7 @@ use QtCore4::slots
+ openImage => [],
+ setupPuzzle => [],
+ setCompleted => [];
++use lib '.';
+ use PiecesModel;
+ use PuzzleWidget;
+ use List::Util qw( min );
+diff --git a/qtgui/examples/mainwindows/mdi/MainWindow.pm
b/qtgui/examples/mainwindows/mdi/MainWindow.pm
+index 5788a2f..4a7c8bb 100644
+--- a/qtgui/examples/mainwindows/mdi/MainWindow.pm
++++ b/qtgui/examples/mainwindows/mdi/MainWindow.pm
+@@ -21,6 +21,7 @@ use QtCore4::slots
+ switchLayoutDirection => [''],
+ setActiveSubWindow => ['QWidget*'];
+
++use lib '.';
+ use MdiChild;
+
+ sub NEW {
+diff --git a/qtgui/examples/mainwindows/mdi/mdi.pl
b/qtgui/examples/mainwindows/mdi/mdi.pl
+index c2720cc..a14eaec 100755
+--- a/qtgui/examples/mainwindows/mdi/mdi.pl
++++ b/qtgui/examples/mainwindows/mdi/mdi.pl
+@@ -18,6 +18,7 @@ use QtGui4;
+
+ =cut
+
++use lib '.';
+ use MainWindow;
+
+ =begin
+diff --git a/qtgui/examples/network/fortuneserver/fortuneserver.pl
b/qtgui/examples/network/fortuneserver/fortuneserver.pl
+index 6e40cd9..6d9af50 100755
+--- a/qtgui/examples/network/fortuneserver/fortuneserver.pl
++++ b/qtgui/examples/network/fortuneserver/fortuneserver.pl
+@@ -4,6 +4,7 @@ use strict;
+ use warnings;
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use Server;
+
+ sub main
+diff --git a/qtgui/examples/painting/fontsampler/MainWindow.pm
b/qtgui/examples/painting/fontsampler/MainWindow.pm
+index 27b34e7..8949a5f 100644
+--- a/qtgui/examples/painting/fontsampler/MainWindow.pm
++++ b/qtgui/examples/painting/fontsampler/MainWindow.pm
+@@ -4,6 +4,7 @@ use strict;
+ use warnings;
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use Ui_MainWindowBase;
+ use QtCore4::isa qw( Qt::MainWindow );
+ use QtCore4::slots
+diff --git a/qtgui/examples/painting/fontsampler/fontsampler.pl
b/qtgui/examples/painting/fontsampler/fontsampler.pl
+index f50f8d6..bcfbabd 100755
+--- a/qtgui/examples/painting/fontsampler/fontsampler.pl
++++ b/qtgui/examples/painting/fontsampler/fontsampler.pl
+@@ -4,6 +4,7 @@ use strict;
+ use warnings;
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use MainWindow;
+
+ sub main
+diff --git a/qtgui/examples/richtext/calendar/calendar.pl
b/qtgui/examples/richtext/calendar/calendar.pl
+index 2b98881..02b9007 100755
+--- a/qtgui/examples/richtext/calendar/calendar.pl
++++ b/qtgui/examples/richtext/calendar/calendar.pl
+@@ -4,6 +4,7 @@ use strict;
+ use warnings;
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use MainWindow;
+
+ sub main
+diff --git a/qtgui/examples/sql/querymodel/querymodel.pl
b/qtgui/examples/sql/querymodel/querymodel.pl
+index 1ef5918..fc07847 100755
+--- a/qtgui/examples/sql/querymodel/querymodel.pl
++++ b/qtgui/examples/sql/querymodel/querymodel.pl
+@@ -5,7 +5,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+
+-use lib '../';
++use lib ('../', '.');
+ use Connection;
+ use CustomSqlModel;
+ use EditableSqlModel;
+diff --git a/qtgui/examples/widgets/calculator/Calculator.pm
b/qtgui/examples/widgets/calculator/Calculator.pm
+index 7a9e5de..6e1e31c 100644
+--- a/qtgui/examples/widgets/calculator/Calculator.pm
++++ b/qtgui/examples/widgets/calculator/Calculator.pm
+@@ -23,6 +23,7 @@ use QtCore4::slots
+ setMemory => [],
+ addToMemory => [];
+
++use lib '.';
+ use Button;
+
+ use constant { NumDigitButtons => 10 };
+diff --git a/qtgui/examples/widgets/calculator/calculator.pl
b/qtgui/examples/widgets/calculator/calculator.pl
+index 2d34280..778c4c0 100755
+--- a/qtgui/examples/widgets/calculator/calculator.pl
++++ b/qtgui/examples/widgets/calculator/calculator.pl
+@@ -5,6 +5,7 @@ use warnings;
+
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use Calculator;
+
+ sub main {
+diff --git a/qtgui/examples/widgets/wiggly/Dialog.pm
b/qtgui/examples/widgets/wiggly/Dialog.pm
+index 0b80409..a594c5f 100644
+--- a/qtgui/examples/widgets/wiggly/Dialog.pm
++++ b/qtgui/examples/widgets/wiggly/Dialog.pm
+@@ -7,6 +7,7 @@ use QtCore4;
+ use QtGui4;
+ use QtCore4::isa qw( Qt::Dialog );
+
++use lib '.';
+ use WigglyWidget;
+
+ # [0]
+diff --git a/qtgui/examples/widgets/wiggly/wiggly.pl
b/qtgui/examples/widgets/wiggly/wiggly.pl
+index f999a41..dd4439b 100755
+--- a/qtgui/examples/widgets/wiggly/wiggly.pl
++++ b/qtgui/examples/widgets/wiggly/wiggly.pl
+@@ -5,6 +5,7 @@ use warnings;
+
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use Dialog;
+
+ sub main {
+diff --git a/qtgui/examples/xml/streambookmarks/MainWindow.pm
b/qtgui/examples/xml/streambookmarks/MainWindow.pm
+index 7164e2a..7c6f557 100644
+--- a/qtgui/examples/xml/streambookmarks/MainWindow.pm
++++ b/qtgui/examples/xml/streambookmarks/MainWindow.pm
+@@ -10,6 +10,7 @@ use QtCore4::slots
+ open => [],
+ saveAs => [],
+ about => [];
++use lib '.';
+ use XbelReader;
+ use XbelWriter;
+
+diff --git a/qtgui/examples/xml/streambookmarks/streambookmarks.pl
b/qtgui/examples/xml/streambookmarks/streambookmarks.pl
+index daade51..9961d81 100755
+--- a/qtgui/examples/xml/streambookmarks/streambookmarks.pl
++++ b/qtgui/examples/xml/streambookmarks/streambookmarks.pl
+@@ -4,6 +4,7 @@ use strict;
+ use warnings;
+ use QtCore4;
+ use QtGui4;
++use lib '.';
+ use MainWindow;
+
+ # [0]
+diff --git a/qtgui/t/helpcontextsensitivehelp.t
b/qtgui/t/helpcontextsensitivehelp.t
+index 223fc1a..1140e28 100644
+--- a/qtgui/t/helpcontextsensitivehelp.t
++++ b/qtgui/t/helpcontextsensitivehelp.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use WateringConfigDialog;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/itemviewspixelator.t b/qtgui/t/itemviewspixelator.t
+index 43d4365..4224606 100644
+--- a/qtgui/t/itemviewspixelator.t
++++ b/qtgui/t/itemviewspixelator.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use MainWindow;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/itemviewspuzzle.t b/qtgui/t/itemviewspuzzle.t
+index 0cc359b..fbd5118 100644
+--- a/qtgui/t/itemviewspuzzle.t
++++ b/qtgui/t/itemviewspuzzle.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use MainWindow;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/mainwindowsmdi.t b/qtgui/t/mainwindowsmdi.t
+index eb08524..d4d8d13 100755
+--- a/qtgui/t/mainwindowsmdi.t
++++ b/qtgui/t/mainwindowsmdi.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use MainWindow;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/networkfortune.t b/qtgui/t/networkfortune.t
+index 0464b6c..773cbfd 100644
+--- a/qtgui/t/networkfortune.t
++++ b/qtgui/t/networkfortune.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use Server;
+ use lib '../fortuneclient';
+ use Client;
+diff --git a/qtgui/t/paintingfontsampler.t b/qtgui/t/paintingfontsampler.t
+index b5d727c..0318017 100644
+--- a/qtgui/t/paintingfontsampler.t
++++ b/qtgui/t/paintingfontsampler.t
+@@ -7,6 +7,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4;
++use lib '.';
+ use MainWindow;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/richtextcalendar.t b/qtgui/t/richtextcalendar.t
+index 0e6820d..79f14b7 100644
+--- a/qtgui/t/richtextcalendar.t
++++ b/qtgui/t/richtextcalendar.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use MainWindow;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/sqlquerymodel.t b/qtgui/t/sqlquerymodel.t
+index 36fca67..4389297 100644
+--- a/qtgui/t/sqlquerymodel.t
++++ b/qtgui/t/sqlquerymodel.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4 qw( QVERIFY );
++use lib '.';
+ use EditableSqlModel;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/widgetscalculator.t b/qtgui/t/widgetscalculator.t
+index f4aea24..174f252 100755
+--- a/qtgui/t/widgetscalculator.t
++++ b/qtgui/t/widgetscalculator.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4;
++use lib '.';
+ use Calculator;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/widgetswiggly.t b/qtgui/t/widgetswiggly.t
+index 2a434a3..41cff43 100644
+--- a/qtgui/t/widgetswiggly.t
++++ b/qtgui/t/widgetswiggly.t
+@@ -8,6 +8,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4;
++use lib '.';
+ use Dialog;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+diff --git a/qtgui/t/xmlstreambookmarks.t b/qtgui/t/xmlstreambookmarks.t
+index 99504dd..42afb42 100755
+--- a/qtgui/t/xmlstreambookmarks.t
++++ b/qtgui/t/xmlstreambookmarks.t
+@@ -7,6 +7,7 @@ use warnings;
+ use QtCore4;
+ use QtGui4;
+ use QtTest4;
++use lib '.';
+ use MainWindow;
+ use QtCore4::isa qw(Qt::Object);
+ use QtCore4::slots
+--
+2.9.4
+
--
cgit v1.1
https://src.fedoraproject.org/cgit/perl-Qt.git/commit/?h=master&id=4cc471f0752fba2574611e2f85afbfc593de5f8a
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
