View | Details | Raw Unified | Return to bug 241532
Collapse All | Expand All

(-)b/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch (+26 lines)
Added Link Here
1
This patch doesn't come from Gentoo, but because there are already
2
three unrelated patches that touch the same file, I'm following the
3
naming convention so that it gets applied in the right order.
4
5
Chase constness changes in the poppler API.
6
7
--- pdf2djvu.cc.orig	2019-10-27 19:16:30.654895000 +0000
8
+++ pdf2djvu.cc	2019-10-27 19:16:47.450786000 +0000
9
@@ -333,7 +333,7 @@
10
   }
11
 
12
   void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
13
-    pdf::gfx::ImageColorMap *color_map, bool interpolate, int *mask_colors, bool inline_image)
14
+    pdf::gfx::ImageColorMap *color_map, bool interpolate, const int *mask_colors, bool inline_image)
15
   {
16
     if (is_foreground_color_map(color_map) || config.no_render)
17
     {
18
@@ -376,7 +376,7 @@
19
   bool interpretType3Chars() { return false; }
20
 
21
   void drawChar(pdf::gfx::State *state, double x, double y, double dx, double dy, double origin_x, double origin_y,
22
-    CharCode code, int n_bytes, Unicode *unistr, int length)
23
+    CharCode code, int n_bytes, const Unicode *unistr, int length)
24
   {
25
     double pox, poy, pdx, pdy, px, py, pw, ph;
26
     x -= origin_x; y -= origin_y;
(-)b/converters/pdf2djvu/files/patch-pdf-dpi.cc (+11 lines)
Added Link Here
1
--- pdf-dpi.cc.orig	2019-10-27 19:10:07 UTC
2
+++ pdf-dpi.cc
3
@@ -34,7 +34,7 @@ class DpiGuessDevice : public pdf::OutputDevice (prote
4
   }
5
 
6
   virtual void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height,
7
-    pdf::gfx::ImageColorMap *color_map, bool interpolate, int *mask_colors, bool inline_image)
8
+    pdf::gfx::ImageColorMap *color_map, bool interpolate, const int *mask_colors, bool inline_image)
9
   {
10
     this->process_image(state, width, height);
11
   }
(-)b/converters/pdf2djvu/files/patch-pdf-unicode.cc (+25 lines)
Added Link Here
1
--- pdf-unicode.cc.orig	2019-10-27 19:19:18.837645000 +0000
2
+++ pdf-unicode.cc	2019-10-27 19:20:31.405700000 +0000
3
@@ -125,11 +125,11 @@
4
  * ===================
5
  */
6
 
7
-pdf::FullNFKC::FullNFKC(Unicode *unistr, int length)
8
+pdf::FullNFKC::FullNFKC(const Unicode *unistr, int length)
9
 : data(nullptr), length_(0)
10
 {
11
     assert(length >= 0);
12
-    this->data = unicodeNormalizeNFKC(unistr, length, &this->length_, nullptr);
13
+    this->data = unicodeNormalizeNFKC(const_cast<Unicode*>(unistr), length, &this->length_, nullptr);
14
 }
15
 
16
 pdf::FullNFKC::~FullNFKC()
17
@@ -141,7 +141,7 @@
18
  * ======================
19
  */
20
 
21
-pdf::MinimalNFKC::MinimalNFKC(Unicode *unistr, int length)
22
+pdf::MinimalNFKC::MinimalNFKC(const Unicode *unistr, int length)
23
 {
24
     this->string.append(unistr, length);
25
 }
(-)b/converters/pdf2djvu/files/patch-pdf-unicode.hh (+20 lines)
Added Link Here
1
--- pdf-unicode.hh.orig	2019-10-27 19:18:36.768779000 +0000
2
+++ pdf-unicode.hh	2019-10-27 19:19:00.052652000 +0000
3
@@ -58,7 +58,7 @@
4
         Unicode* data;
5
         int length_;
6
     public:
7
-        explicit FullNFKC(Unicode *, int length);
8
+        explicit FullNFKC(const Unicode *, int length);
9
         ~FullNFKC();
10
         int length() const
11
         {
12
@@ -79,7 +79,7 @@
13
     protected:
14
         std::basic_string<Unicode> string;
15
     public:
16
-        explicit MinimalNFKC(Unicode *, int length);
17
+        explicit MinimalNFKC(const Unicode *, int length);
18
         int length() const;
19
         operator const Unicode*() const;
20
     };
