head 1.14; access; symbols pkgsrc-2018Q1:1.13.0.22 pkgsrc-2018Q1-base:1.13 pkgsrc-2017Q4:1.13.0.20 pkgsrc-2017Q4-base:1.13 pkgsrc-2017Q3:1.13.0.18 pkgsrc-2017Q3-base:1.13 pkgsrc-2017Q2:1.13.0.14 pkgsrc-2017Q2-base:1.13 pkgsrc-2017Q1:1.13.0.12 pkgsrc-2017Q1-base:1.13 pkgsrc-2016Q4:1.13.0.10 pkgsrc-2016Q4-base:1.13 pkgsrc-2016Q3:1.13.0.8 pkgsrc-2016Q3-base:1.13 pkgsrc-2016Q2:1.13.0.6 pkgsrc-2016Q2-base:1.13 pkgsrc-2016Q1:1.13.0.4 pkgsrc-2016Q1-base:1.13 pkgsrc-2015Q4:1.13.0.2 pkgsrc-2015Q4-base:1.13 pkgsrc-2015Q3:1.12.0.28 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.26 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.24 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.22 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.20 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.18 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.16 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.14 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.12 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.10 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.8 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.6 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.4 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.2 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.11.0.12 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.10 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.8 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.6 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.4 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.2 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q2:1.9.0.2 pkgsrc-2010Q2-base:1.9 pkgsrc-2009Q4:1.7.0.2 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.5.0.12 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.10 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.8 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.6 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.4 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.2 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.4.0.26 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.24 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.22 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.20 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.18 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.16 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.14 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.12 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.10 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.8 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.6 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.4 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.2 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.3.0.2 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2; locks; strict; comment @# @; 1.14 date 2018.05.11.12.55.28; author wiz; state dead; branches; next 1.13; commitid 2VQWD8m9WuHpzSBA; 1.13 date 2015.12.05.21.31.13; author adam; state Exp; branches; next 1.12; commitid NqfZnka9WpLYXNLy; 1.12 date 2012.05.07.08.40.08; author adam; state Exp; branches; next 1.11; 1.11 date 2010.10.25.19.06.11; author adam; state Exp; branches; next 1.10; 1.10 date 2010.07.04.05.36.49; author adam; state dead; branches; next 1.9; 1.9 date 2010.06.20.14.01.59; author wiz; state Exp; branches; next 1.8; 1.8 date 2010.06.13.22.44.32; author wiz; state Exp; branches; next 1.7; 1.7 date 2009.12.16.19.16.49; author drochner; state dead; branches; next 1.6; 1.6 date 2009.11.13.17.29.51; author drochner; state Exp; branches; next 1.5; 1.5 date 2007.10.25.21.07.02; author adam; state dead; branches; next 1.4; 1.4 date 2004.06.21.19.48.41; author adam; state Exp; branches; next 1.3; 1.3 date 2004.05.03.06.45.28; author adam; state Exp; branches; next 1.2; 1.2 date 98.04.15.20.48.13; author tron; state dead; branches; next 1.1; 1.1 date 98.02.03.10.17.06; author tron; state Exp; branches; next ; desc @@ 1.14 log @gimp: remove patch that is not in distinfo @ text @$NetBSD: patch-ad,v 1.13 2015/12/05 21:31:13 adam Exp $ Disable API deprecated in Mac OS X v10.5 or not available for 64-bit. --- plug-ins/twain/tw_mac.c.orig 2015-11-20 20:32:13.000000000 +0000 +++ plug-ins/twain/tw_mac.c @@@@ -193,10 +193,12 @@@@ static void twainSetupMacUI() /* Voodoo magic fix inspired by java_swt launcher */ /* Without this the icon setting doesn't work about half the time. */ +/* CGrafPtr p = BeginQDContextForApplicationDockTile(); EndQDContextForApplicationDockTile(p); SetApplicationDockTileImage (icon); +*/ } int @ 1.13 log @GIMP 2.8.16 Core: - Seek much less when writing XCF - Don't seek past the end of the file when writing XCF - Windows: call SetDLLDirectory() for less DLL hell - Fix velocity parameter on .GIH brushes - Fix brokenness while transforming certain sets of linked layers GUI: - Always show image tabs in single window mode - Fix switching of dock tabs by DND hovering - Don't make the scroll area for tags too small - Fixed a crash in the save dialog - Fix issue where ruler updates made things very slow on Windows Plug-ins: - Fix several issues in the BMP plug-in - Make Gfig work with the new brush size behavior again - Fix font export in the PDF plug-in - Support layer groups in OpenRaster files - Fix loading of PSD files with layer groups General: - OSX build system fixes - Bug fixes - Translation updates @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.12 2012/05/07 08:40:08 adam Exp $ @ 1.12 log @Changes 2.8.0: Core: - Add our own GimpOperationBrightnessContrast because GEGL one is different Plug-ins: - Fix some GFig rendering issues Source and build system: - Depend on Babl 0.1.10, GEGL 0.2.0 and some other new library versions General: - Bug fixes - Translation updates @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.11 2010/10/25 19:06:11 adam Exp $ d5 1 a5 1 --- plug-ins/twain/tw_mac.c.orig 2010-10-25 18:48:00.000000000 +0000 d7 1 a7 2 @@@@ -192,10 +192,12 @@@@ static void twainSetupMacUI() d10 2 a11 1 + /* d16 1 a16 1 + */ @ 1.11 log @Fixed buildling on MacOSX @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -193,10 +193,12 @@@@ static void twainSetupMacUI() @ 1.10 log @Changes 2.6.9: * Bugs fixed: - Font selection remains visible - gimp.desktop: image/x-psd in MimeTypes twice - Unportable test(1) construct in configure script - Description of "histogram" procedure is slightly inaccurate - Tool options not saved/loaded correctly? - Importing PDF files with long titles - blur-gauss-selective.exe crashes - Dialog of "Save as BMP" ignores changes which are not made with a mous - Text-Tool crashes when edit a 2.4.2 version xcf - Text-Tool crashes when edit a 2.4.2 version xcf - Layer preview suddenly stops getting updated - leaks shared memory - Exporting to Alias PIX format fails - a few strings in Save as... > Raw image data dialog are always in English - GEGL Operation "path" crashes GIMP - Crashes when using path tool - GIMP 2.7.0 fails to build against libpng 1.4.0 - Saving to .ppm fails on indexed colorspace - the "Antialiasing..." message in the progress bar does not show translated - gimp-layer-new-from-visible should work from updated projection * Updated and new translations @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.9 2010/06/20 14:01:59 wiz Exp $ d3 1 a3 1 https://bugzilla.gnome.org/show_bug.cgi?id=622198 d5 15 a19 19 --- plug-ins/file-ico/ico-load.c.orig 2009-07-20 20:20:51.000000000 +0000 +++ plug-ins/file-ico/ico-load.c @@@@ -287,14 +287,14 @@@@ ico_read_png (FILE *fp, switch (color_type) { case PNG_COLOR_TYPE_GRAY: - png_set_gray_1_2_4_to_8 (png_ptr); + png_set_expand_gray_1_2_4_to_8 (png_ptr); if ( bit_depth == 16 ) png_set_strip_16 (png_ptr); png_set_gray_to_rgb (png_ptr); png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); break; case PNG_COLOR_TYPE_GRAY_ALPHA: - png_set_gray_1_2_4_to_8 (png_ptr); + png_set_expand_gray_1_2_4_to_8 (png_ptr); if ( bit_depth == 16 ) png_set_strip_16 (png_ptr); png_set_gray_to_rgb (png_ptr); @ 1.9 log @Add bug report URL. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.8 2010/06/13 22:44:32 wiz Exp $ @ 1.8 log @Bump PKGREVISION for libpng shlib name change. Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x. @ text @d1 3 a3 1 $NetBSD$ @ 1.7 log @update to 2.6.8 changes: -bugfixes -translation updates @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2009/11/13 17:29:51 drochner Exp $ d3 4 a6 9 --- plug-ins/file-bmp/bmp-read.c.orig 2009-08-03 22:17:25.000000000 +0200 +++ plug-ins/file-bmp/bmp-read.c @@@@ -424,7 +424,8 @@@@ ReadBMP (const gchar *name, return -1; } - if (Bitmap_Head.biWidth < 0) + if (Bitmap_Head.biWidth < 0 || + ABS (Bitmap_Head.biHeight) < 0) d8 14 a21 21 g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), @@@@ -448,6 +449,18 @@@@ ReadBMP (const gchar *name, return -1; } + /* protect against integer overflows caused by malicious BMPs */ + + if (((guint64) Bitmap_Head.biWidth) * Bitmap_Head.biBitCnt > G_MAXINT32 || + ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) > G_MAXINT32 || + ((guint64) Bitmap_Head.biWidth) * ABS (Bitmap_Head.biHeight) * 4 > G_MAXINT32) + { + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("'%s' is not a valid BMP file"), + gimp_filename_to_utf8 (filename)); + return -1; + } + /* Windows and OS/2 declare filler so that rows are a multiple of * word length (32 bits == 4 bytes) */ @ 1.6 log @add patch from upstream CVS to fix possible integer overflow in BMP plugin (CVE-2009-1570) bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Changes 2.4.0: * Refreshed Look * Scalable Brushes * Selection Tools * Foreground Select Tool * Align Tool * Changes in menus * Improved display when zooming in or out @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4 2004/06/21 19:48:41 adam Exp $ d3 5 a7 4 --- app/base/cpu-accel.c.orig 2004-06-15 09:21:39.000000000 +0000 +++ app/base/cpu-accel.c @@@@ -395,7 +395,7 @@@@ arch_accel (void) canjump = 1; d9 9 a17 5 asm volatile ("mtspr 256, %0\n\t" - "vand %%v0, %%v0, %%v0" + "vand v0, v0, v0" : : "r" (-1)); d19 15 @ 1.4 log @Changes 2.0.2: - several build fixes (#140115, #142907, #143069) - allow plug-ins to register menu entries from within init() (#139969) - fixed focus issues with tool dialogs (#139349) - allow to load grayscale TGA files - a couple of string and i18n fixes (#140296, #140039, #137036, #142996) - fixed crash in template editor (#140315) - fixed crash in IWarp plug-in (#140554) - fixed snap to guides (#140649) - made the PNG plug-in handle empty colormaps (#142029) - fixed bug in text editor dialog (#141792) - fixed Old Photo script-fu (#142326) - fixed glitch in the Curves tool dialog (#142506) - don't allow tablet pressure to become negative (#123811) - improved range of tablet pressure values (#142808) - better defaults for tablet pressure (#143626) - fixed use of screen color picker with XInput devices (#143166) - actually return values from the run function of Python scripts (#141338) - documentation fixes (#142618) - fixed bug in the save routine of the TIFF plug-in (#143522) - don't let Curve Bend silently apply the layer mask (#134748) - fixed bug in Blur plug-in (#142318) - fixed mask offsets after crop operations (#143860) - let extensions run synchronously when called via PDB (#140112) - updated (and some new) translations @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Fix building and enable AltiVec support on Darwin/MacOSX @ text @d3 1 a3 1 --- app/base/cpu-accel.c.orig Sun May 2 23:15:36 2004 d5 1 a5 1 @@@@ -366,7 +366,7 @@@@ arch_accel (void) d9 4 a12 4 - "vand %%v0, %%v0, %%v0" + "vand v0, v0, v0" : : "r" (-1)); @ 1.2 log @Update to "gimp-0.99.26" using changes supplied by Bernd Sieker. @ text @d1 6 a6 10 --- plug-ins/gimptcl/gtclMain.c.orig Thu Jan 29 01:34:18 1998 +++ plug-ins/gimptcl/gtclMain.c Thu Jan 29 01:35:15 1998 @@@@ -29,8 +29,8 @@@@ #include #include #include -#include -#include +#include +#include d8 5 a12 1 #include "gtcl.h" @ 1.1 log @Initial import of gimp-0.99.18 package made by Bernd Sieker. @ text @@