Update libgnomeprint and libgnomeprintui to 2.12.1:

libgnomeprint 2.12.1

Christian Persch:
	* Fix the missing page of the print dialog. [#316692]
	* Don't crash or leak when printing to an invalid file. [#312803]

Jody:
	* Fix transparent image rendering. [#316018]
	* Patch leaks. [#312928, #312929, #316517]
	* Update paper preview on custom paper size change [#306886]
	* Fix instability in filters [#316490]

Jürg Billeter:
	* select the default printer. [#155144]

------------------------------------------------------------------------------
libgnomeprint 2.11.0

Ivan Wong:
	* Port to win32.
	* GDI backend.

Jody:
	* Fix pdf generation.
	* Fix duplex for cups printers.
	* Re-enable duplex-tumble for printers without ppd.
	* Add some G_GNUC_PRINTF to improve api warnings.

Lutz:
	* Prepare to modularize transports and drivers.
	* More work on clipboard support for previews.

Owen:
	* Fix pango handling of vertical offsets.

6 files changed, 40 insertions, 35 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 5969082117f..49794cf0dcc 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/10/10 13:57:40 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprint-2.10.3
+DISTNAME=	libgnomeprint-2.12.1
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index 2d7b5398622..240cf05a6e8 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2005/03/22 16:03:04 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/10/10 13:57:40 jmmv Exp $
 include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-filter.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-meta.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-pango.h
@@ -18,6 +19,7 @@ include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-path.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
@@ -34,6 +36,15 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-state.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-clip.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-draft.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-frgba.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-multipage.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-position.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-reorder.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-rotate.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-select.la
+lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-zoom.la
 ${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la
 lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintlpd.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la
@@ -93,6 +104,7 @@ ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -121,6 +133,7 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -128,11 +141,13 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm share/libgnomeprint/${PKGVERSION}/printers/uninstalled
@@ -143,6 +158,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm share/libgnomeprint
 @dirrm share/doc/libgnomeprint
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules/transports
+@dirrm lib/libgnomeprint/${PKGVERSION}/modules/filters
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules
 @dirrm lib/libgnomeprint/${PKGVERSION}
 @dirrm lib/libgnomeprint
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index df22053a3d5..4d5f6a6d6e6 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2005/06/05 09:36:47 jmmv Exp $
+$NetBSD: distinfo,v 1.21 2005/10/10 13:57:40 jmmv Exp $
 
-SHA1 (libgnomeprint-2.10.3.tar.bz2) = b0fe6fad7737c70eec526db4092560d7bb4b8587
-RMD160 (libgnomeprint-2.10.3.tar.bz2) = 6d91bb094905321f4b9af392f60151bfadbdd92c
-Size (libgnomeprint-2.10.3.tar.bz2) = 727745 bytes
+SHA1 (libgnomeprint-2.12.1.tar.bz2) = 9e7fb75b18d162a274a7cf77f64d84b2741174a5
+RMD160 (libgnomeprint-2.12.1.tar.bz2) = 40e906f9b59e68802afbe322739956b57084b6ab
+Size (libgnomeprint-2.12.1.tar.bz2) = 787980 bytes
 SHA1 (patch-aa) = 73dffa07cb1218b41784563dc822c08b3455fd59
 SHA1 (patch-ab) = 04499f4ce10315b894d85228588c24e9576f4df3
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index dce6fbdf46e..7424ea07518 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/10/10 13:57:40 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprintui-2.10.2
+DISTNAME=	libgnomeprintui-2.12.1
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.pc.in
 CONFIGURE_ARGS=		--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.10.2
+BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.12.1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index 89d7a748fee..002d6569a7d 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2005/03/25 16:34:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/10/10 13:57:40 jmmv Exp $
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-content-selector.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
@@ -9,23 +10,7 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
 include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h
 lib/libgnomeprintui-2-2.la
 lib/pkgconfig/libgnomeprintui-2.2.pc
-share/doc/libgnomeprintui/ch02.html
-share/doc/libgnomeprintui/home.png
-share/doc/libgnomeprintui/index.html
-share/doc/libgnomeprintui/index.sgml
-share/doc/libgnomeprintui/left.png
-share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
-share/doc/libgnomeprintui/libgnomeprintui.devhelp
-share/doc/libgnomeprintui/libgnomeprintui.html
-share/doc/libgnomeprintui/right.png
-share/doc/libgnomeprintui/style.css
-share/doc/libgnomeprintui/up.png
+share/libgnomeprintui/${PKGVERSION}/gnome-print-job-preview.xml
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -79,6 +64,7 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -86,13 +72,16 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/te/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
-@dirrm share/doc/libgnomeprintui
+@dirrm share/libgnomeprintui/${PKGVERSION}
+@dirrm share/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 6c11cc9cf94..6401be570fb 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2005/03/25 16:34:47 jmmv Exp $
+$NetBSD: distinfo,v 1.16 2005/10/10 13:57:40 jmmv Exp $
 
-SHA1 (libgnomeprintui-2.10.2.tar.bz2) = 0aeeeb8a25ac8489a036066ed632a05732bf5064
-RMD160 (libgnomeprintui-2.10.2.tar.bz2) = b4e7254bf439984c0b4d1b24d7dd81fdacabb17b
-Size (libgnomeprintui-2.10.2.tar.bz2) = 626042 bytes
+SHA1 (libgnomeprintui-2.12.1.tar.bz2) = 7ed05a789245fbee975a2010a0e2414169197ac0
+RMD160 (libgnomeprintui-2.12.1.tar.bz2) = 8cc6fb413c53f0ea965203859362f8ef0762eaae
+Size (libgnomeprintui-2.12.1.tar.bz2) = 646459 bytes