Attachment #93466 for bug #131376

Lines 6-12 Link Here

(-)astro/gpscorrelate/Makefile (-1 / +1 lines)
6		6
7	PORTNAME= gpscorrelate	7	PORTNAME= gpscorrelate
8	PORTVERSION= 1.5.6	8	PORTVERSION= 1.5.6
9	PORTREVISION= 1	9	PORTREVISION= 2
10	CATEGORIES= astro geography	10	CATEGORIES= astro geography
11	MASTER_SITES= http://freefoote.dview.net/linux/	11	MASTER_SITES= http://freefoote.dview.net/linux/
12		12

Lines 7-13 Link Here

(-)astro/merkaartor/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= merkaartor	8	PORTNAME= merkaartor
9	PORTVERSION= 0.12	9	PORTVERSION= 0.12
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= astro	11	CATEGORIES= astro
12	MASTER_SITES= http://www.merkaartor.org/downloads/source/	12	MASTER_SITES= http://www.merkaartor.org/downloads/source/
13		13

Lines 6-12 Link Here

(-)deskutils/strigi/Makefile (-1 / +1 lines)
6		6
7	PORTNAME= strigi	7	PORTNAME= strigi
8	PORTVERSION= 0.5.11	8	PORTVERSION= 0.5.11
9	PORTREVISION= 1	9	PORTREVISION= 2
10	CATEGORIES= deskutils	10	CATEGORIES= deskutils
11	MASTER_SITES= http://www.vandenoever.info/software/strigi/	11	MASTER_SITES= http://www.vandenoever.info/software/strigi/
12		12

Lines 7-13 Link Here

(-)graphics/digikam/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= digikam	8	PORTNAME= digikam
9	DISTVERSION= 0.9.4	9	DISTVERSION= 0.9.4
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= graphics kde	11	CATEGORIES= graphics kde
12	MASTER_SITES= SFE	12	MASTER_SITES= SFE
13		13

Lines 6-13 Link Here

(-)graphics/exiv2/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= exiv2	8	PORTNAME= exiv2
9	PORTVERSION= 0.16	9	PORTVERSION= 0.18
10	PORTREVISION= 1
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= graphics	11	CATEGORIES= graphics
13	MASTER_SITES= http://www.exiv2.org/	12	MASTER_SITES= http://www.exiv2.org/

Lines 1-3 Link Here

(-)graphics/exiv2/distinfo (-3 / +3 lines)
1	MD5 (exiv2-0.16.tar.gz) = a6e72343885d990c593bd013c6c988f1	1	MD5 (exiv2-0.18.tar.gz) = 03044792525ae0a1b109df5a53b858fb
2	SHA256 (exiv2-0.16.tar.gz) = d407bd0f9b06d68940ae1a73b226ca234cd9a19ea65eab108746b69ac7ce0afb	2	SHA256 (exiv2-0.18.tar.gz) = e567918c747043588a58b8f6de49727443f275291119edd84b1c62cc685be4cd
3	SIZE (exiv2-0.16.tar.gz) = 1591822	3	SIZE (exiv2-0.18.tar.gz) = 2299215




bin/exiv2
include/exiv2/basicio.hpp
include/exiv2/bmpimage.hpp
include/exiv2/canonmn.hpp
include/exiv2/convert.hpp
include/exiv2/cr2image.hpp
include/exiv2/crwimage.hpp
include/exiv2/datasets.hpp

include/exiv2/exv_msvc.h
include/exiv2/fujimn.hpp
include/exiv2/futils.hpp
include/exiv2/gifimage.hpp
include/exiv2/image.hpp
include/exiv2/iptc.hpp
include/exiv2/jp2image.hpp
include/exiv2/jpgimage.hpp
include/exiv2/makernote.hpp
include/exiv2/makernote2.hpp
include/exiv2/metadatum.hpp
include/exiv2/minoltamn.hpp
include/exiv2/mn.hpp

