Update to 2.2.1.1. Changes since 1.116.0:

* libgnomeprint/gnome-fontmap.c (fcpattern_to_gp_font_entry_alias): disable
  the patch for #105006 which was causing problems
* Makefile.am (mydistcheck): use $(AMTAR) rather than $(TAR) which I guess is
  needed because I am using a newer automake.
* libgnomeprint/gnome-fontmap.c (fcpattern_to_gp_font_entry_alias): Fix #105006
* libgnomeprint/gpa/gpa-settings.c (gpa_settings_finalize): only
  gpa_node_unref settings->printer when it is not NULL. Settings can be
  unatached to a printer in some cases
* libgnomeprint/gnome-print-ps2.c: allow us to embed two fonts who happen to
  have the same Postscript name. See #105063.  (gnome_print_ps2_init): create
  fonts_hash (gnome_print_ps2_finalize): destroy fonts_hash
  (gnome_print_ps2_set_font_real): when creating PSOs, specify which instance
  of the psname the font is for.
* libgnomeprint/gnome-font-face.c (gnome_font_face_pso_new): add a "instance"
  argument that allows us to embed to fonts who happen to have the same
  postscript name. Set ->encodedname accordingly to the instance
* libgnomeprint/gnome-print-pdf.c (gnome_print_pdf_set_font_real): when
  creating a pso, pass 0 as the instance.
* libgnomeprint/gnome-font-private.h: update _pso_new's prototype, update the
  description of GnomeFontPsObject->encodedname.
* tests/simple.c: add file used for simple code to test or replicate a bug.
* tests/Makefile.am: add simple to Makefile
* libgnomeprint/gnome-font-family.c (gnome_font_family_style_list): Don't
  return duplicated styles, the font-dialog no longer displays duplicated
  styles.

Changes in the package:
* Move documentation to share/doc/html.

Update based on a patch provided by Juan RP in private mail.

1 files changed, 126 insertions, 118 deletions

diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index ee220f58c03..d1cd311b311 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,118 +1,126 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:38 tron Exp $
-bin/libgnomeprint-2.0-font-install
-etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
-include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-print.h
-include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h
-include/libgnomeprint-2.0/libgnomeprint/gp-gc.h
-include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h
-include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.a
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.la
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.so
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.so.0
-lib/gnome-print-2.0/drivers/libgnomeprint-fax.so.0.0
-lib/gnome-print-2.0/transports/libgnomeprint-custom.a
-lib/gnome-print-2.0/transports/libgnomeprint-custom.la
-lib/gnome-print-2.0/transports/libgnomeprint-custom.so
-lib/gnome-print-2.0/transports/libgnomeprint-custom.so.0
-lib/gnome-print-2.0/transports/libgnomeprint-custom.so.0.0
-lib/gnome-print-2.0/transports/libgnomeprint-file.a
-lib/gnome-print-2.0/transports/libgnomeprint-file.la
-lib/gnome-print-2.0/transports/libgnomeprint-file.so
-lib/gnome-print-2.0/transports/libgnomeprint-file.so.0
-lib/gnome-print-2.0/transports/libgnomeprint-file.so.0.0
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.a
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.la
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.so
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.so.0
-lib/gnome-print-2.0/transports/libgnomeprint-lpr.so.0.0
-lib/libgnomeprint-2.a
-lib/libgnomeprint-2.la
-lib/libgnomeprint-2.so
-lib/libgnomeprint-2.so.0
-lib/libgnomeprint-2.so.0.0
-lib/pkgconfig/libgnomeprint-2.0.pc
-share/fonts/README.installer.2
-share/gnome-print-2.0/media/media.xml
-share/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome-print-2.0/printers/GENERIC.printer
-share/gnome-print-2.0/vendors/EPSON.vendor
-share/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome-print-2.0/vendors/HP.vendor
-share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
-share/gtk-doc/html/libgnomeprint/index.html
-share/gtk-doc/html/libgnomeprint/index.sgml
-share/gtk-doc/html/libgnomeprint/libgnomeprint-building.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-compiling.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-font-face.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-font.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-glyphlist.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-pgl.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-config.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-master.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-paper.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-unit.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-rfont.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-question-index.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint-resources.html
-share/gtk-doc/html/libgnomeprint/libgnomeprint.html
-share/gtk-doc/html/libgnomeprint/libgnomeprintunsorted.html
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
-@dirrm share/gtk-doc/html/libgnomeprint
-@unexec ${RMDIR} -p %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
-@dirrm share/gnome/libgnomeprint-2.0/fonts
-@dirrm share/gnome/libgnomeprint-2.0
-@dirrm share/gnome-print-2.0/vendors
-@dirrm share/gnome-print-2.0/printers
-@dirrm share/gnome-print-2.0/models
-@dirrm share/gnome-print-2.0/media
-@dirrm share/gnome-print-2.0
-@dirrm lib/gnome-print-2.0/transports
-@dirrm lib/gnome-print-2.0/drivers
-@dirrm lib/gnome-print-2.0
-@dirrm include/libgnomeprint-2.0/libgnomeprint/private
-@dirrm include/libgnomeprint-2.0/libgnomeprint
-@dirrm include/libgnomeprint-2.0
-@dirrm etc/gnome/libgnomeprint-2.0/fonts
-@dirrm etc/gnome/libgnomeprint-2.0
+@comment $NetBSD: PLIST,v 1.4 2003/02/14 20:19:47 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-job.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h
+include/libgnomeprint-2.2/libgnomeprint/gp-gc.h
+include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h
+include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.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-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-key.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-list.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-model.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-node-private.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-option.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
+lib/libgnomeprint-2-2.a
+lib/libgnomeprint-2-2.la
+lib/libgnomeprint-2-2.so
+lib/libgnomeprint-2-2.so.0
+lib/libgnomeprint-2-2.so.0.0
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.a
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so.0
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so.0.0
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.a
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.la
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so.0
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so.0.0
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.a
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.la
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so.0
+lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so.0.0
+lib/pkgconfig/libgnomeprint-2.2.pc
+share/doc/html/libgnomeprint-2.2/index.html
+share/doc/html/libgnomeprint-2.2/index.sgml
+share/doc/html/libgnomeprint-2.2/libgnomeprint-building.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-compiling.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-font.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint-resources.html
+share/doc/html/libgnomeprint-2.2/libgnomeprint.html
+share/doc/html/libgnomeprint-2.2/libgnomeprintunsorted.html
+share/libgnomeprint/${PKGVERSION}/globals.xml
+share/libgnomeprint/${PKGVERSION}/models/GNOME-GENERIC-PS.xml
+share/libgnomeprint/${PKGVERSION}/models/GNOME-PDF-WRITER.xml
+share/libgnomeprint/${PKGVERSION}/printers/GENERIC.xml
+share/libgnomeprint/${PKGVERSION}/printers/PDF-WRITER.xml
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/et/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/he/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo
+${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/sk/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/sl/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/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/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
+@dirrm share/libgnomeprint/${PKGVERSION}/printers
+@dirrm share/libgnomeprint/${PKGVERSION}/models
+@dirrm share/libgnomeprint/${PKGVERSION}
+@dirrm share/libgnomeprint
+@dirrm share/doc/html/libgnomeprint-2.2
+@dirrm lib/libgnomeprint/${PKGVERSION}/modules/transports
+@dirrm lib/libgnomeprint/${PKGVERSION}/modules
+@dirrm lib/libgnomeprint/${PKGVERSION}
+@dirrm lib/libgnomeprint
+@dirrm include/libgnomeprint-2.2/libgnomeprint/private
+@dirrm include/libgnomeprint-2.2/libgnomeprint
+@dirrm include/libgnomeprint-2.2