Pullup ticket 1940 - requested by wiz

security update for evince

Revisions pulled up:
- pkgsrc/print/evince/Makefile				1.26, 1.27
- pkgsrc/print/evince/Makefile.common			1.12
- pkgsrc/print/evince/PLIST				1.13
- pkgsrc/print/evince/distinfo				1.9, 1.10
- pkgsrc/print/evince/patches/patch-ac			1.1
- pkgsrc/print/evince-nautilus/Makefile			1.11, 1.12
- pkgsrc/print/poppler/Makefile.common			1.7
- pkgsrc/print/poppler/distinfo				1.14, 1.15
- pkgsrc/print/poppler/patches/patch-ab			1.6
- pkgsrc/print/poppler/patches/patch-ac			1.3, 1.4
- pkgsrc/print/poppler-qt/Makefile			1.14
- pkgsrc/print/poppler-qt/PLIST				1.3

   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Thu Oct 12 14:16:22 UTC 2006

   Modified Files:
   	pkgsrc/print/evince: Makefile Makefile.common PLIST distinfo
   	pkgsrc/print/evince-nautilus: Makefile

   Log Message:
   update to 0.6.1
   canges:
   -bugfixes
   -translation updates

   pkgsrc change: include tiff/buildlink directly instead relying on gtk to
   pull it in
---
   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Wed Dec  6 14:48:35 UTC 2006

   Modified Files:
   	pkgsrc/print/evince: Makefile distinfo
   Added Files:
   	pkgsrc/print/evince/patches: patch-ac

   Log Message:
   Fix CVE-2006-5864 using a patch from evince CVS.
   Bump PKGREVISION.
---
   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Wed Dec  6 14:51:36 UTC 2006

   Modified Files:
   	pkgsrc/print/evince-nautilus: Makefile

   Log Message:
   Bump PKGREVISION for evince/patches/patch-ac,
   to be on the safe side.
---
   Module Name:		pkgsrc
   Committed By:	rillig
   Date:		Tue Oct 10 20:07:05 UTC 2006

   Modified Files:
   	pkgsrc/print/poppler: distinfo
   Added Files:
   	pkgsrc/print/poppler/patches: patch-ac

   Log Message:
   Fixed "test ==".
---
   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Thu Oct 12 14:12:15 UTC 2006

   Modified Files:
   	pkgsrc/print/poppler: Makefile.common distinfo
   	pkgsrc/print/poppler/patches: patch-ab patch-ac

   Log Message:
   update to 0.5.4
   changes:
   -Automatically read in CJK encoding files
   -Speed ups
   -let the utils take input on stdin
   -Bugs fixed
---
   Module Name:		pkgsrc
   Committed By:	markd
   Date:		Fri Oct 13 20:25:22 UTC 2006

   Modified Files:
   	pkgsrc/print/poppler-qt: Makefile PLIST

   Log Message:
   poppler-link-qt3.h should also be installed.  Bump PKGREVISION.
   Should fix PR pkg/34810.

12 files changed, 136 insertions, 50 deletions

diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 87c639b4437..666619b43b9 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2006/09/16 12:20:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2006/12/09 08:38:35 salo Exp $
 #
 
 .include "../../print/evince/Makefile.common"
+PKGREVISION=		1
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		1
 
 COMMENT=		File properties plugin for evince files
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 461e071f16e..07e8d43348f 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2006/09/19 11:21:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.25.2.1 2006/12/09 08:38:35 salo Exp $
 #
 
 .include "../../print/evince/Makefile.common"
-
-PKGREVISION=		2
+PKGREVISION=		1
 
 COMMENT=		Document viewer for the GNOME Desktop
 
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index c7117864e4b..67ef15693d0 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.11 2006/09/19 11:21:37 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.11.2.1 2006/12/09 08:38:35 salo Exp $
 #
 
-DISTNAME=		evince-0.6.0
+DISTNAME=		evince-0.6.1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -33,6 +33,7 @@ BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.3
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index 084bfb77431..97e7487b958 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/09/19 11:21:37 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12.2.1 2006/12/09 08:38:35 salo Exp $
 bin/evince
 bin/evince-thumbnailer
 share/applications/evince.desktop