include/exiv2/orfimage.hpp
include/exiv2/panasonicmn.hpp
include/exiv2/pentaxmn.hpp
include/exiv2/pngchunk.hpp
include/exiv2/pngimage.hpp
include/exiv2/preview.hpp
include/exiv2/properties.hpp
include/exiv2/psdimage.hpp
include/exiv2/rafimage.hpp
include/exiv2/rcsid.hpp
include/exiv2/sigmamn.hpp
include/exiv2/sonymn.hpp
include/exiv2/tags.hpp
include/exiv2/tgaimage.hpp
include/exiv2/tifffwd.hpp
include/exiv2/tiffimage.hpp
include/exiv2/tiffparser.hpp
include/exiv2/tiffvisitor.hpp
include/exiv2/types.hpp
include/exiv2/value.hpp
include/exiv2/version.hpp
include/exiv2/xmp.hpp
include/exiv2/xmpsidecar.hpp
lib/libexiv2.a
lib/libexiv2.la
lib/libexiv2.so
lib/libexiv2.so.7
libdata/pkgconfig/exiv2.pc
share/locale/de/LC_MESSAGES/exiv2.mo
share/locale/es/LC_MESSAGES/exiv2.mo

share/locale/fr/LC_MESSAGES/exiv2.mo
share/locale/pl/LC_MESSAGES/exiv2.mo
share/locale/ru/LC_MESSAGES/exiv2.mo
share/locale/sk/LC_MESSAGES/exiv2.mo
@dirrm include/exiv2

Lines 7-13 Link Here

(-)graphics/geeqie/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= geeqie	9	PORTNAME= geeqie
10	DISTVERSION= 1.0alpha1	10	DISTVERSION= 1.0alpha3
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13		13
Lines 34-40 Link Here
34	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
35		35
36	.if defined(WITH_EXIV2)	36	.if defined(WITH_EXIV2)
37	LIB_DEPENDS+= exiv2.3:${PORTSDIR}/graphics/exiv2	37	LIB_DEPENDS+= exiv2.7:${PORTSDIR}/graphics/exiv2
38	CONFIGURE_ARGS+=--with-exiv2	38	CONFIGURE_ARGS+=--with-exiv2
39	.else	39	.else
40	CONFIGURE_ARGS+=--without-exiv2	40	CONFIGURE_ARGS+=--without-exiv2

Lines 1-3 Link Here

(-)graphics/geeqie/distinfo (-3 / +3 lines)
1	MD5 (geeqie-1.0alpha1.tar.gz) = 8e4838018b597cb6df056959ccf1ba45	1	MD5 (geeqie-1.0alpha3.tar.gz) = 0f0c3991ee4ef9232e21ed49fa879b83
2	SHA256 (geeqie-1.0alpha1.tar.gz) = 7df5b644e572ec0f8a489c31ccf01789d602c788cffa33bca5ecd236020ad199	2	SHA256 (geeqie-1.0alpha3.tar.gz) = 98073322e9db72ede5c374eb3213a981fecf60542f0e610436b4fd9c01b9b464
3	SIZE (geeqie-1.0alpha1.tar.gz) = 1970338	3	SIZE (geeqie-1.0alpha3.tar.gz) = 2067890

Lines 7-13 Link Here

(-)graphics/gwenview/Makefile (-2 / +2 lines)
7		7
8	PORTNAME= gwenview	8	PORTNAME= gwenview
9	PORTVERSION= 1.4.2	9	PORTVERSION= 1.4.2
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= graphics kde	11	CATEGORIES= graphics kde
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-22 Link Here
16	COMMENT= An image viewer and browser for the KDE environment	16	COMMENT= An image viewer and browser for the KDE environment
17		17
18	LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \	18	LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
19	exiv2.3:${PORTSDIR}/graphics/exiv2	19	exiv2.7:${PORTSDIR}/graphics/exiv2
20		20
21	USE_BZIP2= yes	21	USE_BZIP2= yes
22	USE_GMAKE= yes	22	USE_GMAKE= yes




--- 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());
 }
 
 

Lines 7-12 Link Here