(-)b/editors/calligra/Makefile (-6 / +2 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD: head/editors/calligra/Makefile 515671 2019-10-25 23:41:34Z tcberner $
2
2
3
PORTNAME=	calligra
3
PORTNAME=	calligra
4
DISTVERSION=	3.1.0
4
DISTVERSION=	3.1.0
5
PORTREVISION=	26
5
PORTREVISION=	27
6
CATEGORIES=	editors kde
6
CATEGORIES=	editors kde
7
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
7
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
8
DIST_SUBDIR=	KDE/${PORTNAME}
8
DIST_SUBDIR=	KDE/${PORTNAME}
Lines 69-76 CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" Link Here
69
69
70
PLIST_SUB+=	SHLIB_VER=16.0.0
70
PLIST_SUB+=	SHLIB_VER=16.0.0
71
71
72
post-patch:
73
	# Fix with poppler 0.73
74
	${REINPLACE_CMD} -e 's|Guchar|unsigned char|g' \
75
		${WRKSRC}/filters/karbon/pdf/SvgOutputDev.cpp
76
.include <bsd.port.mk>
72
.include <bsd.port.mk>
(-)b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp (-2 / +24 lines)
Lines 101-107 Link Here
101
 {
101
 {
102
     int render = state->getRender();
102
     int render = state->getRender();
103
     // check for invisible text -- this is used by Acrobat Capture
103
     // check for invisible text -- this is used by Acrobat Capture
104
@@ -402,7 +408,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
104
@@ -402,10 +408,10 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
105
 
105
 
106
     QString str;
106
     QString str;
107
 
107
 
Lines 109-115 Link Here
109
+    const char * p = s->c_str();
109
+    const char * p = s->c_str();
110
     int len = s->getLength();
110
     int len = s->getLength();
111
     CharCode code;
111
     CharCode code;
112
     Unicode *u = nullptr;
112
-    Unicode *u = nullptr;
113
+    const Unicode *u = nullptr;
114
     int uLen;
115
     double dx, dy, originX, originY;
116
     while (len > 0) {
113
@@ -429,7 +435,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
117
@@ -429,7 +435,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
114
     double x = state->getCurX();
118
     double x = state->getCurX();
115
     double y = state->getCurY();
119
     double y = state->getCurY();
Lines 144-149 Link Here
144
 {
148
 {
145
     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
149
     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
146
     imgStr->reset();
150
     imgStr->reset();
151
@@ -488,7 +494,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
152
     if (maskColors) {
153
         for (int y = 0; y < height; y++) {
154
             dest = (unsigned int *)(buffer + y * 4 * width);
155
-            Guchar * pix = imgStr->getLine();
156
+            unsigned char * pix = imgStr->getLine();
157
             colorMap->getRGBLine(pix, dest, width);
158
 
159
             for (int x = 0; x < width; x++) {
160
@@ -507,7 +513,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
161
     } else {
162
         for (int y = 0; y < height; y++) {
163
             dest = (unsigned int *)(buffer + y * 4 * width);
164
-            Guchar * pix = imgStr->getLine();
165
+            unsigned char * pix = imgStr->getLine();
166
             colorMap->getRGBLine(pix, dest, width);
167
         }
168
 
147
@@ -522,7 +528,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
169
@@ -522,7 +528,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
148
         return;
170
         return;
149
     }
171
     }
(-)b/editors/calligra/files/patch-sheets_plugins_calendar_CalendarToolWidget.cpp (-9 / +1 lines)
Lines 3-15 From: David Faure <faure@kde.org> Link Here
3
Date: Tue, 23 Jul 2019 13:02:34 +0200
3
Date: Tue, 23 Jul 2019 13:02:34 +0200
4
Subject: Fix compilation with Qt 5.13 (missing include)
4
Subject: Fix compilation with Qt 5.13 (missing include)
5
5
6
---
6
--- sheets/plugins/calendar/CalendarToolWidget.cpp.orig	2018-01-26 09:24:44 UTC
7
 sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
8
 1 file changed, 1 insertion(+)
9
10
diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
11
index b10b230..0c5eeb6 100644
12
--- sheets/plugins/calendar/CalendarToolWidget.cpp
13
+++ sheets/plugins/calendar/CalendarToolWidget.cpp
7
+++ sheets/plugins/calendar/CalendarToolWidget.cpp
14
@@ -30,6 +30,7 @@
8
@@ -30,6 +30,7 @@
15
 #include <kdatepicker.h>
9
 #include <kdatepicker.h>
Lines 19-23 index b10b230..0c5eeb6 100644 Link Here
19
 
13
 
20
 namespace Calligra
14
 namespace Calligra
21
 {
15
 {
22
-- 
23
cgit v1.1
(-)b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx (+35 lines)
Added Link Here
1
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2019-10-27 14:16:14 UTC
2
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
3
@@ -866,7 +866,7 @@ void PDFOutDev::eoClip(GfxState *state)
4
 void PDFOutDev::drawChar(GfxState *state, double x, double y,
5
                          double dx, double dy,
6
                          double originX, double originY,
7
-                         CharCode, int /*nBytes*/, Unicode *u, int uLen)
8
+                         CharCode, int /*nBytes*/, const Unicode *u, int uLen)
9
 {
10
     assert(state);
11
 
12
@@ -982,7 +982,7 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
13
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
14
                           int width, int height, GfxImageColorMap* colorMap,
15
                           poppler_bool /*interpolate*/,
16
-                          int* maskColors, poppler_bool /*inlineImg*/ )
17
+                          const int* maskColors, poppler_bool /*inlineImg*/ )
18
 {
19
     if (m_bSkipImages)
20
         return;
21
@@ -1004,12 +1004,12 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* 
22
         {
23
             GfxRGB aMinRGB;
24
             colorMap->getColorSpace()->getRGB(
25
-                reinterpret_cast<GfxColor*>(maskColors),
26
+                reinterpret_cast<const GfxColor*>(maskColors),
27
                 &aMinRGB );
28
 
29
             GfxRGB aMaxRGB;
30
             colorMap->getColorSpace()->getRGB(
31
-                reinterpret_cast<GfxColor*>(maskColors)+gfxColorMaxComps,
32
+                reinterpret_cast<const GfxColor*>(maskColors)+gfxColorMaxComps,
33
                 &aMaxRGB );
34
 
35
             aMaskBuf.push_back( colToByte(aMinRGB.r) );
(-)b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx (+39 lines)
Added Link Here
1
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2019-10-27 14:16:24 UTC
2
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
3
@@ -232,10 +232,18 @@ namespace pdfi
4
         virtual void eoClip(GfxState *state) override;
5
 
6
         //----- text drawing
7
+#if POPPLER_CHECK_VERSION(0, 82, 0)
8
         virtual void drawChar(GfxState *state, double x, double y,
9
                               double dx, double dy,
10
                               double originX, double originY,
11
+                              CharCode code, int nBytes, const Unicode *u, int uLen) override;
12
+#else
13
+        virtual void drawChar(GfxState *state, double x, double y,
14
+                              double dx, double dy,
15
+                              double originX, double originY,
16
                               CharCode code, int nBytes, Unicode *u, int uLen) override;
17
+#endif
18
+
19
 #if POPPLER_CHECK_VERSION(0, 64, 0)
20
         virtual void drawString(GfxState *state, const GooString *s) override;
21
 #else
22
@@ -248,10 +256,17 @@ namespace pdfi
23
                                    int width, int height, poppler_bool invert,
24
                                    poppler_bool interpolate,
25
                                    poppler_bool inlineImg) override;
26
+#if POPPLER_CHECK_VERSION(0, 82, 0)
27
         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
28
                                int width, int height, GfxImageColorMap *colorMap,
29
                                poppler_bool interpolate,
30
+                               const int* maskColors, poppler_bool inlineImg) override;
31
+#else
32
+        virtual void drawImage(GfxState *state, Object *ref, Stream *str,
33
+                               int width, int height, GfxImageColorMap *colorMap,
34
+                               poppler_bool interpolate,
35
                                int* maskColors, poppler_bool inlineImg) override;
36
+#endif
37
         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
38
                                      int width, int height,
39
                                      GfxImageColorMap *colorMap,
(-)b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp (+20 lines)
Added Link Here
1
--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2019-10-27 20:00:15.887122000 +0000
2
+++ src/extension/internal/pdfinput/pdf-parser.cpp	2019-10-27 20:02:37.972576000 +0000
3
@@ -2414,7 +2414,7 @@
4
   int wMode;
5
   double riseX, riseY;
6
   CharCode code;
7
-  Unicode *u = NULL;
8
+  const Unicode *u = NULL;
9
   double x, y, dx, dy, tdx, tdy;
10
   double originX, originY, tOriginX, tOriginY;
11
   double oldCTM[6], newCTM[6];
12
@@ -2537,7 +2537,7 @@
13
       originY *= state->getFontSize();
14
       state->textTransformDelta(originX, originY, &tOriginX, &tOriginY);
15
       builder->addChar(state, state->getCurX() + riseX, state->getCurY() + riseY,
16
-                       dx, dy, tOriginX, tOriginY, code, n, u, uLen);
17
+                       dx, dy, tOriginX, tOriginY, code, n, const_cast<Unicode*>(u), uLen);
18
       state->shift(tdx, tdy);
19
       p += n;
20
       len -= n;
(-)b/graphics/poppler-glib/pkg-plist (-1 / +1 lines)
Lines 16-21 include/poppler/glib/poppler.h Link Here
16
lib/girepository-1.0/Poppler-0.18.typelib
16
lib/girepository-1.0/Poppler-0.18.typelib
17
lib/libpoppler-glib.so
17
lib/libpoppler-glib.so
18
lib/libpoppler-glib.so.8
18
lib/libpoppler-glib.so.8
19
lib/libpoppler-glib.so.8.14.0
19
lib/libpoppler-glib.so.8.15.0
20
libdata/pkgconfig/poppler-glib.pc
20
libdata/pkgconfig/poppler-glib.pc
21
share/gir-1.0/Poppler-0.18.gir
21
share/gir-1.0/Poppler-0.18.gir
(-)b/graphics/poppler/Makefile (-2 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	poppler
4
PORTNAME=	poppler
5
DISTVERSION=	0.81.0
5
DISTVERSION=	0.82.0
6
PORTREVISION?=	1
6
PORTREVISION?=	0
7
CATEGORIES=	graphics print
7
CATEGORIES=	graphics print
8
MASTER_SITES=	https://poppler.freedesktop.org/
8
MASTER_SITES=	https://poppler.freedesktop.org/
9
9
(-)b/graphics/poppler/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1569211524
1
TIMESTAMP = 1572047126
2
SHA256 (poppler-0.81.0.tar.xz) = 212d020b035b67b36c9666bd08ac778dff3222d85c01c338787d546f0f9bfe02
2
SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
3
SIZE (poppler-0.81.0.tar.xz) = 1548944
3
SIZE (poppler-0.82.0.tar.xz) = 1553336
(-)b/graphics/poppler/pkg-plist (-2 / +5 lines)
Lines 4-9 include/poppler/BuiltinFont.h Link Here
4
include/poppler/BuiltinFontTables.h
4
include/poppler/BuiltinFontTables.h
5
include/poppler/CMap.h
5
include/poppler/CMap.h
6
include/poppler/CachedFile.h
6
include/poppler/CachedFile.h
7
include/poppler/CairoFontEngine.h
8
include/poppler/CairoOutputDev.h
9
include/poppler/CairoRescaleBox.h
7
include/poppler/Catalog.h
10
include/poppler/Catalog.h
8
include/poppler/CertificateInfo.h
11
include/poppler/CertificateInfo.h
9
include/poppler/CharCodeToUnicode.h
12
include/poppler/CharCodeToUnicode.h
Lines 132-139 lib/libpoppler-cpp.so Link Here
132
lib/libpoppler-cpp.so.0
135
lib/libpoppler-cpp.so.0
133
lib/libpoppler-cpp.so.0.7.0
136
lib/libpoppler-cpp.so.0.7.0
134
lib/libpoppler.so
137
lib/libpoppler.so
135
lib/libpoppler.so.91
138
lib/libpoppler.so.92
136
lib/libpoppler.so.91.0.0
139
lib/libpoppler.so.92.0.0
137
libdata/pkgconfig/poppler-cairo.pc
140
libdata/pkgconfig/poppler-cairo.pc
138
libdata/pkgconfig/poppler-cpp.pc
141
libdata/pkgconfig/poppler-cpp.pc
139
libdata/pkgconfig/poppler-splash.pc
142
libdata/pkgconfig/poppler-splash.pc
(-)b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp (+29 lines)
Added Link Here
1
--- scribus/plugins/import/pdf/slaoutput.cpp.orig	2019-10-27 16:14:24 UTC
2
+++ scribus/plugins/import/pdf/slaoutput.cpp
3
@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob
4
 	delete[] mbuffer;
5
 }
6
 
7
-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg)
8
+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg)
9
 {
10
 	ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
11
 //	qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors;
12
@@ -3365,7 +3365,7 @@ err1:
13
 		fontsrc->unref();
14
 }
15
 
16
-void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen)
17
+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen)
18
 {
19
 	double x1, y1, x2, y2;
20
 	int render;
21
@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x,
22
 	}
23
 }
24
 
25
-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
26
+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen)
27
 {
28
 //	qDebug() << "beginType3Char";
29
 	GfxFont *gfxFont;
(-)b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h (+22 lines)
Added Link Here
1
--- scribus/plugins/import/pdf/slaoutput.h.orig	2019-10-27 16:12:47 UTC
2
+++ scribus/plugins/import/pdf/slaoutput.h
3
@@ -229,7 +229,7 @@ class SlaOutputDev : public OutputDev (public)
4
 
5
 	//----- image drawing
6
 	void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;
7
-	void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;
8
+	void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override;
9
 	void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
10
 				   int width, int height,
11
 				   GfxImageColorMap *colorMap,
12
@@ -261,8 +261,8 @@ class SlaOutputDev : public OutputDev (public)
13
 	//----- text drawing
14
 	void  beginTextObject(GfxState *state) override;
15
 	void  endTextObject(GfxState *state) override;
16
-	void  drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;
17
-	GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;
18
+	void  drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override;
19
+	GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override;
20
 	void  endType3Char(GfxState * /*state*/) override;
21
 	void  type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;
22
 	void  type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;

Return to bug 241532