Commit 67186c11b for imagemagick.org

commit 67186c11b98b6973f3625f77916def77462da020
Author: Cristy <mikayla-grace@urban-warrior.org>
Date:   Wed Jan 13 10:28:21 2021 -0500

    ...

diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
deleted file mode 100644
index ab75eb4bb..000000000
--- a/PerlMagick/Magick.pm
+++ /dev/null
@@ -1,146 +0,0 @@
-package Image::Magick;
-
-#  Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization
-#  dedicated to making software imaging solutions freely available.
-#
-#  You may not use this file except in compliance with the License.  You may
-#  obtain a copy of the License at
-#
-#    https://imagemagick.org/script/license.php
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  Initial version, written by Kyle Shorter.
-
-
-use strict;
-use Carp;
-use vars qw($VERSION @ISA @EXPORT $AUTOLOAD);
-
-require 5.002;
-require Exporter;
-require DynaLoader;
-require AutoLoader;
-
-@ISA = qw(Exporter DynaLoader);
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-@EXPORT =
-  qw(
-      Success Transparent Opaque QuantumDepth QuantumRange MaxRGB
-      WarningException ResourceLimitWarning TypeWarning OptionWarning
-      DelegateWarning MissingDelegateWarning CorruptImageWarning
-      FileOpenWarning BlobWarning StreamWarning CacheWarning CoderWarning
-      ModuleWarning DrawWarning ImageWarning XServerWarning RegistryWarning
-      ConfigureWarning ErrorException ResourceLimitError TypeError
-      OptionError DelegateError MissingDelegateError CorruptImageError
-      FileOpenError BlobError StreamError CacheError CoderError
-      ModuleError DrawError ImageError XServerError RegistryError
-      ConfigureError FatalErrorException
-    );
-
-$VERSION = '7.0.10';
-
-sub AUTOLOAD {
-    # This AUTOLOAD is used to 'autoload' constants from the constant()
-    # XS function.  If a constant is not found then control is passed
-    # to the AUTOLOAD in AutoLoader.
-    no warnings;
-
-    my $constname;
-    ($constname = $AUTOLOAD) =~ s/.*:://;
-    die "&${AUTOLOAD} not defined. The required ImageMagick libraries are not installed or not installed properly.\n" if $constname eq 'constant';
-    my $val = constant($constname, @_ ? $_[0] : 0);
-    if ($! != 0) {
-    	if ($! =~ /Invalid/) {
-	        $AutoLoader::AUTOLOAD = $AUTOLOAD;
-	        goto &AutoLoader::AUTOLOAD;
-    	}
-    	else {
-	        my($pack,$file,$line) = caller;
-	        die "Your vendor has not defined PerlMagick macro $pack\:\:$constname, used at $file line $line.\n";
-    	}
-    }
-    eval "sub $AUTOLOAD { $val }";
-    goto &$AUTOLOAD;
-}
-
-bootstrap Image::Magick $VERSION;
-
-# Preloaded methods go here.
-
-sub new
-{
-    my $this = shift;
-    my $class = ref($this) || $this || "Image::Magick";
-    my $self = [ ];
-    bless $self, $class;
-    $self->set(@_) if @_;
-    return $self;
-}
-
-sub New
-{
-    my $this = shift;
-    my $class = ref($this) || $this || "Image::Magick";
-    my $self = [ ];
-    bless $self, $class;
-    $self->set(@_) if @_;
-    return $self;
-}
-
-# Autoload methods go after =cut, and are processed by the autosplit program.
-
-END { UNLOAD () };
-
-1;
-__END__
-
-=head1 NAME
-
-Image::Magick - objected-oriented Perl interface to ImageMagick. Use it to read, manipulate, or write an image or image sequence from within a Perl script.
-
-=head1 SYNOPSIS
-
-  use Image::Magick;
-  $p = new Image::Magick;
-  $p->Read("imagefile");
-  $p->Set(attribute => value, ...)
-  ($a, ...) = $p->Get("attribute", ...)
-  $p->routine(parameter => value, ...)
-  $p->Mogrify("Routine", parameter => value, ...)
-  $p->Write("filename");
-
-=head1 DESCRIPTION
-
-This Perl extension allows the reading, manipulation and writing of
-a large number of image file formats using the ImageMagick library.
-It was originally developed to be used by CGI scripts for Web pages.
-
-A web page has been set up for this extension. See:
-
-	 file:///usr/local/share/doc/ImageMagick-7.0.0/www/perl-magick.html
-	 https://imagemagick.org/script/perl-magick.php
-
-If you have problems, go to
-
-   https://imagemagick.org/discourse-server/viewforum.php?f=7
-
-=head1 AUTHOR
-
-Kyle Shorter	magick-users@imagemagick.org
-
-=head1 BUGS
-
-Has all the bugs of ImageMagick and much, much more!
-
-=head1 SEE ALSO
-
-perl(1).
-
-=cut
diff --git a/configure b/configure
index 67ef26511..99bf7f9ac 100755
--- a/configure
+++ b/configure
@@ -1066,6 +1066,7 @@ MAGICK_TARGET_VENDOR
 MAGICK_TARGET_CPU
 CONFIGURE_ARGS
 DISTCHECK_CONFIG_FLAGS
+CONFIGURE_DEPENDENCIES
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -3774,6 +3775,7 @@ test -n "$target_alias" &&
   program_prefix=${target_alias}-


+
 am__api_version='1.16'

 # Find a good install program.  We prefer a C program (faster),
@@ -4460,6 +4462,7 @@ END
   fi
 fi

+
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
@@ -4499,6 +4502,8 @@ else
 fi
 AM_BACKSLASH='\'

+CONFIGURE_DEPENDENCIES="$CONFIGURE_DEPENDENCIES \$(top_srcdir)/ChangeLog \$(top_srcdir)/version.sh"
+

 #
 # Save initial user-tunable values
@@ -4565,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=58

 MAGICK_VERSION=7.0.10-58

-MAGICK_GIT_REVISION=18222:61a2a80af:20210109
+MAGICK_GIT_REVISION=18244:c41ba6aa2:20210113


 # Substitute library versioning
diff --git a/configure.ac b/configure.ac
index 75e91aff9..7bcf4fb5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,8 +63,11 @@ AC_CONFIG_HEADERS([config/config.h])
 AX_PREFIX_CONFIG_H([MagickCore/magick-baseconfig.h],[MagickCore])
 AC_CANONICAL_SYSTEM
 AC_CANONICAL_TARGET
+
 AM_INIT_AUTOMAKE([foreign no-define color-tests parallel-tests -Wall -Wno-portability subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip tar-ustar])
+
 AM_SILENT_RULES([yes])
+AC_SUBST([CONFIGURE_DEPENDENCIES],["$CONFIGURE_DEPENDENCIES \$(top_srcdir)/ChangeLog \$(top_srcdir)/version.sh"])

 #
 # Save initial user-tunable values