(-)graphics/hugin/Makefile (+1 lines)
7		7
8	PORTNAME= hugin	8	PORTNAME= hugin
9	PORTVERSION= 0.7.0	9	PORTVERSION= 0.7.0
		10	PORTREVISION= 1
10	CATEGORIES= graphics	11	CATEGORIES= graphics
11	MASTER_SITES= SF	12	MASTER_SITES= SF
12		13

Lines 6-12 Link Here

(-)graphics/kdegraphics4/Makefile (-2 / +2 lines)
6		6
7	PORTNAME= kdegraphics	7	PORTNAME= kdegraphics
8	PORTVERSION= ${KDE4_VERSION}	8	PORTVERSION= ${KDE4_VERSION}
9	PORTREVISION= 1	9	PORTREVISION= 2
10	CATEGORIES= graphics kde	10	CATEGORIES= graphics kde
11	MASTER_SITES= ${MASTER_SITE_KDE}	11	MASTER_SITES= ${MASTER_SITE_KDE}
12	MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src	12	MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
Lines 23-29 Link Here
23	lcms:${PORTSDIR}/graphics/lcms \	23	lcms:${PORTSDIR}/graphics/lcms \
24	paper:${PORTSDIR}/print/libpaper \	24	paper:${PORTSDIR}/print/libpaper \
25	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \	25	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
26	exiv2.3:${PORTSDIR}/graphics/exiv2 \	26	exiv2.7:${PORTSDIR}/graphics/exiv2 \
27	chm.0:${PORTSDIR}/misc/chmlib \	27	chm.0:${PORTSDIR}/misc/chmlib \
28	sane.1:${PORTSDIR}/graphics/sane-backends \	28	sane.1:${PORTSDIR}/graphics/sane-backends \
29	gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \	29	gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \

Lines 7-13 Link Here

(-)graphics/kipi-plugins/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= kipi-plugins	8	PORTNAME= kipi-plugins
9	PORTVERSION= 0.1.7	9	PORTVERSION= 0.1.7
10	PORTREVISION= 2	10	PORTREVISION= 3
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= graphics kde	12	CATEGORIES= graphics kde
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}

Lines 6-12 Link Here

(-)graphics/kphotoalbum/Makefile (-2 / +2 lines)
6		6
7	PORTNAME= kphotoalbum	7	PORTNAME= kphotoalbum
8	PORTVERSION= 3.1.1	8	PORTVERSION= 3.1.1
9	PORTREVISION= 3	9	PORTREVISION= 4
10	CATEGORIES= graphics kde	10	CATEGORIES= graphics kde
11	MASTER_SITES= http://www.kphotoalbum.org/data/download/	11	MASTER_SITES= http://www.kphotoalbum.org/data/download/
12		12
Lines 14-20 Link Here
14	COMMENT= Image database for KDE	14	COMMENT= Image database for KDE
15		15
16	LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \	16	LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \
17	exiv2.3:${PORTSDIR}/graphics/exiv2 \	17	exiv2.7:${PORTSDIR}/graphics/exiv2 \
18	kdcraw.4:${PORTSDIR}/graphics/libkdcraw	18	kdcraw.4:${PORTSDIR}/graphics/libkdcraw
19		19
20	USE_KDELIBS_VER= 3	20	USE_KDELIBS_VER= 3

Lines 6-11 Link Here

(-)graphics/libkexiv2/Makefile (-1 / +2 lines)
6		6
7	PORTNAME= libkexiv2	7	PORTNAME= libkexiv2
8	PORTVERSION= 0.1.8	8	PORTVERSION= 0.1.8
		9	PORTREVISION= 1
9	CATEGORIES= graphics devel	10	CATEGORIES= graphics devel
10	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
11	MASTER_SITE_SUBDIR= kipi	12	MASTER_SITE_SUBDIR= kipi
Lines 13-19 Link Here
13	MAINTAINER= ale@FreeBSD.org	14	MAINTAINER= ale@FreeBSD.org
14	COMMENT= A wrapper library to manipulate pictures metadata	15	COMMENT= A wrapper library to manipulate pictures metadata
15		16
16	LIB_DEPENDS= exiv2.3:${PORTSDIR}/graphics/exiv2	17	LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2
17		18
18	USE_BZIP2= yes	19	USE_BZIP2= yes
19	USE_KDELIBS_VER=3	20	USE_KDELIBS_VER=3

