Reimport gwenview 1.4.2nb15 as gwenview-kde3

6 files changed, 297 insertions, 0 deletions

diff --git a/graphics/gwenview-kde3/DESCR b/graphics/gwenview-kde3/DESCR
new file mode 100644
index 00000000000..50bcc86e9cf
--- /dev/null
+++ b/graphics/gwenview-kde3/DESCR
@@ -0,0 +1,2 @@
+Gwenview is an very powerful image viewer for KDE whose aims
+are ease of use and speed.
diff --git a/graphics/gwenview-kde3/Makefile b/graphics/gwenview-kde3/Makefile
new file mode 100644
index 00000000000..4088e4bd296
--- /dev/null
+++ b/graphics/gwenview-kde3/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1.1.1 2012/03/19 23:19:05 markd Exp $
+#
+
+DISTNAME=	gwenview-1.4.2
+PKGREVISION=	15
+CATEGORIES=	kde graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwenview/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	ianzag@mail.ru
+HOMEPAGE=	http://gwenview.sourceforge.net/
+COMMENT=	Image viewer for KDE whose aims are ease of use and speed
+LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=	gmake pkg-config msgfmt perl
+USE_LANGUAGES=	c c++
+USE_LIBTOOL=	YES
+GNU_CONFIGURE=	YES
+SET_LIBDIR=	YES
+
+# Enable kipi (KDE Image Plugin Interface)
+CONFIGURE_ARGS+=	--enable-kipi
+
+SHLIBTOOL_OVERRIDE=	# empty
+
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/exiv2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libkipi-kde3/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gwenview-kde3/PLIST b/graphics/gwenview-kde3/PLIST
new file mode 100644
index 00000000000..19e9a3ab736
--- /dev/null
+++ b/graphics/gwenview-kde3/PLIST
@@ -0,0 +1,96 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/19 23:19:06 markd Exp $
+bin/gwenview
+lib/kde3/gwenview.la
+lib/kde3/libgvdirpart.la
+lib/kde3/libgvimagepart.la
+lib/libgwenviewcore.la
+lib/libkdeinit_gwenview.la
+man/man1/gwenview.1
+share/applications/kde/gwenview.desktop
+share/doc/kde/HTML/en/gwenview/browse_mode.png
+share/doc/kde/HTML/en/gwenview/common
+share/doc/kde/HTML/en/gwenview/dock_grip.png
+share/doc/kde/HTML/en/gwenview/docked_windows.docbook
+share/doc/kde/HTML/en/gwenview/external_tools.docbook
+share/doc/kde/HTML/en/gwenview/external_tools_dialog.png
+share/doc/kde/HTML/en/gwenview/index.cache.bz2
+share/doc/kde/HTML/en/gwenview/index.docbook
+share/doc/kde/HTML/en/gwenview/interface.docbook
+share/doc/kde/HTML/en/gwenview/introduction.docbook
+share/doc/kde/HTML/en/gwenview/keybindings.docbook
+share/doc/kde/HTML/en/gwenview/mouse.docbook
+share/doc/kde/HTML/en/gwenview/view_mode.png
+share/icons/crystalsvg/16x16/apps/gvdirpart.png
+share/icons/crystalsvg/22x22/apps/gvdirpart.png
+share/icons/crystalsvg/32x32/apps/gvdirpart.png
+share/icons/crystalsvg/scalable/apps/gvdirpart.svg
+share/icons/hicolor/128x128/apps/gwenview.png
+share/icons/hicolor/16x16/apps/gvdirpart.png
+share/icons/hicolor/16x16/apps/gwenview.png
+share/icons/hicolor/22x22/apps/gvdirpart.png
+share/icons/hicolor/22x22/apps/gwenview.png
+share/icons/hicolor/32x32/apps/gvdirpart.png
+share/icons/hicolor/32x32/apps/gwenview.png
+share/icons/hicolor/48x48/apps/gwenview.png
+share/icons/hicolor/64x64/apps/gwenview.png
+share/icons/hicolor/scalable/apps/gvdirpart.svg
+share/icons/hicolor/scalable/apps/gwenview.svgz
+share/kde/apps/gvdirpart/gvdirpart.rc
+share/kde/apps/gvimagepart/gvimagepart.rc
+share/kde/apps/gvimagepart/gvimagepartpopup.rc
+share/kde/apps/gwenview/cursors/zoom.png
+share/kde/apps/gwenview/gwenviewui.rc
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd1.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd2.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd3.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd4.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd5.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd6.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd7.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/dnd8.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/flip.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/mirror.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/rotate_left.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/rotate_right.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/slideshow_pause.png
+share/kde/apps/gwenview/icons/hicolor/16x16/actions/slideshow_play.png
+share/kde/apps/gwenview/icons/hicolor/22x22/actions/flip.png
+share/kde/apps/gwenview/icons/hicolor/22x22/actions/mirror.png
+share/kde/apps/gwenview/icons/hicolor/22x22/actions/rotate_left.png
+share/kde/apps/gwenview/icons/hicolor/22x22/actions/rotate_right.png
+share/kde/apps/gwenview/icons/hicolor/22x22/actions/slideshow_pause.png
+share/kde/apps/gwenview/icons/hicolor/22x22/actions/slideshow_play.png
+share/kde/apps/gwenview/icons/hicolor/32x32/actions/flip.png
+share/kde/apps/gwenview/icons/hicolor/32x32/actions/mirror.png
+share/kde/apps/gwenview/icons/hicolor/32x32/actions/rotate_left.png
+share/kde/apps/gwenview/icons/hicolor/32x32/actions/rotate_right.png
+share/kde/apps/gwenview/icons/hicolor/32x32/actions/slideshow_pause.png
+share/kde/apps/gwenview/icons/hicolor/32x32/actions/slideshow_play.png
+share/kde/apps/gwenview/icons/hicolor/48x48/actions/flip.png
+share/kde/apps/gwenview/icons/hicolor/48x48/actions/mirror.png
+share/kde/apps/gwenview/icons/hicolor/48x48/actions/rotate_left.png
+share/kde/apps/gwenview/icons/hicolor/48x48/actions/rotate_right.png
+share/kde/apps/gwenview/icons/hicolor/48x48/actions/slideshow_pause.png
+share/kde/apps/gwenview/icons/hicolor/48x48/actions/slideshow_play.png
+share/kde/apps/gwenview/icons/hicolor/scalable/actions/slideshow_pause.svgz
+share/kde/apps/gwenview/icons/hicolor/scalable/actions/slideshow_play.svgz
+share/kde/apps/gwenview/thumbnail/wait.png
+share/kde/apps/gwenview/tools/gimp.desktop
+share/kde/apps/gwenview/tools/kolourpaint.desktop
+share/kde/apps/gwenview/tools/konqueror.desktop
+share/kde/apps/gwenview/tools/tiledwallpaper.desktop
+share/kde/apps/gwenview/tools/wallpaper.desktop
+share/kde/apps/kconf_update/gwenview_1.4_osdformat.sh
+share/kde/apps/kconf_update/gwenview_1.4_osdformat.upd
+share/kde/apps/kconf_update/gwenview_thumbnail_size.sh
+share/kde/apps/kconf_update/gwenview_thumbnail_size.upd
+share/kde/apps/konqueror/servicemenus/konqgwenview.desktop
+share/kde/config.kcfg/fileoperationconfig.kcfg
+share/kde/config.kcfg/fileviewconfig.kcfg
+share/kde/config.kcfg/fullscreenconfig.kcfg
+share/kde/config.kcfg/gvdirpartconfig.kcfg
+share/kde/config.kcfg/imageviewconfig.kcfg
+share/kde/config.kcfg/miscconfig.kcfg
+share/kde/config.kcfg/slideshowconfig.kcfg
+share/kde/services/gvdirpart.desktop
+share/kde/services/gvimagepart.desktop
diff --git a/graphics/gwenview-kde3/distinfo b/graphics/gwenview-kde3/distinfo
new file mode 100644
index 00000000000..072a9b05d9a
--- /dev/null
+++ b/graphics/gwenview-kde3/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2012/03/19 23:19:06 markd Exp $
+
+SHA1 (gwenview-1.4.2.tar.bz2) = d2168b48eb7f27b4338681acc49b5b2a51268209
+RMD160 (gwenview-1.4.2.tar.bz2) = 9c8bc84c90c2eda36f31fb6728990bc7e8063dd4
+Size (gwenview-1.4.2.tar.bz2) = 984977 bytes
+SHA1 (patch-aa) = 03d6fd5756e9ea500a8885cbfd0a69ebfe1ff7b8
+SHA1 (patch-ab) = fdf53253a5aa0efc9474092304b7130401c87976
diff --git a/graphics/gwenview-kde3/patches/patch-aa b/graphics/gwenview-kde3/patches/patch-aa
new file mode 100644
index 00000000000..be00c9882a2
--- /dev/null
+++ b/graphics/gwenview-kde3/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1.1.1 2012/03/19 23:19:06 markd Exp $
+
+Fix build with exiv2-01.8 from gentoo patches.
+
+--- src/imageutils/jpegcontent.cpp.orig	2007-09-15 19:46:17.000000000 +0600
++++ src/imageutils/jpegcontent.cpp	2009-01-09 14:24:04.000000000 +0500
+@@ -589,7 +589,8 @@
+ QImage JPEGContent::thumbnail() const {
+ 	QImage image;
+ 	if (!d->mExifData.empty()) {
+-		Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
++		Exiv2::ExifThumbC thumb(d->mExifData);
++		Exiv2::DataBuf const thumbnail = thumb.copy();
+ 		image.loadFromData(thumbnail.pData_, thumbnail.size_);
+ 	}
+ 	return image;
+@@ -611,7 +612,8 @@
+ 		return;
+ 	}
+ 	
+-	d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
++	Exiv2::ExifThumb thumb(d->mExifData);
++	thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
+ }
+ 
+ 
diff --git a/graphics/gwenview-kde3/patches/patch-ab b/graphics/gwenview-kde3/patches/patch-ab
new file mode 100644
index 00000000000..f634ed90d69
--- /dev/null
+++ b/graphics/gwenview-kde3/patches/patch-ab
@@ -0,0 +1,129 @@
+$NetBSD: patch-ab,v 1.1.1.1 2012/03/19 23:19:06 markd Exp $
+
+Fix build with png-1.5.
+https://bugs.kde.org/show_bug.cgi?id=266319
+
+--- src/gvcore/pngformattype.cpp.orig	2007-09-15 13:46:13.000000000 +0000
++++ src/gvcore/pngformattype.cpp
+@@ -211,7 +211,7 @@ void setup_qt( QImage& image, png_struct
+ 
+     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
+ 	// Black & White or 8-bit grayscale
+-	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
++      if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
+ 	    png_set_invert_mono( png_ptr );
+ 	    png_read_update_info( png_ptr, info_ptr );
+ 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
+@@ -245,16 +245,24 @@ void setup_qt( QImage& image, png_struct
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-		const int g = info_ptr->trans_values.gray;
++		png_bytep trans_alpha;
++		int num_trans;
++		png_color_16p trans_color;
++		png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
++		const int g = trans_color->gray;
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+ 		}
+ 	    }
+ 	}
+-    } else if ( color_type == PNG_COLOR_TYPE_PALETTE
++    } else {
++     png_colorp palette;
++     int num_palette;
++     png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
++     if ( color_type == PNG_COLOR_TYPE_PALETTE
+      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
+-     && info_ptr->num_palette <= 256 )
++     && num_palette <= 256 )
+     {
+ 	// 1-bit and 8-bit color
+ 	if ( bit_depth != 1 )
+@@ -262,28 +270,32 @@ void setup_qt( QImage& image, png_struct
+ 	png_read_update_info( png_ptr, info_ptr );
+ 	png_get_IHDR(png_ptr, info_ptr,
+ 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
+-	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
++	if (!image.create(width, height, bit_depth, num_palette,
+ 	    QImage::BigEndian))
+ 	    return;
+ 	int i = 0;
+ 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
++	    png_bytep trans_alpha;
++	    int num_trans;
++	    png_color_16p trans_color;
++	    png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
+ 	    image.setAlphaBuffer( TRUE );
+-	    while ( i < info_ptr->num_trans ) {
++	    while ( i < num_trans ) {
+ 		image.setColor(i, qRgba(
+-		    info_ptr->palette[i].red,
+-		    info_ptr->palette[i].green,
+-		    info_ptr->palette[i].blue,
+-		    info_ptr->trans[i]
++		    palette[i].red,
++		    palette[i].green,
++		    palette[i].blue,
++		    trans_alpha[i]
+ 		    )
+ 		);
+ 		i++;
+ 	    }
+ 	}
+-	while ( i < info_ptr->num_palette ) {
++	while ( i < num_palette ) {
+ 	    image.setColor(i, qRgba(
+-		info_ptr->palette[i].red,
+-		info_ptr->palette[i].green,
+-		info_ptr->palette[i].blue,
++		palette[i].red,
++		palette[i].green,
++		palette[i].blue,
+ 		0xff
+ 		)
+ 	    );
+@@ -318,12 +330,13 @@ void setup_qt( QImage& image, png_struct
+ 	}
+ 
+ 	png_read_update_info(png_ptr, info_ptr);
+-    }
++      }
+ 
+     // Qt==ARGB==Big(ARGB)==Little(BGRA)
+     if ( QImage::systemByteOrder() == QImage::LittleEndian ) {
+ 	png_set_bgr(png_ptr);
+     }
++    }
+ }
+ 
+ 
+@@ -381,7 +394,7 @@ int PNGFormat::decode(QImage& img, QImag
+ 	    return -1;
+ 	}
+ 
+-	if (setjmp((png_ptr)->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ 	    image = 0;
+ 	    return -1;
+@@ -409,7 +422,7 @@ int PNGFormat::decode(QImage& img, QImag
+ 
+     if ( !png_ptr ) return 0;
+ 
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
+ 	image = 0;
+ 	state = MovieStart;
+@@ -476,7 +489,7 @@ void PNGFormat::end(png_structp png, png
+     consumer->frameDone(QPoint(offx,offy),r);
+     consumer->end();
+     state = FrameStart;
+-    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
++    unused_data = png_process_data_pause(png, 1);
+ }
+ 
+ #ifdef PNG_USER_CHUNKS_SUPPORTED