Merge lp:~invidian/shutter/perl-5.30 into lp:shutter

[Mateusz Gozdek]

[lp:~invidian/shutter/perl-5.30]

1304. By Mateusz Gozdek on 2019-06-07

Switch from glob to bsd_glob

glob has been deperecated from Perl from a long time and has been removed in
version 5.30.

This commit simply migrates from old 'glob' to new 'bsd_glob', which provides
the same functionality.

=== modified file 'bin/shutter'
--- bin/shutter	2018-09-10 20:09:32 +0000
+++ bin/shutter	2019-06-07 23:21:58 +0000
@@ -57,7 +57,7 @@
 
 #File operations
 use File::Copy qw/ cp mv /;
-use File::Glob qw/ glob /;
+use File::Glob qw/ bsd_glob /;
 use File::Basename qw/ fileparse dirname basename /;
 use File::Temp qw/ tempfile tempdir /;
 use File::Spec;
@@ -968,7 +968,7 @@
     my $combobox_settings_profiles = Gtk2::ComboBox->new_text;
     my @current_profiles;
     my $current_index = 0;
-    foreach my $pfile ( sort glob("$ENV{'HOME'}/.shutter/profiles/*.xml") ) {
+    foreach my $pfile ( sort bsd_glob("$ENV{'HOME'}/.shutter/profiles/*.xml") ) {
         utf8::decode $pfile;
         next
           if $pfile =~ /\_accounts.xml/;    #accounts file - we are looking for "real" profiles
@@ -8212,7 +8212,7 @@
         my $fb_pixbuf = $lp->load( $fb_pixbuf_path, Gtk2::IconSize->lookup('menu') );
 
         foreach my $plugin_path (@plugin_paths) {
-            my @plugins = glob($plugin_path);
+            my @plugins = bsd_glob($plugin_path);
             foreach my $pkey (@plugins) {
                 if ( -d $pkey ) {
                     my $dir_name = $pkey;
@@ -8354,7 +8354,7 @@
         my @upload_plugin_paths = ("$shutter_root/share/shutter/resources/system/upload_plugins/upload/*");
 
         foreach my $upload_plugin_path (@upload_plugin_paths) {
-            my @upload_plugins = glob($upload_plugin_path);
+            my @upload_plugins = bsd_glob($upload_plugin_path);
             foreach my $ukey (@upload_plugins) {
 
                 #Checking if file exists
@@ -9437,7 +9437,7 @@
 
         #delete all files in this folder
         #except the ones that are in the current session
-        my @unsaved_files = glob( $sdir->get_cache_dir . "/*" );
+        my @unsaved_files = bsd_glob( $sdir->get_cache_dir . "/*" );
         foreach my $unsaved_file (@unsaved_files) {
             utf8::decode $unsaved_file;
             print $unsaved_file, " checking \n" if $sc->get_debug;
 
=== modified file 'share/shutter/resources/modules/Shutter/Draw/DrawingTool.pm'
--- share/shutter/resources/modules/Shutter/Draw/DrawingTool.pm	2014-08-09 11:58:22 +0000
+++ share/shutter/resources/modules/Shutter/Draw/DrawingTool.pm	2019-06-07 23:21:58 +0000
@@ -35,7 +35,7 @@
 use Exporter;
 use Goo::Canvas;
 use File::Basename qw/ fileparse dirname basename /;
-use File::Glob qw/ glob /;
+use File::Glob qw/ bsd_glob /;
 use File::Temp qw/ tempfile tempdir /;
 use Data::Dumper;
 
@@ -221,7 +221,7 @@
     #
     #cursors borrowed from inkscape
     #http://www.inkscape.org
-    my @cursors = glob( $self->{_dicons} . "/cursor/*" );
+    my @cursors = bsd_glob( $self->{_dicons} . "/cursor/*" );
     foreach my $cursor_path (@cursors) {
         my ( $cname, $folder, $type ) = fileparse( $cursor_path, qr/\.[^.]*/ );
         $self->{_cursors}{$cname} = Gtk2::Gdk::Pixbuf->new_from_file($cursor_path);
@@ -6567,7 +6567,7 @@
     my $fd = TRUE;
     my $ff = FALSE;
 
-    my @objects = glob("$dobjects/*");
+    my @objects = bsd_glob("$dobjects/*");
     foreach my $name ( sort { -d $a <=> -d $b } @objects ) {
 
         #parse filename