Lines 7-13 Link Here

(-)graphics/py-exiv2/Makefile (-2 / +4 lines)
7		7
8	PORTNAME= exiv2	8	PORTNAME= exiv2
9	PORTVERSION= 0.1.2	9	PORTVERSION= 0.1.2
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= graphics python	11	CATEGORIES= graphics python
12	MASTER_SITES= http://tilloy.net/dev/pyexiv2/releases/	12	MASTER_SITES= http://tilloy.net/dev/pyexiv2/releases/
13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 16-24 Link Here
16	MAINTAINER= dindin@dindin.ru	16	MAINTAINER= dindin@dindin.ru
17	COMMENT= Python bindings for exiv2	17	COMMENT= Python bindings for exiv2
18		18
19	LIB_DEPENDS= exiv2.3:${PORTSDIR}/graphics/exiv2\	19	LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2\
20	boost_python.4:${PORTSDIR}/devel/boost-python	20	boost_python.4:${PORTSDIR}/devel/boost-python
21		21
		22	BROKEN= does not compile with exiv2-0.18, should change at future version py-exiv2-0.2
		23
22	WRKSRC= ${WRKDIR}/py${PORTNAME}	24	WRKSRC= ${WRKDIR}/py${PORTNAME}
23	USE_PYTHON= yes	25	USE_PYTHON= yes
24	USE_GMAKE= yes	26	USE_GMAKE= yes

Lines 7-13 Link Here

(-)graphics/qtpfsgui/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= qtpfsgui	8	PORTNAME= qtpfsgui
9	PORTVERSION= 1.9.2	9	PORTVERSION= 1.9.2
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13		13

Lines 7-13 Link Here

(-)graphics/ufraw/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= ufraw	8	PORTNAME= ufraw
9	PORTVERSION= 0.15	9	PORTVERSION= 0.15
10	PORTREVISION= 0	10	PORTREVISION= 1
11	CATEGORIES= graphics gnome	11	CATEGORIES= graphics gnome
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13		13

Return to bug 131376

Lines 1-6 Link Here

(-)graphics/exiv2/pkg-plist (-9 / +10 lines)
1	bin/exiv2	1	bin/exiv2
2	include/exiv2/basicio.hpp	2	include/exiv2/basicio.hpp
		3	include/exiv2/bmpimage.hpp
3	include/exiv2/canonmn.hpp	4	include/exiv2/canonmn.hpp
		5	include/exiv2/convert.hpp
4	include/exiv2/cr2image.hpp	6	include/exiv2/cr2image.hpp
5	include/exiv2/crwimage.hpp	7	include/exiv2/crwimage.hpp
6	include/exiv2/datasets.hpp	8	include/exiv2/datasets.hpp
Lines 10-21 Link Here
10	include/exiv2/exv_msvc.h	12	include/exiv2/exv_msvc.h
11	include/exiv2/fujimn.hpp	13	include/exiv2/fujimn.hpp
12	include/exiv2/futils.hpp	14	include/exiv2/futils.hpp
13	include/exiv2/ifd.hpp	15	include/exiv2/gifimage.hpp
14	include/exiv2/image.hpp	16	include/exiv2/image.hpp
15	include/exiv2/iptc.hpp	17	include/exiv2/iptc.hpp
		18	include/exiv2/jp2image.hpp
