Index: general.ent
===================================================================
--- general.ent (revision c45eca2047661b4cc8d0d5808cbefb45a68597e6)
+++ general.ent (revision 10cbf37c2ae0c51249db59114fd80a9b69dbdd61)
@@ -1,5 +1,5 @@
-
+
@@ -7,5 +7,5 @@
-
+
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml (revision c45eca2047661b4cc8d0d5808cbefb45a68597e6)
+++ introduction/welcome/changelog.xml (revision 10cbf37c2ae0c51249db59114fd80a9b69dbdd61)
@@ -42,4 +42,17 @@
-->
+
+ November 25th, 2018
+
+
+ [ken] - Fix breakage from poppler versions 70,71 in
+ cups-filters, libreoffice and inkscape, and in so-doing
+ update to cups-filters-1.21.4. Fixes
+ #11096,
+ #11245 and
+ #11383.
+
+
+
Index: packages.ent
===================================================================
--- packages.ent (revision c45eca2047661b4cc8d0d5808cbefb45a68597e6)
+++ packages.ent (revision 10cbf37c2ae0c51249db59114fd80a9b69dbdd61)
@@ -981,5 +981,5 @@
-
+
Index: pst/printing/cups-filters.xml
===================================================================
--- pst/printing/cups-filters.xml (revision c45eca2047661b4cc8d0d5808cbefb45a68597e6)
+++ pst/printing/cups-filters.xml (revision 10cbf37c2ae0c51249db59114fd80a9b69dbdd61)
@@ -8,7 +8,7 @@
"https://www.openprinting.org/download/cups-filters/cups-filters-&cups-filters-version;.tar.xz">
-
-
-
+
+
+
]>
@@ -70,4 +70,11 @@
Estimated build time: &cups-filters-time;
+
+
+
+
+
+ Required patch to fix building with recent versions of :
+
@@ -82,5 +89,4 @@
,
,
- (mutool),
, and
@@ -90,6 +96,7 @@
,
- and
-
+ ,
+ and
+ (mutool),
@@ -126,4 +133,11 @@
sed -i "s:cups.service:org.cups.cupsd.service:g" utils/cups-browsed.service
+
+
+ Fix the build for the changes in some recent versions of
+ poppler:
+
+
+patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler71-1.patch
@@ -177,10 +191,9 @@
Command Explanations
-
+
+ patch -Np1 -i ../cups-filters-&cups-filters-version;-poppler71-1.patch:
Conditionally apply changes for recent versions of poppler.
--->
--disable-avahi: This switch is needed
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml (revision c45eca2047661b4cc8d0d5808cbefb45a68597e6)
+++ xsoft/office/libreoffice.xml (revision 10cbf37c2ae0c51249db59114fd80a9b69dbdd61)
@@ -147,12 +147,21 @@
-
+
+
+
+ Required patch to fix building with system (all
+ recent versions):
+
+
+
+
+
+
+ Required patch to fix building with system
+ (only if using that version or a later version):
+
+
+
+
LibreOffice Dependencies
@@ -329,11 +338,17 @@
export LO_PREFIX=<PREFIX>
-
+
+
+ Fix build failures introduced by recent versions of :
+
+
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler70-1.patch
+
+
+ Similarly, fix build failures introduced with :
+
+
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler71-1.patch
+
Locales "fr" and "en-GB", you will find below, are just examples; you
Index: xsoft/other/inkscape.xml
===================================================================
--- xsoft/other/inkscape.xml (revision c45eca2047661b4cc8d0d5808cbefb45a68597e6)
+++ xsoft/other/inkscape.xml (revision 10cbf37c2ae0c51249db59114fd80a9b69dbdd61)
@@ -77,5 +77,5 @@
- Required patch:
+ Required patch:
@@ -146,15 +146,19 @@
Ensure that the libraries from can be used,
- and fix the build for the changes in poppler-0.65.0:
+ and fix the build for the changes in some recent versions of
+ poppler:
patch -Np1 -i ../inkscape-&inkscape-version;-use_versioned_ImageMagick6-1.patch &&
-patch -Np1 -i ../inkscape-&inkscape-version;-poppler65-1.patch
+patch -Np1 -i ../inkscape-&inkscape-version;-upstream_poppler_fixes-1.patch
- Fix a build issue with GCC-7.1:
-
-
-sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
+ Fix build issues with GCC-7.1 and
+ poppler-0.71.0:
+
+
+sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp &&
+sed -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
+ -i src/extension/internal/pdfinput/pdf-parser.*