Hello community, here is the log from the commit of package perl-GD for openSUSE:Factory checked in at Fri May 20 15:10:28 CEST 2011.
-------- --- perl-GD/perl-GD.changes 2010-12-01 14:45:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-GD/perl-GD.changes 2011-05-03 10:37:43.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 3 08:13:42 UTC 2011 - vci...@novell.com + +- update to 2.46 + Added a basic "use" test for GD::Simple + Corrected license to GPL+ or Artistic + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- GD-2.45.tar.bz2 New: ---- GD-2.46.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-GD.spec ++++++ --- /var/tmp/diff_new_pack.5VN6yK/_old 2011-05-20 15:09:50.000000000 +0200 +++ /var/tmp/diff_new_pack.5VN6yK/_new 2011-05-20 15:09:50.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-GD (Version 2.45) +# spec file for package perl-GD # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: perl-GD %define cpan_name GD Summary: Interface to Gd Graphics Library -Version: 2.45 -Release: 2 -License: MIT License (or similar) +Version: 2.46 +Release: 1 +License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/GD AutoReqProv: on ++++++ GD-2.45.tar.bz2 -> GD-2.46.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/ChangeLog new/GD-2.46/ChangeLog --- old/GD-2.45/ChangeLog 2010-04-30 20:47:06.000000000 +0200 +++ new/GD-2.46/ChangeLog 2011-05-01 19:44:50.000000000 +0200 @@ -1,3 +1,4 @@ +2.46 Added a basic "use" test for GD::Simple 2.45 Clarified the GD license. There is now a formal LICENSE file in the package. 2.44 GD::Group now installed properly. Quenched compiler warning caused by Newxs() calls. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/GD/Simple.pm new/GD-2.46/GD/Simple.pm --- old/GD-2.45/GD/Simple.pm 2008-12-21 17:51:29.000000000 +0100 +++ new/GD-2.46/GD/Simple.pm 2011-02-05 21:47:32.000000000 +0100 @@ -308,6 +308,8 @@ $self->moveTo(@_); } +=item $img->line($x1,$y1,$x2,$y2 [,$color]) + =item $img->line($dx,$dy) =item $img->line($dr) @@ -318,15 +320,25 @@ called with one argument, it draws a line $dr pixels long along the angle defined by the current pen angle. +When called with four or five arguments, line() behaves like +GD::Image->line(). + =cut sub line { my $self = shift; - croak 'Usage GD::Simple->line($dx,$dy) or line($r)' unless @_ >= 1; + + if (@_ >= 4) { + my ($x1,$x2,$y1,$y2,$color) = @_; + $color ||= $self->fgcolor; + return $self->gd->line($x1,$x2,$y1,$y2,$color); + } + + croak 'Usage GD::Simple->line($dx,$dy) or line($r) or line($x1,$y1,$x2,$y2 [,$color])' unless @_ >= 1; my @curPos = $self->curPos; $self->move(@_); my @newPos = $self->curPos; - $self->gd->line(@curPos,@newPos,$self->fgcolor); + return $self->gd->line(@curPos,@newPos,$self->fgcolor); } =item $img->clear @@ -353,6 +365,9 @@ sub rectangle { my $self = shift; + + return $self->gd->rectangle(@_) if @_ == 5; + croak 'Usage GD::Simple->rectangle($x1,$y1,$x2,$y2)' unless @_ == 4; my $gd = $self->gd; my ($bg,$fg) = ($self->bgcolor,$self->fgcolor); @@ -372,6 +387,8 @@ sub ellipse { my $self = shift; + return $self->gd->ellipse(@_) if @_ == 5; + croak 'Usage GD::Simple->ellipse($width,$height)' unless @_ == 2; my $gd = $self->gd; my ($bg,$fg) = ($self->bgcolor,$self->fgcolor); @@ -390,6 +407,8 @@ sub arc { my $self = shift; + return $self->gd->arc(@_) if @_ == 7; + croak 'Usage GD::Simple->arc($width,$height,$start,$end,$style)' unless @_ >= 4; my ($width,$height,$start,$end,$style) = @_; my $gd = $self->gd; @@ -465,6 +484,8 @@ sub string { my $self = shift; + return $self->gd->string(@_) if @_ == 5; + my $string = shift; my $font = $self->font; my @bounds; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/GD.pm new/GD-2.46/GD.pm --- old/GD-2.45/GD.pm 2010-04-30 20:46:47.000000000 +0200 +++ new/GD-2.46/GD.pm 2011-05-01 19:44:27.000000000 +0200 @@ -16,7 +16,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $AUTOLOAD); -$VERSION = '2.45'; +$VERSION = '2.46'; @ISA = qw(Exporter DynaLoader); # Items to export into callers namespace by default. Note: do not export diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/GD.xs new/GD-2.46/GD.xs --- old/GD-2.45/GD.xs 2009-04-24 22:35:44.000000000 +0200 +++ new/GD-2.46/GD.xs 2009-01-12 02:39:31.000000000 +0100 @@ -10,6 +10,8 @@ #include <gdfontmb.h> #include <gdfonts.h> #include <gdfontt.h> +#include <errno.h> + #ifdef FCGI #include <fcgi_stdio.h> #else @@ -431,7 +433,7 @@ static gdIOCtx* newDynamicCtx (char* data, int length) { bufIOCtxPtr ctx; - Newz(0,ctx,1,bufIOCtx); + Newxz(ctx,1,bufIOCtx); if (ctx == NULL) return NULL; ctx->data = data; ctx->pos = 0; @@ -920,7 +922,8 @@ if (cloning) XSRETURN_UNDEF; data = (void*) SvPV(serialized,length); image = gdImageCreateFromGd2Ptr(length,data); - sv_setiv(SvRV(object),(int)image); +/* sv_setiv(SvRV(object),(int)image); */ + sv_setiv(SvRV(object),(long int)image); } #ifdef HAVE_PNG @@ -2397,19 +2400,19 @@ croak("safemalloc() returned NULL while trying to allocate font struct.\n"); /* read header from font - note that the file is assumed to be littleendian*/ if (read(fontfile,word,4) < 4) - croak(strerror(errno)); + croak("error while reading font file: %s",strerror(errno)); font->nchars = littleendian(word); if (read(fontfile,word,4) < 4) - croak(strerror(errno)); + croak("error while reading font file: %s",strerror(errno)); font->offset = littleendian(word); if (read(fontfile,word,4) < 4) - croak(strerror(errno)); + croak("error while reading font file: %s",strerror(errno)); font->w = littleendian(word); if (read(fontfile,word,4) < 4) - croak(strerror(errno)); + croak("error while reading font file: %s",strerror(errno)); font->h = littleendian(word); datasize = font->nchars * font->w * font->h; @@ -2418,7 +2421,7 @@ croak("safemalloc() returned NULL while trying to allocate font bitmap.\n"); if (read(fontfile,fontdata,datasize) < datasize) - croak(strerror(errno)); + croak("error while reading font file: %s",strerror(errno)); font->data = fontdata; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/LICENSE new/GD-2.46/LICENSE --- old/GD-2.45/LICENSE 2010-04-30 20:45:16.000000000 +0200 +++ new/GD-2.46/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,446 +0,0 @@ -This package and its accompanying libraries is free software; you may -redistribute it and/or modify it under the terms of either of these -licenses: - -a) the GNU General Public License as published by the Free - Software Foundation; either version 1, or (at your option) any - later version, or -b) the "Artistic License 2.0" - ----------------------------------------------------------------------------- - -The General Public License (GPL) -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, -Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute -verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share -and change it. By contrast, the GNU General Public License is intended to -guarantee your freedom to share and change free software--to make sure the -software is free for all its users. This General Public License applies to most of -the Free Software Foundation's software and to any other program whose -authors commit to using it. (Some other Free Software Foundation software is -covered by the GNU Library General Public License instead.) You can apply it to -your programs, too. - -When we speak of free software, we are referring to freedom, not price. Our -General Public Licenses are designed to make sure that you have the freedom -to distribute copies of free software (and charge for this service if you wish), that -you receive source code or can get it if you want it, that you can change the -software or use pieces of it in new free programs; and that you know you can do -these things. - -To protect your rights, we need to make restrictions that forbid anyone to deny -you these rights or to ask you to surrender the rights. These restrictions -translate to certain responsibilities for you if you distribute copies of the -software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a -fee, you must give the recipients all the rights that you have. You must make -sure that they, too, receive or can get the source code. And you must show -them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the software, and (2) offer -you this license which gives you legal permission to copy, distribute and/or -modify the software. - -Also, for each author's protection and ours, we want to make certain that -everyone understands that there is no warranty for this free software. If the -software is modified by someone else and passed on, we want its recipients to -know that what they have is not the original, so that any problems introduced by -others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish -to avoid the danger that redistributors of a free program will individually obtain -patent licenses, in effect making the program proprietary. To prevent this, we -have made it clear that any patent must be licensed for everyone's free use or -not licensed at all. - -The precise terms and conditions for copying, distribution and modification -follow. - -GNU GENERAL PUBLIC LICENSE -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND -MODIFICATION - -0. This License applies to any program or other work which contains a notice -placed by the copyright holder saying it may be distributed under the terms of -this General Public License. The "Program", below, refers to any such program -or work, and a "work based on the Program" means either the Program or any -derivative work under copyright law: that is to say, a work containing the -Program or a portion of it, either verbatim or with modifications and/or translated -into another language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by -this License; they are outside its scope. The act of running the Program is not -restricted, and the output from the Program is covered only if its contents -constitute a work based on the Program (independent of having been made by -running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the Program's source code as -you receive it, in any medium, provided that you conspicuously and appropriately -publish on each copy an appropriate copyright notice and disclaimer of warranty; -keep intact all the notices that refer to this License and to the absence of any -warranty; and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at -your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus -forming a work based on the Program, and copy and distribute such -modifications or work under the terms of Section 1 above, provided that you also -meet all of these conditions: - -a) You must cause the modified files to carry prominent notices stating that you -changed the files and the date of any change. - -b) You must cause any work that you distribute or publish, that in whole or in -part contains or is derived from the Program or any part thereof, to be licensed -as a whole at no charge to all third parties under the terms of this License. - -c) If the modified program normally reads commands interactively when run, you -must cause it, when started running for such interactive use in the most ordinary -way, to print or display an announcement including an appropriate copyright -notice and a notice that there is no warranty (or else, saying that you provide a -warranty) and that users may redistribute the program under these conditions, -and telling the user how to view a copy of this License. (Exception: if the -Program itself is interactive but does not normally print such an announcement, -your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable -sections of that work are not derived from the Program, and can be reasonably -considered independent and separate works in themselves, then this License, -and its terms, do not apply to those sections when you distribute them as -separate works. But when you distribute the same sections as part of a whole -which is a work based on the Program, the distribution of the whole must be on -the terms of this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to -work written entirely by you; rather, the intent is to exercise the right to control -the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the -Program (or with a work based on the Program) on a volume of a storage or -distribution medium does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based on it, under -Section 2) in object code or executable form under the terms of Sections 1 and 2 -above provided that you also do one of the following: - -a) Accompany it with the complete corresponding machine-readable source -code, which must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange; or, - -b) Accompany it with a written offer, valid for at least three years, to give any -third party, for a charge no more than your cost of physically performing source -distribution, a complete machine-readable copy of the corresponding source -code, to be distributed under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - -c) Accompany it with the information you received as to the offer to distribute -corresponding source code. (This alternative is allowed only for noncommercial -distribution and only if you received the program in object code or executable -form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making -modifications to it. For an executable work, complete source code means all the -source code for all modules it contains, plus any associated interface definition -files, plus the scripts used to control compilation and installation of the -executable. However, as a special exception, the source code distributed need -not include anything that is normally distributed (in either source or binary form) -with the major components (compiler, kernel, and so on) of the operating system -on which the executable runs, unless that component itself accompanies the -executable. - -If distribution of executable or object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the source -code from the same place counts as distribution of the source code, even though -third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as -expressly provided under this License. Any attempt otherwise to copy, modify, -sublicense or distribute the Program is void, and will automatically terminate -your rights under this License. However, parties who have received copies, or -rights, from you under this License will not have their licenses terminated so long -as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. -However, nothing else grants you permission to modify or distribute the Program -or its derivative works. These actions are prohibited by law if you do not accept -this License. Therefore, by modifying or distributing the Program (or any work -based on the Program), you indicate your acceptance of this License to do so, -and all its terms and conditions for copying, distributing or modifying the -Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), -the recipient automatically receives a license from the original licensor to copy, -distribute or modify the Program subject to these terms and conditions. You -may not impose any further restrictions on the recipients' exercise of the rights -granted herein. You are not responsible for enforcing compliance by third parties -to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement -or for any other reason (not limited to patent issues), conditions are imposed on -you (whether by court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the conditions of this -License. If you cannot distribute so as to satisfy simultaneously your obligations -under this License and any other pertinent obligations, then as a consequence -you may not distribute the Program at all. For example, if a patent license would -not permit royalty-free redistribution of the Program by all those who receive -copies directly or indirectly through you, then the only way you could satisfy -both it and this License would be to refrain entirely from distribution of the -Program. - -If any portion of this section is held invalid or unenforceable under any particular -circumstance, the balance of the section is intended to apply and the section as -a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other -property right claims or to contest validity of any such claims; this section has -the sole purpose of protecting the integrity of the free software distribution -system, which is implemented by public license practices. Many people have -made generous contributions to the wide range of software distributed through -that system in reliance on consistent application of that system; it is up to the -author/donor to decide if he or she is willing to distribute software through any -other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a -consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries -either by patents or by copyrighted interfaces, the original copyright holder who -places the Program under this License may add an explicit geographical -distribution limitation excluding those countries, so that distribution is permitted -only in or among countries not thus excluded. In such case, this License -incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the -General Public License from time to time. Such new versions will be similar in -spirit to the present version, but may differ in detail to address new problems or -concerns. - -Each version is given a distinguishing version number. If the Program specifies a -version number of this License which applies to it and "any later version", you -have the option of following the terms and conditions either of that version or of -any later version published by the Free Software Foundation. If the Program does -not specify a version number of this License, you may choose any version ever -published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs -whose distribution conditions are different, write to the author to ask for -permission. For software which is copyrighted by the Free Software Foundation, -write to the Free Software Foundation; we sometimes make exceptions for this. -Our decision will be guided by the two goals of preserving the free status of all -derivatives of our free software and of promoting the sharing and reuse of -software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS -NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE -COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE -ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, -YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR -CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED -TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY -WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS -PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM -(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY -OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - - ----------------------------------------------------------------------------- -Artistic License 2.0 - -Copyright (c) 2000-2006, The Perl Foundation. - -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. - - -Preamble -This license establishes the terms under which a given free software Package may -be copied, modified, distributed, and/or redistributed. The intent is that the -Copyright Holder maintains some artistic control over the development of that -Package while still keeping the Package available as open source and free -software. - -You are always permitted to make arrangements wholly outside of this license -directly with the Copyright Holder of a given Package. If the terms of this -license do not permit the full use that you propose to make of the Package, you -should contact the Copyright Holder and seek a different licensing arrangement. - - -Definitions -"Copyright Holder" means the individual(s) or organization(s) named in the -copyright notice for the entire Package. - -"Contributor" means any party that has contributed code or other material to the -Package, in accordance with the Copyright Holder's procedures. - -"You" and "your" means any person who would like to copy, distribute, or modify -the Package. - -"Package" means the collection of files distributed by the Copyright Holder, and -derivatives of that collection and/or of those files. A given Package may -consist of either the Standard Version, or a Modified Version. - -"Distribute" means providing a copy of the Package or making it accessible to -anyone else, or in the case of a company or organization, to others outside of -your company or organization. - -"Distributor Fee" means any fee that you charge for Distributing this Package or -providing support for this Package to another party. It does not mean licensing -fees. - -"Standard Version" refers to the Package if it has not been modified, or has -been modified only in ways explicitly requested by the Copyright Holder. - -"Modified Version" means the Package, if it has been changed, and such changes -were not explicitly requested by the Copyright Holder. - -"Original License" means this Artistic License as Distributed with the Standard -Version of the Package, in its current version or as it may be modified by The -Perl Foundation in the future. - -"Source" form means the source code, documentation source, and configuration -files for the Package. - -"Compiled" form means the compiled bytecode, object code, binary, or any other -form resulting from mechanical transformation or translation of the Source form. - - -Permission for Use and Modification Without Distribution -(1) You are permitted to use the Standard Version and create and use Modified -Versions for any purpose without restriction, provided that you do not -Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version -(2) You may Distribute verbatim copies of the Source form of the Standard -Version of this Package in any medium without restriction, either gratis or for -a Distributor Fee, provided that you duplicate all of the original copyright -notices and associated disclaimers. At your discretion, such verbatim copies may -or may not include a Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other modifications -made available from the Copyright Holder. The resulting Package will still be -considered the Standard Version, and as such will be subject to the Original -License. - - -Distribution of Modified Versions of the Package as Source -(4) You may Distribute your Modified Version as Source (either gratis or for a -Distributor Fee, and with or without a Compiled form of the Modified Version) -provided that you clearly document how it differs from the Standard Version, -including, but not limited to, documenting any non-standard features, -executables, or modules, and provided that you do at least ONE of the -following: - -(a) make the Modified Version available to the Copyright Holder of the Standard -Version, under the Original License, so that the Copyright Holder may include -your modifications in the Standard Version. -(b) ensure that installation of your Modified Version does not prevent the user -installing or running the Standard Version. In addition, the Modified Version -must bear a name that is different from the name of the Standard Version. -(c) allow anyone who receives a copy of the Modified Version to make the Source -form of the Modified Version available to others under -(i) the Original License or -(ii) a license that permits the licensee to freely copy, modify and redistribute -the Modified Version using the same licensing terms that apply to the copy that -the licensee received, and requires that the Source form of the Modified -Version, and of any works derived from it, be made freely available in that -license fees are prohibited but Distributor Fees are allowed. - -Distribution of Compiled Forms of the Standard Version or Modified Versions -without the Source - -(5) You may Distribute Compiled forms of the Standard Version without the -Source, provided that you include complete instructions on how to get the -Source of the Standard Version. Such instructions must be valid at the time of -your distribution. If these instructions, at any time while you are carrying out -such distribution, become invalid, you must provide new instructions on demand -or cease further distribution. If you provide valid instructions or cease -distribution within thirty days after you become aware that the instructions are -invalid, then you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without the Source, -provided that you comply with Section 4 with respect to the Source of the -Modified Version. - - -Aggregating or Linking the Package -(7) You may aggregate the Package (either the Standard Version or Modified -Version) with other packages and Distribute the resulting aggregation provided -that you do not charge a licensing fee for the Package. Distributor Fees are -permitted, and licensing fees for other components in the aggregation are -permitted. The terms of this license apply to the use and Distribution of the -Standard or Modified Versions as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with other works, -to embed the Package in a larger work of your own, or to build stand-alone -binary or bytecode versions of applications that include the Package, and -Distribute the result without restriction, provided the result does not expose a -direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version -(9) Works (including, but not limited to, modules and scripts) that merely -extend or make use of the Package, do not, by themselves, cause the Package to -be a Modified Version. In addition, such works are not considered parts of the -Package itself, and are not subject to the terms of this license. - - -General Provisions -(10) Any use, modification, and distribution of the Standard or Modified -Versions is governed by this Artistic License. By using, modifying or -distributing the Package, you accept this license. Do not use, modify, or -distribute the Package, if you do not accept this license. - -(11) If your Modified Version has been derived from a Modified Version made by -someone other than you, you are nevertheless required to ensure that your -Modified Version complies with the requirements of this license. - -(12) This license does not grant you the right to use any trademark, service -mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, free-of-charge patent -license to make, have made, use, offer to sell, sell, import and otherwise -transfer the Package with respect to any patent claims licensable by the -Copyright Holder that are necessarily infringed by the Package. If you institute -patent litigation (including a cross-claim or counterclaim) against any party -alleging that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the date that -such litigation is filed. - -(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND -CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. -UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY -OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/MANIFEST new/GD-2.46/MANIFEST --- old/GD-2.45/MANIFEST 2010-04-30 20:45:24.000000000 +0200 +++ new/GD-2.46/MANIFEST 2011-05-01 19:40:58.000000000 +0200 @@ -12,10 +12,8 @@ README README.QUICKDRAW README.unix -LICENSE bdf_scripts/README bdf_scripts/bdf2gdfont.PLS -bdf_scripts/bdf2gdfont.pl bdf_scripts/bdftogd demos/brushes.pl demos/copies.pl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/META.yml new/GD-2.46/META.yml --- old/GD-2.45/META.yml 2010-04-30 20:49:02.000000000 +0200 +++ new/GD-2.46/META.yml 2011-05-01 19:45:05.000000000 +0200 @@ -1,14 +1,22 @@ --- #YAML:1.0 -name: GD -version: 2.45 -abstract: Interface to Gd Graphics Library -license: ~ -author: +name: GD +version: 2.46 +abstract: Interface to Gd Graphics Library +author: - Lincoln Stein (lst...@cshl.org) -generated_by: ExtUtils::MakeMaker version 6.42 -distribution_type: module -requires: - Math::Trig: 0 +license: unknown +distribution_type: module +configure_requires: + ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 +requires: + Math::Trig: 0 +no_index: + directory: + - t + - inc +generated_by: ExtUtils::MakeMaker version 6.55_02 meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.3.html - version: 1.3 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/bdf_scripts/bdf2gdfont.pl new/GD-2.46/bdf_scripts/bdf2gdfont.pl --- old/GD-2.45/bdf_scripts/bdf2gdfont.pl 2010-04-30 20:48:54.000000000 +0200 +++ new/GD-2.46/bdf_scripts/bdf2gdfont.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,189 +0,0 @@ -#!/usr/bin/perl - -# -# Simple convertor from bdf to loadable GD font format. -# -# Author: Lincoln Stein <lst...@cshl.edu>, heavily adopted from bdftogd from -# Jan Pazdziora <adel...@fi.muni.cz> -# -# Example of use: -# fstobdf -s fontserverhost:7100 -fn 8x16 | bdftofnt > myfont.fnt -# - -use strict; -our $VERSION = '1.00'; - -if ($ARGV[0] =~ /^--?h/) { - exec "perldoc $0"; -} - -my ($width, $height); -my (@data, @left, @bottom); -my ($globalleft, $globaltop); - -my ($minchar, $maxchar); - -my ($copyright, $fontdef); - -my $currentchar; -my $gobitmap = 0; - -foreach (@ARGV) { - $_ = "gunzip -c $_ |" if /\.gz$/; -} - -while (<>) - { - chomp; - s/\r$//; - next unless $_; - my ($tag, $value) = split / /, $_, 2; - die "Font is not fixed width\n" - if $tag eq 'SPACING' and not $value =~ /[CM]/i; - - $currentchar = $value if $tag eq 'ENCODING'; - $minchar = $currentchar if not defined $minchar - or ($currentchar < $minchar && $currentchar >= 0); - $maxchar = $currentchar if not defined $maxchar - or ($currentchar > $maxchar && $currentchar >= 0); - - if ($tag eq 'ENDCHAR') - { - next if $currentchar < 0; - $gobitmap = 0; - my $bottom = $globaltop - $bottom[$currentchar]; - - - if ($bottom > 0) - { $data[$currentchar] = substr $data[$currentchar], 0, length($data[$currentchar]) - $bottom * $width; } - else - { $data[$currentchar] .= '0' x (-$bottom * $width); } - } - - if ($tag eq 'FONTBOUNDINGBOX') - { - my ($tag, $wid, $hei, $left, $top) = split / /; - if (defined $top) - { - $globalleft = $left; - $globaltop = $top; - $height = $hei; - $width = $wid; - } - } - if ($tag eq 'FONT' and not defined $fontdef) - { $fontdef = $value; } - if ($tag eq 'COPYRIGHT' and not defined $copyright) - { $copyright = $value; } - - if ($tag eq 'BBX') - { - my ($tag, $wid, $hei, $left, $bottom) = split / /; - if (defined $bottom) - { - $left[$currentchar] = $left; - $bottom[$currentchar] = $bottom; - } - } - - if ($gobitmap) - { - my $value = pack 'H*', $_; - my $bits = unpack 'B*', $value; - $bits = ('0' x $left[$currentchar]) . $bits; - $bits .= '0' x ($width - length $bits); - $bits = substr $bits, 0, $width; - $data[$currentchar] .= $bits; - } - - if ($tag eq 'BITMAP') - { - $gobitmap = 1; - $data[$currentchar] = ''; - } - } - -$minchar = 0 unless defined $minchar; -$maxchar = 255 unless defined $maxchar; - -binmode STDOUT; # for DOS/Windows systems -my $length = $maxchar-$minchar+1; - - -print pack ('VVVV',$length,$minchar,$width,$height); # header - -for (my $i = $minchar; $i <= $maxchar; $i++) { - $data[$i] = '' unless defined $data[$i]; - $data[$i] = '0' x ($width * $height - length $data[$i]) . $data[$i]; - print pack('C*',split '',$data[$i]); -} - -print STDERR "Successfully converted $length ${width}x$}height} characters\n"; - -__END__ - -=head1 NAME - -bdf2gdfont.pl - Convert X11 "BDF" fonts into a loadable font format for GD. - -=head1 SYNOPSIS - - % bdf2gdfont.pl courR12.bdf > courR12.fnt - -=head1 DESCRIPTION - -This script converts BDF-style X11 font files into a format that can -be loaded by the GD module using the GD::Font->load() method. There -are a number of ways to obtain BDF fonts. - -=over 4 - -=item 1. The font is already present on your system. - -Some BDF fonts can be found in the standard X11R6 distribution. This -script will automatically uncompress gzipped font files if their -extension ends with .gz (the gunzip program must be on your path). - -=item 2. From a font server. - -The "fstobdf" utility, a standard X11 utility, will read a named font -from the font server of your choice and return it in BDF format. You -can pipe it to bdf2gdfont.pl: - - fstobdf -s fontserverhost:7100 -fn 8x16 | bdf2gdfont.pl > newfont.fnt - -Use xlsfonts to find out what fonts are available. Most fonts will -have long names like --B&H-LucidaTypewriter-Bold-R-Normal-Sans-18-180-75-75-M-110-ISO8859-10. - -=item 3. Using the pcf2bdf utility. - -Some fonts are only available in PCF (compiled) format. To obtain -these, you can either turn on a font server and follow recipe (2), or -use TAGA Nayuta's pcf2bdf utility. This utility is available from -http://www.tsg.ne.jp/GANA/S/pcf2bdf/ (page is in Japanese, but you can -find the download link). - -=back - -=head2 Limitations - -This font converter only works with fixed-width fonts. If used with a -TrueType or proportional font it will die with an error message. - -=head1 SEE ALSO - -L<GD> - -=head1 AUTHOR - -Lincoln Stein <lst...@cshl.org>, heavily adapted from bdftogd from -Jan Pazdziora <adel...@fi.muni.cz>. - -Copyright (c) 2004 Cold Spring Harbor Laboratory - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. - -=cut - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/qd.pl new/GD-2.46/qd.pl --- old/GD-2.45/qd.pl 2001-12-07 00:25:48.000000000 +0100 +++ new/GD-2.46/qd.pl 2001-12-07 00:25:48.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -# $Id: qd.pl,v 1.1.1.1 2001/12/06 23:25:48 lstein Exp $ +# $Id: qd.pl,v 1.1.1.1 2001-12-06 23:25:48 lstein Exp $ # This is a package of routines that let you create Macintosh # PICT files from within perl. It implements a subset of Quickdraw diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/GD-2.45/t/GD.t new/GD-2.46/t/GD.t --- old/GD-2.45/t/GD.t 2005-03-09 21:56:28.000000000 +0100 +++ new/GD-2.46/t/GD.t 2011-05-01 19:43:22.000000000 +0200 @@ -12,6 +12,7 @@ END {print "not ok 1\n" unless $loaded;} use GD qw(:DEFAULT GD_CMP_IMAGE); +use GD::Simple; $loaded++; if ($suffix = $ENV{GDIMAGETYPE}) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org