16	include/exiv2/jpgimage.hpp	19	include/exiv2/jpgimage.hpp
17	include/exiv2/makernote.hpp
18	include/exiv2/makernote2.hpp
19	include/exiv2/metadatum.hpp	20	include/exiv2/metadatum.hpp
20	include/exiv2/minoltamn.hpp	21	include/exiv2/minoltamn.hpp
21	include/exiv2/mn.hpp	22	include/exiv2/mn.hpp
Lines 25-51 Link Here
25	include/exiv2/orfimage.hpp	26	include/exiv2/orfimage.hpp
26	include/exiv2/panasonicmn.hpp	27	include/exiv2/panasonicmn.hpp
27	include/exiv2/pentaxmn.hpp	28	include/exiv2/pentaxmn.hpp
28	include/exiv2/pngchunk.hpp
29	include/exiv2/pngimage.hpp	29	include/exiv2/pngimage.hpp
		30	include/exiv2/preview.hpp
30	include/exiv2/properties.hpp	31	include/exiv2/properties.hpp
		32	include/exiv2/psdimage.hpp
31	include/exiv2/rafimage.hpp	33	include/exiv2/rafimage.hpp
32	include/exiv2/rcsid.hpp	34	include/exiv2/rcsid.hpp
33	include/exiv2/sigmamn.hpp	35	include/exiv2/sigmamn.hpp
34	include/exiv2/sonymn.hpp	36	include/exiv2/sonymn.hpp
35	include/exiv2/tags.hpp	37	include/exiv2/tags.hpp
36	include/exiv2/tiffcomposite.hpp	38	include/exiv2/tgaimage.hpp
37	include/exiv2/tifffwd.hpp
38	include/exiv2/tiffimage.hpp	39	include/exiv2/tiffimage.hpp
39	include/exiv2/tiffparser.hpp
40	include/exiv2/tiffvisitor.hpp
41	include/exiv2/types.hpp	40	include/exiv2/types.hpp
42	include/exiv2/value.hpp	41	include/exiv2/value.hpp
43	include/exiv2/version.hpp	42	include/exiv2/version.hpp
44	include/exiv2/xmp.hpp	43	include/exiv2/xmp.hpp
		44	include/exiv2/xmpsidecar.hpp
45	lib/libexiv2.a	45	lib/libexiv2.a
46	lib/libexiv2.la	46	lib/libexiv2.la
47	lib/libexiv2.so	47	lib/libexiv2.so
48	lib/libexiv2.so.3	48	lib/libexiv2.so.7
49	libdata/pkgconfig/exiv2.pc	49	libdata/pkgconfig/exiv2.pc
50	share/locale/de/LC_MESSAGES/exiv2.mo	50	share/locale/de/LC_MESSAGES/exiv2.mo
51	share/locale/es/LC_MESSAGES/exiv2.mo	51	share/locale/es/LC_MESSAGES/exiv2.mo
Lines 53-56 Link Here
53	share/locale/fr/LC_MESSAGES/exiv2.mo	53	share/locale/fr/LC_MESSAGES/exiv2.mo
54	share/locale/pl/LC_MESSAGES/exiv2.mo	54	share/locale/pl/LC_MESSAGES/exiv2.mo
55	share/locale/ru/LC_MESSAGES/exiv2.mo	55	share/locale/ru/LC_MESSAGES/exiv2.mo
		56	share/locale/sk/LC_MESSAGES/exiv2.mo
56	@dirrm include/exiv2	57	@dirrm include/exiv2

Added Link Here

(-)graphics/gwenview/files/patch-src_imageutils_jpegcontent.cpp (+22 lines)
1	--- src/imageutils/jpegcontent.cpp.orig 2007-09-15 19:46:17.000000000 +0600
2	+++ src/imageutils/jpegcontent.cpp 2009-01-09 14:24:04.000000000 +0500
3	@@ -589,7 +589,8 @@
4	QImage JPEGContent::thumbnail() const {
5	QImage image;
6	if (!d->mExifData.empty()) {
7	- Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
8	+ Exiv2::ExifThumbC thumb(d->mExifData);
9	+ Exiv2::DataBuf const thumbnail = thumb.copy();
10	image.loadFromData(thumbnail.pData_, thumbnail.size_);
11	}
12	return image;
13	@@ -611,7 +612,8 @@
14	return;
15	}
16
17	- d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
18	+ Exiv2::ExifThumb thumb(d->mExifData);
19	+ thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
20	}
21
22