From 47b84ca5ed0773896c69cc2b217845ed0c80e999 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 26 Sep 2016 17:26:37 +0200 Subject: [PATCH 1/2] travis-base.Dockerfile: depend on perl, not perl-modules As per the package description, perl-modules is an implementation detail and packages should depend on perl instead. --- travis/travis-base.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/travis-base.Dockerfile b/travis/travis-base.Dockerfile index 0861b26a..85fa2752 100644 --- a/travis/travis-base.Dockerfile +++ b/travis/travis-base.Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update && \ dpkg-dev devscripts git equivs \ clang clang-format-3.5 \ lintian \ - libanyevent-perl libanyevent-i3-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libinline-c-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl-modules libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libipc-run-perl libxcb-xtest0-dev libx11-xcb-perl libanyevent-i3-perl && \ + libanyevent-perl libanyevent-i3-perl libextutils-pkgconfig-perl xcb-proto cpanminus xvfb xserver-xephyr xauth libinline-perl libinline-c-perl libxml-simple-perl libmouse-perl libmousex-nativetraits-perl libextutils-depends-perl perl libtest-deep-perl libtest-exception-perl libxml-parser-perl libtest-simple-perl libtest-fatal-perl libdata-dump-perl libtest-differences-perl libxml-tokeparser-perl libipc-run-perl libxcb-xtest0-dev libx11-xcb-perl libanyevent-i3-perl && \ rm -rf /var/lib/apt/lists/* # Install i3 build dependencies. From 8f9138fbad1e88490a2f2ca83987a01d925e39a5 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 26 Sep 2016 17:29:27 +0200 Subject: [PATCH 2/2] t/158-wm_take_focus.t: avoid shift on scalars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This feature is forbidden in Perl ≥ 5.24: Experimental shift on scalar is now forbidden at ./t/158-wm_take_focus.t line 94, near ");" --- testcases/t/158-wm_take_focus.t | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testcases/t/158-wm_take_focus.t b/testcases/t/158-wm_take_focus.t index b8dae3b1..5d481924 100644 --- a/testcases/t/158-wm_take_focus.t +++ b/testcases/t/158-wm_take_focus.t @@ -56,7 +56,8 @@ subtest 'Window without WM_TAKE_FOCUS', sub { ok(!recv_take_focus($window), 'did not receive ClientMessage'); - my $con = shift get_ws_content($ws); + my ($nodes) = get_ws_content($ws); + my $con = shift @$nodes; ok($con->{focused}, 'con is focused'); done_testing; @@ -91,7 +92,8 @@ subtest 'Window with WM_TAKE_FOCUS and without InputHint', sub { ok(!recv_take_focus($window), 'did not receive ClientMessage'); - my $con = shift get_ws_content($ws); + my ($nodes) = get_ws_content($ws); + my $con = shift @$nodes; ok($con->{focused}, 'con is focused'); done_testing; @@ -111,7 +113,8 @@ subtest 'Window with WM_TAKE_FOCUS and unspecified InputHint', sub { ok(!recv_take_focus($window), 'did not receive ClientMessage'); - my $con = shift get_ws_content($ws); + my ($nodes) = get_ws_content($ws); + my $con = shift @$nodes; ok($con->{focused}, 'con is focused'); done_testing;