@@ -20,6 +20,8 @@ share/gnome/help/evince/el/evince.xml
 share/gnome/help/evince/el/figures/evince_start_window.png
 share/gnome/help/evince/es/evince.xml
 share/gnome/help/evince/es/figures/evince_start_window.png
+share/gnome/help/evince/fi/evince.xml
+share/gnome/help/evince/fi/figures/evince_start_window.png
 share/gnome/help/evince/fr/evince.xml
 share/gnome/help/evince/fr/figures/evince_start_window.png
 share/gnome/help/evince/it/evince.xml
@@ -30,10 +32,12 @@ share/gnome/help/evince/ru/evince.xml
 share/gnome/help/evince/ru/figures/evince_start_window.png
 share/gnome/help/evince/sr/evince.xml
 share/gnome/help/evince/sr/figures/evince_start_window.png
+share/gnome/help/evince/sv/evince.xml
+share/gnome/help/evince/sv/figures/evince_start_window.png
 share/gnome/help/evince/uk/evince.xml
 share/gnome/help/evince/uk/figures/evince_start_window.png
-share/icons/hicolor/16x16/apps/evince-16.png
-share/icons/hicolor/22x22/apps/evince-22.png
+share/icons/hicolor/16x16/apps/evince.png
+share/icons/hicolor/22x22/apps/evince.png
 share/icons/hicolor/48x48/apps/evince.png
 share/icons/hicolor/scalable/apps/evince.svg
 share/locale/be/LC_MESSAGES/evince.mo
@@ -103,11 +107,13 @@ share/omf/evince/evince-C.omf
 share/omf/evince/evince-bg.omf
 share/omf/evince/evince-el.omf
 share/omf/evince/evince-es.omf
+share/omf/evince/evince-fi.omf
 share/omf/evince/evince-fr.omf
 share/omf/evince/evince-it.omf
 share/omf/evince/evince-nl.omf
 share/omf/evince/evince-ru.omf
 share/omf/evince/evince-sr.omf
+share/omf/evince/evince-sv.omf
 share/omf/evince/evince-uk.omf
 @dirrm share/omf/evince
 @comment in scrollkeeper: @dirrm share/omf
@@ -118,6 +124,8 @@ share/omf/evince/evince-uk.omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/evince/uk/figures
 @dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/sv/figures
+@dirrm share/gnome/help/evince/sv
 @dirrm share/gnome/help/evince/sr/figures
 @dirrm share/gnome/help/evince/sr
 @dirrm share/gnome/help/evince/ru/figures
@@ -128,6 +136,8 @@ share/omf/evince/evince-uk.omf
 @dirrm share/gnome/help/evince/it
 @dirrm share/gnome/help/evince/fr/figures
 @dirrm share/gnome/help/evince/fr
+@dirrm share/gnome/help/evince/fi/figures
+@dirrm share/gnome/help/evince/fi
 @dirrm share/gnome/help/evince/es/figures
 @dirrm share/gnome/help/evince/es
 @dirrm share/gnome/help/evince/el/figures
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 2a543473937..d7f7f8bac37 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2006/09/15 15:22:16 jmmv Exp $
+$NetBSD: distinfo,v 1.8.2.1 2006/12/09 08:38:35 salo Exp $
 
-SHA1 (evince-0.6.0.tar.bz2) = b3a38490b109284d91de3b50a3bb85b2847b39ed
-RMD160 (evince-0.6.0.tar.bz2) = 697fe6b5c1ba60d529422c2ea2a145b2e2dc7f3b
-Size (evince-0.6.0.tar.bz2) = 1120159 bytes
+SHA1 (evince-0.6.1.tar.bz2) = bc314761ecc9c29d10d09294ad8e32bab3a5dbc6
+RMD160 (evince-0.6.1.tar.bz2) = ac94e1964f4f46e505fe945daa9de288c2587898
+Size (evince-0.6.1.tar.bz2) = 1212271 bytes
 SHA1 (patch-aa) = 65abdde02e6b72743d47e5c5d6156cbb4a74f0a6
 SHA1 (patch-ab) = 800d96b612b09976f8573b4caab40da1d5d838f6
+SHA1 (patch-ac) = a2f08a7d977b1e51a811c80c6abc8b8480dd3cda
diff --git a/print/evince/patches/patch-ac b/print/evince/patches/patch-ac
new file mode 100644
index 00000000000..d64973d8e7d
--- /dev/null
+++ b/print/evince/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1.2.2 2006/12/09 08:38:35 salo Exp $
+
+Fix for CVE-2006-5864. From evince CVS
+http://cvs.gnome.org/viewcvs/evince/ps/ps.c?r1=1.6&r2=1.6.6.1
+
+--- ps/ps.c.orig	2006-01-07 00:03:44.000000000 +0100
++++ ps/ps.c
+@@ -1231,7 +1231,8 @@ get_next_text(line, next_char)
+     int level = 0;
+     quoted = 1;
+     line++;
+-    while(*line && !(*line == ')' && level == 0)) {
++    while(*line && !(*line == ')' && level == 0)
++	  && (cp - text) < PSLINELENGTH - 1) {
+       if(*line == '\\') {
+         if(*(line + 1) == 'n') {
+           *cp++ = '\n';
+@@ -1302,7 +1303,8 @@ get_next_text(line, next_char)
+     }
+   }
+   else {
+-    while(*line && !(*line == ' ' || *line == '\t' || *line == '\n'))
++    while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')
++	  && (cp - text) < PSLINELENGTH - 1)
+       *cp++ = *line++;
+   }
+   *cp = '\0';
diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 5758dcc0b39..e180dd8a5f9 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2006/05/31 18:13:54 drochner Exp $
+# $NetBSD: Makefile,v 1.13.4.1 2006/12/09 08:38:35 salo Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-qt-${POPPLER_VERS}
+PKGREVISION=		1
 
 COMMENT=		PDF rendering library (QT wrapper)
 
@@ -28,6 +29,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${PREFIX}/include/poppler
 	${INSTALL_DATA} ${WRKSRC}/qt/poppler-page-transition.h \
 		${PREFIX}/include/poppler
+	${INSTALL_DATA} ${WRKSRC}/qt/poppler-link-qt3.h \
+		${PREFIX}/include/poppler
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${PREFIX}/lib/pkgconfig
 
 BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
diff --git a/print/poppler-qt/PLIST b/print/poppler-qt/PLIST
index cd959d3e7a4..793c136e046 100644
--- a/print/poppler-qt/PLIST
+++ b/print/poppler-qt/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/01 13:59:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2.4.1 2006/12/09 08:38:35 salo Exp $
+include/poppler/poppler-link-qt3.h
 include/poppler/poppler-page-transition.h
 include/poppler/poppler-qt.h
 lib/libpoppler-qt.la
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index 071be27657d..383da6de62b 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2006/05/31 18:13:54 drochner Exp $
+# $NetBSD: Makefile.common,v 1.6.4.1 2006/12/09 08:38:35 salo Exp $
 #
 
-POPPLER_VERS=		0.5.3
+POPPLER_VERS=		0.5.4
 DISTNAME=		poppler-${POPPLER_VERS}
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index c23662b30ac..e172a7a8eb1 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2006/05/31 18:13:54 drochner Exp $
+$NetBSD: distinfo,v 1.13.4.1 2006/12/09 08:38:35 salo Exp $
 
-SHA1 (poppler-0.5.3.tar.gz) = e197f5cf56f0676b5ca313577dd6456a393c46ec
-RMD160 (poppler-0.5.3.tar.gz) = 3456de23955fc4001842c76d32deba308bd7f968
-Size (poppler-0.5.3.tar.gz) = 1049900 bytes
+SHA1 (poppler-0.5.4.tar.gz) = edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1
+RMD160 (poppler-0.5.4.tar.gz) = f28c89b03388757067505df3c60a1d878626b0dd
+Size (poppler-0.5.4.tar.gz) = 1062401 bytes
 SHA1 (patch-aa) = dba62eabac1d77b5a64c47aaa0ba94208149668b
-SHA1 (patch-ab) = c00be67e0ff6c171c57a1762f7ff23db4b449acf
+SHA1 (patch-ab) = 5ff54831e530c857b88f90c91108d1a04178579e
+SHA1 (patch-ac) = ba2f2e83897e4c56541da6e9e4f1b61d60fea9b0
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 20618cad3dd..934b21a00b1 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
+$NetBSD: patch-ab,v 1.5.4.1 2006/12/09 08:38:35 salo Exp $
 
---- utils/Makefile.in.orig	2006-05-22 22:15:21.000000000 +0200
+--- utils/Makefile.in.orig	2006-09-22 02:54:29.000000000 +0200
 +++ utils/Makefile.in
 @@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
@@ -11,33 +11,29 @@ $NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  PROGRAMS = $(bin_PROGRAMS)
-@@ -61,41 +61,41 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+@@ -60,35 +60,35 @@ am__objects_1 = parseargs.$(OBJEXT)
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
- am__DEPENDENCIES_1 =
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	$(am__objects_1)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
  	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
 -@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
 -@BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
@@ -45,24 +41,22 @@ $NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
 +	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
-+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
- 	$(am__DEPENDENCIES_1)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -283,12 +283,12 @@ sbindir = @sbindir@
+ am__depfiles_maybe = depfiles
+@@ -278,12 +278,12 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -80,7 +74,7 @@ $NetBSD: patch-ab,v 1.5 2006/05/31 18:13:54 drochner Exp $
  INCLUDES = \
  	-I$(top_srcdir)				\
  	-I$(top_srcdir)/utils			\
-@@ -296,8 +296,8 @@ INCLUDES = \
+@@ -291,8 +291,8 @@ INCLUDES = \
  	$(UTILS_CFLAGS)
  
  LDADD = \
diff --git a/print/poppler/patches/patch-ac b/print/poppler/patches/patch-ac
new file mode 100644
index 00000000000..e095c3282cf
--- /dev/null
+++ b/print/poppler/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.2.6.1 2006/12/09 08:38:35 salo Exp $
+
+--- configure.orig	2006-10-12 12:26:10.000000000 +0200
++++ configure
+@@ -25346,7 +25346,7 @@ if test "x$qt_libdir" != "xno" ; then
+     fi
+ fi
+ 
+-if test "x$have_qt" == "xyes"; then
++if test "x$have_qt" = "xyes"; then
+     ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -25534,7 +25534,7 @@ if test "x$qt_libdir" != "xno" ; then
+     fi
+ fi
+ 
+-if test "x$have_qt" == "xyes"; then
++if test "x$have_qt" = "xyes"; then
+     ac_ext=cc
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -25754,7 +25754,7 @@ if test "x$qt4_libdir" != "xno" ; then
+     fi
+ fi
+ 
+-if test "x$have_qt4" == "xyes"; then
++if test "x$have_qt4" = "xyes"; then
+     POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
+     if test x$windows_qt = xyes; then
+ 	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
+@@ -25827,7 +25827,7 @@ if test "x$qt4_libdir" != "xno" ; then
+     fi
+ fi
+ 
+-if test "x$have_qt4" == "xyes"; then
++if test "x$have_qt4" = "xyes"; then
+     POPPLER_QT4_CXXFLAGS="-I$qt4_incdir"
+     if test x$windows_qt = xyes; then
+ 	POPPLER_QT4_LIBS="-L$qt4_libdir -lQtCore4 -lQtGui4 -lQtXml4"
+@@ -25910,7 +25910,7 @@ if test "x$qt4test_libdir" != "xno" ; th
+     fi
+ fi
+ 
+-if test "x$have_qt4testlib" == "xyes"; then
++if test "x$have_qt4testlib" = "xyes"; then
+     POPPLER_QTTEST_CXXFLAGS="-I$qt4test_incdir"
+     POPPLER_QTTEST_LIBS="-L$qt4test_libdir -lQtTest"
+     enable_poppler_qt4testlib="yes"