update print/poppler
Hi,
this updates poppler to 24.05.0. A little bit late, because I wanted
to run a test bulk build with the recent kde6 churn, and my build
machine isn't the fastest on the planet.
Diffs for graphics/inkscape, print/scribus, x11/kde-applications/kitinerary
will follow in a few minutes.
Tested some weeks ago with a couple of ports.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.184 Makefile
--- Makefile2 Apr 2024 21:03:51 - 1.184
+++ Makefile6 May 2024 20:36:32 -
@@ -3,7 +3,7 @@ COMMENT-qt5=Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 24.04.0
+V= 24.05.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,11 +13,11 @@ PKGNAME-qt6=poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 79.0 # 136.0
+SHARED_LIBS += poppler 80.0 # 137.0
SHARED_LIBS += poppler-glib 19.12# 8.26
-SHARED_LIBS += poppler-qt5 8.12 # 1.33
-SHARED_LIBS += poppler-qt6 1.4 # 3.4
-SHARED_LIBS += poppler-cpp 17.1 # 0.11
+SHARED_LIBS += poppler-qt5 8.13 # 1.34
+SHARED_LIBS += poppler-qt6 1.5 # 3.5
+SHARED_LIBS += poppler-cpp 18.0 # 1.0
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.101 distinfo
--- distinfo2 Apr 2024 21:03:51 - 1.101
+++ distinfo6 May 2024 20:36:32 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-24.04.0.tar.xz) = HoBOxWWs9xJusum7O1ZCKrIDn34Fhjpd+r3R/9G7d6c=
-SIZE (poppler-24.04.0.tar.xz) = 1904936
+SHA256 (poppler-24.05.0.tar.xz) = 2MXrMLUCha2fCvjGM1zC07lZf8pHXLwlmKVHn6N593k=
+SIZE (poppler-24.05.0.tar.xz) = 1909164
Index: patches/patch-cpp_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-cpp_CMakeLists_txt,v
diff -u -p -r1.4 patch-cpp_CMakeLists_txt
--- patches/patch-cpp_CMakeLists_txt17 Jul 2023 20:45:52 - 1.4
+++ patches/patch-cpp_CMakeLists_txt6 May 2024 20:36:32 -
@@ -7,7 +7,7 @@ Index: cpp/CMakeLists.txt
add_library(poppler-cpp ${poppler_cpp_SRCS})
generate_export_header(poppler-cpp BASE_NAME poppler-cpp EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h")
--set_target_properties(poppler-cpp PROPERTIES VERSION 0.11.0 SOVERSION 0)
+-set_target_properties(poppler-cpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION)
set_target_properties(poppler-cpp PROPERTIES SUFFIX
"-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
diff -u -p -r1.10 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt11 Oct 2023 18:09:12 -
1.10
+++ patches/patch-qt5_src_CMakeLists_txt6 May 2024 20:36:32 -
@@ -7,7 +7,7 @@ Index: qt5/src/CMakeLists.txt
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.33.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.34.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-qt6_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt6_src_CMakeLists_txt,v
diff -u -p -r1.7 patch-qt6_src_CMakeLists_txt
--- patches/patch-qt6_src_CMakeLists_txt11 Oct 2023 18:09:12 -
1.7
+++ patches/patch-qt6_src_CMakeLists_txt6 May 2024 20:36:32 -
@@ -7,7 +7,7 @@ Index: qt6/src/CMakeLists.txt
)
add_library(poppler-qt6 ${poppler_qt6_SRCS})
generate_export_header(poppler-qt6 BASE_NAME poppler-qt6 EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt6 PROPERTIES VERSION 3.4.0 SOVERSION 3)
+-set_target_properties(poppler-qt6 PROPERTIES VERSION 3.5.0 SOVERSION 3)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION)
set_target_properties(poppler-qt6 PROPERTIES SUFFIX
"-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: pkg/PLIST-main
update print/poppler
Hi,
this updates poppler to 24.03.0.
graphics/inkscape and print/scribus require some patches, which I'll
send after this one.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.182 Makefile
--- Makefile5 Feb 2024 22:15:38 - 1.182
+++ Makefile17 Mar 2024 19:40:31 -
@@ -3,7 +3,7 @@ COMMENT-qt5=Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 24.02.0
+V= 24.03.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,7 +13,7 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 77.0 # 134.0
+SHARED_LIBS += poppler 78.0 # 135.0
SHARED_LIBS += poppler-glib 19.12# 8.26
SHARED_LIBS += poppler-qt5 8.12 # 1.33
SHARED_LIBS += poppler-qt6 1.4 # 3.4
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
diff -u -p -r1.99 distinfo
--- distinfo5 Feb 2024 22:15:38 - 1.99
+++ distinfo17 Mar 2024 19:40:31 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-24.02.0.tar.xz) = GRh6P90F8z59YExHmcGD3lygEYZAyIs3DdzzE2NDIi4=
-SIZE (poppler-24.02.0.tar.xz) = 1897604
+SHA256 (poppler-24.03.0.tar.xz) = uvvw21cT3sJbXRbrLNh+SmI1HNxA8FDDk3zY3WiC1EY=
+SIZE (poppler-24.03.0.tar.xz) = 1902068
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
diff -u -p -r1.30 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 11 Oct 2023 18:09:12 - 1.30
+++ patches/patch-poppler_XRef_cc 17 Mar 2024 19:40:31 -
@@ -1,7 +1,7 @@
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1110,7 +1110,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -,7 +,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -10,7 +10,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1118,48 +1118,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1119,48 +1119,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: patches/patch-utils_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-utils_CMakeLists_txt,v
diff -u -p -r1.8 patch-utils_CMakeLists_txt
--- patches/patch-utils_CMakeLists_txt 17 Jul 2023 20:45:52 - 1.8
+++ patches/patch-utils_CMakeLists_txt 17 Mar 2024 19:40:31 -
@@ -4,7 +4,7 @@ up any already installed older version o
Index: utils/CMakeLists.txt
--- utils/CMakeLists.txt.orig
+++ utils/CMakeLists.txt
-@@ -36,7 +36,7 @@ if (HAVE_CAIRO)
+@@ -38,7 +38,7 @@ if (HAVE_CAIRO)
)
add_definitions(${CAIRO_CFLAGS})
add_executable(pdftocairo ${pdftocairo_SOURCES})
update print/poppler
Hi, this updates poppler to the latest version. I'm waiting for a bulk build on my machine to finish with it, but I don't expect any fallout. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v diff -u -p -r1.179 Makefile --- Makefile11 Nov 2023 15:21:52 - 1.179 +++ Makefile12 Dec 2023 00:01:50 - @@ -3,7 +3,7 @@ COMMENT-qt5=Qt5 interface to PDF render COMMENT-qt6= Qt6 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 23.11.0 +V= 23.12.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v diff -u -p -r1.96 distinfo --- distinfo7 Nov 2023 23:56:40 - 1.96 +++ distinfo12 Dec 2023 00:01:50 - @@ -1,2 +1,2 @@ -SHA256 (poppler-23.11.0.tar.xz) = +ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w= -SIZE (poppler-23.11.0.tar.xz) = 1894712 +SHA256 (poppler-23.12.0.tar.xz) = vro5jJ03qbbQJIZJZjXgjx3z1DfP5h2rJZP0fE0Uzbs= +SIZE (poppler-23.12.0.tar.xz) = 1895580
update print/poppler
Hi, probably the smallest poppler update ever ;-) Build-tested on amd64 with everything depending on it (directly or via WANTLIB), runtime tested with a few applications. If there aren't objections, I'll commit this on wednesday. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v diff -u -p -r1.176 Makefile --- Makefile11 Oct 2023 18:09:12 - 1.176 +++ Makefile6 Nov 2023 18:46:34 - @@ -3,7 +3,7 @@ COMMENT-qt5=Qt5 interface to PDF render COMMENT-qt6= Qt6 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 23.10.0 +V= 23.11.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,7 +13,7 @@ PKGNAME-qt6= poppler-qt6-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 75.0 # 132.0 +SHARED_LIBS += poppler 76.0 # 133.0 SHARED_LIBS += poppler-glib 19.12# 8.26 SHARED_LIBS += poppler-qt5 8.12 # 1.33 SHARED_LIBS += poppler-qt6 1.3 # 3.4 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v diff -u -p -r1.95 distinfo --- distinfo11 Oct 2023 18:09:12 - 1.95 +++ distinfo6 Nov 2023 18:46:34 - @@ -1,2 +1,2 @@ -SHA256 (poppler-23.10.0.tar.xz) = MaPf3qefSSJALTE3N0FaRNRNwU1rMX+VmnfFu6Bkfdk= -SIZE (poppler-23.10.0.tar.xz) = 1892152 +SHA256 (poppler-23.11.0.tar.xz) = +ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w= +SIZE (poppler-23.11.0.tar.xz) = 1894712
[after unlock]: update print/poppler
Hi,
update to poppler-23.10.0.
No idea why upstream applied major bumps to -glib, -qt5 and -qt6;
according to /usr/src/lib/check_sym only minor bumps are necessary (no
removed dynamic export changes).
I'm using this since a few days without any problems.
ok?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.175
diff -u -p -r1.175 Makefile
--- Makefile27 Sep 2023 14:32:03 - 1.175
+++ Makefile7 Oct 2023 19:43:40 -
@@ -3,7 +3,7 @@ COMMENT-qt5=Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 23.05.0
+V= 23.10.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt6=poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 74.0 # 128.0
-SHARED_LIBS += poppler-glib 19.11# 8.24
-SHARED_LIBS += poppler-qt5 8.11 # 1.31
-SHARED_LIBS += poppler-qt6 1.2 # 3.2
+SHARED_LIBS += poppler 75.0 # 132.0
+SHARED_LIBS += poppler-glib 19.12# 8.26
+SHARED_LIBS += poppler-qt5 8.12 # 1.33
+SHARED_LIBS += poppler-qt6 1.3 # 3.4
SHARED_LIBS += poppler-cpp 17.1 # 0.11
HOMEPAGE= https://poppler.freedesktop.org/
@@ -98,7 +98,8 @@ WANTLIB-utils=${COMPILER_LIBCXX} c cair
CONFIGURE_ARGS+=-DENABLE_UNSTABLE_API_ABI_HEADERS=True \
-DBUILD_GTK_TESTS=False \
-DENABLE_LIBCURL=False \
- -DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True \
+ -DENABLE_GPGME=False \
+ -DENABLE_NSS3=False \
-DOpenJPEG_DIR=${LOCALBASE}/lib/openjp2 \
-DX11BASE=${X11BASE}
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.94
diff -u -p -r1.94 distinfo
--- distinfo17 Jul 2023 20:45:52 - 1.94
+++ distinfo7 Oct 2023 19:43:40 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-23.05.0.tar.xz) = OClN5xSevkWBkabm0OKDfafbqGg5AKY1JS9tDuI1+ZA=
-SIZE (poppler-23.05.0.tar.xz) = 1856488
+SHA256 (poppler-23.10.0.tar.xz) = MaPf3qefSSJALTE3N0FaRNRNwU1rMX+VmnfFu6Bkfdk=
+SIZE (poppler-23.10.0.tar.xz) = 1892152
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt17 Jul 2023 20:45:52 - 1.3
+++ patches/patch-CMakeLists_txt7 Oct 2023 19:43:40 -
@@ -1,14 +1,14 @@
-Allow to build against qt-6.0.
+Allow to build against qt-6.5.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -204,7 +204,7 @@ endif()
+@@ -215,7 +215,7 @@ find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VE
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION})
+ find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION})
- if (ENABLE_QT6)
- SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
-- find_package(Qt6 6.2 COMPONENTS Core Gui Widgets Test QUIET)
-+ find_package(Qt6 COMPONENTS Core Gui Widgets Test QUIET)
- if (NOT (Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND
Qt6Test_FOUND))
- message("-- Package Qt6Core or Qt6Gui or Qt6Widgets or Qt6Test not found")
- set(ENABLE_QT6 OFF)
+-set(QT6_VERSION "6.2")
++set(QT6_VERSION "6")
+ SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION})
+ find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION})
Index: patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.13
diff -u -p -r1.13 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 17 Jul 2023 20:45:52 - 1.13
+++ patches/patch-glib_CMakeLists_txt 7 Oct 2023 19:43:40 -
@@ -7,11 +7,11 @@ Index: glib/CMakeLists.txt
)
add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
--set_target_properties(poppler-glib PROPERTIES VERSION 8.24.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.26.0 SOVERSION 8)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
set_target_properties(poppler-glib PROPERTIES SUFFIX
"-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-@@ -131,6 +130,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
+@@ -135,6 +134,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
_gir_list_prefi
Update print/poppler and fix graphics/inkscape
Hi,
the diff below updates poppler to 21.12.0 and also includes a fix
for inkscape.
I've already tested this on my machine.
Note that poppler-qt6 wants qt6.1 but still at least builds with
qt6.0. Afaics, no port currently depends on poppler-qt6, so there
should be no breakage even if poppler-21.12.0 and qt6.0 don't play
well together.
ok? (especially for the inkscape patch)
Ciao,
Kili
Index: print/poppler/Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile
--- print/poppler/Makefile 1 Nov 2021 18:33:24 - 1.169
+++ print/poppler/Makefile 21 Dec 2021 11:09:20 -
@@ -5,7 +5,7 @@ COMMENT-qt5=Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 21.10.0
+V= 21.12.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -15,8 +15,8 @@ PKGNAME-qt6= poppler-qt6-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 72.0 # 113.0
-SHARED_LIBS += poppler-glib 19.9 # 8.21
+SHARED_LIBS += poppler 73.0 # 116.0
+SHARED_LIBS += poppler-glib 19.10# 8.22
SHARED_LIBS += poppler-qt5 8.10 # 1.30
SHARED_LIBS += poppler-qt6 1.1 # 3.1
SHARED_LIBS += poppler-cpp 17.0 # 0.9
Index: print/poppler/distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.92
diff -u -p -r1.92 distinfo
--- print/poppler/distinfo 1 Nov 2021 18:33:25 - 1.92
+++ print/poppler/distinfo 21 Dec 2021 11:09:20 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-21.10.0.tar.xz) = lktbFikPvsP65XwqW83qSbsHNr11DDo3EcR5lcnvw5Q=
-SIZE (poppler-21.10.0.tar.xz) = 1779668
+SHA256 (poppler-21.12.0.tar.xz) = rLhAwsHsB9B+U8V8Szof8+PuLYiNROHp8vAarxaBTec=
+SIZE (poppler-21.12.0.tar.xz) = 1798780
Index: print/poppler/patches/patch-CMakeLists_txt
===
RCS file: print/poppler/patches/patch-CMakeLists_txt
diff -N print/poppler/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ print/poppler/patches/patch-CMakeLists_txt 21 Dec 2021 11:09:20 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Allow to build against qt-6.0.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -191,7 +191,7 @@ endif()
+
+ if (ENABLE_QT6)
+ SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
+- find_package(Qt6 6.1 COMPONENTS Core Gui Widgets Test QUIET)
++ find_package(Qt6 COMPONENTS Core Gui Widgets Test QUIET)
+ if (NOT (Qt6Core_FOUND AND Qt6Gui_FOUND AND Qt6Widgets_FOUND AND
Qt6Test_FOUND))
+ message("-- Package Qt6Core or Qt6Gui or Qt6Widgets or Qt6Test not found")
+ set(ENABLE_QT6 OFF)
Index: print/poppler/patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.10
diff -u -p -r1.10 patch-glib_CMakeLists_txt
--- print/poppler/patches/patch-glib_CMakeLists_txt 19 May 2021 19:57:03
- 1.10
+++ print/poppler/patches/patch-glib_CMakeLists_txt 21 Dec 2021 11:09:20
-
@@ -9,7 +9,7 @@ Index: glib/CMakeLists.txt
)
add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
--set_target_properties(poppler-glib PROPERTIES VERSION 8.21.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.22.0 SOVERSION 8)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
set_target_properties(poppler-glib PROPERTIES SUFFIX
"-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: print/poppler/patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.10
diff -u -p -r1.10 patch-poppler_Form_cc
--- print/poppler/patches/patch-poppler_Form_cc 1 Nov 2021 18:33:25 -
1.10
+++ print/poppler/patches/patch-poppler_Form_cc 21 Dec 2021 11:09:20 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.10 2
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -38,6 +38,7 @@
+@@ -39,6 +39,7 @@
#include
#include
Index: print/poppler/patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.26
diff -u -p -r1.26 patch-poppler_XRef_cc
--- print/poppler/patches/patch-poppler_XRef_cc 8 Sep 2021 17:50:37 -
1.26
+++ print/poppler/patches/patch-popp
update print/poppler
Hi,
overdue update to the newest poppler.
Works for me[tm] on amd64. I'm sending this because it breaks one port
(x11/kde-applications/kitinerary), which I'll send a patch for.
Ciao,
KIli
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.167
diff -u -p -r1.167 Makefile
--- Makefile19 May 2021 19:57:03 - 1.167
+++ Makefile7 Sep 2021 17:41:10 -
@@ -5,23 +5,20 @@ COMMENT-qt5= Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 21.05.0
+V= 21.09.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt5= poppler-qt5-$V
PKGNAME-qt6= poppler-qt6-$V
-REVISION-main= 0
-REVISION-qt5= 0
-REVISION-utils=0
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 70.0 # 110.0
+SHARED_LIBS += poppler 71.0 # 113.0
SHARED_LIBS += poppler-glib 19.9 # 8.21
-SHARED_LIBS += poppler-qt5 8.8 # 1.28
-SHARED_LIBS += poppler-qt6 0.1 # 1.2
+SHARED_LIBS += poppler-qt5 8.9 # 1.29
+SHARED_LIBS += poppler-qt6 1.0 # 3.0
SHARED_LIBS += poppler-cpp 17.0 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.90
diff -u -p -r1.90 distinfo
--- distinfo19 May 2021 19:57:03 - 1.90
+++ distinfo7 Sep 2021 17:41:10 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-21.05.0.tar.xz) = 2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=
-SIZE (poppler-21.05.0.tar.xz) = 1700632
+SHA256 (poppler-21.09.0.tar.xz) = Wkf+9zjCuZRx+bRZqL+LQK77fu2SyqSGHDeYsuEm0Fs=
+SIZE (poppler-21.09.0.tar.xz) = 1722828
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.8
diff -u -p -r1.8 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 9 Mar 2021 20:33:48 - 1.8
+++ patches/patch-poppler_Form_cc 7 Sep 2021 17:41:10 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.8 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
#include
#include
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.25
diff -u -p -r1.25 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 9 Mar 2021 20:33:48 - 1.25
+++ patches/patch-poppler_XRef_cc 7 Sep 2021 17:41:10 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.25 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1075,7 +1075,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -11,7 +11,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1083,48 +1083,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt19 May 2021 19:57:03 -
1.5
+++ patches/patch-qt5_src_CMakeLists_txt7 Sep 2021 17:41:10 -
@@ -9,7 +9,7 @@ Index: qt5/src/CMakeLists.txt
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h")
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.28.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.29.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-qt6_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt6_src_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt6_src_CMakeLists_txt
--- patches/patch-qt6_src_CMakeLists_txt19 May 2021 19:57:03 -
1.2
+++ patches/patch-qt6_src_CMakeLists_txt7 Se
Re: update print/poppler
Matthias Kilian writes:
> Hi,
>
> this works fine for me (on amd64) since a couple of days.
>
> But it also needs a patch for print/scribus (to be sent in a minute).
OK gnezdo
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.166
> diff -u -p -r1.166 Makefile
> --- Makefile 7 May 2021 07:25:15 - 1.166
> +++ Makefile 17 May 2021 18:44:32 -
> @@ -5,7 +5,7 @@ COMMENT-qt5= Qt5 interface to PDF render
> COMMENT-qt6= Qt6 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 21.03.0
> +V= 21.05.0
> DISTNAME=poppler-$V
> CATEGORIES= print
> PKGNAME-main=poppler-$V
> @@ -18,11 +18,11 @@ REVISION-utils= 0
>
> EXTRACT_SUFX=.tar.xz
>
> -SHARED_LIBS += poppler 69.0 # 108.0
> -SHARED_LIBS += poppler-glib 19.8 # 8.19
> -SHARED_LIBS += poppler-qt5 8.7 # 1.27
> -SHARED_LIBS += poppler-qt6 0.0 # 1.1
> -SHARED_LIBS += poppler-cpp 16.2 # 0.9
> +SHARED_LIBS += poppler 70.0 # 110.0
> +SHARED_LIBS += poppler-glib 19.9 # 8.21
> +SHARED_LIBS += poppler-qt5 8.8 # 1.28
> +SHARED_LIBS += poppler-qt6 0.1 # 1.2
> +SHARED_LIBS += poppler-cpp 17.0 # 0.9
>
> HOMEPAGE=https://poppler.freedesktop.org/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.89
> diff -u -p -r1.89 distinfo
> --- distinfo 9 Mar 2021 20:33:48 - 1.89
> +++ distinfo 17 May 2021 18:44:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (poppler-21.03.0.tar.xz) =
> /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
> -SIZE (poppler-21.03.0.tar.xz) = 1690848
> +SHA256 (poppler-21.05.0.tar.xz) =
> 2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=
> +SIZE (poppler-21.05.0.tar.xz) = 1700632
> Index: patches/patch-cpp_CMakeLists_txt
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-cpp_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-cpp_CMakeLists_txt
> --- patches/patch-cpp_CMakeLists_txt 27 Jul 2020 17:31:55 - 1.1
> +++ patches/patch-cpp_CMakeLists_txt 17 May 2021 18:44:32 -
> @@ -5,10 +5,10 @@ $OpenBSD: patch-cpp_CMakeLists_txt,v 1.1
> Index: cpp/CMakeLists.txt
> --- cpp/CMakeLists.txt.orig
> +++ cpp/CMakeLists.txt
> -@@ -25,7 +25,6 @@ set(poppler_cpp_SRCS
> - )
> +@@ -26,7 +26,6 @@ set(poppler_cpp_SRCS
>
> add_library(poppler-cpp ${poppler_cpp_SRCS})
> + generate_export_header(poppler-cpp BASE_NAME poppler-cpp EXPORT_FILE_NAME
> "${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h")
> -set_target_properties(poppler-cpp PROPERTIES VERSION 0.9.0 SOVERSION 0)
> if(MINGW AND BUILD_SHARED_LIBS)
> get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION)
> Index: patches/patch-glib_CMakeLists_txt
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-glib_CMakeLists_txt
> --- patches/patch-glib_CMakeLists_txt 7 Dec 2020 21:31:24 - 1.9
> +++ patches/patch-glib_CMakeLists_txt 17 May 2021 18:44:32 -
> @@ -6,14 +6,14 @@ Index: glib/CMakeLists.txt
> --- glib/CMakeLists.txt.orig
> +++ glib/CMakeLists.txt
> @@ -87,7 +87,6 @@ set(poppler_glib_generated_SRCS
> - ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
> )
> add_library(poppler-glib ${poppler_glib_SRCS}
> ${poppler_glib_generated_SRCS})
> --set_target_properties(poppler-glib PROPERTIES VERSION 8.19.0 SOVERSION 8)
> - set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
> - set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
> - set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
> -@@ -136,6 +135,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
> + generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC
> EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
> +-set_target_properties(poppler-glib PROPERTIES VERSION 8.21.0 SOVERSION 8)
> + if(MINGW AND BUILD_SHARED_LIBS)
> + get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
> + set_target_properties(poppler-glib PROPERTIES SUFFIX
> "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
> +@@ -130,6 +129,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
> _gir_list_prefix(_includes _tmp_includes "-I")
> # And set flags for gir compiler and scanner
> set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}
> -L${CMAKE_CURRENT_BINARY_DIR})
> Index: patches/patch-glib_poppler-action_cc
> =
update print/poppler
Hi,
this works fine for me (on amd64) since a couple of days.
But it also needs a patch for print/scribus (to be sent in a minute).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.166
diff -u -p -r1.166 Makefile
--- Makefile7 May 2021 07:25:15 - 1.166
+++ Makefile17 May 2021 18:44:32 -
@@ -5,7 +5,7 @@ COMMENT-qt5=Qt5 interface to PDF render
COMMENT-qt6= Qt6 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 21.03.0
+V= 21.05.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -18,11 +18,11 @@ REVISION-utils= 0
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 69.0 # 108.0
-SHARED_LIBS += poppler-glib 19.8 # 8.19
-SHARED_LIBS += poppler-qt5 8.7 # 1.27
-SHARED_LIBS += poppler-qt6 0.0 # 1.1
-SHARED_LIBS += poppler-cpp 16.2 # 0.9
+SHARED_LIBS += poppler 70.0 # 110.0
+SHARED_LIBS += poppler-glib 19.9 # 8.21
+SHARED_LIBS += poppler-qt5 8.8 # 1.28
+SHARED_LIBS += poppler-qt6 0.1 # 1.2
+SHARED_LIBS += poppler-cpp 17.0 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.89
diff -u -p -r1.89 distinfo
--- distinfo9 Mar 2021 20:33:48 - 1.89
+++ distinfo17 May 2021 18:44:32 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-21.03.0.tar.xz) = /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
-SIZE (poppler-21.03.0.tar.xz) = 1690848
+SHA256 (poppler-21.05.0.tar.xz) = 2v1Te2gPrRIVvED8U9HzjoRJ18GFvGDVqJ4dJskNvYw=
+SIZE (poppler-21.05.0.tar.xz) = 1700632
Index: patches/patch-cpp_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-cpp_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-cpp_CMakeLists_txt
--- patches/patch-cpp_CMakeLists_txt27 Jul 2020 17:31:55 - 1.1
+++ patches/patch-cpp_CMakeLists_txt17 May 2021 18:44:32 -
@@ -5,10 +5,10 @@ $OpenBSD: patch-cpp_CMakeLists_txt,v 1.1
Index: cpp/CMakeLists.txt
--- cpp/CMakeLists.txt.orig
+++ cpp/CMakeLists.txt
-@@ -25,7 +25,6 @@ set(poppler_cpp_SRCS
- )
+@@ -26,7 +26,6 @@ set(poppler_cpp_SRCS
add_library(poppler-cpp ${poppler_cpp_SRCS})
+ generate_export_header(poppler-cpp BASE_NAME poppler-cpp EXPORT_FILE_NAME
"${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h")
-set_target_properties(poppler-cpp PROPERTIES VERSION 0.9.0 SOVERSION 0)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION)
Index: patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -r1.9 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 7 Dec 2020 21:31:24 - 1.9
+++ patches/patch-glib_CMakeLists_txt 17 May 2021 18:44:32 -
@@ -6,14 +6,14 @@ Index: glib/CMakeLists.txt
--- glib/CMakeLists.txt.orig
+++ glib/CMakeLists.txt
@@ -87,7 +87,6 @@ set(poppler_glib_generated_SRCS
- ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
)
add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
--set_target_properties(poppler-glib PROPERTIES VERSION 8.19.0 SOVERSION 8)
- set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
- set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
- set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
-@@ -136,6 +135,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
+ generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h")
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.21.0 SOVERSION 8)
+ if(MINGW AND BUILD_SHARED_LIBS)
+ get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION)
+ set_target_properties(poppler-glib PROPERTIES SUFFIX
"-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+@@ -130,6 +129,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
_gir_list_prefix(_includes _tmp_includes "-I")
# And set flags for gir compiler and scanner
set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}
-L${CMAKE_CURRENT_BINARY_DIR})
Index: patches/patch-glib_poppler-action_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_poppler-action_cc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-glib_poppler-action_cc
--- patches/patch-glib_poppler-action_cc9 May 2021 08:55:41 -
1.3
+++ patches/patch-g
Re: update print/poppler
https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs
--
Sent from a phone, apologies for poor formatting.
On 8 March 2021 05:06:03 Greg Steuck wrote:
Matthias Kilian writes:
Hi,
this updates poppler to 21.03.0. Tested on amd64. If noone complains or
wants me to wait longer, I'll commit this (together with a fix for
scribus) on wednesday.
This looks good to me.
I'm not sure how to decide which SHARED_LIBS should be bumped. Do we
have some tools for helping notice when a bump is needed or just follow
the upstream bumps? Somehow I managed to not have touched a single port
that needed an bump of this kind.
Thanks
Greg
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile7 Dec 2020 21:31:24 - 1.164
+++ Makefile7 Mar 2021 17:54:35 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 20.12.0
+V= 21.03.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,9 +13,9 @@ PKGNAME-qt5= poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 68.0 # 105.0
+SHARED_LIBS += poppler 69.0 # 108.0
SHARED_LIBS += poppler-glib 19.8 # 8.19
-SHARED_LIBS += poppler-qt5 8.6 # 1.26
+SHARED_LIBS += poppler-qt5 8.7 # 1.27
SHARED_LIBS += poppler-cpp 16.2 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.88
diff -u -p -r1.88 distinfo
--- distinfo7 Dec 2020 21:31:24 - 1.88
+++ distinfo7 Mar 2021 17:54:35 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-20.12.0.tar.xz) = o5B1JcMuf/OV6vjPg++o1PUiuREoG4CChYb6gy/u+CQ=
-SIZE (poppler-20.12.0.tar.xz) = 1659844
+SHA256 (poppler-21.03.0.tar.xz) = /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
+SIZE (poppler-21.03.0.tar.xz) = 1690848
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.7
diff -u -p -r1.7 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 16 Jun 2020 20:24:05 - 1.7
+++ patches/patch-poppler_Form_cc 7 Mar 2021 17:54:35 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.7 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -34,6 +34,7 @@
+@@ -36,6 +36,7 @@
#include
#include
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.24
diff -u -p -r1.24 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 9 Sep 2020 20:16:44 - 1.24
+++ patches/patch-poppler_XRef_cc 7 Mar 2021 17:54:35 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.24 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -11,7 +11,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1052,48 +1052,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt7 Dec 2020 21:31:24 -
1.3
+++ patches/patch-qt5_src_CMakeLists_txt7 Mar 2021 17:54:35 -
@@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v
Index: qt5/src/CMakeLists.txt
--- qt5/src/CMakeLists.txt.orig
+++ qt5/src/CMakeLists.txt
-@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
+@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS
poppler-version.cpp
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-utils_CMakeLists_txt
===
Re: update print/poppler
Hi, On Sun, Mar 07, 2021 at 09:05:34PM -0800, Greg Steuck wrote: > > this updates poppler to 21.03.0. Tested on amd64. If noone complains or > > wants me to wait longer, I'll commit this (together with a fix for > > scribus) on wednesday. > > This looks good to me. > > I'm not sure how to decide which SHARED_LIBS should be bumped. Do we > have some tools for helping notice when a bump is needed or just follow > the upstream bumps? Somehow I managed to not have touched a single port > that needed an bump of this kind. I'm using /usr/src/lib/check_sym for this (in addition to looking at the diffs between header files of two poppler versions). Relying on upstream bumps was not enough in the past -- in poppler we had incompatible changes where upstream didn't bump majors. Ciao, Kili
Re: update print/poppler
Matthias Kilian writes:
> Hi,
>
> this updates poppler to 21.03.0. Tested on amd64. If noone complains or
> wants me to wait longer, I'll commit this (together with a fix for
> scribus) on wednesday.
This looks good to me.
I'm not sure how to decide which SHARED_LIBS should be bumped. Do we
have some tools for helping notice when a bump is needed or just follow
the upstream bumps? Somehow I managed to not have touched a single port
that needed an bump of this kind.
Thanks
Greg
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.164
> diff -u -p -r1.164 Makefile
> --- Makefile 7 Dec 2020 21:31:24 - 1.164
> +++ Makefile 7 Mar 2021 17:54:35 -
> @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 20.12.0
> +V= 21.03.0
> DISTNAME=poppler-$V
> CATEGORIES= print
> PKGNAME-main=poppler-$V
> @@ -13,9 +13,9 @@ PKGNAME-qt5=poppler-qt5-$V
>
> EXTRACT_SUFX=.tar.xz
>
> -SHARED_LIBS += poppler 68.0 # 105.0
> +SHARED_LIBS += poppler 69.0 # 108.0
> SHARED_LIBS += poppler-glib 19.8 # 8.19
> -SHARED_LIBS += poppler-qt5 8.6 # 1.26
> +SHARED_LIBS += poppler-qt5 8.7 # 1.27
> SHARED_LIBS += poppler-cpp 16.2 # 0.9
>
> HOMEPAGE=https://poppler.freedesktop.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.88
> diff -u -p -r1.88 distinfo
> --- distinfo 7 Dec 2020 21:31:24 - 1.88
> +++ distinfo 7 Mar 2021 17:54:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (poppler-20.12.0.tar.xz) =
> o5B1JcMuf/OV6vjPg++o1PUiuREoG4CChYb6gy/u+CQ=
> -SIZE (poppler-20.12.0.tar.xz) = 1659844
> +SHA256 (poppler-21.03.0.tar.xz) =
> /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
> +SIZE (poppler-21.03.0.tar.xz) = 1690848
> Index: patches/patch-poppler_Form_cc
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-poppler_Form_cc
> --- patches/patch-poppler_Form_cc 16 Jun 2020 20:24:05 - 1.7
> +++ patches/patch-poppler_Form_cc 7 Mar 2021 17:54:35 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.7 20
> Index: poppler/Form.cc
> --- poppler/Form.cc.orig
> +++ poppler/Form.cc
> -@@ -34,6 +34,7 @@
> +@@ -36,6 +36,7 @@
> #include
>
> #include
> Index: patches/patch-poppler_XRef_cc
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
> retrieving revision 1.24
> diff -u -p -r1.24 patch-poppler_XRef_cc
> --- patches/patch-poppler_XRef_cc 9 Sep 2020 20:16:44 - 1.24
> +++ patches/patch-poppler_XRef_cc 7 Mar 2021 17:54:35 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.24 2
> Index: poppler/XRef.cc
> --- poppler/XRef.cc.orig
> +++ poppler/XRef.cc
> -@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r)
> +@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
>
> bool XRef::okToPrint(bool ignoreOwnerPW) const
> {
> @@ -11,7 +11,7 @@ Index: poppler/XRef.cc
> }
>
> // we can print at high res if we are only doing security handler revision
> -@@ -1052,48 +1052,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
> +@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
> // 3 and we are allowed to print, and bit 12 is set.
> bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
> {
> Index: patches/patch-qt5_src_CMakeLists_txt
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-qt5_src_CMakeLists_txt
> --- patches/patch-qt5_src_CMakeLists_txt 7 Dec 2020 21:31:24 -
> 1.3
> +++ patches/patch-qt5_src_CMakeLists_txt 7 Mar 2021 17:54:35 -
> @@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v
> Index: qt5/src/CMakeLists.txt
> --- qt5/src/CMakeLists.txt.orig
> +++ qt5/src/CMakeLists.txt
> -@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
> +@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS
> poppler-version.cpp
> )
> add_library(poppler-qt5 ${poppler_qt5_SRCS})
> --set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1)
> +-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
> if(MINGW AND BUILD_SHARED_LIBS)
> get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
> set_target_properties(poppler-qt5 PROPERTIES SUFFIX
> "-${POPPLER_QT5_SOVERSION}${CMAKE_
update print/poppler
Hi,
this updates poppler to 21.03.0. Tested on amd64. If noone complains or
wants me to wait longer, I'll commit this (together with a fix for
scribus) on wednesday.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile7 Dec 2020 21:31:24 - 1.164
+++ Makefile7 Mar 2021 17:54:35 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 20.12.0
+V= 21.03.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,9 +13,9 @@ PKGNAME-qt5= poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 68.0 # 105.0
+SHARED_LIBS += poppler 69.0 # 108.0
SHARED_LIBS += poppler-glib 19.8 # 8.19
-SHARED_LIBS += poppler-qt5 8.6 # 1.26
+SHARED_LIBS += poppler-qt5 8.7 # 1.27
SHARED_LIBS += poppler-cpp 16.2 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.88
diff -u -p -r1.88 distinfo
--- distinfo7 Dec 2020 21:31:24 - 1.88
+++ distinfo7 Mar 2021 17:54:35 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-20.12.0.tar.xz) = o5B1JcMuf/OV6vjPg++o1PUiuREoG4CChYb6gy/u+CQ=
-SIZE (poppler-20.12.0.tar.xz) = 1659844
+SHA256 (poppler-21.03.0.tar.xz) = /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
+SIZE (poppler-21.03.0.tar.xz) = 1690848
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.7
diff -u -p -r1.7 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 16 Jun 2020 20:24:05 - 1.7
+++ patches/patch-poppler_Form_cc 7 Mar 2021 17:54:35 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.7 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -34,6 +34,7 @@
+@@ -36,6 +36,7 @@
#include
#include
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.24
diff -u -p -r1.24 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 9 Sep 2020 20:16:44 - 1.24
+++ patches/patch-poppler_XRef_cc 7 Mar 2021 17:54:35 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.24 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -11,7 +11,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1052,48 +1052,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt7 Dec 2020 21:31:24 -
1.3
+++ patches/patch-qt5_src_CMakeLists_txt7 Mar 2021 17:54:35 -
@@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v
Index: qt5/src/CMakeLists.txt
--- qt5/src/CMakeLists.txt.orig
+++ qt5/src/CMakeLists.txt
-@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
+@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS
poppler-version.cpp
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-utils_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-utils_CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-utils_CMakeLists_txt
--- patches/patch-utils_CMakeLists_txt 9 Sep 2020 20:16:44 - 1.4
+++ patches/patch-utils_CMakeLists_txt 7 Mar 2021 17:54:35 -
@@ -6,7 +6,7 @@ up any already installed older version o
Index: utils/CMakeLists.txt
--- utils/CMakeLists.txt.orig
+++ utils/CMakeLists.txt
-@@ -3
Re: update print/poppler
On Mon, Jun 15, 2020 at 02:51:06PM +0200, Matthias Kilian wrote: > Hi, > > On Sun, Jun 14, 2020 at 06:48:34PM -0700, Greg Steuck wrote: > > > here's an update to poppler-0.89.0. Survived a bulk build on amd64, > > > but I coould'nt yet test it (because of flaky internet, and I'm > > > doing the builds on a remote machine, not at home). > > > > > > According to check_sym, library bumps are fine. > > > > > > I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded > > > SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work > > > around spurious build failures. > > > > > > Any tests are appreciated. > > > > I tried to build the poppler package on a -current (+ pirofti@'s gettime) > > system and ran into a problem. I have libreoffice installed, so the > > previous version of poppler is in use. > > [...] > > ===> Building package for poppler-qt5-0.89.0 > > Create /usr/ports/packages/amd64/all/poppler-qt5-0.89.0.tgz > > Creating package poppler-qt5-0.89.0 > > |library poppler.64.0 not found > > | /usr/local/lib/libpoppler.so.63.0 (poppler-0.88.0): bad major > > Direct dependencies for poppler-qt5-0.89.0 resolve to poppler-0.88.0 > > qtbase-5.13.2p0 > [...] > > So it looks like poppler is one of those ports that can't be built > when an older version is already installed, because it picks up the > (old, installed) libpoppler.so.* from /usr/local/lib. > > No idea wether it's worth to fix this. Depends whether it's trivial to fix or not... People building bulks are not affected, and it's very simple to build stuff in a proot anyway, so if it takes more than 15mn to fix, just drop it.
Re: update print/poppler
Hi, On Sun, Jun 14, 2020 at 06:48:34PM -0700, Greg Steuck wrote: > > here's an update to poppler-0.89.0. Survived a bulk build on amd64, > > but I coould'nt yet test it (because of flaky internet, and I'm > > doing the builds on a remote machine, not at home). > > > > According to check_sym, library bumps are fine. > > > > I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded > > SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work > > around spurious build failures. > > > > Any tests are appreciated. > > I tried to build the poppler package on a -current (+ pirofti@'s gettime) > system and ran into a problem. I have libreoffice installed, so the > previous version of poppler is in use. [...] > ===> Building package for poppler-qt5-0.89.0 > Create /usr/ports/packages/amd64/all/poppler-qt5-0.89.0.tgz > Creating package poppler-qt5-0.89.0 > |library poppler.64.0 not found > | /usr/local/lib/libpoppler.so.63.0 (poppler-0.88.0): bad major > Direct dependencies for poppler-qt5-0.89.0 resolve to poppler-0.88.0 > qtbase-5.13.2p0 [...] So it looks like poppler is one of those ports that can't be built when an older version is already installed, because it picks up the (old, installed) libpoppler.so.* from /usr/local/lib. No idea wether it's worth to fix this. Ciao, Kili
Re: update print/poppler
> here's an update to poppler-0.89.0. Survived a bulk build on amd64,
> but I coould'nt yet test it (because of flaky internet, and I'm
> doing the builds on a remote machine, not at home).
>
> According to check_sym, library bumps are fine.
>
> I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded
> SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work
> around spurious build failures.
>
> Any tests are appreciated.
I tried to build the poppler package on a -current (+ pirofti@'s gettime)
system and ran into a problem. I have libreoffice installed, so the
previous version of poppler is in use.
$ make clean=all
...
$ make package
...
===> Building package for poppler-0.89.0
Create /usr/ports/packages/amd64/all/poppler-0.89.0.tgz
Creating package poppler-0.89.0
Creating package debug-poppler-0.89.0
Link to /usr/ports/packages/amd64/ftp/poppler-0.89.0.tgz
Link to /usr/ports/packages/amd64/ftp/debug-poppler-0.89.0.tgz
`/usr/ports/pobj/poppler-0.89.0/fake-amd64/.fake_done' is up to date.
===> Building package for poppler-qt5-0.89.0
Create /usr/ports/packages/amd64/all/poppler-qt5-0.89.0.tgz
Creating package poppler-qt5-0.89.0
|library poppler.64.0 not found
| /usr/local/lib/libpoppler.so.63.0 (poppler-0.88.0): bad major
Direct dependencies for poppler-qt5-0.89.0 resolve to poppler-0.88.0
qtbase-5.13.2p0
Full dependency tree is pcre-8.41p2 libpsl-0.20.2p1 jpeg-2.0.4p0v0
gnutls-3.6.14 librsvg-2.48.7 geoclue-0.12.99p9 libsoup-2.70.0
dbus-glib-0.110p1v0 gtk-update-icon-cache-3.24.20 cairo-1.16.0
qtbase-5.13.2p0 openjp2-2.3.1p0 lzo2-2.10p2
gsettings-desktop-schemas-3.36.1 dconf-0.36.0p0 p11-kit-0.23.20
libunbound-1.10.1 double-conversion-3.1.5 shared-mime-info-2.0
gdk-pixbuf-2.40.0p2 zstd-1.4.5 xz-5.2.5 avahi-0.8 bzip2-1.0.8
harfbuzz-2.6.7 at-spi2-atk-2.34.2 sqlite3-3.31.1p0 fribidi-1.0.9
libproxy-0.4.15p4 png-1.6.37 desktop-file-utils-0.24p0 poppler-data-0.4.9
gmp-6.2.0 lcms2-2.9p0 libtasn1-4.16.0 cups-libs-2.3.3 libffi-3.3
glib2-2.64.3 atk-2.36.0 jasper-2.0.14 gettext-runtime-0.20.2 tiff-4.1.0
graphite2-1.3.14 libxml-2.9.10p1 icu4c-67.1 dbus-1.12.18v0 poppler-0.88.0
pcre2-10.34 libunistring-0.9.7 dbus-daemon-launch-helper-1.12.18
libexecinfo-0.3p2v0 glib2-networking-2.64.3 python-3.7.7
libxkbcommon-0.10.0p0 pango-1.44.7p0 lz4-1.9.2p0 gdbm-1.18.1p0
libidn2-2.3.0p0 at-spi2-core-2.36.0 libnettle-3.6 libdaemon-0.14p1
adwaita-icon-theme-3.36.1 brotli-1.0.7 boost-1.66.0p11 libevent-2.1.11
libiconv-1.16p0 iodbc-3.52.12p0 hicolor-icon-theme-0.17 gtk+3-3.24.20
pkg_create: can't continue
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2121
'/usr/ports/packages/amd64/all/poppler-qt5-0.89.0.tgz': @trap "cd
/usr/ports...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2602
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(doas
-...)
*** Error 2 in /home/greg/ports/print/poppler (/usr/ports/infrastructure/mk/
bsd.port.mk:2581 'package': @lock=poppler-0.89.0; export _LOCKS...)
--
nest.cx is Gmail hosted, use PGP:
https://pgp.key-server.io/0x0B1542BD8DF5A1B0
Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0
update print/poppler
Hi,
here's an update to poppler-0.89.0. Survived a bulk build on amd64,
but I coould'nt yet test it (because of flaky internet, and I'm
doing the builds on a remote machine, not at home).
According to check_sym, library bumps are fine.
I also added a patch for qt5/src/CMakeLists.txt to drop the hardcoded
SOVERSION, like rsadowski@ did for glib/CMakeLists.txt, to work
around spurious build failures.
Any tests are appreciated.
Ciao,
Kil
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile
--- Makefile16 May 2020 18:41:15 - 1.158
+++ Makefile14 Jun 2020 22:07:37 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.88.0
+V= 0.89.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 63.0 # 99.0
-SHARED_LIBS += poppler-glib 19.5 # 8.16
+SHARED_LIBS += poppler 64.0 # 100.0
+SHARED_LIBS += poppler-glib 19.6 # 8.17
SHARED_LIBS += poppler-qt5 8.4 # 1.24
-SHARED_LIBS += poppler-cpp 16.1 # 0.8
+SHARED_LIBS += poppler-cpp 16.2 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.83
diff -u -p -r1.83 distinfo
--- distinfo16 May 2020 18:41:15 - 1.83
+++ distinfo14 Jun 2020 22:07:37 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.88.0.tar.xz) = tEU4BOmlpRnmzu4KyPXvwinjsL9wQZJjwjkSRHTSVsc=
-SIZE (poppler-0.88.0.tar.xz) = 1604348
+SHA256 (poppler-0.89.0.tar.xz) = +6IwNkU3eCzF1DsI1pPvacNlhihjSWg8exJxVqjvm1w=
+SIZE (poppler-0.89.0.tar.xz) = 1612156
Index: patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 17 May 2020 18:29:37 - 1.5
+++ patches/patch-glib_CMakeLists_txt 14 Jun 2020 22:07:37 -
@@ -9,7 +9,7 @@ Index: glib/CMakeLists.txt
${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
)
add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
--set_target_properties(poppler-glib PROPERTIES VERSION 8.16.0 SOVERSION 8)
+-set_target_properties(poppler-glib PROPERTIES VERSION 8.17.0 SOVERSION 8)
set_target_properties(poppler-glib PROPERTIES C_VISIBILITY_PRESET hidden)
set_target_properties(poppler-glib PROPERTIES CXX_VISIBILITY_PRESET hidden)
set_target_properties(poppler-glib PROPERTIES VISIBILITY_INLINES_HIDDEN 1)
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 17 Feb 2020 20:33:00 - 1.6
+++ patches/patch-poppler_Form_cc 14 Jun 2020 22:07:37 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.6 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
#include
#include
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: patches/patch-qt5_src_CMakeLists_txt
diff -N patches/patch-qt5_src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-qt5_src_CMakeLists_txt14 Jun 2020 22:07:37 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+- Remove hardcoded SOVERSION
+
+Index: qt5/src/CMakeLists.txt
+--- qt5/src/CMakeLists.txt.orig
qt5/src/CMakeLists.txt
+@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
+ poppler-version.cpp
+ )
+ add_library(poppler-qt5 ${poppler_qt5_SRCS})
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.24.0 SOVERSION 1)
+ if(MINGW AND BUILD_SHARED_LIBS)
+ get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
+ set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.36
diff -u -p -r1.36 PLIST-main
--- pkg/PLIST-main 16 May 2020 18:41:15 - 1.36
+++ pkg/PLIST-main 14 Jun 2020 22:07:37 -
@@ -82,6 +82,7 @@ include/poppler/cpp/
include/poppler/cpp/poppler-destination.h
include/poppler/cpp/poppler-document.h
include/poppler/cpp/poppler-embedded-file.h
+include/poppler/cpp/poppler-font-private.h
include/poppl
Re: update print/poppler (annoying as always)
Hi,
On Sat, Mar 14, 2020 at 04:54:55PM -0700, Greg Steuck wrote:
>
> > #0 build_goto_dest (document=, action=,
> > link=0x0) at \
> > /home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:348
> > 348 \
> > if (! link->isOk ()) { [Current thread is 1 (process 435846)]
> > (gdb) print link
> > $1 = (const LinkGoTo *) 0x0
> > (gdb) up
> > #1 _poppler_action_new (document=0x280b77b5c00, link=0x2812b023d40,
> > title= > out>) at
> > /home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:630
> > \
> > 630 build_goto_dest (document, action, dynamic_cast
> > > LinkGoTo *> (link)); (gdb) print link
> > $2 = (const LinkAction *) 0x2812b023d40
> > (gdb)
>
> > I'm not a C++ magician, especially if it comes to things like that
> > dynamic_cast, but it really looks odd to me that this pointer is
> > NULL in the callee while it's not NULL in the caller.
>
> I hope I'm not belaboring the obvious here. This condition seems a
> fairly direct result of an unchecked dynamic_cast. Per C++
> dynamic_cast description:
>
> "If the cast fails and new-type is a pointer type, it returns a null
> pointer of that type."
> https://en.cppreference.com/w/cpp/language/dynamic_cast
>
> This just means that the downcast was a mistake, LinkAction* is NOT a
> LinkGoTo*, but some other subclass of LinkAction of which there is a
> bunch:
[...]
There's a commit upstream that just changes all those dynamic_casts to
static_casts (see complete new diff below). Allthough this looks even
more wrong, it doesn't cause a segmentation fault any longer (but maybe
some completely garbaged object?).
[...]
> Out of curiosity, is MALLOC_OPTIONS any help? If repro is easy, maybe
> rebuild on an OS with ASan support and see what you get from that?
No, MALLOC_OPTIONS=S didn't change anyting for me.
So, new diff with that dynamic_cast -> static_cast commit
(68b6dd2ecd868c1a757cb8b9273e2e26687e5229) included, but I'm unsure
what to do. It probably will be in the next release of poppler.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.154
diff -u -p -r1.154 Makefile
--- Makefile22 Feb 2020 18:55:24 - 1.154
+++ Makefile20 Mar 2020 13:08:24 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.85.0
+V= 0.86.1
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,10 +16,10 @@ REVISION-qt5= 0
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 60.0 # 95.0
+SHARED_LIBS += poppler 61.0 # 97.0
SHARED_LIBS += poppler-glib 19.4 # 8.15
-SHARED_LIBS += poppler-qt5 8.1 # 1.22
-SHARED_LIBS += poppler-cpp 15.0 # 0.7
+SHARED_LIBS += poppler-qt5 8.2 # 1.22
+SHARED_LIBS += poppler-cpp 16.0 # 0.7
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.80
diff -u -p -r1.80 distinfo
--- distinfo17 Feb 2020 20:33:00 - 1.80
+++ distinfo20 Mar 2020 13:08:24 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.85.0.tar.xz) = K8h16zIwAq5rKH4JmARzUY4rLta1t9LhCJ42ps0A2Us=
-SIZE (poppler-0.85.0.tar.xz) = 1588616
+SHA256 (poppler-0.86.1.tar.xz) = r2MKJ3yOGUwxM5xURiQYNK7W7T1LTccIAxHlHGYlf2w=
+SIZE (poppler-0.86.1.tar.xz) = 1593856
Index: patches/patch-glib_poppler-action_cc
===
RCS file: patches/patch-glib_poppler-action_cc
diff -N patches/patch-glib_poppler-action_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-glib_poppler-action_cc20 Mar 2020 13:08:24 -
@@ -0,0 +1,58 @@
+$OpenBSD$
+
+Upstream commit 68b6dd2ecd868c1a757cb8b9273e2e26687e5229:
+Replace dynamic_cast by static_cast where we already perform the
+type checks explicitly before downcasting.
+
+Index: glib/poppler-action.cc
+--- glib/poppler-action.cc.orig
glib/poppler-action.cc
+@@ -627,39 +627,39 @@ _poppler_action_new (PopplerDocument *document,
+ switch (link->getKind ()) {
+ case actionGoTo:
+ action->type = POPPLER_ACTION_GOTO_DEST;
+- build_goto_dest (document, action, dynamic_cast (link));
++ build_goto_dest (document, action, static_cast (link));
+ break;
+ case actionGoToR:
+ action->type = POPPLER_ACTION_GOTO_REMOTE;
+- build_goto_remote (action, dynamic_cast
(link));
++ build_goto_remote (action, static_cast
(link));
+ break;
+ case actionLaunch:
+ action->type = POPPLER_ACTION_LAUNCH;
+- build_launch (action, dynamic_c
Re: update print/poppler (annoying as always)
Hi Matthias,
> #0 build_goto_dest (document=, action=,
link=0x0) at \
>
/home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:348
348 \
> if (! link->isOk ()) { [Current thread is 1 (process 435846)]
> (gdb) print link
> $1 = (const LinkGoTo *) 0x0
> (gdb) up
> #1 _poppler_action_new (document=0x280b77b5c00, link=0x2812b023d40,
title= out>) at
/home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:630
\
> 630 build_goto_dest (document, action, dynamic_cast
LinkGoTo *> (link)); (gdb) print link
> $2 = (const LinkAction *) 0x2812b023d40
> (gdb)
> I'm not a C++ magician, especially if it comes to things like that
> dynamic_cast, but it really looks odd to me that this pointer is
> NULL in the callee while it's not NULL in the caller.
I hope I'm not belaboring the obvious here. This condition seems a
fairly direct result of an unchecked dynamic_cast. Per C++
dynamic_cast description:
"If the cast fails and new-type is a pointer type, it returns a null
pointer of that type."
https://en.cppreference.com/w/cpp/language/dynamic_cast
This just means that the downcast was a mistake, LinkAction* is NOT a
LinkGoTo*, but some other subclass of LinkAction of which there is a
bunch:
Link.h:161:class LinkGoTo: public LinkAction {
Link.h:187:class LinkGoToR: public LinkAction {
Link.h:216:class LinkLaunch: public LinkAction {
Link.h:240:class LinkURI: public LinkAction {
Link.h:263:class LinkNamed: public LinkAction {
Link.h:285:class LinkMovie: public LinkAction {
Link.h:324:class LinkRendition: public LinkAction {
Link.h:372:class LinkSound: public LinkAction {
Link.h:400:class LinkJavaScript: public LinkAction {
Link.h:422:class LinkOCGState: public LinkAction {
Link.h:453:class LinkHide: public LinkAction {
Link.h:486:class LinkUnknown: public LinkAction {
I don't see how this can be the case if type safety were respected.
The only place where actionGoTo is returned from getKind is in
LinkGoTo class. Though I can't say I'm surprised, the number of
static_cast and C-style casts around these types is so high
I won't expect any type safety in the program.
If one wanted to paper over the problem they could rewrite
_poppler_action_new
"defensively" and make the program fallback locally to
POPPLER_ACTION_NONE. This would avoid the crash, but I suspect the
memory is borked by that point and something else will crash instead.
Out of curiosity, is MALLOC_OPTIONS any help? If repro is easy, maybe
rebuild on an OS with ASan support and see what you get from that?
Thanks
Greg
--
nest.cx is Gmail hosted, use PGP:
https://pgp.key-server.io/0x0B1542BD8DF5A1B0
Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0
Re: update print/poppler (annoying as always)
Hi,
On Fri, Mar 06, 2020 at 10:20:33PM +0100, Matthias Kilian wrote:
> untested, breakage so far is editors/libreoffice -- i'm waiting
> for dpb to pick it up again after i hopefully fixed it.
Unfortunately, this has to be deferred a little bit. I found a (new)
error while running evince on one of my toxic test PDFs ("toxic"
in the sense that they used to trigger bugs in poppler, xpdf etc.
in older versions).
Even more unfortunately, I don't remember who sent me that specific
file and thus don't know wether it's ok to attach it to a bug report
for the poppler people. In case it rings a bell:
-rw--- 1 kili kili 3909884 Apr 7 2007 PLANHALF.pdf
(That's the date I *received* the file)
Oh, and just for the joy of it:
...
Core was generated by `evince'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0 build_goto_dest (document=, action=,
link=0x0) at
/home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:348
348 if (! link->isOk ()) {
[Current thread is 1 (process 435846)]
(gdb) print link
$1 = (const LinkGoTo *) 0x0
(gdb) up
#1 _poppler_action_new (document=0x280b77b5c00, link=0x2812b023d40,
title=) at
/home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:630
630 build_goto_dest (document, action, dynamic_cast (link));
(gdb) print link
$2 = (const LinkAction *) 0x2812b023d40
(gdb)
I'm not a C++ magician, especially if it comes to things like that
dynamic_cast, but it really looks odd to me that this pointer is
NULL in the callee while it's not NULL in the caller.
Ciao,
Kili
update print/poppler (annoying as always)
Hi,
untested, breakage so far is editors/libreoffice -- i'm waiting
for dpb to pick it up again after i hopefully fixed it.
If anyone wants to beat me and to test (-build) other ports using
it, be aware that there are some changes where unique_ptr
are now used instead of LinkAction *.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.154
diff -u -p -r1.154 Makefile
--- Makefile22 Feb 2020 18:55:24 - 1.154
+++ Makefile6 Mar 2020 21:10:28 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.85.0
+V= 0.86.1
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,10 +16,10 @@ REVISION-qt5= 0
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 60.0 # 95.0
+SHARED_LIBS += poppler 61.0 # 97.0
SHARED_LIBS += poppler-glib 19.4 # 8.15
-SHARED_LIBS += poppler-qt5 8.1 # 1.22
-SHARED_LIBS += poppler-cpp 15.0 # 0.7
+SHARED_LIBS += poppler-qt5 8.2 # 1.22
+SHARED_LIBS += poppler-cpp 16.0 # 0.7
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.80
diff -u -p -r1.80 distinfo
--- distinfo17 Feb 2020 20:33:00 - 1.80
+++ distinfo6 Mar 2020 21:10:28 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.85.0.tar.xz) = K8h16zIwAq5rKH4JmARzUY4rLta1t9LhCJ42ps0A2Us=
-SIZE (poppler-0.85.0.tar.xz) = 1588616
+SHA256 (poppler-0.86.1.tar.xz) = r2MKJ3yOGUwxM5xURiQYNK7W7T1LTccIAxHlHGYlf2w=
+SIZE (poppler-0.86.1.tar.xz) = 1593856
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.22
diff -u -p -r1.22 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 19 Jun 2019 19:39:14 - 1.22
+++ patches/patch-poppler_XRef_cc 6 Mar 2020 21:10:28 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.22 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1013,49 +1013,38 @@ void XRef::getEncryptionParameters(unsigned char **fil
+@@ -1042,49 +1042,38 @@ bool XRef::isRefEncrypted(Ref r)
}
bool XRef::okToPrint(bool ignoreOwnerPW) const {
update print/poppler
Hi,
here's an updatge to poppler-0.85.0.
Upstream got a little bit sloppy on bumping shared library versions
(there were some symbol revmoved from poppler-cpp).
Fallout: graphics/gdcm (some more constification in poppler),
graphics/pdf2djvu (removed data argument to the ErrorCallback).
I'll sent diffe for those in a minute.
I've not yet runtime-tested anything (fucked internet access at
home since the storm last week), but I will do so next monday at
work.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.152
diff -u -p -r1.152 Makefile
--- Makefile5 Jan 2020 19:18:48 - 1.152
+++ Makefile15 Feb 2020 20:57:51 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.84.0
+V= 0.85.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 59.0 # 94.0
+SHARED_LIBS += poppler 60.0 # 95.0
SHARED_LIBS += poppler-glib 19.4 # 8.15
-SHARED_LIBS += poppler-qt5 8.0 # 1.21
-SHARED_LIBS += poppler-cpp 14.0 # 0.7
+SHARED_LIBS += poppler-qt5 8.1 # 1.22
+SHARED_LIBS += poppler-cpp 15.0 # 0.7
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo5 Jan 2020 19:18:48 - 1.79
+++ distinfo15 Feb 2020 20:57:51 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.84.0.tar.xz) = x6Ew2nQ7OKVI96If5ZQFBvsZSfTr3TIJ8OWzAvoTlzE=
-SIZE (poppler-0.84.0.tar.xz) = 1561236
+SHA256 (poppler-0.85.0.tar.xz) = K8h16zIwAq5rKH4JmARzUY4rLta1t9LhCJ42ps0A2Us=
+SIZE (poppler-0.85.0.tar.xz) = 1588616
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.5
diff -u -p -r1.5 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 10 Sep 2019 13:52:42 - 1.5
+++ patches/patch-poppler_Form_cc 15 Feb 2020 20:57:51 -
@@ -9,5 +9,5 @@ Index: poppler/Form.cc
#include
+#include
#include
- #include
- #include
+ #include
+ #include
Index: patches/patch-utils_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-utils_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-utils_CMakeLists_txt
--- patches/patch-utils_CMakeLists_txt 14 Jan 2019 19:50:32 - 1.1
+++ patches/patch-utils_CMakeLists_txt 15 Feb 2020 20:57:51 -
@@ -6,7 +6,7 @@ up any already installed older version o
Index: utils/CMakeLists.txt
--- utils/CMakeLists.txt.orig
+++ utils/CMakeLists.txt
-@@ -34,7 +34,7 @@ if (HAVE_CAIRO)
+@@ -35,7 +35,7 @@ if (HAVE_CAIRO)
)
add_definitions(${CAIRO_CFLAGS})
add_executable(pdftocairo ${pdftocairo_SOURCES})
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.34
diff -u -p -r1.34 PLIST-main
--- pkg/PLIST-main 12 Nov 2019 22:03:42 - 1.34
+++ pkg/PLIST-main 15 Feb 2020 20:57:51 -
@@ -4,8 +4,6 @@
include/poppler/
include/poppler/Annot.h
include/poppler/Array.h
-include/poppler/BuiltinFont.h
-include/poppler/BuiltinFontTables.h
include/poppler/CMap.h
include/poppler/CachedFile.h
include/poppler/CairoFontEngine.h
@@ -15,7 +13,6 @@ include/poppler/Catalog.h
include/poppler/CertificateInfo.h
include/poppler/CharCodeToUnicode.h
include/poppler/CharTypes.h
-include/poppler/CompactFontTables.h
include/poppler/DateInfo.h
include/poppler/Decrypt.h
include/poppler/Dict.h
update print/poppler (again)
Hi, here's the next one (released december 28th). >From the Changelog: core: * Fix crash when converting from Unicode to ASCII-7 * Splash::scaleImageYdXu: Protect against crash if srcWidth is too big * JBIG2Stream: fix potential crash in malformed documents * JBIG2Stream: fix leak in reset() if called several times * Internal code improvements utils: * pdfimages: Add error message if first page is larger then number of pages. * pdfinfo: Improved paper size recognition * pdfsig: Fix exit code when dumping signatures * pdftocairo: Error out when even/odd selects 0 pages * pdftohtml: Fix memory leak * pdftoppm: Add an option to scale before rotate * pdftoppm: Add -hide-annotations option * pdftoppm: Error out when even/odd selects 0 pages * pdftops: Improve -optimizecolorspace qt5: * Code cleanups glib: * Fix compiler warrnings Built on amd64 with everything depending on it, tested with some PDF viewers. Unless anyone wants to do some more tests and needs more time for it, I'll commit this on sunday evening. check_sym reported dynamic export removals for all shared libs except poppler-glib, so I've added more major bumps than upstream did. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.151 diff -u -p -r1.151 Makefile --- Makefile2 Jan 2020 20:29:06 - 1.151 +++ Makefile3 Jan 2020 19:06:47 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.83.0 +V= 0.84.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 58.0 # 93.0 +SHARED_LIBS += poppler 59.0 # 94.0 SHARED_LIBS += poppler-glib 19.4 # 8.15 -SHARED_LIBS += poppler-qt5 7.3 # 1.21 -SHARED_LIBS += poppler-cpp 13.0 # 0.7 +SHARED_LIBS += poppler-qt5 8.0 # 1.21 +SHARED_LIBS += poppler-cpp 14.0 # 0.7 HOMEPAGE= https://poppler.freedesktop.org/ Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.78 diff -u -p -r1.78 distinfo --- distinfo2 Jan 2020 20:29:06 - 1.78 +++ distinfo3 Jan 2020 19:06:47 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.83.0.tar.xz) = aFxlDZdx4cNA6iIrV8i9P3UC4hkcz+it655jjcsLeZs= -SIZE (poppler-0.83.0.tar.xz) = 1555456 +SHA256 (poppler-0.84.0.tar.xz) = x6Ew2nQ7OKVI96If5ZQFBvsZSfTr3TIJ8OWzAvoTlzE= +SIZE (poppler-0.84.0.tar.xz) = 1561236
Re: update print/poppler
Adding Bryan C. Everly, MAINTAINER of x11/lumina. On Thu, 19 Dec 2019 22:19:52 +0100 Matthias Kilian wrote: > On Wed, Dec 18, 2019 at 12:30:37AM -0500, George Koehler wrote: > > I built your 0.83.0 with ports-gcc on powerpc (macppc). The good news > > is that the build completed, so I can still build other ports that > > depend on poppler. > > > > I looked for a port that would use poppler to view a PDF file. I found > > and built x11/lumina and tried lumina-pdf. A PDF of 89 pages causes > > lumina-pdf to run out of memory and crash. A PDF of 7 pages almost > > works, but colors are wrong. White is still white, but some black text > > becomes blue, and other colors are worse. These symptoms might not be > > new; I didn't try viewing a PDF with poppler before 0.83.0, and I don't > > know whether the color problem is in lumina or in poppler. The macppc > > is big-endian, but some code might assume little-endian color. > > It would be nice if anyone else with macppc could do some similar > tests with poppler-0.82.0, so we can see wether this is a regression > or not. There is no regression, and the problems are in lumina-pdf, not in poppler. I pkg_delete(1)d poppler-0.83.0, then updated my macppc to the recent powerpc snapshot packages, so I'm now on poppler-0.82.0. The snapshot's lumina-pdf built with poppler-0.82.0 has exactly the same problems as my earlier build of lumina-pdf with poppler-0.83.0: the 89-page PDF runs out of memory and crashes, and the 7-page PDF has wrong color. I pkg_add(1)ed apvlv, another PDF viewer that depends on poppler. "apvlv $file.pdf" works with both files: no crash, correct color. This proves to me that poppler-0.82.0 works on macppc. (I have not yet tried apvlv with poppler-0.83.0 because I would need to rebuild 0.83.0, then build apvlv.) I conclude that - poppler-0.83.0 is just as good as 0.82.0, and - lumina-pdf has problems, while other PDF viewers work with poppler. These are the PDF files: http://tack.sourceforge.net/olddocs/em.pdf (190K) is the 89-page PDF, mostly black text on white. When lumina-pdf tries to open this, it writes many memory errors to the terminal, like QImage: out of memory, returning null Out of memory "Error: unable to allocate 383 entries" It usually crashes, but my last run got stuck without crashing. top(1) shows lumina-pdf with SIZE 512M and RES 544M. I have a data limit per process of 512M (from datasize-cur=512M for staff in /etc/login.conf). This old macppc machine has a 32-bit address space. https://www.thc.texas.gov/public/upload/forms/six-flags-over-texas.pdf (422K) is the 7-page PDF. Colors are wrong in lumina-pdf. If these problems only happen on macppc (32-bit big-endian), they might persist until some macppc user fixes them. --George
Re: update print/poppler
Hi, On Wed, Dec 18, 2019 at 12:30:37AM -0500, George Koehler wrote: > > Update to poppler-0.83.0. > > > > Tests (at least build tests) on non-base-clang archs are welcome. > > I built your 0.83.0 with ports-gcc on powerpc (macppc). The good news > is that the build completed, so I can still build other ports that > depend on poppler. > > I looked for a port that would use poppler to view a PDF file. I found > and built x11/lumina and tried lumina-pdf. A PDF of 89 pages causes > lumina-pdf to run out of memory and crash. A PDF of 7 pages almost > works, but colors are wrong. White is still white, but some black text > becomes blue, and other colors are worse. These symptoms might not be > new; I didn't try viewing a PDF with poppler before 0.83.0, and I don't > know whether the color problem is in lumina or in poppler. The macppc > is big-endian, but some code might assume little-endian color. First of all, thanks for the testing. It would be nice if anyone else with macppc could do some similar tests with poppler-0.82.0, so we can see wether this is a regression or not. I had a quick look on the diffs between poppler-0.82.0 and poppler.0.83.0, and I didn't see anything obvious which could have introduced bugs wrt endianess or colour handling in poppler; there are some changes like from if (foo.isNum()) bar = foo.getNum() to bar = foo.getNumWithDefaultValue(some_default) in the color area, but they don't look as if they wouldn't have also introduced problems on other architectures. And for the memory consumption: not sure what could have caused this *if* this is a regression in poppler-0.83.0. Ciao, Kili
Re: update print/poppler
On Mon, 16 Dec 2019 22:26:48 +0100 Matthias Kilian wrote: > Update to poppler-0.83.0. > > Tests (at least build tests) on non-base-clang archs are welcome. I built your 0.83.0 with ports-gcc on powerpc (macppc). The good news is that the build completed, so I can still build other ports that depend on poppler. I looked for a port that would use poppler to view a PDF file. I found and built x11/lumina and tried lumina-pdf. A PDF of 89 pages causes lumina-pdf to run out of memory and crash. A PDF of 7 pages almost works, but colors are wrong. White is still white, but some black text becomes blue, and other colors are worse. These symptoms might not be new; I didn't try viewing a PDF with poppler before 0.83.0, and I don't know whether the color problem is in lumina or in poppler. The macppc is big-endian, but some code might assume little-endian color. --George > > From the Changelog: > > core: >* Improve when a file is recognized as Linearized >* Improve const-ness of the code >* Make code a bit more readable/maintanable >* Fix uninitialized memory uses in broken files > > utils: >* pdffonts: Make code a bit more readable/maintanable >* pdftohtml: Make code a bit more readable/maintanable > > qt5: >* Remove a bunch of unused internal functions >* trUtf8 -> tr (less warnings) > > build system: >* make-glib-api-docs: switch to python3 > > I've adde a major bump do libpoppler-cpp.so because check_sym reported > this: > > Dynamic export changes: > added: > _ZNK13BaseMemStreamIKcE7getKindEv > > removed: > _ZN13BaseMemStreamIKcE7getKindEv > > This breaks the following ports (because of the use of unique > pointers and some constification): editors/calligra, editors/libreoffice, > graphics/gdcm, graphics/inkscape, graphics/pdf2djvu. > > Diffs for those ports are in my queue (still waiting for that little > calligra monster) -- I'll send them later today or tomorrow. > > Ciao, > Kili > > Index: Makefile > === > RCS file: /cvs/ports/print/poppler/Makefile,v > retrieving revision 1.150 > diff -u -p -r1.150 Makefile > --- Makefile 12 Nov 2019 22:03:41 - 1.150 > +++ Makefile 16 Dec 2019 21:14:21 - > @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library > COMMENT-qt5= Qt5 interface to PDF rendering library > COMMENT-utils= PDF conversion tools and utilities > > -V= 0.82.0 > +V= 0.83.0 > DISTNAME=poppler-$V > CATEGORIES= print > PKGNAME-main=poppler-$V > @@ -13,10 +13,10 @@ PKGNAME-qt5= poppler-qt5-$V > > EXTRACT_SUFX=.tar.xz > > -SHARED_LIBS += poppler 57.0 # 92.0 > +SHARED_LIBS += poppler 58.0 # 93.0 > SHARED_LIBS += poppler-glib 19.4 # 8.15 > SHARED_LIBS += poppler-qt5 7.3 # 1.21 > -SHARED_LIBS += poppler-cpp 12.0 # 0.7 > +SHARED_LIBS += poppler-cpp 13.0 # 0.7 > > HOMEPAGE=https://poppler.freedesktop.org/ > > @@ -33,7 +33,7 @@ MULTI_PACKAGES=-main -qt5 -utils > > .include > > -# c++-11 > +# c++-14 > COMPILER=base-clang ports-gcc > > cWANTLIB=expat freetype fontconfig jpeg m pthread tiff z > Index: distinfo > === > RCS file: /cvs/ports/print/poppler/distinfo,v > retrieving revision 1.77 > diff -u -p -r1.77 distinfo > --- distinfo 12 Nov 2019 22:03:41 - 1.77 > +++ distinfo 16 Dec 2019 21:14:21 - > @@ -1,2 +1,2 @@ > -SHA256 (poppler-0.82.0.tar.xz) = I0+OVz6lf7agCOfB5Wv64a9dGt8OZfR1VeGuEDh05N8= > -SIZE (poppler-0.82.0.tar.xz) = 1553336 > +SHA256 (poppler-0.83.0.tar.xz) = aFxlDZdx4cNA6iIrV8i9P3UC4hkcz+it655jjcsLeZs= > +SIZE (poppler-0.83.0.tar.xz) = 1555456 >
update print/poppler
Update to poppler-0.83.0. Tests (at least build tests) on non-base-clang archs are welcome. >From the Changelog: core: * Improve when a file is recognized as Linearized * Improve const-ness of the code * Make code a bit more readable/maintanable * Fix uninitialized memory uses in broken files utils: * pdffonts: Make code a bit more readable/maintanable * pdftohtml: Make code a bit more readable/maintanable qt5: * Remove a bunch of unused internal functions * trUtf8 -> tr (less warnings) build system: * make-glib-api-docs: switch to python3 I've adde a major bump do libpoppler-cpp.so because check_sym reported this: Dynamic export changes: added: _ZNK13BaseMemStreamIKcE7getKindEv removed: _ZN13BaseMemStreamIKcE7getKindEv This breaks the following ports (because of the use of unique pointers and some constification): editors/calligra, editors/libreoffice, graphics/gdcm, graphics/inkscape, graphics/pdf2djvu. Diffs for those ports are in my queue (still waiting for that little calligra monster) -- I'll send them later today or tomorrow. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.150 diff -u -p -r1.150 Makefile --- Makefile12 Nov 2019 22:03:41 - 1.150 +++ Makefile16 Dec 2019 21:14:21 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.82.0 +V= 0.83.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 57.0 # 92.0 +SHARED_LIBS += poppler 58.0 # 93.0 SHARED_LIBS += poppler-glib 19.4 # 8.15 SHARED_LIBS += poppler-qt5 7.3 # 1.21 -SHARED_LIBS += poppler-cpp 12.0 # 0.7 +SHARED_LIBS += poppler-cpp 13.0 # 0.7 HOMEPAGE= https://poppler.freedesktop.org/ @@ -33,7 +33,7 @@ MULTI_PACKAGES=-main -qt5 -utils .include -# c++-11 +# c++-14 COMPILER= base-clang ports-gcc cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.77 diff -u -p -r1.77 distinfo --- distinfo12 Nov 2019 22:03:41 - 1.77 +++ distinfo16 Dec 2019 21:14:21 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.82.0.tar.xz) = I0+OVz6lf7agCOfB5Wv64a9dGt8OZfR1VeGuEDh05N8= -SIZE (poppler-0.82.0.tar.xz) = 1553336 +SHA256 (poppler-0.83.0.tar.xz) = aFxlDZdx4cNA6iIrV8i9P3UC4hkcz+it655jjcsLeZs= +SIZE (poppler-0.83.0.tar.xz) = 1555456
Re: Fixeditors/libreoffice with new poppler [was: update print/poppler]
Yes.
On 07/11/19 10:46 +0100, Matthias Kilian wrote:
> Hi,
>
> On Tue, Nov 05, 2019 at 11:33:08PM +0100, Robert Nagy wrote:
> > i am working on an libreoffice update right now so please hold it
> > off a bit
>
> Even after your update, the patches below are still needed to let
> it build with poppler-0.82.0.
>
> ok?
>
> Ciao,
> Kili
>
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> ===
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> 6 Nov 2019 23:21:46 -
> @@ -0,0 +1,71 @@
> +$OpenBSD$
> +
> +Fix build with poppler-8.82.0.
> +
> +https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
> +
> +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
> sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
> + local offset of character (zero for horizontal writing mode). not
> + taken into account for output pos updates. Used for vertical writing.
> + */
> ++
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + void PDFOutDev::drawChar(GfxState *state, double x, double y,
> + double dx, double dy,
> + double originX, double originY,
> ++ CharCode, int /*nBytes*/, const Unicode *u, int
> uLen)
> ++{
> ++#else
> ++void PDFOutDev::drawChar(GfxState *state, double x, double y,
> ++ double dx, double dy,
> ++ double originX, double originY,
> + CharCode, int /*nBytes*/, Unicode *u, int uLen)
> + {
> ++#endif
> + assert(state);
> +
> + if( u == nullptr )
> +@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
> + writeBinaryBuffer(aBuf);
> + }
> +
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
> + int width, int height, GfxImageColorMap* colorMap,
> + poppler_bool /*interpolate*/,
> ++ const int* maskColors, poppler_bool /*inlineImg*/
> )
> ++{
> ++#else
> ++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
> ++ int width, int height, GfxImageColorMap* colorMap,
> ++ poppler_bool /*interpolate*/,
> + int* maskColors, poppler_bool /*inlineImg*/ )
> + {
> ++#endif
> + if (m_bSkipImages)
> + return;
> + OutputBuffer aBuf; initBuf(aBuf);
> +@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*,
> Stream*
> + {
> + GfxRGB aMinRGB;
> + colorMap->getColorSpace()->getRGB(
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> ++reinterpret_cast(maskColors),
> ++#else
> + reinterpret_cast(maskColors),
> ++#endif
> + &aMinRGB );
> +
> + GfxRGB aMaxRGB;
> + colorMap->getColorSpace()->getRGB(
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> ++reinterpret_cast GfxColor*>(maskColors)+gfxColorMaxComps,
> ++#else
> + reinterpret_cast(maskColors)+gfxColorMaxComps,
> ++#endif
> + &aMaxRGB );
> +
> + aMaskBuf.push_back( colToByte(aMinRGB.r) );
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> ===
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> 6 Nov 2019 23:21:46 -
> @@ -0,0 +1,46 @@
> +$OpenBSD$
> +
> +Fix build with poppler-8.82.0.
> +
> +https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
> +
> +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
> +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
> sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
> +@@ -232,10 +232,17 @@ namespace pdfi
> + virtual void eoClip(GfxState *state) override;
> +
> + //- text drawing
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + virtual 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;
> ++#else
> ++
Re: Fixeditors/libreoffice with new poppler [was: update print/poppler]
Hi,
On Tue, Nov 05, 2019 at 11:33:08PM +0100, Robert Nagy wrote:
> i am working on an libreoffice update right now so please hold it
> off a bit
Even after your update, the patches below are still needed to let
it build with poppler-0.82.0.
ok?
Ciao,
Kili
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 6 Nov
2019 23:21:46 -
@@ -0,0 +1,71 @@
+$OpenBSD$
+
+Fix build with poppler-8.82.0.
+
+https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
+ local offset of character (zero for horizontal writing mode). not
+ taken into account for output pos updates. Used for vertical writing.
+ */
++
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ void PDFOutDev::drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
++ CharCode, int /*nBytes*/, const Unicode *u, int uLen)
++{
++#else
++void PDFOutDev::drawChar(GfxState *state, double x, double y,
++ double dx, double dy,
++ double originX, double originY,
+ CharCode, int /*nBytes*/, Unicode *u, int uLen)
+ {
++#endif
+ assert(state);
+
+ if( u == nullptr )
+@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
+ writeBinaryBuffer(aBuf);
+ }
+
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+ int width, int height, GfxImageColorMap* colorMap,
+ poppler_bool /*interpolate*/,
++ const int* maskColors, poppler_bool /*inlineImg*/ )
++{
++#else
++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
++ int width, int height, GfxImageColorMap* colorMap,
++ poppler_bool /*interpolate*/,
+ int* maskColors, poppler_bool /*inlineImg*/ )
+ {
++#endif
+ if (m_bSkipImages)
+ return;
+ OutputBuffer aBuf; initBuf(aBuf);
+@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream*
+ {
+ GfxRGB aMinRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors),
++#else
+ reinterpret_cast(maskColors),
++#endif
+ &aMinRGB );
+
+ GfxRGB aMaxRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors)+gfxColorMaxComps,
++#else
+ reinterpret_cast(maskColors)+gfxColorMaxComps,
++#endif
+ &aMaxRGB );
+
+ aMaskBuf.push_back( colToByte(aMinRGB.r) );
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 6 Nov
2019 23:21:46 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Fix build with poppler-8.82.0.
+
+https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -232,10 +232,17 @@ namespace pdfi
+ virtual void eoClip(GfxState *state) override;
+
+ //- text drawing
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ virtual 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;
++#else
++virtual 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;
++#endif
+ #if POPPLER_CHECK_VERSION(0, 64, 0)
+
Re: Fixeditors/libreoffice with new poppler [was: update print/poppler]
hi
i am working on an libreoffice update right now so please hold it
off a bit
On 05/11/19 22:54 +0100, Matthias Kilian wrote:
> On Mon, Nov 04, 2019 at 08:28:36PM +0100, Matthias Kilian wrote:
> > > update to poppler-0.82.0.
> >
> > [...]
> >
> > > As always, tests from other people (and on other architectures) are
> > > welcome.
> >
> > Don't waste time with this to try to build libreoffice yet -- it's
> > broken. [...]
>
> The diff below fixes at least the build, and it should be possible to
> commit this before the poppler update.
>
> ok?
>
> Ciao,
> Kili
>
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> ===
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> 5 Nov 2019 21:47:52 -
> @@ -0,0 +1,71 @@
> +$OpenBSD$
> +
> +Fix build with poppler-8.82.0.
> +
> +https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
> +
> +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
> sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
> + local offset of character (zero for horizontal writing mode). not
> + taken into account for output pos updates. Used for vertical writing.
> + */
> ++
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + void PDFOutDev::drawChar(GfxState *state, double x, double y,
> + double dx, double dy,
> + double originX, double originY,
> ++ CharCode, int /*nBytes*/, const Unicode *u, int
> uLen)
> ++{
> ++#else
> ++void PDFOutDev::drawChar(GfxState *state, double x, double y,
> ++ double dx, double dy,
> ++ double originX, double originY,
> + CharCode, int /*nBytes*/, Unicode *u, int uLen)
> + {
> ++#endif
> + assert(state);
> +
> + if( u == nullptr )
> +@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
> + writeBinaryBuffer(aBuf);
> + }
> +
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
> + int width, int height, GfxImageColorMap* colorMap,
> + poppler_bool /*interpolate*/,
> ++ const int* maskColors, poppler_bool /*inlineImg*/
> )
> ++{
> ++#else
> ++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
> ++ int width, int height, GfxImageColorMap* colorMap,
> ++ poppler_bool /*interpolate*/,
> + int* maskColors, poppler_bool /*inlineImg*/ )
> + {
> ++#endif
> + if (m_bSkipImages)
> + return;
> + OutputBuffer aBuf; initBuf(aBuf);
> +@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*,
> Stream*
> + {
> + GfxRGB aMinRGB;
> + colorMap->getColorSpace()->getRGB(
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> ++reinterpret_cast(maskColors),
> ++#else
> + reinterpret_cast(maskColors),
> ++#endif
> + &aMinRGB );
> +
> + GfxRGB aMaxRGB;
> + colorMap->getColorSpace()->getRGB(
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> ++reinterpret_cast GfxColor*>(maskColors)+gfxColorMaxComps,
> ++#else
> + reinterpret_cast(maskColors)+gfxColorMaxComps,
> ++#endif
> + &aMaxRGB );
> +
> + aMaskBuf.push_back( colToByte(aMinRGB.r) );
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> ===
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
> 5 Nov 2019 21:47:52 -
> @@ -0,0 +1,46 @@
> +$OpenBSD$
> +
> +Fix build with poppler-8.82.0.
> +
> +https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
> +
> +Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
> +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
> sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
> +@@ -232,10 +232,17 @@ namespace pdfi
> + virtual void eoClip(GfxState *state) override;
> +
> + //- text drawing
> ++#if POPPLER_CHECK_VERSION(0, 82, 0)
> + virtual void drawChar(GfxState *state, double x, double y,
> +
Fixeditors/libreoffice with new poppler [was: update print/poppler]
On Mon, Nov 04, 2019 at 08:28:36PM +0100, Matthias Kilian wrote:
> > update to poppler-0.82.0.
>
> [...]
>
> > As always, tests from other people (and on other architectures) are
> > welcome.
>
> Don't waste time with this to try to build libreoffice yet -- it's
> broken. [...]
The diff below fixes at least the build, and it should be possible to
commit this before the poppler update.
ok?
Ciao,
Kili
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 5 Nov
2019 21:47:52 -
@@ -0,0 +1,71 @@
+$OpenBSD$
+
+Fix build with poppler-8.82.0.
+
+https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state)
+ local offset of character (zero for horizontal writing mode). not
+ taken into account for output pos updates. Used for vertical writing.
+ */
++
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ void PDFOutDev::drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
++ CharCode, int /*nBytes*/, const Unicode *u, int uLen)
++{
++#else
++void PDFOutDev::drawChar(GfxState *state, double x, double y,
++ double dx, double dy,
++ double originX, double originY,
+ CharCode, int /*nBytes*/, Unicode *u, int uLen)
+ {
++#endif
+ assert(state);
+
+ if( u == nullptr )
+@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
+ writeBinaryBuffer(aBuf);
+ }
+
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
+ int width, int height, GfxImageColorMap* colorMap,
+ poppler_bool /*interpolate*/,
++ const int* maskColors, poppler_bool /*inlineImg*/ )
++{
++#else
++void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
++ int width, int height, GfxImageColorMap* colorMap,
++ poppler_bool /*interpolate*/,
+ int* maskColors, poppler_bool /*inlineImg*/ )
+ {
++#endif
+ if (m_bSkipImages)
+ return;
+ OutputBuffer aBuf; initBuf(aBuf);
+@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream*
+ {
+ GfxRGB aMinRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors),
++#else
+ reinterpret_cast(maskColors),
++#endif
+ &aMinRGB );
+
+ GfxRGB aMaxRGB;
+ colorMap->getColorSpace()->getRGB(
++#if POPPLER_CHECK_VERSION(0, 82, 0)
++reinterpret_cast(maskColors)+gfxColorMaxComps,
++#else
+ reinterpret_cast(maskColors)+gfxColorMaxComps,
++#endif
+ &aMaxRGB );
+
+ aMaskBuf.push_back( colToByte(aMinRGB.r) );
Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_hxx 5 Nov
2019 21:47:52 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Fix build with poppler-8.82.0.
+
+https://gerrit.libreoffice.org/plugins/gitiles/core/+/2eadd46ab81058087af95bdfc1fea28fcdb65998%5E%21
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -232,10 +232,17 @@ namespace pdfi
+ virtual void eoClip(GfxState *state) override;
+
+ //- text drawing
++#if POPPLER_CHECK_VERSION(0, 82, 0)
+ virtual 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;
++#else
++virtual void drawChar(GfxState *state, double x, double y,
++ double dx, double dy,
++ double originX, double originY
Re: update print/poppler
On Sun, Nov 03, 2019 at 05:21:07PM +0100, Matthias Kilian wrote: > update to poppler-0.82.0. [...] > As always, tests from other people (and on other architectures) are > welcome. Don't waste time with this to try to build libreoffice yet -- it's broken. I already have a diff which I'll send around as soon as dpb(1) on my machine decides to give libreoffice the next try (and succeeds building it). Ciao, Kili
update print/poppler
Hi, update to poppler-0.82.0. libpoppler-cpp.so needs a major bump due to symbol removals, which is missing in the upstream version. I'm currently running a bulk build with this on amd64, which will take a little bit. As always, tests from other people (and on other architectures) are welcome. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.149 diff -u -p -r1.149 Makefile --- Makefile30 Sep 2019 11:25:03 - 1.149 +++ Makefile3 Nov 2019 16:16:01 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.81.0 +V= 0.82.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 56.0 # 91.0 -SHARED_LIBS += poppler-glib 19.3 # 8.14 +SHARED_LIBS += poppler 57.0 # 92.0 +SHARED_LIBS += poppler-glib 19.4 # 8.15 SHARED_LIBS += poppler-qt5 7.3 # 1.21 -SHARED_LIBS += poppler-cpp 11.0 # 0.7 +SHARED_LIBS += poppler-cpp 12.0 # 0.7 HOMEPAGE= https://poppler.freedesktop.org/ Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.76 diff -u -p -r1.76 distinfo --- distinfo30 Sep 2019 11:25:03 - 1.76 +++ distinfo3 Nov 2019 16:16:01 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.81.0.tar.xz) = IS0CCwNbZ7Nslma9CKx3jf8yIthcAcM4eH1Ubw+b/gI= -SIZE (poppler-0.81.0.tar.xz) = 1548944 +SHA256 (poppler-0.82.0.tar.xz) = I0+OVz6lf7agCOfB5Wv64a9dGt8OZfR1VeGuEDh05N8= +SIZE (poppler-0.82.0.tar.xz) = 1553336 Index: pkg/PLIST-main === RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v retrieving revision 1.33 diff -u -p -r1.33 PLIST-main --- pkg/PLIST-main 10 Sep 2019 13:52:42 - 1.33 +++ pkg/PLIST-main 3 Nov 2019 16:16:01 - @@ -8,6 +8,9 @@ include/poppler/BuiltinFont.h include/poppler/BuiltinFontTables.h include/poppler/CMap.h include/poppler/CachedFile.h +include/poppler/CairoFontEngine.h +include/poppler/CairoOutputDev.h +include/poppler/CairoRescaleBox.h include/poppler/Catalog.h include/poppler/CertificateInfo.h include/poppler/CharCodeToUnicode.h
update print/poppler
Hi, this updates poppler to 0.51.0. Only the main poppler library has changed (some #ifdefs removed at other places because CMYK rasterization is no longer optional). From the Changlog: * Splash: Always enable support for CMYK rasterization * CairoOutputDev: Check scaled dimensions for 0. Issue #737 * BaseCryptStream: Fix potential uninitialized memory read * SplashBitmap: Fix wrong width condition for splashModeDeviceN8 * Fix crashes in malformed files My build machine is too slow, so I didn't yet have a change to test it. So if anyone else wants to beat me and give it a try... Ciao, Kil Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.148 diff -u -p -r1.148 Makefile --- Makefile15 Sep 2019 21:29:40 - 1.148 +++ Makefile29 Sep 2019 17:43:49 - @@ -4,9 +4,8 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.80.0 +V= 0.81.0 DISTNAME= poppler-$V -REVISION-main= 1 CATEGORIES=print PKGNAME-main= poppler-$V PKGNAME-utils= poppler-utils-$V @@ -14,7 +13,7 @@ PKGNAME-qt5= poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 55.0 # 90.0 +SHARED_LIBS += poppler 56.0 # 91.0 SHARED_LIBS += poppler-glib 19.3 # 8.14 SHARED_LIBS += poppler-qt5 7.3 # 1.21 SHARED_LIBS += poppler-cpp 11.0 # 0.7 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.75 diff -u -p -r1.75 distinfo --- distinfo10 Sep 2019 13:52:42 - 1.75 +++ distinfo29 Sep 2019 17:43:49 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.80.0.tar.xz) = TTymt5vBO44kCS40+D7184fzuwu9c1mmwHjgnGltEE8= -SIZE (poppler-0.80.0.tar.xz) = 1548908 +SHA256 (poppler-0.81.0.tar.xz) = IS0CCwNbZ7Nslma9CKx3jf8yIthcAcM4eH1Ubw+b/gI= +SIZE (poppler-0.81.0.tar.xz) = 1548944
update print/poppler
Hi, just in case anyone wants to do some more tests... this updates poppler to 0.80.0. Built (including all ports) and tested (with a few ports) on amd64. Following minor / major shared library bumps, since they look sane (both by looking at code diffs and using check_sym). Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.145 diff -u -p -r1.145 Makefile --- Makefile6 Aug 2019 18:32:20 - 1.145 +++ Makefile8 Sep 2019 20:29:39 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.79.0 +V= 0.80.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,9 +13,9 @@ PKGNAME-qt5= poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 53.0 # 89.0 -SHARED_LIBS += poppler-glib 19.2 # 8.13 -SHARED_LIBS += poppler-qt5 7.2 # 1.20 +SHARED_LIBS += poppler 54.0 # 90.0 +SHARED_LIBS += poppler-glib 19.3 # 8.14 +SHARED_LIBS += poppler-qt5 7.3 # 1.21 SHARED_LIBS += poppler-cpp 11.0 # 0.7 HOMEPAGE= https://poppler.freedesktop.org/ Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.74 diff -u -p -r1.74 distinfo --- distinfo6 Aug 2019 18:32:20 - 1.74 +++ distinfo8 Sep 2019 20:29:39 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.79.0.tar.xz) = +YWkYI/lktJUbZ031BguUC/2tMQvjbS+CgIaHDaVKMg= -SIZE (poppler-0.79.0.tar.xz) = 1544140 +SHA256 (poppler-0.80.0.tar.xz) = TTymt5vBO44kCS40+D7184fzuwu9c1mmwHjgnGltEE8= +SIZE (poppler-0.80.0.tar.xz) = 1548908 Index: patches/patch-poppler_Form_cc === RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v retrieving revision 1.4 diff -u -p -r1.4 patch-poppler_Form_cc --- patches/patch-poppler_Form_cc 19 Jun 2019 19:39:14 - 1.4 +++ patches/patch-poppler_Form_cc 8 Sep 2019 20:29:39 - @@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.4 20 Index: poppler/Form.cc --- poppler/Form.cc.orig +++ poppler/Form.cc -@@ -32,6 +32,7 @@ +@@ -33,6 +33,7 @@ #include #include Index: pkg/PLIST-main === RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v retrieving revision 1.32 diff -u -p -r1.32 PLIST-main --- pkg/PLIST-main 6 May 2019 21:17:19 - 1.32 +++ pkg/PLIST-main 8 Sep 2019 20:29:39 - @@ -114,7 +114,6 @@ include/poppler/glib/poppler-page.h include/poppler/glib/poppler-structure-element.h include/poppler/glib/poppler.h include/poppler/goo/ -include/poppler/goo/FixedPoint.h include/poppler/goo/GooCheckedOps.h include/poppler/goo/GooLikely.h include/poppler/goo/GooString.h
Re: update print/poppler
Hi, On Tue, Aug 06, 2019 at 03:46:51PM +0200, Jeremie Courreges-Anglas wrote: > That's weird, when I look at the output of check_sym here: [...] > the "Dynamic export changes" calls for: > - a major bump for libpoppler > - a minor bump for libpoppler-glib > - a minor bump for libpoppler-qt5 > > But you propose a major bump for both libpoppler and libpoppler-glib. > Not a big deal, but I figured I'd ask... That was probably a reading error (of the check_sym output) on my side. I'll commit with a minor instead of a major bump to libpoppler-glib. Thanks for testing! Ciao, Kili
Re: update print/poppler
On Sun, Aug 04 2019, Matthias Kilian wrote: > Hi, > > update to poppler-0.79.0. > > Tested on amd64 with apvlv, evince and gummi. Build-tested on sparc64 with the same consumer ports. > check_sym reported some symbol removals for poppler-glib, thus the > major bump. That's weird, when I look at the output of check_sym here: --8<-- /usr/local/lib/libpoppler.so.52.0 --> /usr/ports/pobj/poppler-0.79.0/fake-amd64/usr/local/lib/libpoppler.so.53.0 Dynamic export changes: added: _Z9greallocnPviibb _ZN10FormWidget19setAdditionalActionEN5Annot25FormAdditionalActionsTypeERK9GooString _ZN11AnnotWidget16setNewAppearanceEO6Object _ZN11AnnotWidget23setFormAdditionalActionEN5Annot25FormAdditionalActionsTypeERK9GooString _ZN11PSOutputDev11writeHeaderEiPK12PDFRectangleS2_iPKc _ZN11PSOutputDev13writeDocSetupEP7CatalogRKNSt3__16vectorIiNS2_9allocatorIib _ZN14LinkJavaScript12createObjectEP4XRefRK9GooString _ZN22AnnotAppearanceBuilder18lineEndingXShortenE20AnnotLineEndingStyled _ZN22AnnotAppearanceBuilder21lineEndingXExtendBBoxE20AnnotLineEndingStyled removed: _Z9greallocnPviib _ZN11PSOutputDev11writeHeaderERKNSt3__16vectorIiNS0_9allocatorIiPK12PDFRectangleS9_iPc _ZN11PSOutputDev13writeDocSetupEP6PDFDocP7CatalogRKNSt3__16vectorIiNS4_9allocatorIib _ZN22AnnotAppearanceBuilder27shortenLineSegmentForEndingE20AnnotLineEndingStyledd PLT added: _Z9greallocnPviibb _ZN10SplashClip4growEi _ZN11AnnotWidget23setFormAdditionalActionEN5Annot25FormAdditionalActionsTypeERK9GooString _ZN11PSOutputDev11writeHeaderEiPK12PDFRectangleS2_iPKc _ZN11PSOutputDev13writeDocSetupEP7CatalogRKNSt3__16vectorIiNS2_9allocatorIib _ZN14LinkJavaScript12createObjectEP4XRefRK9GooString PLT removed: _Z9greallocnPviib _ZN11PSOutputDev11writeHeaderERKNSt3__16vectorIiNS0_9allocatorIiPK12PDFRectangleS9_iPc _ZN11PSOutputDev13writeDocSetupEP6PDFDocP7CatalogRKNSt3__16vectorIiNS4_9allocatorIib /usr/local/lib/libpoppler-glib.so.19.1 --> /usr/ports/pobj/poppler-0.79.0/fake-amd64/usr/local/lib/libpoppler-glib.so.20.0 Dynamic export changes: added: poppler_document_create_dests_tree External reference changes: added: _ZN7Catalog12getDestsDestEi _ZN7Catalog12getDestsNameEi _ZN7Catalog15getDestNameTreeEv _ZN7Catalog19getDestNameTreeDestEi _ZN7Catalog8numDestsEv _ZN8NameTree7getNameEi g_prefix_error g_strcmp0 g_tree_insert g_tree_new_full g_type_add_instance_private removed: g_type_class_add_private g_type_instance_get_private PLT added: poppler_dest_free /usr/local/lib/libpoppler-qt5.so.7.1 --> /usr/ports/pobj/poppler-0.79.0/fake-amd64/usr/local/lib/libpoppler-qt5.so.7.2 Dynamic export changes: added: _ZN7Poppler13FormFieldIconC1EPNS_17FormFieldIconDataE _ZN7Poppler13FormFieldIconC1ERKS0_ _ZN7Poppler13FormFieldIconC2EPNS_17FormFieldIconDataE _ZN7Poppler13FormFieldIconC2ERKS0_ _ZN7Poppler13FormFieldIconD1Ev _ZN7Poppler13FormFieldIconD2Ev _ZN7Poppler13FormFieldIconaSERKS0_ _ZN7Poppler15FormFieldButton7setIconERKNS_13FormFieldIconE _ZN7Poppler17FormFieldIconData7getDataERKNS_13FormFieldIconE _ZN7Poppler9FormField12setPrintableEb _ZNK7Poppler15FormFieldButton4iconEv _ZNK7Poppler9FormField11isPrintableEv External reference changes: added: _ZN11AnnotWidget16setNewAppearanceEO6Object _ZSt7nothrow _ZnwmRKSt9nothrow_t PLT added: _ZN7Poppler17FormFieldIconData7getDataERKNS_13FormFieldIconE /usr/local/lib/libpoppler-cpp.so.11.0 --> /usr/ports/pobj/poppler-0.79.0/fake-amd64/usr/local/lib/libpoppler-cpp.so.11.0 No dynamic export changes -->8-- the "Dynamic export changes" calls for: - a major bump for libpoppler - a minor bump for libpoppler-glib - a minor bump for libpoppler-qt5 But you propose a major bump for both libpoppler and libpoppler-glib. Not a big deal, but I figured I'd ask... > If anyone wants to test on other archs or with other applications, > please let me know. Otherwise I'd like to commit this on tuesday. LGTM -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
update print/poppler
Hi,
update to poppler-0.79.0.
Tested on amd64 with apvlv, evince and gummi.
check_sym reported some symbol removals for poppler-glib, thus the
major bump.
If anyone wants to test on other archs or with other applications,
please let me know. Otherwise I'd like to commit this on tuesday.
Ciao,
Kili
ps: apologies for beeing so terribly inactive on ports
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.144
diff -u -p -r1.144 Makefile
--- Makefile12 Jul 2019 20:48:56 - 1.144
+++ Makefile4 Aug 2019 19:54:55 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.77.0
+V= 0.79.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,9 +13,9 @@ PKGNAME-qt5= poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 52.0 # 88.0
-SHARED_LIBS += poppler-glib 19.1 # 8.12
-SHARED_LIBS += poppler-qt5 7.1 # 1.19
+SHARED_LIBS += poppler 53.0 # 89.0
+SHARED_LIBS += poppler-glib 20.0 # 8.13
+SHARED_LIBS += poppler-qt5 7.2 # 1.20
SHARED_LIBS += poppler-cpp 11.0 # 0.7
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.73
diff -u -p -r1.73 distinfo
--- distinfo19 Jun 2019 19:39:14 - 1.73
+++ distinfo4 Aug 2019 19:54:55 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.77.0.tar.xz) = cmfrTLzNZKWCRLghFgPBwba/Msf2pM7SZChlNGEC82s=
-SIZE (poppler-0.77.0.tar.xz) = 1533068
+SHA256 (poppler-0.79.0.tar.xz) = +YWkYI/lktJUbZ031BguUC/2tMQvjbS+CgIaHDaVKMg=
+SIZE (poppler-0.79.0.tar.xz) = 1544140
Index: patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 20 Feb 2019 17:10:45 - 1.2
+++ patches/patch-glib_CMakeLists_txt 4 Aug 2019 19:54:55 -
@@ -11,6 +11,6 @@ Index: glib/CMakeLists.txt
+ set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR}
-L${CMAKE_CURRENT_BINARY_DIR}
+-L${X11BASE}/lib
+ )
- set(Poppler_0_18_gir_LIBS poppler-glib)
+ set(Poppler_0_18_gir_LIBS poppler-glib poppler)
_list_prefix(_abs_introspection_files introspection_files
"${CMAKE_CURRENT_SOURCE_DIR}/")
list(APPEND _abs_introspection_files
update print/poppler
Hi,
this updates poppler to 0.77.0.
While here, drop the no_qt5 and bootstrap pseudo flavors.
They are confusing and make it difficult to track down weird problems
with the SOVERSION of the to be installed libpoppler-glib.so happening
sometimes during fake, but only for print/poppler,,-qt5.
Major bump to libpoppler.so, following upstream, allthough
/usr/src/lib/check_sym didn't report any dynamic export changes
(nor for the other shared libs).
I'll also clean up the dependencies to print/poppler,,-qt5 (now with
only one comma) in the following ports:
devel/kf5/kfilemetadata
editors/calligra
editors/kile
editors/ktikz
editors/texworks
emulators/gr-lida
graphics/krita
textproc/calibre
x11/kde-applications/okular
x11/lumina
x11/tellico
Already tested on amd64. If anyone wants do do some own tests, please
let me know. Otherwise, I'll commit the update tomorrow evening.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.142
diff -u -p -r1.142 Makefile
--- Makefile20 May 2019 22:15:21 - 1.142
+++ Makefile18 Jun 2019 15:30:31 -
@@ -4,17 +4,16 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.76.1
+V= 0.77.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt5= poppler-qt5-$V
-REVISION= 1
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 51.0 # 87.0
+SHARED_LIBS += poppler 52.0 # 88.0
SHARED_LIBS += poppler-glib 19.1 # 8.12
SHARED_LIBS += poppler-qt5 7.1 # 1.19
SHARED_LIBS += poppler-cpp 11.0 # 0.7
@@ -28,10 +27,6 @@ PERMIT_PACKAGE_CDROM=Yes
MASTER_SITES= ${HOMEPAGE}
-PSEUDO_FLAVORS=no_qt5 bootstrap
-# XXX not strictly a bootstrap loop, but on the critical path for libreoffice
-FLAVOR?=no_qt5 bootstrap
-
NOT_FOR_ARCHS-qt5 = arm
MULTI_PACKAGES=-main -qt5 -utils
@@ -45,11 +40,7 @@ cWANTLIB=expat freetype fontconfig jpeg
MODULES= devel/cmake
-.if ${BUILD_PACKAGES:M-qt5}
MODULES+= x11/qt5
-.else
-CONFIGURE_ARGS+= --disable-poppler-qt5
-.endif
BUILD_DEPENDS+= devel/gobject-introspection
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.72
diff -u -p -r1.72 distinfo
--- distinfo9 May 2019 11:23:04 - 1.72
+++ distinfo18 Jun 2019 15:30:31 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.76.1.tar.xz) = 5izUBT+FHuzEpqorgdc5+6sdZ7PGCzHrrHBJSDzGF7E=
-SIZE (poppler-0.76.1.tar.xz) = 1531548
+SHA256 (poppler-0.77.0.tar.xz) = cmfrTLzNZKWCRLghFgPBwba/Msf2pM7SZChlNGEC82s=
+SIZE (poppler-0.77.0.tar.xz) = 1533068
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 4 Jan 2019 21:05:34 - 1.3
+++ patches/patch-poppler_Form_cc 18 Jun 2019 15:30:31 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.3 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -30,6 +30,7 @@
+@@ -32,6 +32,7 @@
#include
#include
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.21
diff -u -p -r1.21 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 11 Jan 2019 21:31:52 - 1.21
+++ patches/patch-poppler_XRef_cc 18 Jun 2019 15:30:31 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.21 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1015,49 +1015,38 @@ void XRef::getEncryptionParameters(unsigned char **fil
+@@ -1013,49 +1013,38 @@ void XRef::getEncryptionParameters(unsigned char **fil
}
bool XRef::okToPrint(bool ignoreOwnerPW) const {
Re: update print/poppler (again)
On Wed, May 08 2019, Jeremie Courreges-Anglas wrote: > On Wed, May 08 2019, Matthias Kilian wrote: >> And another one, as allways for early testers (before my slow build >> machine has finished the build). >> >> From the release notes (I think we want especially the qt5 one, because >> that's a != 0 vs. != -1 diff): >> >> core: >> * Make the mul tables be calculated at compile time with constexpr. >> * splash: Fix compile with SPLASH_CMYK enabled >> * Some typo fixing in error messages >> >> qt5: >> * Fix regression in annotation handling >> >> build system: >> * Fix some typos in build system output and comments > > Looks rather safe (631 lines diff). Still builds fine using ports-gcc > and ld.bfd. No symbol change, no regression here, ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update print/poppler (again)
On Wed, May 08 2019, Matthias Kilian wrote: > And another one, as allways for early testers (before my slow build > machine has finished the build). > > From the release notes (I think we want especially the qt5 one, because > that's a != 0 vs. != -1 diff): > > core: > * Make the mul tables be calculated at compile time with constexpr. > * splash: Fix compile with SPLASH_CMYK enabled > * Some typo fixing in error messages > > qt5: > * Fix regression in annotation handling > > build system: > * Fix some typos in build system output and comments Looks rather safe (631 lines diff). Still builds fine using ports-gcc and ld.bfd. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
update print/poppler (again)
And another one, as allways for early testers (before my slow build machine has finished the build). >From the release notes (I think we want especially the qt5 one, because that's a != 0 vs. != -1 diff): core: * Make the mul tables be calculated at compile time with constexpr. * splash: Fix compile with SPLASH_CMYK enabled * Some typo fixing in error messages qt5: * Fix regression in annotation handling build system: * Fix some typos in build system output and comments Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.139 diff -u -p -r1.139 Makefile --- Makefile6 May 2019 21:17:19 - 1.139 +++ Makefile8 May 2019 20:53:27 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.76.0 +V= 0.76.1 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.71 diff -u -p -r1.71 distinfo --- distinfo6 May 2019 21:17:19 - 1.71 +++ distinfo8 May 2019 20:53:27 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.76.0.tar.xz) = Nw9fz+K78Mdvw5TTOM1y7X8gRLZ/TrSxFesHTM/HDWM= -SIZE (poppler-0.76.0.tar.xz) = 1530264 +SHA256 (poppler-0.76.1.tar.xz) = 5izUBT+FHuzEpqorgdc5+6sdZ7PGCzHrrHBJSDzGF7E= +SIZE (poppler-0.76.1.tar.xz) = 1531548
Re: update print/poppler
On Sun, May 05 2019, Matthias Kilian wrote:
> Hi,
>
> On Sun, May 05, 2019 at 01:30:56PM +0200, Jeremie Courreges-Anglas wrote:
>> > Adding major bumps for poppler-qt5 and poppler-cpp because of
>> > incompatible changes in some "private" parts, even if the corresponding
>> > headers aren't included in the packages.
>> >
>> > I'm still waiting for my bulk update on amd64 to finish, but in case
>> > anyone want's to do some testing in advance...
>>
>> Builds fine on amd64 with ports-gcc and ld.bfd (can't test on sparc64
>> right now). Hopefully that test should be enough for ports-gcc archs.
>
> Thanks for that test.
>
>> Looks like symbols from poppler-qt5 didn't change yet there's a major
>> bump. I'm not saying this is a problem though (eg we have situations in
>> base where we bump both libA and libB when libB depends on libA).
>>
>> /usr/local/lib/libpoppler-qt5.so.7.1 -->
>> /usr/ports/pobj/poppler-0.76.0/fake-amd64/usr/local/lib/libpoppler-qt5.so.8.0
>> No dynamic export changes
>
> I usually just look at a diff of the old and new version of poppler
> to check wether upstream may have missed a (minor or major) bump.
>
> Honestly I even forgot the name of the tool for comparing shared
> library export ;-)
The FAQ still advises to use nm -g but these days I'm using
/usr/src/lib/check_sym, courtesy of guenther@. Note that check_sym
can't detect every change such as return / parameter types changes in
C code. It probably works better in C++ where final symbol names are
constructed using said types.
> In this case it was this chunk in qt5/src/poppler-private.h
>
> @@ -123,7 +125,7 @@ namespace Poppler {
> DocumentData(const DocumentData &) = delete;
> DocumentData& operator=(const DocumentData &) = delete;
>
> - void addTocChildren( QDomDocument * docSyn, QDomNode * parent, const
> GooList * items );
> + void addTocChildren( QDomDocument * docSyn, QDomNode * parent, const
> std::vector<::OutlineItem*> * items );
>
> void setPaperColor(const QColor &color)
> {
>
> That is the declaration of a public method in class DocumentData
> in the namespace Poppler. If i see such a change, I add a major
> bump (if upstream didn't already do).
>
> Since you didn't find any change in this case, I could drop the
> bump if you insist (but it would be a little mess on my build machine
> and in my package repository).
In this case, I would omit the bump since poppler-private.h is not
installed, thus probably not part of any public API.
russell /usr/ports/print/poppler$ readelf -Wa
/usr/local/lib/libpoppler-qt5.so.7.1 | grep addTocChildren | c++filt
2104: 0009421840 OBJECT LOCAL DEFAULT 16
Poppler::DocumentData::addTocChildren(QDomDocument*, QDomNode*, GooList
const*)::$_1::operator()() const::qstring_literal
2115: 0007ccf0 2590 FUNCLOCAL HIDDEN12
Poppler::DocumentData::addTocChildren(QDomDocument*, QDomNode*, GooList const*)
russell /usr/ports/print/poppler$ readelf -Wa
/usr/local/lib/libpoppler-qt5.so.8.0 | grep addTocChildren | c++filt
2121: 0009421840 OBJECT LOCAL DEFAULT 16
Poppler::DocumentData::addTocChildren(QDomDocument*, QDomNode*,
std::__1::vector >
const*)::$_1::operator()() const::qstring_literal
2132: 0007cc00 2574 FUNCLOCAL HIDDEN12
Poppler::DocumentData::addTocChildren(QDomDocument*, QDomNode*,
std::__1::vector > const*)
"LOCAL" and "HIDDEN" support this theory. I would not add a bump but
please choose the safe option if you have any doubt.
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update print/poppler
Hi,
On Sun, May 05, 2019 at 01:30:56PM +0200, Jeremie Courreges-Anglas wrote:
> > Adding major bumps for poppler-qt5 and poppler-cpp because of
> > incompatible changes in some "private" parts, even if the corresponding
> > headers aren't included in the packages.
> >
> > I'm still waiting for my bulk update on amd64 to finish, but in case
> > anyone want's to do some testing in advance...
>
> Builds fine on amd64 with ports-gcc and ld.bfd (can't test on sparc64
> right now). Hopefully that test should be enough for ports-gcc archs.
Thanks for that test.
> Looks like symbols from poppler-qt5 didn't change yet there's a major
> bump. I'm not saying this is a problem though (eg we have situations in
> base where we bump both libA and libB when libB depends on libA).
>
> /usr/local/lib/libpoppler-qt5.so.7.1 -->
> /usr/ports/pobj/poppler-0.76.0/fake-amd64/usr/local/lib/libpoppler-qt5.so.8.0
> No dynamic export changes
I usually just look at a diff of the old and new version of poppler
to check wether upstream may have missed a (minor or major) bump.
Honestly I even forgot the name of the tool for comparing shared
library export ;-)
In this case it was this chunk in qt5/src/poppler-private.h
@@ -123,7 +125,7 @@ namespace Poppler {
DocumentData(const DocumentData &) = delete;
DocumentData& operator=(const DocumentData &) = delete;
- void addTocChildren( QDomDocument * docSyn, QDomNode * parent, const
GooList * items );
+ void addTocChildren( QDomDocument * docSyn, QDomNode * parent, const
std::vector<::OutlineItem*> * items );
void setPaperColor(const QColor &color)
{
That is the declaration of a public method in class DocumentData
in the namespace Poppler. If i see such a change, I add a major
bump (if upstream didn't already do).
Since you didn't find any change in this case, I could drop the
bump if you insist (but it would be a little mess on my build machine
and in my package repository).
Ciao,
Kili
Re: update print/poppler
On Sat, May 04 2019, Matthias Kilian wrote: > Update to poppler-0.76.0. > > Adding major bumps for poppler-qt5 and poppler-cpp because of > incompatible changes in some "private" parts, even if the corresponding > headers aren't included in the packages. > > I'm still waiting for my bulk update on amd64 to finish, but in case > anyone want's to do some testing in advance... Builds fine on amd64 with ports-gcc and ld.bfd (can't test on sparc64 right now). Hopefully that test should be enough for ports-gcc archs. Looks like symbols from poppler-qt5 didn't change yet there's a major bump. I'm not saying this is a problem though (eg we have situations in base where we bump both libA and libB when libB depends on libA). /usr/local/lib/libpoppler-qt5.so.7.1 --> /usr/ports/pobj/poppler-0.76.0/fake-amd64/usr/local/lib/libpoppler-qt5.so.8.0 No dynamic export changes > This also breaks graphics/pdf2djvu, I'll sent a diff to fix this > in a Minute. > > Ciao, > Kili > > Index: Makefile > === > RCS file: /cvs/ports/print/poppler/Makefile,v > retrieving revision 1.138 > diff -u -p -r1.138 Makefile > --- Makefile 21 Apr 2019 23:27:53 - 1.138 > +++ Makefile 30 Apr 2019 20:37:53 - > @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library > COMMENT-qt5= Qt5 interface to PDF rendering library > COMMENT-utils= PDF conversion tools and utilities > > -V= 0.75.0 > +V= 0.76.0 > DISTNAME=poppler-$V > CATEGORIES= print > PKGNAME-main=poppler-$V > @@ -13,10 +13,10 @@ PKGNAME-qt5= poppler-qt5-$V > > EXTRACT_SUFX=.tar.xz > > -SHARED_LIBS += poppler 50.0 # 86.0 > +SHARED_LIBS += poppler 51.0 # 87.0 > SHARED_LIBS += poppler-glib 19.1 # 8.12 > -SHARED_LIBS += poppler-qt5 7.1 # 1.19 > -SHARED_LIBS += poppler-cpp 10.2 # 0.7 > +SHARED_LIBS += poppler-qt5 8.0 # 1.19 > +SHARED_LIBS += poppler-cpp 11.0 # 0.7 > > HOMEPAGE=https://poppler.freedesktop.org/ > > Index: distinfo > === > RCS file: /cvs/ports/print/poppler/distinfo,v > retrieving revision 1.70 > diff -u -p -r1.70 distinfo > --- distinfo 21 Apr 2019 23:27:53 - 1.70 > +++ distinfo 30 Apr 2019 20:37:53 - > @@ -1,2 +1,2 @@ > -SHA256 (poppler-0.75.0.tar.xz) = O7rtsPonl8rJM6BlnRRDA+TQnuxoksZWANqYfYcHGZo= > -SIZE (poppler-0.75.0.tar.xz) = 1523872 > +SHA256 (poppler-0.76.0.tar.xz) = Nw9fz+K78Mdvw5TTOM1y7X8gRLZ/TrSxFesHTM/HDWM= > +SIZE (poppler-0.76.0.tar.xz) = 1530264 > Index: pkg/PLIST-main > === > RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v > retrieving revision 1.31 > diff -u -p -r1.31 PLIST-main > --- pkg/PLIST-main20 Feb 2019 17:10:45 - 1.31 > +++ pkg/PLIST-main30 Apr 2019 20:37:53 - > @@ -117,7 +117,6 @@ include/poppler/goo/ > include/poppler/goo/FixedPoint.h > include/poppler/goo/GooCheckedOps.h > include/poppler/goo/GooLikely.h > -include/poppler/goo/GooList.h > include/poppler/goo/GooString.h > include/poppler/goo/GooTimer.h > include/poppler/goo/ImgWriter.h > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
update print/poppler
Update to poppler-0.76.0. Adding major bumps for poppler-qt5 and poppler-cpp because of incompatible changes in some "private" parts, even if the corresponding headers aren't included in the packages. I'm still waiting for my bulk update on amd64 to finish, but in case anyone want's to do some testing in advance... This also breaks graphics/pdf2djvu, I'll sent a diff to fix this in a Minute. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.138 diff -u -p -r1.138 Makefile --- Makefile21 Apr 2019 23:27:53 - 1.138 +++ Makefile30 Apr 2019 20:37:53 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.75.0 +V= 0.76.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 50.0 # 86.0 +SHARED_LIBS += poppler 51.0 # 87.0 SHARED_LIBS += poppler-glib 19.1 # 8.12 -SHARED_LIBS += poppler-qt5 7.1 # 1.19 -SHARED_LIBS += poppler-cpp 10.2 # 0.7 +SHARED_LIBS += poppler-qt5 8.0 # 1.19 +SHARED_LIBS += poppler-cpp 11.0 # 0.7 HOMEPAGE= https://poppler.freedesktop.org/ Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.70 diff -u -p -r1.70 distinfo --- distinfo21 Apr 2019 23:27:53 - 1.70 +++ distinfo30 Apr 2019 20:37:53 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.75.0.tar.xz) = O7rtsPonl8rJM6BlnRRDA+TQnuxoksZWANqYfYcHGZo= -SIZE (poppler-0.75.0.tar.xz) = 1523872 +SHA256 (poppler-0.76.0.tar.xz) = Nw9fz+K78Mdvw5TTOM1y7X8gRLZ/TrSxFesHTM/HDWM= +SIZE (poppler-0.76.0.tar.xz) = 1530264 Index: pkg/PLIST-main === RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v retrieving revision 1.31 diff -u -p -r1.31 PLIST-main --- pkg/PLIST-main 20 Feb 2019 17:10:45 - 1.31 +++ pkg/PLIST-main 30 Apr 2019 20:37:53 - @@ -117,7 +117,6 @@ include/poppler/goo/ include/poppler/goo/FixedPoint.h include/poppler/goo/GooCheckedOps.h include/poppler/goo/GooLikely.h -include/poppler/goo/GooList.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h
Re: update print/poppler
On Fri, Mar 29 2019, Matthias Kilian wrote: > Hi, > > On Fri, Mar 29, 2019 at 09:38:24PM +0100, Jeremie Courreges-Anglas wrote: >> > update to poppler-0.75.0, some bug fixes, and a new program (pdfattach) >> > in poppler-utils. > [...] >> Just to be clear: do you plan to commit this before 6.5 is tagged? > > If the timing isn't too tight... but see below. > >> (My sparc64 build machine is also running a test bulk and got past >> print/poppler already, so I can't really apply your diff now.) > > Well, the scariest entry in the release notes is: > > * pdfsig: fix use after free > > which doesn't apply to us (because we don't build / include that > one)[. > > So i'll just defer the update unless your sparc64 gains super powers > before the ports tree is locked ;-) I did another partial sparc64 bulk, the poppler-0.75 packages built fine. This was using gcc-8.3.0 though. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update print/poppler
Hi, On Fri, Mar 29, 2019 at 09:38:24PM +0100, Jeremie Courreges-Anglas wrote: > > update to poppler-0.75.0, some bug fixes, and a new program (pdfattach) > > in poppler-utils. [...] > Just to be clear: do you plan to commit this before 6.5 is tagged? If the timing isn't too tight... but see below. > (My sparc64 build machine is also running a test bulk and got past > print/poppler already, so I can't really apply your diff now.) Well, the scariest entry in the release notes is: * pdfsig: fix use after free which doesn't apply to us (because we don't build / include that one)[. So i'll just defer the update unless your sparc64 gains super powers before the ports tree is locked ;-) Ciao, Kili
Re: update print/poppler
On Thu, Mar 28 2019, Matthias Kilian wrote: > Hi, Hi kili, > update to poppler-0.75.0, some bug fixes, and a new program (pdfattach) > in poppler-utils. > > I'm still waiting for my poor old build machine to finish a bulk > build -- tests from anyone with a really fast machine are welcome. Just to be clear: do you plan to commit this before 6.5 is tagged? (My sparc64 build machine is also running a test bulk and got past print/poppler already, so I can't really apply your diff now.) > Ciao, > Kili > > Index: Makefile > === > RCS file: /cvs/ports/print/poppler/Makefile,v > retrieving revision 1.137 > diff -u -p -r1.137 Makefile > --- Makefile 20 Feb 2019 17:10:45 - 1.137 > +++ Makefile 28 Mar 2019 22:39:59 - > @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library > COMMENT-qt5= Qt5 interface to PDF rendering library > COMMENT-utils= PDF conversion tools and utilities > > -V= 0.74.0 > +V= 0.75.0 > DISTNAME=poppler-$V > CATEGORIES= print > PKGNAME-main=poppler-$V > @@ -13,7 +13,7 @@ PKGNAME-qt5=poppler-qt5-$V > > EXTRACT_SUFX=.tar.xz > > -SHARED_LIBS += poppler 49.0 # 85.0 > +SHARED_LIBS += poppler 50.0 # 86.0 > SHARED_LIBS += poppler-glib 19.1 # 8.12 > SHARED_LIBS += poppler-qt5 7.1 # 1.19 > SHARED_LIBS += poppler-cpp 10.2 # 0.7 > Index: distinfo > === > RCS file: /cvs/ports/print/poppler/distinfo,v > retrieving revision 1.69 > diff -u -p -r1.69 distinfo > --- distinfo 20 Feb 2019 17:10:45 - 1.69 > +++ distinfo 28 Mar 2019 22:39:59 - > @@ -1,2 +1,2 @@ > -SHA256 (poppler-0.74.0.tar.xz) = kuCf0zAlZ/02FGs2u3B9tDzkNuiEEhkCWoLqn7AHay8= > -SIZE (poppler-0.74.0.tar.xz) = 1514044 > +SHA256 (poppler-0.75.0.tar.xz) = O7rtsPonl8rJM6BlnRRDA+TQnuxoksZWANqYfYcHGZo= > +SIZE (poppler-0.75.0.tar.xz) = 1523872 > Index: pkg/PLIST-utils > === > RCS file: /cvs/ports/print/poppler/pkg/PLIST-utils,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST-utils > --- pkg/PLIST-utils 9 Jul 2016 15:37:47 - 1.4 > +++ pkg/PLIST-utils 28 Mar 2019 22:39:59 - > @@ -2,6 +2,7 @@ > @conflict xpdf-utils-* > @conflict poppler-<0.18.4p0 > @pkgpath textproc/xpdf,-utils > +@bin bin/pdfattach > @comment bin/pdfdetach > @bin bin/pdffonts > @bin bin/pdfimages > @@ -13,6 +14,7 @@ > @bin bin/pdftops > @bin bin/pdftotext > @bin bin/pdfunite > +@man man/man1/pdfattach.1 > @comment man/man1/pdfdetach.1 > @man man/man1/pdffonts.1 > @man man/man1/pdfimages.1 > <#secure method=pgpmime mode=sign> -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
update print/poppler
Hi, update to poppler-0.75.0, some bug fixes, and a new program (pdfattach) in poppler-utils. I'm still waiting for my poor old build machine to finish a bulk build -- tests from anyone with a really fast machine are welcome. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.137 diff -u -p -r1.137 Makefile --- Makefile20 Feb 2019 17:10:45 - 1.137 +++ Makefile28 Mar 2019 22:39:59 - @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.74.0 +V= 0.75.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -13,7 +13,7 @@ PKGNAME-qt5= poppler-qt5-$V EXTRACT_SUFX= .tar.xz -SHARED_LIBS += poppler 49.0 # 85.0 +SHARED_LIBS += poppler 50.0 # 86.0 SHARED_LIBS += poppler-glib 19.1 # 8.12 SHARED_LIBS += poppler-qt5 7.1 # 1.19 SHARED_LIBS += poppler-cpp 10.2 # 0.7 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.69 diff -u -p -r1.69 distinfo --- distinfo20 Feb 2019 17:10:45 - 1.69 +++ distinfo28 Mar 2019 22:39:59 - @@ -1,2 +1,2 @@ -SHA256 (poppler-0.74.0.tar.xz) = kuCf0zAlZ/02FGs2u3B9tDzkNuiEEhkCWoLqn7AHay8= -SIZE (poppler-0.74.0.tar.xz) = 1514044 +SHA256 (poppler-0.75.0.tar.xz) = O7rtsPonl8rJM6BlnRRDA+TQnuxoksZWANqYfYcHGZo= +SIZE (poppler-0.75.0.tar.xz) = 1523872 Index: pkg/PLIST-utils === RCS file: /cvs/ports/print/poppler/pkg/PLIST-utils,v retrieving revision 1.4 diff -u -p -r1.4 PLIST-utils --- pkg/PLIST-utils 9 Jul 2016 15:37:47 - 1.4 +++ pkg/PLIST-utils 28 Mar 2019 22:39:59 - @@ -2,6 +2,7 @@ @conflict xpdf-utils-* @conflict poppler-<0.18.4p0 @pkgpath textproc/xpdf,-utils +@bin bin/pdfattach @comment bin/pdfdetach @bin bin/pdffonts @bin bin/pdfimages @@ -13,6 +14,7 @@ @bin bin/pdftops @bin bin/pdftotext @bin bin/pdfunite +@man man/man1/pdfattach.1 @comment man/man1/pdfdetach.1 @man man/man1/pdffonts.1 @man man/man1/pdfimages.1
update print/poppler
Hi,
this is a bugfix update to poppler-0.74.0. No API breakages this time.
I'll commit this as soon as my builds are done and I had a change
for the usual testing (probably in a day or two, because my build
machine is still slow).
Useless fact: this version drops support for ACORN, MACOS and VMS ;-)
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile
--- Makefile11 Jan 2019 21:31:52 - 1.136
+++ Makefile17 Feb 2019 19:49:32 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.73.0
+V= 0.74.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 48.0 # 84.0
+SHARED_LIBS += poppler 49.0 # 85.0
SHARED_LIBS += poppler-glib 19.1 # 8.12
-SHARED_LIBS += poppler-qt5 7.0 # 1.18
-SHARED_LIBS += poppler-cpp 10.1 # 0.6
+SHARED_LIBS += poppler-qt5 7.1 # 1.19
+SHARED_LIBS += poppler-cpp 10.2 # 0.7
HOMEPAGE= https://poppler.freedesktop.org/
@@ -74,7 +74,7 @@ LIB_DEPENDS-utils=${MODGCC4_CPPLIBDEP} \
WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 pixman-1 openjp2 X11 Xrender cairo pcre \
- png xcb xcb-render lcms2 xcb-shm \
+ png16 xcb xcb-render lcms2 xcb-shm \
iconv intl ${COMPILER_LIBCXX}
WANTLIB-qt5= ${cWANTLIB} $(COMPILER_LIBCXX) \
@@ -82,10 +82,10 @@ WANTLIB-qt5=${cWANTLIB} $(COMPILER_LIBC
Xdamage Xext Xfixes Xxf86vm drm execinfo glapi \
glib-2.0 graphite2 gthread-2.0 harfbuzz \
iconv icudata icui18n icuuc intl lcms2 openjp2 pcre \
- pcre2-16 png poppler xcb xcb-dri2 xcb-glx
+ pcre2-16 png16 poppler xcb xcb-dri2 xcb-glx
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
- png ${COMPILER_LIBCXX} xcb xcb-render xcb-shm openjp2 \
+ png16 ${COMPILER_LIBCXX} xcb xcb-render xcb-shm openjp2 \
poppler z ${cWANTLIB}
CONFIGURE_ARGS+=-DENABLE_UNSTABLE_API_ABI_HEADERS=True \
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.68
diff -u -p -r1.68 distinfo
--- distinfo11 Jan 2019 21:31:52 - 1.68
+++ distinfo17 Feb 2019 19:49:32 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.73.0.tar.xz) = 5EtVQ5AxKIhLpFOMKpfTvMiInpf/rMRjYRIQHwI42wM=
-SIZE (poppler-0.73.0.tar.xz) = 1507068
+SHA256 (poppler-0.74.0.tar.xz) = kuCf0zAlZ/02FGs2u3B9tDzkNuiEEhkCWoLqn7AHay8=
+SIZE (poppler-0.74.0.tar.xz) = 1514044
Index: patches/patch-glib_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-glib_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-glib_CMakeLists_txt
--- patches/patch-glib_CMakeLists_txt 11 Jan 2019 21:31:52 - 1.1
+++ patches/patch-glib_CMakeLists_txt 17 Feb 2019 19:49:32 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-glib_CMakeLists_txt,v 1.
Index: glib/CMakeLists.txt
--- glib/CMakeLists.txt.orig
+++ glib/CMakeLists.txt
-@@ -130,7 +130,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
+@@ -134,7 +134,9 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
set(Poppler_0_18_gir_INCLUDES GObject-2.0 Gio-2.0 cairo-1.0)
get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
_list_prefix(_includes _tmp_includes "-I")
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST-main
--- pkg/PLIST-main 11 Jan 2019 21:31:52 - 1.30
+++ pkg/PLIST-main 17 Feb 2019 19:49:32 -
@@ -78,6 +78,7 @@ include/poppler/UnicodeTypeTable.h
include/poppler/ViewerPreferences.h
include/poppler/XRef.h
include/poppler/cpp/
+include/poppler/cpp/poppler-destination.h
include/poppler/cpp/poppler-document.h
include/poppler/cpp/poppler-embedded-file.h
include/poppler/cpp/poppler-font.h
Re: update print/poppler
On Wed, Jan 09, 2019 at 09:58:23PM +0100, Matthias Kilian wrote: > Index: pkg/PLIST-main > === > RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v > retrieving revision 1.29 > diff -u -p -r1.29 PLIST-main > --- pkg/PLIST-main4 Jan 2019 21:05:34 - 1.29 > +++ pkg/PLIST-main9 Jan 2019 20:52:07 - [...] > @@ -127,8 +128,8 @@ include/poppler/goo/gfile.h > include/poppler/goo/gmem.h > include/poppler/goo/grandom.h > include/poppler/goo/gstrtod.h > -include/poppler/goo/gtypes.h > include/poppler/poppler-config.h > +include/poppler/qt5/poppler-version.h ^ This one should end up in PLIST-qt5, of course. Not sending a new diff, but already fixed in my tree. Ciao, Kili
update print/poppler
Hi,
this will update poppler to 0.73.0. Currently going through a bulk
update on my machine. But in case, anyone wants to do some testing
with her/his favorite port in advance...
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.135
diff -u -p -r1.135 Makefile
--- Makefile7 Jan 2019 23:40:38 - 1.135
+++ Makefile9 Jan 2019 20:52:07 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.72.0
+V= 0.73.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,10 +13,10 @@ PKGNAME-qt5=poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 47.0 # 83.0
-SHARED_LIBS += poppler-glib 19.0 # 8.11
-SHARED_LIBS += poppler-qt5 6.0 # 1.17
-SHARED_LIBS += poppler-cpp 10.0 # 0.5
+SHARED_LIBS += poppler 48.0 # 84.0
+SHARED_LIBS += poppler-glib 19.1 # 8.12
+SHARED_LIBS += poppler-qt5 7.0 # 1.18
+SHARED_LIBS += poppler-cpp 10.1 # 0.6
HOMEPAGE= https://poppler.freedesktop.org/
@@ -101,7 +101,7 @@ WANTLIB-utils= X11 Xext Xrender c cairo
png ${COMPILER_LIBCXX} xcb xcb-render xcb-shm openjp2 \
poppler z ${cWANTLIB}
-CONFIGURE_ARGS+=-DENABLE_XPDF_HEADERS=True \
+CONFIGURE_ARGS+=-DENABLE_UNSTABLE_API_ABI_HEADERS=True \
-DBUILD_GTK_TESTS=False \
-DENABLE_LIBCURL=False \
-DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True \
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.67
diff -u -p -r1.67 distinfo
--- distinfo4 Jan 2019 21:05:34 - 1.67
+++ distinfo9 Jan 2019 20:52:07 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.72.0.tar.xz) = wXR+uPJunnU8QAHtlR2yiW7cECG20PVHoL0qJ8MK2lE=
-SIZE (poppler-0.72.0.tar.xz) = 1492912
+SHA256 (poppler-0.73.0.tar.xz) = 5EtVQ5AxKIhLpFOMKpfTvMiInpf/rMRjYRIQHwI42wM=
+SIZE (poppler-0.73.0.tar.xz) = 1507068
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.20
diff -u -p -r1.20 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 4 Jan 2019 21:05:34 - 1.20
+++ patches/patch-poppler_XRef_cc 9 Jan 2019 20:52:07 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.20 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1015,49 +1015,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
+@@ -1015,49 +1015,38 @@ void XRef::getEncryptionParameters(unsigned char **fil
}
bool XRef::okToPrint(bool ignoreOwnerPW) const {
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/print/poppler/pkg/PLIST-main,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST-main
--- pkg/PLIST-main 4 Jan 2019 21:05:34 - 1.29
+++ pkg/PLIST-main 9 Jan 2019 20:52:07 -
@@ -9,6 +9,7 @@ include/poppler/BuiltinFontTables.h
include/poppler/CMap.h
include/poppler/CachedFile.h
include/poppler/Catalog.h
+include/poppler/CertificateInfo.h
include/poppler/CharCodeToUnicode.h
include/poppler/CharTypes.h
include/poppler/CompactFontTables.h
@@ -127,8 +128,8 @@ include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
include/poppler/goo/grandom.h
include/poppler/goo/gstrtod.h
-include/poppler/goo/gtypes.h
include/poppler/poppler-config.h
+include/poppler/qt5/poppler-version.h
include/poppler/splash/
include/poppler/splash/Splash.h
include/poppler/splash/SplashBitmap.h
update print/poppler
Hi,
update to poppler-0.72.0, drop the -qt4 subpackage.
Not to be committed yet, because we still have to fix/update ports
using poppler-qt4 (I'll give the diffs people sent to ports@ a try),
and because it breaks some additional ports (at least graphics/inkscape,
graphics/gdcm, graphics/pdf2djvu). I'll steal some diffs from
archlinux and/or upstream pointed out by rsadowski@.
Unfortunately, it still needs the USE_LLD=Yes on i386 (same errors
as sthen@ noticed when g-ir-scanner calls the linker).
If people can waste some time, please try this with ports that are
disabled on i386 (libreoffice, maybe others?).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.133
diff -u -p -r1.133 Makefile
--- Makefile18 Dec 2018 00:12:14 - 1.133
+++ Makefile27 Dec 2018 19:39:16 -
@@ -1,25 +1,22 @@
# $OpenBSD: Makefile,v 1.133 2018/12/18 00:12:14 sthen Exp $
COMMENT-main= PDF rendering library
-COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.61.1
+V= 0.72.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
-PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 46.0 # 72.0
-SHARED_LIBS += poppler-glib 18.0 # 8.9
-SHARED_LIBS += poppler-qt4 21.0 # 4.11
-SHARED_LIBS += poppler-qt5 5.0 # 1.11
-SHARED_LIBS += poppler-cpp 9.0 # 0.3
+SHARED_LIBS += poppler 47.0 # 83.0
+SHARED_LIBS += poppler-glib 19.0 # 8.11
+SHARED_LIBS += poppler-qt5 6.0 # 1.17
+SHARED_LIBS += poppler-cpp 10.0 # 0.5
HOMEPAGE= https://poppler.freedesktop.org/
@@ -30,14 +27,13 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}
-PSEUDO_FLAVORS=no_qt4 no_qt5 bootstrap
+PSEUDO_FLAVORS=no_qt5 bootstrap
# XXX not strictly a bootstrap loop, but on the critical path for libreoffice
-FLAVOR?=no_qt4 no_qt5 bootstrap
+FLAVOR?=no_qt5 bootstrap
-NOT_FOR_ARCHS-qt4 = arm
NOT_FOR_ARCHS-qt5 = arm
-MULTI_PACKAGES=-main -qt4 -qt5 -utils
+MULTI_PACKAGES=-main -qt5 -utils
# XXX build fails with ld.bfd: undefined references to X libs e.g.
#
@@ -58,12 +54,6 @@ cWANTLIB=expat freetype fontconfig jpeg
MODULES= devel/cmake
-.if ${BUILD_PACKAGES:M-qt4}
-MODULES+= x11/qt4
-.else
-CONFIGURE_ARGS+= --disable-poppler-qt4
-.endif
-
.if ${BUILD_PACKAGES:M-qt5}
MODULES+= x11/qt5
.else
@@ -85,10 +75,6 @@ LIB_DEPENDS-main=${MODGCC4_CPPLIBDEP} \
graphics/png \
graphics/tiff
-LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
- ${MODGCC4_CPPLIBDEP} \
- print/poppler
-
LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \
${MODGCC4_CPPLIBDEP} \
print/poppler
@@ -101,11 +87,6 @@ WANTLIB-main= ${cWANTLIB} Xext ffi gio-2
png xcb xcb-render lcms2 xcb-shm \
iconv intl ${COMPILER_LIBCXX}
-WANTLIB-qt4=${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
- SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
- gobject-2.0 gthread-2.0 iconv intl lcms2 openjp2 \
- png poppler pcre ${COMPILER_LIBCXX} xcb
-
WANTLIB-qt5= ${cWANTLIB} $(COMPILER_LIBCXX) \
GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
Xdamage Xext Xfixes Xxf86vm drm execinfo glapi \
@@ -120,6 +101,7 @@ WANTLIB-utils= X11 Xext Xrender c cairo
CONFIGURE_ARGS+=-DENABLE_XPDF_HEADERS=True \
-DBUILD_GTK_TESTS=False \
-DENABLE_LIBCURL=False \
- -DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True
+ -DCMAKE_DISABLE_FIND_PACKAGE_NSS3=True \
+ -DOpenJPEG_DIR=${LOCALBASE}/lib/openjp2
.include
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.66
diff -u -p -r1.66 distinfo
--- distinfo9 Dec 2018 17:47:45 - 1.66
+++ distinfo27 Dec 2018 19:39:16 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.61.1.tar.xz) = EmYJY0P1FjwaWFEk6abURHThNF3lzf5V3HtHNXvPzak=
-SIZE (poppler-0.61.1.tar.xz) = 1433696
+SHA256 (poppler-0.72.0.tar.xz) = wXR+uPJunnU8QAHtlR2yiW7cECG20PVHoL0qJ8MK2lE=
+SIZE (poppler-0.72.0.tar.xz) = 1492912
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 9 Dec 2018 17:47:45 - 1.2
+++ patches/patch-poppler_Form_cc 27 Dec 2018 19:39:16 -
@@ -3,8 +3,8 @@ $Ope
Re: Update print/poppler
On Sat, Sep 09, 2017 at 09:00:15PM +0200, Matthias Kilian wrote: > here's an update to poppler-0.58 Ignore this, I missed that poppler is already at 0.59. Ciao, Kili
Update print/poppler
Hi,
here's an update to poppler-0.58. poppler-qt5 needs a minor bump
because there was a method addition (void
ArthurOutputDev::setDefaultCTM(double *ctm)).
Current fallout (bulk update build still running): graphics/pdf2djvu
(an update should fix tis, I'll send a diff in a minute),
print/texlive/base (fails during configure, I'll look at it).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.125
diff -u -p -r1.125 Makefile
--- Makefile28 Aug 2017 19:08:30 - 1.125
+++ Makefile9 Sep 2017 13:18:34 -
@@ -5,7 +5,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.57.0
+V= 0.58.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -15,10 +15,10 @@ PKGNAME-qt5=poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 44.0 # 68.0
+SHARED_LIBS += poppler 45.0 # 69.0
SHARED_LIBS += poppler-glib 17.0 # 17.0
SHARED_LIBS += poppler-qt4 20.1 # 15.0
-SHARED_LIBS += poppler-qt5 4.0 # 11.0
+SHARED_LIBS += poppler-qt5 4.1 # 11.0
SHARED_LIBS += poppler-cpp 8.0 # 3.0
HOMEPAGE= http://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.64
diff -u -p -r1.64 distinfo
--- distinfo28 Aug 2017 19:08:30 - 1.64
+++ distinfo9 Sep 2017 12:50:42 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.57.0.tar.xz) = DqN95xt9t4IS68ed9Z+ZtmQJopwurE2ILa6fI5f+RNg=
-SIZE (poppler-0.57.0.tar.xz) = 1703300
+SHA256 (poppler-0.58.0.tar.xz) = DkLkZBmuVLAtnytSfGR1tgEdFYFpGLkFffo6riEa+DI=
+SIZE (poppler-0.58.0.tar.xz) = 1710412
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.17
diff -u -p -r1.17 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 17 Dec 2016 01:20:10 - 1.17
+++ patches/patch-poppler_XRef_cc 9 Sep 2017 12:57:59 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.17 2016/12/17 01:20:10 kili Exp $
poppler/XRef.cc.orig Thu Dec 15 20:08:06 2016
-+++ poppler/XRef.ccFri Dec 16 14:16:46 2016
-@@ -1090,49 +1090,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
+Index: poppler/XRef.cc
+--- poppler/XRef.cc.orig
poppler/XRef.cc
+@@ -1049,49 +1049,38 @@ void XRef::getEncryptionParameters(Guchar **fileKeyA,
}
GBool XRef::okToPrint(GBool ignoreOwnerPW) {
@@ -58,4 +59,4 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.17 2
+ return gTrue;
}
- Object *XRef::getCatalog(Object *catalog) {
+ Object XRef::getCatalog() {
Index: patches/patch-qt5_src_Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-qt5_src_Makefile_in
--- patches/patch-qt5_src_Makefile_in 17 Dec 2016 01:20:10 - 1.4
+++ patches/patch-qt5_src_Makefile_in 9 Sep 2017 12:57:59 -
@@ -1,8 +1,9 @@
$OpenBSD: patch-qt5_src_Makefile_in,v 1.4 2016/12/17 01:20:10 kili Exp $
Reorder linking to make sure libestdc++ is picked up earlier than libstdc++.
qt5/src/Makefile.in.orig Thu Dec 15 23:36:31 2016
-+++ qt5/src/Makefile.inFri Dec 16 14:16:48 2016
-@@ -521,8 +521,8 @@ libpoppler_qt5_la_CXXFLAGS = \
+Index: qt5/src/Makefile.in
+--- qt5/src/Makefile.in.orig
qt5/src/Makefile.in
+@@ -522,8 +522,8 @@ libpoppler_qt5_la_CXXFLAGS = \
-Dpoppler_qt5_EXPORTS
libpoppler_qt5_la_LIBADD = \
@@ -12,4 +13,4 @@ Reorder linking to make sure libestdc++
+ $(top_builddir)/poppler/libpoppler.la
libpoppler_qt5_la_LDFLAGS = \
- -version-info 9:0:8 \
+ -version-info 11:0:10 \
remove poppler-qt (was: update print/poppler...)
Hi,
On Thu, Mar 23, 2017 at 09:04:19PM +0100, Matthias Kilian wrote:
> > Updated diff below, which also kills a stray tab that emacs warns about.
>
> I'll try it this evening in a dpb -uR run.
That didn't went well, because it breaks editors/texmaker,
editors/texworks, graphics/pdf2djvu, and print/texlive/base.
I really don't want even try to switch those to ports gcc now.
Instead, I'll try to patch away the c++11 changes to poppler, but
first I'd like to get rid of the qt subpackages (that's qt3). Or
backport the bugfixess from poppler-0.53 to 0.52 (which is pretty
much the same).
Diff below (including the stray tabs removal from jca). Any objections?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile19 Feb 2017 20:53:26 - 1.119
+++ Makefile25 Mar 2017 22:13:47 -
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.119 2017/02/19 20:53:26 kili Exp $
COMMENT-main= PDF rendering library
-COMMENT-qt=qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
@@ -11,20 +10,17 @@ DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
-PKGNAME-qt=poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
-OLDSHIT = poppler-0.16.7
+
+EXTRACT_SUFX= .tar.xz
SHARED_LIBS += poppler 43.1 # 66.0
SHARED_LIBS += poppler-glib 16.0 # 16.0
-SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 20.1 # 15.0
SHARED_LIBS += poppler-qt5 3.1 # 10.0
SHARED_LIBS += poppler-cpp 8.0 # 3.0
-DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
-
HOMEPAGE= http://poppler.freedesktop.org/
MAINTAINER=Matthias Kilian
@@ -34,25 +30,19 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${HOMEPAGE}
-PSEUDO_FLAVORS=no_qt no_qt4 no_qt5 bootstrap
+PSEUDO_FLAVORS=no_qt4 no_qt5 bootstrap
# XXX not strictly a bootstrap loop, but on the critical path for libreoffice
-FLAVOR?=no_qt no_qt4 no_qt5 bootstrap
+FLAVOR?=no_qt4 no_qt5 bootstrap
NOT_FOR_ARCHS-qt4 = arm
NOT_FOR_ARCHS-qt5 = arm
-MULTI_PACKAGES=-main -qt -qt4 -qt5 -utils
+MULTI_PACKAGES=-main -qt4 -qt5 -utils
.include
cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+= x11/qt3
-.else
-CONFIGURE_ARGS+= --disable-poppler-qt
-.endif
-
.if ${BUILD_PACKAGES:M-qt4}
MODULES+= x11/qt4
.else
@@ -80,9 +70,6 @@ LIB_DEPENDS-main= \
graphics/png \
graphics/tiff
-LIB_DEPENDS-qt=${MODQT3_LIB_DEPENDS} \
- print/poppler
-
LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
print/poppler
@@ -96,12 +83,6 @@ WANTLIB-main=${cWANTLIB} Xext ffi gio-2
png pthread-stubs xcb xcb-render lcms2 xcb-shm \
iconv intl stdc++
-WANTLIB-qt=${cWANTLIB} ${MODQT3_WANTLIB} lcms2 openjp2 poppler png \
- pthread-stubs stdc++ \
- GL ICE SM X11 X11-xcb Xcursor Xdamage Xext Xfixes Xft \
- Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm drm glapi \
- lcms mng xcb xcb-dri2 xcb-glx
-
WANTLIB-qt4=${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
gobject-2.0 gthread-2.0 iconv intl lcms2 openjp2 \
@@ -113,7 +94,7 @@ WANTLIB-qt5= ${cWANTLIB} estdc++ \
glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
iconv icudata icui18n icuuc intl lcms2 openjp2 pcre \
pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
-
+
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs stdc++ xcb xcb-render xcb-shm openjp2 \
poppler z ${cWANTLIB}
@@ -130,7 +111,6 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
- POPPLER_QT_LIBS="-L${LOCALBASE}/lib/qt3 -lqt-mt" \
ac_cv_prog_MOCQT4=${MODQT4_MOC}
USE_GMAKE= Yes
@@ -141,15 +121,6 @@ MAIN_CXX= /usr/bin/c++
MAIN_CC:= ccache ${MAIN_CC}
MAIN_CXX:= ccache ${MAIN_CXX}
.endif
-
-post-extract:
- cd ${WRKDIST} && \
- for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
- poppler-qt.pc.in; do \
- ln -sf ../${OLDSHIT}/$$i $$i; \
- done; \
- ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
- cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
post-configure:
fi
Re: update print/poppler, please hit me with the cluestick
Hi, On Wed, Mar 22, 2017 at 11:57:12PM +0100, Jeremie Courreges-Anglas wrote: > > the newest poppler uses --std=c++11 even for the base libpoppler, > > so I tried to set MODULES+=gcc4 and MODGCC_LANGS=c++ (see diff > > below). However, it still just uses c++, and lang/gcc/4.9 doesn't > > even show up in make show=BUILD_DEPENDS or make dump-vars. > > > > Probably a stupid PEBKAC. > > > > Any ideas? > > Missing MODGCC4_ARCHS = *. Thanks, also to aja@ and sthen@ (who replied in private mail). > Updated diff below, which also kills a stray tab that emacs warns about. I'll try it this evening in a dpb -uR run. Ciao, Kili
Re: update print/poppler, please hit me with the cluestick
Matthias Kilian writes:
> Hi,
>
> the newest poppler uses --std=c++11 even for the base libpoppler,
> so I tried to set MODULES+=gcc4 and MODGCC_LANGS=c++ (see diff
> below). However, it still just uses c++, and lang/gcc/4.9 doesn't
> even show up in make show=BUILD_DEPENDS or make dump-vars.
>
> Probably a stupid PEBKAC.
>
> Any ideas?
Missing MODGCC4_ARCHS = *.
Updated diff below, which also kills a stray tab that emacs warns about.
Index: Makefile
===
RCS file: /d/cvs/ports/print/poppler/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile19 Feb 2017 20:53:26 - 1.119
+++ Makefile22 Mar 2017 22:48:25 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.52.0
+V= 0.53.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,11 +16,11 @@ PKGNAME-qt4=poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 43.1 # 66.0
+SHARED_LIBS += poppler 44.0 # 67.0
SHARED_LIBS += poppler-glib 16.0 # 16.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 20.1 # 15.0
-SHARED_LIBS += poppler-qt5 3.1 # 10.0
+SHARED_LIBS += poppler-qt5 4.0 # 11.0
SHARED_LIBS += poppler-cpp 8.0 # 3.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
@@ -47,6 +47,10 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -util
cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z
+MODULES+= gcc4
+MODGCC4_LANGS= c++
+MODGCC4_ARCHS= *
+
.if ${BUILD_PACKAGES:M-qt}
MODULES+= x11/qt3
.else
@@ -113,7 +117,7 @@ WANTLIB-qt5=${cWANTLIB} estdc++ \
glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
iconv icudata icui18n icuuc intl lcms2 openjp2 pcre \
pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
-
+
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs stdc++ xcb xcb-render xcb-shm openjp2 \
poppler z ${cWANTLIB}
@@ -135,13 +139,6 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
USE_GMAKE= Yes
-MAIN_CC= /usr/bin/cc
-MAIN_CXX= /usr/bin/c++
-.if "${USE_CCACHE:L}" == "yes"
-MAIN_CC:= ccache ${MAIN_CC}
-MAIN_CXX:= ccache ${MAIN_CXX}
-.endif
-
post-extract:
cd ${WRKDIST} && \
for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
@@ -150,12 +147,5 @@ post-extract:
done; \
ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
-
-post-configure:
- find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
- perl -pi -e 's,^CC = \S+,override CC = ${MAIN_CC},;' \
--e's,^CPP = \S+,override CPP = ${MAIN_CC},;' \
--e's,^CXX = \S+,override CXX = ${MAIN_CXX},;' \
--e 's,^CXXCPP = \S+,override CXXCPP = ${MAIN_CXX},;'
.include
Index: distinfo
===
RCS file: /d/cvs/ports/print/poppler/distinfo,v
retrieving revision 1.62
diff -u -p -r1.62 distinfo
--- distinfo19 Feb 2017 20:53:26 - 1.62
+++ distinfo22 Mar 2017 22:47:20 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.52.0.tar.xz) = UotmFziDn5ol9uWA/NLV2wB+ChlIWAxkifAGJ5jKGZI=
+SHA256 (poppler-0.53.0.tar.xz) = WSv3KWDGtZSLZ2V1lLBectmieNr3YTyfPN/5pbcwlqg=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.52.0.tar.xz) = 1692144
+SIZE (poppler-0.53.0.tar.xz) = 1696212
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: update print/poppler, please hit me with the cluestick
On March 22, 2017 11:04:56 PM GMT+01:00, Matthias Kilian
wrote:
>Hi,
>
>the newest poppler uses --std=c++11 even for the base libpoppler,
>so I tried to set MODULES+=gcc4 and MODGCC_LANGS=c++ (see diff
>below). However, it still just uses c++, and lang/gcc/4.9 doesn't
>even show up in make show=BUILD_DEPENDS or make dump-vars.
>
>Probably a stupid PEBKAC.
>
>Any ideas?
>
>Ciao,
> Kili
>
>Index: Makefile
>===
>RCS file: /cvs/ports/print/poppler/Makefile,v
>retrieving revision 1.119
>diff -u -p -r1.119 Makefile
>--- Makefile 19 Feb 2017 20:53:26 - 1.119
>+++ Makefile 22 Mar 2017 21:46:37 -
>@@ -6,7 +6,7 @@ COMMENT-qt4= qt4 interface to PDF render
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils=PDF conversion tools and utilities
>
>-V=0.52.0
>+V=0.53.0
> DISTNAME= poppler-$V
> CATEGORIES= print
> PKGNAME-main= poppler-$V
>@@ -16,11 +16,11 @@ PKGNAME-qt4= poppler-qt4-$V
> PKGNAME-qt5= poppler-qt5-$V
> OLDSHIT = poppler-0.16.7
>
>-SHARED_LIBS +=poppler 43.1 # 66.0
>+SHARED_LIBS +=poppler 44.0 # 67.0
> SHARED_LIBS +=poppler-glib 16.0 # 16.0
> SHARED_LIBS +=poppler-qt 12.0 # 3.0
> SHARED_LIBS +=poppler-qt4 20.1 # 15.0
>-SHARED_LIBS +=poppler-qt5 3.1 # 10.0
>+SHARED_LIBS +=poppler-qt5 4.0 # 11.0
> SHARED_LIBS +=poppler-cpp 8.0 # 3.0
>
> DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
>@@ -47,6 +47,9 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -util
>
> cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z
>
>+MODULES+= gcc4
>+MODGCC4_LANGS=c++
>+
> .if ${BUILD_PACKAGES:M-qt}
> MODULES+= x11/qt3
> .else
>@@ -135,13 +138,6 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
>
> USE_GMAKE=Yes
>
>-MAIN_CC= /usr/bin/cc
>-MAIN_CXX= /usr/bin/c++
>-.if "${USE_CCACHE:L}" == "yes"
>-MAIN_CC:= ccache ${MAIN_CC}
>-MAIN_CXX:=ccache ${MAIN_CXX}
>-.endif
>-
> post-extract:
> cd ${WRKDIST} && \
> for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
>@@ -150,12 +146,5 @@ post-extract:
> done; \
> ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
> cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
>-
>-post-configure:
>- find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0
>\
>- perl -pi -e 's,^CC = \S+,override CC = ${MAIN_CC},;' \
>- -e's,^CPP = \S+,override CPP = ${MAIN_CC},;' \
>- -e's,^CXX = \S+,override CXX = ${MAIN_CXX},;' \
>- -e 's,^CXXCPP = \S+,override CXXCPP = ${MAIN_CXX},;'
>
> .include
>Index: distinfo
>===
>RCS file: /cvs/ports/print/poppler/distinfo,v
>retrieving revision 1.62
>diff -u -p -r1.62 distinfo
>--- distinfo 19 Feb 2017 20:53:26 - 1.62
>+++ distinfo 20 Mar 2017 19:18:10 -
>@@ -1,4 +1,4 @@
>SHA256 (poppler-0.16.7.tar.gz) =
>+rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
>-SHA256 (poppler-0.52.0.tar.xz) =
>UotmFziDn5ol9uWA/NLV2wB+ChlIWAxkifAGJ5jKGZI=
>+SHA256 (poppler-0.53.0.tar.xz) =
>WSv3KWDGtZSLZ2V1lLBectmieNr3YTyfPN/5pbcwlqg=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
>-SIZE (poppler-0.52.0.tar.xz) = 1692144
>+SIZE (poppler-0.53.0.tar.xz) = 1696212
MODGCC4_ARCHS ?
--
Antoine
update print/poppler, please hit me with the cluestick
Hi,
the newest poppler uses --std=c++11 even for the base libpoppler,
so I tried to set MODULES+=gcc4 and MODGCC_LANGS=c++ (see diff
below). However, it still just uses c++, and lang/gcc/4.9 doesn't
even show up in make show=BUILD_DEPENDS or make dump-vars.
Probably a stupid PEBKAC.
Any ideas?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile19 Feb 2017 20:53:26 - 1.119
+++ Makefile22 Mar 2017 21:46:37 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.52.0
+V= 0.53.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,11 +16,11 @@ PKGNAME-qt4=poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 43.1 # 66.0
+SHARED_LIBS += poppler 44.0 # 67.0
SHARED_LIBS += poppler-glib 16.0 # 16.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 20.1 # 15.0
-SHARED_LIBS += poppler-qt5 3.1 # 10.0
+SHARED_LIBS += poppler-qt5 4.0 # 11.0
SHARED_LIBS += poppler-cpp 8.0 # 3.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
@@ -47,6 +47,9 @@ MULTI_PACKAGES=-main -qt -qt4 -qt5 -util
cWANTLIB= expat freetype fontconfig jpeg m pthread tiff z
+MODULES+= gcc4
+MODGCC4_LANGS= c++
+
.if ${BUILD_PACKAGES:M-qt}
MODULES+= x11/qt3
.else
@@ -135,13 +138,6 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
USE_GMAKE= Yes
-MAIN_CC= /usr/bin/cc
-MAIN_CXX= /usr/bin/c++
-.if "${USE_CCACHE:L}" == "yes"
-MAIN_CC:= ccache ${MAIN_CC}
-MAIN_CXX:= ccache ${MAIN_CXX}
-.endif
-
post-extract:
cd ${WRKDIST} && \
for i in poppler-qt-uninstalled.pc.in poppler-qt.pc.cmake \
@@ -150,12 +146,5 @@ post-extract:
done; \
ln -sf ../../${OLDSHIT}/m4/qt.m4 m4/qt.m4
cd ${WRKDIST} && cp -R ../${OLDSHIT}/qt qt
-
-post-configure:
- find ${WRKBUILD} -name Makefile \! -path '*/qt5/*' -print0 | xargs -0 \
- perl -pi -e 's,^CC = \S+,override CC = ${MAIN_CC},;' \
--e's,^CPP = \S+,override CPP = ${MAIN_CC},;' \
--e's,^CXX = \S+,override CXX = ${MAIN_CXX},;' \
--e 's,^CXXCPP = \S+,override CXXCPP = ${MAIN_CXX},;'
.include
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.62
diff -u -p -r1.62 distinfo
--- distinfo19 Feb 2017 20:53:26 - 1.62
+++ distinfo20 Mar 2017 19:18:10 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.52.0.tar.xz) = UotmFziDn5ol9uWA/NLV2wB+ChlIWAxkifAGJ5jKGZI=
+SHA256 (poppler-0.53.0.tar.xz) = WSv3KWDGtZSLZ2V1lLBectmieNr3YTyfPN/5pbcwlqg=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.52.0.tar.xz) = 1692144
+SIZE (poppler-0.53.0.tar.xz) = 1696212
Update print/poppler
Hi here's the monthly poppler update ;-) All ports depending on it built fine on amd64, I'm currently running a build on i386 and waiting for an update on my desktop at home to finish, so I can run some tests. Anyone who want's to test his beloved ports depending on poppler, please go ahead. (I'll wait until friday before committing this) Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.110 diff -u -p -r1.110 Makefile --- Makefile22 Aug 2016 21:31:54 - 1.110 +++ Makefile12 Oct 2016 07:45:43 - @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.47.0 +V= 0.48.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V PKGNAME-qt5= poppler-qt5-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 40.0 # 63.0 +SHARED_LIBS += poppler 41.0 # 64.0 SHARED_LIBS += poppler-glib 16.0 # 16.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 19.0 # 14.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.57 diff -u -p -r1.57 distinfo --- distinfo22 Aug 2016 21:31:54 - 1.57 +++ distinfo12 Oct 2016 07:45:13 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.47.0.tar.xz) = uHLnIo/DSnHOS0elrqKleuZ1KIGPqEbh4O2giTGb0kI= +SHA256 (poppler-0.48.0.tar.xz) = haADloB0yF2OE78yDsR872R7SWtW3P9MeQs05Ugv75M= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.47.0.tar.xz) = 1682184 +SIZE (poppler-0.48.0.tar.xz) = 1684164
Update print/poppler
Here comes the monthly poppler update. Only some bugfixes and the non-gnu-grep fix to configure.ac, no interface changes this time. I'll test and commit it when my builds finish (probably in a day or two), but in case anyone wants to run some special tests... Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.109 diff -u -p -r1.109 Makefile --- Makefile1 Aug 2016 18:35:40 - 1.109 +++ Makefile20 Aug 2016 20:30:00 - @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.46.0 +V= 0.47.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.56 diff -u -p -r1.56 distinfo --- distinfo1 Aug 2016 18:35:40 - 1.56 +++ distinfo20 Aug 2016 20:30:00 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.46.0.tar.xz) = ln010T1h3uL+5la4Dv7544ip51K8ebcSPxW0nHdp5Ic= +SHA256 (poppler-0.47.0.tar.xz) = uHLnIo/DSnHOS0elrqKleuZ1KIGPqEbh4O2giTGb0kI= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.46.0.tar.xz) = 1680940 +SIZE (poppler-0.47.0.tar.xz) = 1682184 Index: patches/patch-configure_ac === RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v retrieving revision 1.20 diff -u -p -r1.20 patch-configure_ac --- patches/patch-configure_ac 1 Aug 2016 18:35:40 - 1.20 +++ patches/patch-configure_ac 20 Aug 2016 20:30:00 - @@ -26,15 +26,6 @@ $OpenBSD: patch-configure_ac,v 1.20 2016 dnl dnl Try Qt4 dnl -@@ -779,7 +797,7 @@ if test x$enable_poppler_qt5 = xyes; then - AC_CHECK_TOOL(MOCQT52, moc-qt5) - AC_MSG_CHECKING([for Qt5 moc-qt5]) - mocversion=`$MOCQT52 -v 2>&1` --mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` -+mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"` - if test x"$mocversiongrep" != x"$mocversion"; then - AC_CHECK_TOOL(QTCHOOSER, qtchooser) - AC_MSG_CHECKING([for qtchooser]) @@ -997,6 +1015,9 @@ glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile Ciao, Kili
Re: update print/poppler
On Mon, Aug 01, 2016 at 11:43:26AM +0300, Vadim Zhukov wrote: > Date: Mon, 1 Aug 2016 11:43:26 +0300 > From: Vadim Zhukov > To: Matthias Kilian > Cc: "ports@openbsd.org" , a...@openbsd.org > Subject: Re: update print/poppler > Message-ID: > > > 2016-07-31 0:24 GMT+03:00 Matthias Kilian : > > In addition to the update, this also simplfies configure.ac patch > > for Qt5. It looks like you can just set MOCQT52 (where the '2' has > > nothing to do with any version of qt) to our moc-qt5 (after fixing > > the grep command in configure.ac). The only difference I can see > > in the build log is that moc-qt5 is now run with an absolute path > > (i.e./usr/local/bin/moc-qt5 instead of qt5). [...] > The ac_cv_MOCQT52 in CONFIGURE_ENV isn't needed, the configure script > picks up moc-qt5 from /usr/local/bin, which is correct thing. Thanks for the hint. > Also, I've had a failure with building Qt3 backend; I didn't look in > thoroughly yet, though, so it could be PEBKAC. I built it several time now, both with dpb and directly from the port directory (using env FLAVOR= make ...), without noticing any qt3 problems. CIao, Kili
Re: update print/poppler
2016-07-31 0:24 GMT+03:00 Matthias Kilian :
> [cc'd zhuk because of the qt5 changes]
>
> Hi,
>
> here's an update to poppler-0.46.0, in case anyone wants do some
> early tests.
>
> In addition to the update, this also simplfies configure.ac patch
> for Qt5. It looks like you can just set MOCQT52 (where the '2' has
> nothing to do with any version of qt) to our moc-qt5 (after fixing
> the grep command in configure.ac). The only difference I can see
> in the build log is that moc-qt5 is now run with an absolute path
> (i.e./usr/local/bin/moc-qt5 instead of qt5).
>
> As usual, I'll build everything depending on poppler and run some
> tests, but this will take some time.
The ac_cv_MOCQT52 in CONFIGURE_ENV isn't needed, the configure script
picks up moc-qt5 from /usr/local/bin, which is correct thing.
Also, I've had a failure with building Qt3 backend; I didn't look in
thoroughly yet, though, so it could be PEBKAC.
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.108
> diff -u -p -r1.108 Makefile
> --- Makefile9 Jul 2016 15:37:46 - 1.108
> +++ Makefile30 Jul 2016 20:58:28 -
> @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 0.45.0
> +V= 0.46.0
> DISTNAME= poppler-$V
> CATEGORIES=print
> PKGNAME-main= poppler-$V
> @@ -16,14 +16,12 @@ PKGNAME-qt4=poppler-qt4-$V
> PKGNAME-qt5= poppler-qt5-$V
> OLDSHIT = poppler-0.16.7
>
> -REVISION= 0
> -
> -SHARED_LIBS += poppler 39.0 # 62.0
> -SHARED_LIBS += poppler-glib 15.0 # 15.0
> +SHARED_LIBS += poppler 40.0 # 63.0
> +SHARED_LIBS += poppler-glib 16.0 # 16.0
> SHARED_LIBS += poppler-qt 12.0 # 3.0
> -SHARED_LIBS += poppler-qt4 18.0 # 13.0
> -SHARED_LIBS += poppler-qt5 0.0 # 7.0
> -SHARED_LIBS += poppler-cpp 7.0 # 2.1
> +SHARED_LIBS += poppler-qt4 19.0 # 14.0
> +SHARED_LIBS += poppler-qt5 1.0 # 8.0
> +SHARED_LIBS += poppler-cpp 8.0 # 3.0
>
> DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
>
> @@ -130,7 +128,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
> LDFLAGS="-L${LOCALBASE}/lib" \
> LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
> ac_cv_prog_MOCQT4=${MODQT4_MOC} \
> - ac_cv_prog_MOCQT5=${MODQT5_MOC}
> + ac_cv_prog_MOCQT52=${MODQT5_MOC}
>
> USE_GMAKE= Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.55
> diff -u -p -r1.55 distinfo
> --- distinfo19 Jun 2016 19:42:26 - 1.55
> +++ distinfo30 Jul 2016 20:12:16 -
> @@ -1,4 +1,4 @@
> SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.45.0.tar.xz) = lt0aYCS82qRTCjtJaH2z1cJN39ByzLN8beDkJZlyh5g=
> +SHA256 (poppler-0.46.0.tar.xz) = ln010T1h3uL+5la4Dv7544ip51K8ebcSPxW0nHdp5Ic=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.45.0.tar.xz) = 1674464
> +SIZE (poppler-0.46.0.tar.xz) = 1680940
> Index: patches/patch-configure_ac
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
> retrieving revision 1.19
> diff -u -p -r1.19 patch-configure_ac
> --- patches/patch-configure_ac 19 Jun 2016 19:42:26 - 1.19
> +++ patches/patch-configure_ac 30 Jul 2016 20:48:58 -
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-configure_ac,v 1.19 2016/06/19 19:42:26 kili Exp $
> configure.ac.orig Fri Jun 17 00:12:16 2016
> -+++ configure.ac Fri Jun 17 21:01:05 2016
> +--- configure.ac.orig Mon Jul 25 00:03:53 2016
> configure.ac Sat Jul 30 22:48:42 2016
> @@ -680,6 +680,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
>
> GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
> @@ -26,56 +26,16 @@ $OpenBSD: patch-configure_ac,v 1.19 2016
> dnl
> dnl Try Qt4
> dnl
> -@@ -772,31 +790,35 @@ if test x$enable_poppler_qt5 = xyes; then
> - AC_CHECK_TOOL(MOCQT5, moc)
> - AC_MSG_CHECKING([for Qt5 moc])
> - mocversion=`$MOCQT5 -v 2>&1`
> -- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
> -- if test x"$mocversiongrep" != x"$mocversion"; then
> -+ case $mocversion in
> -+ *Qt\ 5*|*moc\ 5*)
> -+;;
> -+ *)
> - AC_MSG_RESULT([no])
> - # moc was not the qt5 one, try with moc-qt5
> +@@ -779,7 +797,7 @@ if test x$enable_poppler_qt5 = xyes; then
> AC_CHECK_TOOL(MOCQT52, moc-qt5)
> AC_MSG_CHECKING([for Qt5 moc-qt5])
> mocversion=`$MOCQT52 -v 2>&1`
> -mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
> --if test x"$mocversiongrep" != x"$mocversion"; then
>
update print/poppler
[cc'd zhuk because of the qt5 changes]
Hi,
here's an update to poppler-0.46.0, in case anyone wants do some
early tests.
In addition to the update, this also simplfies configure.ac patch
for Qt5. It looks like you can just set MOCQT52 (where the '2' has
nothing to do with any version of qt) to our moc-qt5 (after fixing
the grep command in configure.ac). The only difference I can see
in the build log is that moc-qt5 is now run with an absolute path
(i.e./usr/local/bin/moc-qt5 instead of qt5).
As usual, I'll build everything depending on poppler and run some
tests, but this will take some time.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile
--- Makefile9 Jul 2016 15:37:46 - 1.108
+++ Makefile30 Jul 2016 20:58:28 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.45.0
+V= 0.46.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,14 +16,12 @@ PKGNAME-qt4=poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-REVISION= 0
-
-SHARED_LIBS += poppler 39.0 # 62.0
-SHARED_LIBS += poppler-glib 15.0 # 15.0
+SHARED_LIBS += poppler 40.0 # 63.0
+SHARED_LIBS += poppler-glib 16.0 # 16.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 18.0 # 13.0
-SHARED_LIBS += poppler-qt5 0.0 # 7.0
-SHARED_LIBS += poppler-cpp 7.0 # 2.1
+SHARED_LIBS += poppler-qt4 19.0 # 14.0
+SHARED_LIBS += poppler-qt5 1.0 # 8.0
+SHARED_LIBS += poppler-cpp 8.0 # 3.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
@@ -130,7 +128,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/i
LDFLAGS="-L${LOCALBASE}/lib" \
LIBJPEG_CFLAGS="-I${LOCALBASE}/include" \
ac_cv_prog_MOCQT4=${MODQT4_MOC} \
- ac_cv_prog_MOCQT5=${MODQT5_MOC}
+ ac_cv_prog_MOCQT52=${MODQT5_MOC}
USE_GMAKE= Yes
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo19 Jun 2016 19:42:26 - 1.55
+++ distinfo30 Jul 2016 20:12:16 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.45.0.tar.xz) = lt0aYCS82qRTCjtJaH2z1cJN39ByzLN8beDkJZlyh5g=
+SHA256 (poppler-0.46.0.tar.xz) = ln010T1h3uL+5la4Dv7544ip51K8ebcSPxW0nHdp5Ic=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.45.0.tar.xz) = 1674464
+SIZE (poppler-0.46.0.tar.xz) = 1680940
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.19
diff -u -p -r1.19 patch-configure_ac
--- patches/patch-configure_ac 19 Jun 2016 19:42:26 - 1.19
+++ patches/patch-configure_ac 30 Jul 2016 20:48:58 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.19 2016/06/19 19:42:26 kili Exp $
configure.ac.orig Fri Jun 17 00:12:16 2016
-+++ configure.ac Fri Jun 17 21:01:05 2016
+--- configure.ac.orig Mon Jul 25 00:03:53 2016
configure.ac Sat Jul 30 22:48:42 2016
@@ -680,6 +680,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,56 +26,16 @@ $OpenBSD: patch-configure_ac,v 1.19 2016
dnl
dnl Try Qt4
dnl
-@@ -772,31 +790,35 @@ if test x$enable_poppler_qt5 = xyes; then
- AC_CHECK_TOOL(MOCQT5, moc)
- AC_MSG_CHECKING([for Qt5 moc])
- mocversion=`$MOCQT5 -v 2>&1`
-- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-- if test x"$mocversiongrep" != x"$mocversion"; then
-+ case $mocversion in
-+ *Qt\ 5*|*moc\ 5*)
-+;;
-+ *)
- AC_MSG_RESULT([no])
- # moc was not the qt5 one, try with moc-qt5
+@@ -779,7 +797,7 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT52, moc-qt5)
AC_MSG_CHECKING([for Qt5 moc-qt5])
mocversion=`$MOCQT52 -v 2>&1`
-mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
--if test x"$mocversiongrep" != x"$mocversion"; then
-+case $mocversion in
-+*Qt\ 5*|*moc\ 5*|*moc-qt5\ 5*)
-+ MOCQT5=$MOCQT52
-+ ;;
-+*)
++mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
+ if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
AC_MSG_CHECKING([for qtchooser])
- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut
-d '=' -f 2 | cut -d \" -f 2`
- mocversion=`$qt5tooldir/moc -v 2>&1`
--
Re: update print/poppler
On Fri, Jun 17, 2016 at 09:34:44PM +0200, Matthias Kilian wrote: > Hi, > > here's an update to poppler-0.45.0 (and this time I didn't need a > reminder from aja@ ;-)) Oh noes, I've lost my mojo!
update print/poppler
Hi,
here's an update to poppler-0.45.0 (and this time I didn't need a
reminder from aja@ ;-))
Adding a major bump to poppler-cpp, because
time_type detail::convert_date(const char *date)
had been removed. Nothing external should use it, but you never
know...
Built but not yet packaged nor tested on amd64 (because I've still
a bulk build running on my test/build machine), so if anyone wants
to give it a try, go ahead ;-)
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.106
diff -u -p -r1.106 Makefile
--- Makefile27 May 2016 21:14:31 - 1.106
+++ Makefile17 Jun 2016 19:20:24 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.44.0
+V= 0.45.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,12 +16,12 @@ PKGNAME-qt4=poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 37.0 # 61.0
+SHARED_LIBS += poppler 38.0 # 62.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
SHARED_LIBS += poppler-qt5 0.0 # 7.0
-SHARED_LIBS += poppler-cpp 6.1 # 2.1
+SHARED_LIBS += poppler-cpp 7.0 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.54
diff -u -p -r1.54 distinfo
--- distinfo27 May 2016 21:14:31 - 1.54
+++ distinfo17 Jun 2016 18:46:11 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.44.0.tar.xz) = W0Z+0mpV4YJNpr2G9fVisbRVggacA4mMkfAa1cb6Dqs=
+SHA256 (poppler-0.45.0.tar.xz) = lt0aYCS82qRTCjtJaH2z1cJN39ByzLN8beDkJZlyh5g=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.44.0.tar.xz) = 1671900
+SIZE (poppler-0.45.0.tar.xz) = 1674464
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.18
diff -u -p -r1.18 patch-configure_ac
--- patches/patch-configure_ac 1 May 2016 12:33:24 - 1.18
+++ patches/patch-configure_ac 17 Jun 2016 19:01:13 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.18 2016/05/01 12:33:24 kili Exp $
configure.ac.orig Fri Apr 29 00:30:06 2016
-+++ configure.ac Fri Apr 29 20:48:31 2016
-@@ -679,6 +679,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Fri Jun 17 00:12:16 2016
configure.ac Fri Jun 17 21:01:05 2016
+@@ -680,6 +680,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.18 2016
dnl
dnl Try Qt4
dnl
-@@ -771,31 +789,35 @@ if test x$enable_poppler_qt5 = xyes; then
+@@ -772,31 +790,35 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1`
@@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.18 2016
AC_SUBST(MOCQT5)
AC_MSG_RESULT([$MOCQT5])
fi
-@@ -996,6 +1018,9 @@ glib/reference/Makefile
+@@ -997,6 +1019,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.18 2016
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -1031,6 +1056,7 @@ if test x$enable_cmyk = xyes;then
+@@ -1032,6 +1057,7 @@ if test x$enable_cmyk = xyes;then
echo " with CMYK support"
fi
echo " cairo output:$use_cairo"
update print/poppler
Hi
aja@ wants ze new poppler. Here it is, in case anyone wants to test it
(I'm still waiting for my bulk build to finish before I can start
testing).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile1 May 2016 12:33:24 - 1.105
+++ Makefile26 May 2016 17:41:14 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.43.0
+V= 0.44.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 36.0 # 60.0
+SHARED_LIBS += poppler 37.0 # 61.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo1 May 2016 12:33:24 - 1.53
+++ distinfo26 May 2016 17:41:14 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.43.0.tar.xz) = xyDiaibuELfryeJW0u563NtTbPhfnxxHd6OPf4H7JFY=
+SHA256 (poppler-0.44.0.tar.xz) = W0Z+0mpV4YJNpr2G9fVisbRVggacA4mMkfAa1cb6Dqs=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.43.0.tar.xz) = 1671368
+SIZE (poppler-0.44.0.tar.xz) = 1671900
Index: patches/patch-poppler_Decrypt_cc
===
RCS file: patches/patch-poppler_Decrypt_cc
diff -N patches/patch-poppler_Decrypt_cc
--- patches/patch-poppler_Decrypt_cc27 Mar 2016 20:04:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,88 +0,0 @@
-$OpenBSD: patch-poppler_Decrypt_cc,v 1.2 2016/03/27 20:04:25 sthen Exp $
poppler/Decrypt.cc.origMon Mar 14 13:18:16 2016
-+++ poppler/Decrypt.cc Sun Mar 27 14:03:21 2016
-@@ -1444,22 +1444,22 @@ static void sha256(Guchar *msg, int msgLen, Guchar *ha
- //
- // SHA 384 and SHA 512 use the same sequence of eighty constant 64 bit words.
- static const uint64_t K[80] = {
-- 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f,
0xe9b5dba58189dbbc, 0x3956c25bf348b538,
-- 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
0xd807aa98a3030242, 0x12835b0145706fbe,
-- 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, 0x72be5d74f27b896f,
0x80deb1fe3b1696b1, 0x9bdc06a725c71235,
-- 0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
-- 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4,
0x76f988da831153b5, 0x983e5152ee66dfab,
-- 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4,
0xc6e00bf33da88fc2, 0xd5a79147930aa725,
-- 0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc,
0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed,
-- 0x53380d139d95b3df, 0x650a73548baf63de, 0x766a0abb3c77b2a8,
0x81c2c92e47edaee6, 0x92722c851482353b,
-- 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791,
0xc76c51a30654be30, 0xd192e819d6ef5218,
-- 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
0x19a4c116b8d2d0c8, 0x1e376c085141ab53,
-- 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63,
0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373,
-- 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc, 0x78a5636f43172f60,
0x84c87814a1f0ab72, 0x8cc702081a6439ec,
-- 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915,
0xc67178f2e372532b, 0xca273eceea26619c,
-- 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
0x06f067aa72176fba, 0x0a637dc5a2c898a6,
-- 0x113f9804bef90dae, 0x1b710b35131c471b, 0x28db77f523047d84,
0x32caab7b40c72493, 0x3c9ebe0a15c9bebc,
-- 0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
0x5fcb6fab3ad6faec, 0x6c44198c4a475817
-+ 0x428a2f98d728ae22LL, 0x7137449123ef65cdLL, 0xb5c0fbcfec4d3b2fLL,
0xe9b5dba58189dbbcLL, 0x3956c25bf348b538LL,
-+ 0x59f111f1b605d019LL, 0x923f82a4af194f9bLL, 0xab1c5ed5da6d8118LL,
0xd807aa98a3030242LL, 0x12835b0145706fbeLL,
-+ 0x243185be4ee4b28cLL, 0x550c7dc3d5ffb4e2LL, 0x72be5d74f27b896fLL,
0x80deb1fe3b1696b1LL, 0x9bdc06a725c71235LL,
-+ 0xc19bf174cf692694LL, 0xe49b69c19ef14ad2LL, 0xefbe4786384f25e3LL,
0x0fc19dc68b8cd5b5LL, 0x240ca1cc77ac9c65LL,
-+ 0x2de92c6f592b0275LL, 0x4a7484aa6ea6e483LL, 0x5cb0a9dcbd41fbd4LL,
0x76f988da831153b5LL, 0x983e5152ee66dfabLL,
-+ 0xa831c66d2db43210LL, 0xb00327c898fb213fLL, 0xbf597fc7beef0ee4LL,
0xc6e00bf33da88fc2LL, 0xd5a79147930aa725LL,
-+ 0x06ca6351e003826fLL, 0x142929670a0e6e70LL, 0x27b70a8546d22ffcLL,
0x2e1b21385c
update print/poppler
Hi,
this is an update to poppler-0.43.0. It also replaces the gettext module
by normal dependencies and enables libnss (for pdfsig(1)). For easier
read, I've split it up into three separate diffs.
I'm currently running a bulk build with this on amd64. Tests and
comments are welcome.
Ciao,
Kili
*** part 1: replcae gettext module:
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile23 Mar 2016 20:09:34 - 1.104
+++ Makefile29 Apr 2016 19:35:32 -
@@ -65,14 +65,15 @@ MODULES+= x11/qt5
CONFIGURE_ARGS+= --disable-poppler-qt5
.endif
-MODULES+= devel/gettext
-
BUILD_DEPENDS+= devel/gobject-introspection
-RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS} \
+RUN_DEPENDS-main= \
+ devel/gettext \
print/poppler-data>=0.4.7
-LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
+LIB_DEPENDS-main= \
+ converters/libiconv \
+ devel/gettext \
devel/glib2 \
graphics/cairo \
graphics/lcms2 \
@@ -94,7 +95,7 @@ LIB_DEPENDS-utils= print/poppler
WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \
png pthread-stubs xcb xcb-render lcms2 xcb-shm \
- ${MODGETTEXT_WANTLIB}
+ iconv intl
WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
${MODQT3_WANTLIB}
WANTLIB-qt4=${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
*** part 2: update to poppler-0.43.0
diff -rup -x CVS ./Makefile ../poppler/Makefile
--- ./Makefile Fri Apr 29 21:44:13 2016
+++ ../poppler/Makefile Fri Apr 29 21:44:39 2016
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.42.0
+V= 0.43.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 35.0 # 58.0
+SHARED_LIBS += poppler 36.0 # 60.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
diff -rup -x CVS ./distinfo ../poppler/distinfo
--- ./distinfo Fri Apr 29 21:44:13 2016
+++ ../poppler/distinfo Fri Apr 29 21:44:39 2016
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
+SHA256 (poppler-0.43.0.tar.xz) = xyDiaibuELfryeJW0u563NtTbPhfnxxHd6OPf4H7JFY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.42.0.tar.xz) = 1674024
+SIZE (poppler-0.43.0.tar.xz) = 1671368
diff -rup -x CVS ./patches/patch-configure_ac
../poppler/patches/patch-configure_ac
--- ./patches/patch-configure_acFri Apr 29 21:44:13 2016
+++ ../poppler/patches/patch-configure_ac Fri Apr 29 21:44:40 2016
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:34 kili Exp $
configure.ac.orig Wed Mar 16 20:35:38 2016
-+++ configure.ac Mon Mar 21 11:06:07 2016
-@@ -684,6 +684,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Fri Apr 29 00:30:06 2016
configure.ac Fri Apr 29 20:48:31 2016
+@@ -679,6 +679,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3
dnl
dnl Try Qt4
dnl
-@@ -776,31 +794,35 @@ if test x$enable_poppler_qt5 = xyes; then
+@@ -771,31 +789,35 @@ if test x$enable_poppler_qt5 = xyes; then
AC_CHECK_TOOL(MOCQT5, moc)
AC_MSG_CHECKING([for Qt5 moc])
mocversion=`$MOCQT5 -v 2>&1`
@@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3
AC_SUBST(MOCQT5)
AC_MSG_RESULT([$MOCQT5])
fi
-@@ -1001,6 +1023,9 @@ glib/reference/Makefile
+@@ -996,6 +1018,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2016/03/23 20:09:3
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -1036,6 +1061,7 @@ if test x$enable_cmyk = xyes;then
+@@ -1031,6 +1056,7 @@ if test x$enable_cmyk = xyes;then
echo " with CMYK support"
fi
echo " cairo output:$use_cairo"
diff -rup -x CVS ./patches/patch-poppler_XRef_cc
../poppler/patches/patch-poppler_XRef_cc
--- ./patches/patch-poppler_XRef_cc Fri Apr 29 21:44:13 2016
+++ ../poppler/patches/patch-poppler_XRef_ccFri Apr 29 21:44:40 2016
@@ -1,7 +1,7 @@
$OpenBSD: patch-poppler_XRef_cc,v 1.14 2016/03/23 20:09:34 kili Exp $
Re: update print/poppler
On Mon, Mar 21, 2016 at 02:53:42PM +0100, Matthias Kilian wrote:
> Hi,
>
> this updates poppler to 0.42.0. It does *not* include the new utility
> pdfsig(1), because upstream forgot to include the manpage in the
> distfile, and because it would add security/nss and the kitchensink
> as dependencies to all subpackages. I prefer to wait for the next
> release and have a look again, but if anyone thinks I should include
> it in this update, please let me know.
We can always add a subpackage for it.
>
> As always, tests are welcome. (I'm currently waiting for a dpb run
> on amd64 to finish and will then test several programs with it)
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.103
> diff -u -p -r1.103 Makefile
> --- Makefile 27 Feb 2016 19:21:32 - 1.103
> +++ Makefile 21 Mar 2016 13:42:49 -
> @@ -6,7 +6,7 @@ COMMENT-qt4= qt4 interface to PDF render
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 0.41.0
> +V= 0.42.0
> DISTNAME=poppler-$V
> CATEGORIES= print
> PKGNAME-main=poppler-$V
> @@ -16,7 +16,7 @@ PKGNAME-qt4=poppler-qt4-$V
> PKGNAME-qt5= poppler-qt5-$V
> OLDSHIT =poppler-0.16.7
>
> -SHARED_LIBS += poppler 34.0 # 58.0
> +SHARED_LIBS += poppler 35.0 # 58.0
> SHARED_LIBS += poppler-glib 15.0 # 15.0
> SHARED_LIBS += poppler-qt 12.0 # 3.0
> SHARED_LIBS += poppler-qt4 18.0 # 13.0
> @@ -102,11 +102,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
> gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
> png poppler pcre pthread-stubs xcb
> WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
> - GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
> - Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> - glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
> - icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
> - pthread-stubs xcb xcb-dri2 xcb-glx
> + GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
> + Xdamage Xext Xfixes Xxf86vm drm execinfo ffi glapi \
> + glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
> + iconv icudata icui18n icuuc intl lcms2 openjpeg pcre \
> + pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
> +
> WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
> png pthread-stubs xcb xcb-render xcb-shm openjpeg \
> poppler z ${cWANTLIB}
> @@ -117,7 +118,8 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
> --enable-poppler-cpp \
> --enable-utils \
> --enable-zlib \
> - --disable-gtk-test
> + --disable-gtk-test \
> + --disable-libnss
>
> CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.51
> diff -u -p -r1.51 distinfo
> --- distinfo 27 Feb 2016 19:21:32 - 1.51
> +++ distinfo 21 Mar 2016 13:42:49 -
> @@ -1,4 +1,4 @@
> SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.41.0.tar.xz) = Qgq6q2PK7Z4e4olkoLohbRl5UGcmFkvJmtWt4okZKhs=
> +SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.41.0.tar.xz) = 1655448
> +SIZE (poppler-0.42.0.tar.xz) = 1674024
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-Makefile_in
> --- patches/patch-Makefile_in 20 Nov 2015 07:47:44 - 1.12
> +++ patches/patch-Makefile_in 21 Mar 2016 13:42:49 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_in,v 1.12 2015/11/20 07:47:44 kili Exp $
> Makefile.in.orig Mon Nov 16 21:45:23 2015
> -+++ Makefile.in Wed Nov 18 19:59:20 2015
> -@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
> +--- Makefile.in.orig Wed Mar 16 23:22:12 2016
> Makefile.in Mon Mar 21 11:04:17 2016
> +@@ -389,6 +389,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
> POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
> POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
> POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
> @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
> POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
> POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
>
update print/poppler
Hi,
this updates poppler to 0.42.0. It does *not* include the new utility
pdfsig(1), because upstream forgot to include the manpage in the
distfile, and because it would add security/nss and the kitchensink
as dependencies to all subpackages. I prefer to wait for the next
release and have a look again, but if anyone thinks I should include
it in this update, please let me know.
As always, tests are welcome. (I'm currently waiting for a dpb run
on amd64 to finish and will then test several programs with it)
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile27 Feb 2016 19:21:32 - 1.103
+++ Makefile21 Mar 2016 13:42:49 -
@@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.41.0
+V= 0.42.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -16,7 +16,7 @@ PKGNAME-qt4= poppler-qt4-$V
PKGNAME-qt5= poppler-qt5-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 34.0 # 58.0
+SHARED_LIBS += poppler 35.0 # 58.0
SHARED_LIBS += poppler-glib 15.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 18.0 # 13.0
@@ -102,11 +102,12 @@ WANTLIB-qt4=${cWANTLIB} ${MODQT4_WAN
gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
png poppler pcre pthread-stubs xcb
WANTLIB-qt5= ${cWANTLIB} ${MODQT5_WANTLIB} ${MODGCC4_CPPWANTLIB} \
- GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb Xau \
- Xdamage Xdmcp Xext Xfixes Xxf86vm drm execinfo ffi glapi \
- glib-2.0 gobject-2.0 gthread-2.0 iconv icudata icui18n \
- icuuc intl lcms2 openjpeg pcre pcre16 png poppler \
- pthread-stubs xcb xcb-dri2 xcb-glx
+ GL Qt5Core Qt5Gui Qt5Widgets Qt5Xml X11 X11-xcb \
+ Xdamage Xext Xfixes Xxf86vm drm execinfo ffi glapi \
+ glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz \
+ iconv icudata icui18n icuuc intl lcms2 openjpeg pcre \
+ pcre16 png poppler pthread-stubs xcb xcb-dri2 xcb-glx
+
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs xcb xcb-render xcb-shm openjpeg \
poppler z ${cWANTLIB}
@@ -117,7 +118,8 @@ CONFIGURE_ARGS+=--enable-xpdf-headers \
--enable-poppler-cpp \
--enable-utils \
--enable-zlib \
- --disable-gtk-test
+ --disable-gtk-test \
+ --disable-libnss
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo27 Feb 2016 19:21:32 - 1.51
+++ distinfo21 Mar 2016 13:42:49 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.41.0.tar.xz) = Qgq6q2PK7Z4e4olkoLohbRl5UGcmFkvJmtWt4okZKhs=
+SHA256 (poppler-0.42.0.tar.xz) = n+8Hb/4qTxik4NpUfYFO9cXm+KKDr+M4dQSguxpBgBA=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.41.0.tar.xz) = 1655448
+SIZE (poppler-0.42.0.tar.xz) = 1674024
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Makefile_in
--- patches/patch-Makefile_in 20 Nov 2015 07:47:44 - 1.12
+++ patches/patch-Makefile_in 21 Mar 2016 13:42:49 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.12 2015/11/20 07:47:44 kili Exp $
Makefile.in.orig Mon Nov 16 21:45:23 2015
-+++ Makefile.inWed Nov 18 19:59:20 2015
-@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Wed Mar 16 23:22:12 2016
Makefile.inMon Mar 21 11:04:17 2016
+@@ -389,6 +389,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
-@@ -448,6 +450,8 @@ infodir = @infodir@
+@@ -451,6 +453,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2015/
localedir = @localedir@
Re: print/py-poppler (was: update print/poppler)
On Fri, Dec 18, 2015 at 06:02:47PM +0100, Matthias Kilian wrote:
> Hi,
>
> On Thu, Dec 17, 2015 at 09:01:58PM +0100, Matthias Kilian wrote:
> > Update to poppler-0.39.0. The major bump to libpoppler-glib is
> > necessary because the removal of a function.
>
> This appears to break print/py-poppler. Here's a fix for it. Any
> objections?
None from me.
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/py-poppler/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile 5 May 2015 17:00:18 - 1.10
> +++ Makefile 18 Dec 2015 08:19:57 -
> @@ -6,7 +6,7 @@ DISTNAME= pypoppler-0.12.1
> PKGNAME=${DISTNAME:S/^py/py-/}
> CATEGORIES= print
>
> -REVISION=6
> +REVISION=7
>
> MASTER_SITES=${HOMEPAGE}/trunk/development/+download/
> HOMEPAGE=http://launchpad.net/poppler-python/
> Index: patches/patch-poppler_defs
> ===
> RCS file: /cvs/ports/print/py-poppler/patches/patch-poppler_defs,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-poppler_defs
> --- patches/patch-poppler_defs27 Apr 2013 16:02:59 - 1.2
> +++ patches/patch-poppler_defs18 Dec 2015 12:00:55 -
> @@ -8,8 +8,39 @@ And follow API changes from poppler-0.16
>
>
> --- poppler.defs.origSun Sep 27 11:07:59 2009
> -+++ poppler.defs Fri Apr 26 22:49:32 2013
> -@@ -1646,58 +1646,6 @@
> poppler.defs Fri Dec 18 13:00:41 2015
> +@@ -578,18 +578,6 @@
> + )
> + )
> +
> +-(define-enum Orientation
> +- (in-module "Poppler")
> +- (c-name "PopplerOrientation")
> +- (gtype-id "POPPLER_TYPE_ORIENTATION")
> +- (values
> +-'("portrait" "POPPLER_ORIENTATION_PORTRAIT")
> +-'("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
> +-'("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
> +-'("seascape" "POPPLER_ORIENTATION_SEASCAPE")
> +- )
> +-)
> +-
> + (define-enum PageTransitionType
> + (in-module "Poppler")
> + (c-name "PopplerPageTransitionType")
> +@@ -1341,11 +1329,6 @@
> + (return-type "GType")
> + )
> +
> +-(define-function poppler_orientation_get_type
> +- (c-name "poppler_orientation_get_type")
> +- (return-type "GType")
> +-)
> +-
> + (define-function poppler_page_transition_type_get_type
> + (c-name "poppler_page_transition_type_get_type")
> + (return-type "GType")
> +@@ -1646,58 +1629,6 @@
> (return-type "GType")
> )
>
> @@ -68,7 +99,7 @@ And follow API changes from poppler-0.16
> (define-method render
> (of-object "PopplerPage")
> (c-name "poppler_page_render")
> -@@ -1795,6 +1743,12 @@
> +@@ -1795,6 +1726,12 @@
> (define-method get_text
> (of-object "PopplerPage")
> (c-name "poppler_page_get_text")
>
--
Antoine
print/py-poppler (was: update print/poppler)
Hi,
On Thu, Dec 17, 2015 at 09:01:58PM +0100, Matthias Kilian wrote:
> Update to poppler-0.39.0. The major bump to libpoppler-glib is
> necessary because the removal of a function.
This appears to break print/py-poppler. Here's a fix for it. Any
objections?
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/py-poppler/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile5 May 2015 17:00:18 - 1.10
+++ Makefile18 Dec 2015 08:19:57 -
@@ -6,7 +6,7 @@ DISTNAME= pypoppler-0.12.1
PKGNAME=${DISTNAME:S/^py/py-/}
CATEGORIES=print
-REVISION= 6
+REVISION= 7
MASTER_SITES= ${HOMEPAGE}/trunk/development/+download/
HOMEPAGE= http://launchpad.net/poppler-python/
Index: patches/patch-poppler_defs
===
RCS file: /cvs/ports/print/py-poppler/patches/patch-poppler_defs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-poppler_defs
--- patches/patch-poppler_defs 27 Apr 2013 16:02:59 - 1.2
+++ patches/patch-poppler_defs 18 Dec 2015 12:00:55 -
@@ -8,8 +8,39 @@ And follow API changes from poppler-0.16
--- poppler.defs.orig Sun Sep 27 11:07:59 2009
-+++ poppler.defs Fri Apr 26 22:49:32 2013
-@@ -1646,58 +1646,6 @@
poppler.defs Fri Dec 18 13:00:41 2015
+@@ -578,18 +578,6 @@
+ )
+ )
+
+-(define-enum Orientation
+- (in-module "Poppler")
+- (c-name "PopplerOrientation")
+- (gtype-id "POPPLER_TYPE_ORIENTATION")
+- (values
+-'("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+-'("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+-'("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+-'("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+- )
+-)
+-
+ (define-enum PageTransitionType
+ (in-module "Poppler")
+ (c-name "PopplerPageTransitionType")
+@@ -1341,11 +1329,6 @@
+ (return-type "GType")
+ )
+
+-(define-function poppler_orientation_get_type
+- (c-name "poppler_orientation_get_type")
+- (return-type "GType")
+-)
+-
+ (define-function poppler_page_transition_type_get_type
+ (c-name "poppler_page_transition_type_get_type")
+ (return-type "GType")
+@@ -1646,58 +1629,6 @@
(return-type "GType")
)
@@ -68,7 +99,7 @@ And follow API changes from poppler-0.16
(define-method render
(of-object "PopplerPage")
(c-name "poppler_page_render")
-@@ -1795,6 +1743,12 @@
+@@ -1795,6 +1726,12 @@
(define-method get_text
(of-object "PopplerPage")
(c-name "poppler_page_get_text")
update print/poppler
Hi, Update to poppler-0.39.0. The major bump to libpoppler-glib is necessary because the removal of a function. >From NEWS: core: * Ignore the alternateSpace and tintTransform. Bug #92381 * CairoOutputDev: Scale radial pattern. Bug #22098 * CairoOutputDev: Implement function shading using mesh gradients. Bug #88394 * Regression test improvements * Fix typos in error messages build system: * Visual Studio 2015 now supports snprintf. Bug #93116 utils: * pdftops: fix %%PageBoundingBox. Bug #87161 * pdftocairo: Fix double free when both user and owner passwords are given glib: * Add duration_real to PopplerPageTransition. Bug #92040 * Remove enum PopplerOrientation from API. Bug #93229 * documentation improvements * glib-demo improvements I'll start a bulk update test with this on amd64 in a few minutes. As always, tests, comments and oks are welcome. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.100 diff -u -p -r1.100 Makefile --- Makefile14 Dec 2015 14:25:47 - 1.100 +++ Makefile17 Dec 2015 19:48:04 - @@ -6,7 +6,7 @@ COMMENT-qt4=qt4 interface to PDF render COMMENT-qt5= Qt5 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.38.0 +V= 0.39.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -16,8 +16,8 @@ PKGNAME-qt4= poppler-qt4-$V PKGNAME-qt5= poppler-qt5-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 33.0 # 57.0 -SHARED_LIBS += poppler-glib 14.0 # 15.0 +SHARED_LIBS += poppler 34.0 # 58.0 +SHARED_LIBS += poppler-glib 15.0 # 15.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 18.0 # 13.0 SHARED_LIBS += poppler-qt5 0.0 # 7.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.48 diff -u -p -r1.48 distinfo --- distinfo20 Nov 2015 07:47:44 - 1.48 +++ distinfo17 Dec 2015 19:48:04 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.38.0.tar.xz) = bwwNScg0bXwM/mNIEk5/GcyQG101yc2JlEqsbkVOios= +SHA256 (poppler-0.39.0.tar.xz) = r9db76nDpB4dd1XE5D3qcM/Y8aTawRjoMDLLtBzhe7k= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.38.0.tar.xz) = 1637772 +SIZE (poppler-0.39.0.tar.xz) = 1641156 Index: patches/patch-aclocal_m4 === RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v retrieving revision 1.9 diff -u -p -r1.9 patch-aclocal_m4 --- patches/patch-aclocal_m411 Oct 2015 15:50:49 - 1.9 +++ patches/patch-aclocal_m417 Dec 2015 19:48:04 - @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.9 2015/10/11 15:50:49 kili Exp $ aclocal.m4.origFri Oct 9 18:25:45 2015 -+++ aclocal.m4 Sat Oct 10 10:16:14 2015 -@@ -2373,6 +2373,7 @@ m4_include([m4/define-dir.m4]) +--- aclocal.m4.origThu Dec 17 00:10:12 2015 aclocal.m4 Thu Dec 17 20:12:20 2015 +@@ -2434,6 +2434,7 @@ m4_include([m4/define-dir.m4]) m4_include([m4/gtk-doc.m4]) m4_include([m4/iconv.m4]) m4_include([m4/introspection.m4]) Index: patches/patch-configure_ac === RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v retrieving revision 1.15 diff -u -p -r1.15 patch-configure_ac --- patches/patch-configure_ac 14 Dec 2015 14:25:47 - 1.15 +++ patches/patch-configure_ac 17 Dec 2015 19:48:04 - @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_ac,v 1.15 2015/12/14 14:25:47 zhuk Exp $ configure.ac.orig Sun Aug 9 18:28:07 2015 -+++ configure.ac Thu Aug 13 20:03:50 2015 +--- configure.ac.orig Thu Dec 17 00:07:03 2015 configure.ac Thu Dec 17 20:12:20 2015 @@ -643,6 +643,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) @@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2015 dnl dnl Try Qt4 dnl -@@ -682,31 +700,35 @@ if test x$enable_poppler_qt5 = xyes; then +@@ -735,31 +753,35 @@ if test x$enable_poppler_qt5 = xyes; then AC_CHECK_TOOL(MOCQT5, moc) AC_MSG_CHECKING([for Qt5 moc]) mocversion=`$MOCQT5 -v 2>&1` @@ -75,7 +75,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2015 AC_SUBST(MOCQT5) AC_MSG_RESULT([$MOCQT5]) fi -@@ -907,6 +929,9 @@ glib/reference/Makefile +@@ -960,6 +982,9 @@ glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile @@ -85,7 +85,7 @@ $OpenBSD: patch-configure_ac,v 1.15 2015 qt4/Makefile qt4/src/Makefile qt4/
Re: update print/poppler
On Wed, Nov 18, 2015 at 10:36:54PM +0100, Antoine Jacoutot wrote: > On Wed, Nov 18, 2015 at 10:09:16PM +0100, Matthias Kilian wrote: > > Update to poppler-0.38.0. > > > > Tests are welcome, including a bulk build test (I've some hard times > > on my build machine, so I couldn't run a complete build yet). > > I'll run a bulk tomorrow morning. No fallout. OK aja@
Re: update print/poppler
On Wed, Nov 18, 2015 at 10:09:16PM +0100, Matthias Kilian wrote:
> Update to poppler-0.38.0.
>
> Tests are welcome, including a bulk build test (I've some hard times
> on my build machine, so I couldn't run a complete build yet).
I'll run a bulk tomorrow morning.
>
> Denoised upstream diff for reviews:
>
> https://openbsd.dead-parrot.de/poppler-0.37-0.38.diff
>
> In that diff, I can't see any reason for the upstream bump of
> poppler-qt4, so I'm not touching it for our port.
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.98
> diff -u -p -r1.98 Makefile
> --- Makefile 11 Oct 2015 15:50:49 - 1.98
> +++ Makefile 18 Nov 2015 20:16:15 -
> @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
> COMMENT-qt4= qt4 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 0.37.0
> +V= 0.38.0
> DISTNAME=poppler-$V
> CATEGORIES= print
> PKGNAME-main=poppler-$V
> @@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
> PKGNAME-qt4= poppler-qt4-$V
> OLDSHIT =poppler-0.16.7
>
> -SHARED_LIBS += poppler 32.0 # 55.0
> +SHARED_LIBS += poppler 33.0 # 57.0
> SHARED_LIBS += poppler-glib 14.0 # 15.0
> SHARED_LIBS += poppler-qt 12.0 # 3.0
> -SHARED_LIBS += poppler-qt4 18.0 # 12.0
> +SHARED_LIBS += poppler-qt4 18.0 # 13.0
> SHARED_LIBS += poppler-cpp 6.1 # 2.1
>
> DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.47
> diff -u -p -r1.47 distinfo
> --- distinfo 11 Oct 2015 15:50:49 - 1.47
> +++ distinfo 18 Nov 2015 19:45:32 -
> @@ -1,4 +1,4 @@
> SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.37.0.tar.xz) = uJ+cXq47uxBGsPdncUr9deyhAqBAajowhWd41CpoW+4=
> +SHA256 (poppler-0.38.0.tar.xz) = bwwNScg0bXwM/mNIEk5/GcyQG101yc2JlEqsbkVOios=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.37.0.tar.xz) = 1636496
> +SIZE (poppler-0.38.0.tar.xz) = 1637772
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-Makefile_in
> --- patches/patch-Makefile_in 11 Oct 2015 15:50:49 - 1.11
> +++ patches/patch-Makefile_in 18 Nov 2015 19:45:32 -
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-Makefile_in,v 1.11 2015/10/11 15:50:49 kili Exp $
> Makefile.in.orig Fri Oct 9 18:25:46 2015
> -+++ Makefile.in Sat Oct 10 10:16:15 2015
> +--- Makefile.in.orig Mon Nov 16 21:45:23 2015
> Makefile.in Wed Nov 18 19:59:20 2015
> @@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
> POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
> POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
> @@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
> localedir = @localedir@
> localstatedir = @localstatedir@
> mandir = @mandir@
> -@@ -473,13 +477,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
> +@@ -474,13 +478,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
> @BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
> @BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
> @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
> @@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
>
> # Add CMake buildsystem files here so they get added on make dist
> EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
> -@@ -524,6 +530,7 @@ pkgconfig_DATA = \
> +@@ -525,6 +531,7 @@ pkgconfig_DATA = \
> $(cairo_pc_file)\
> $(splash_pc_file) \
> $(glib_pc_file) \
> @@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
> $(qt4_pc_file) \
> $(qt5_pc_file) \
> $(cpp_pc_file)
> -@@ -595,6 +602,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
> +@@ -596,6 +603,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
> poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
> cd $(top_builddir) && $(SHELL) ./config.status $@
> poppler-glib-uninstalled.pc: $(top_builddir)/config.status
> $(srcdir)/poppler-glib-uninstalled.pc.in
>
--
Antoine
update print/poppler
Update to poppler-0.38.0.
Tests are welcome, including a bulk build test (I've some hard times
on my build machine, so I couldn't run a complete build yet).
Denoised upstream diff for reviews:
https://openbsd.dead-parrot.de/poppler-0.37-0.38.diff
In that diff, I can't see any reason for the upstream bump of
poppler-qt4, so I'm not touching it for our port.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile11 Oct 2015 15:50:49 - 1.98
+++ Makefile18 Nov 2015 20:16:15 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.37.0
+V= 0.38.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 32.0 # 55.0
+SHARED_LIBS += poppler 33.0 # 57.0
SHARED_LIBS += poppler-glib 14.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 18.0 # 12.0
+SHARED_LIBS += poppler-qt4 18.0 # 13.0
SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo11 Oct 2015 15:50:49 - 1.47
+++ distinfo18 Nov 2015 19:45:32 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.37.0.tar.xz) = uJ+cXq47uxBGsPdncUr9deyhAqBAajowhWd41CpoW+4=
+SHA256 (poppler-0.38.0.tar.xz) = bwwNScg0bXwM/mNIEk5/GcyQG101yc2JlEqsbkVOios=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.37.0.tar.xz) = 1636496
+SIZE (poppler-0.38.0.tar.xz) = 1637772
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 11 Oct 2015 15:50:49 - 1.11
+++ patches/patch-Makefile_in 18 Nov 2015 19:45:32 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.11 2015/10/11 15:50:49 kili Exp $
Makefile.in.orig Fri Oct 9 18:25:46 2015
-+++ Makefile.inSat Oct 10 10:16:15 2015
+--- Makefile.in.orig Mon Nov 16 21:45:23 2015
Makefile.inWed Nov 18 19:59:20 2015
@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -473,13 +477,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -474,13 +478,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -524,6 +530,7 @@ pkgconfig_DATA = \
+@@ -525,6 +531,7 @@ pkgconfig_DATA = \
$(cairo_pc_file)\
$(splash_pc_file) \
$(glib_pc_file) \
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.11 2015/
$(qt4_pc_file) \
$(qt5_pc_file) \
$(cpp_pc_file)
-@@ -595,6 +602,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -596,6 +603,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-glib-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-glib-uninstalled.pc.in
update print/poppler
Hi,
here's the usual monthly update to print/poppler, in case anyone
wants to run some extra tests (I'll run some tests tomorrow, but
from looking at the diff between the sources of 0.36.0 and 0.37.0,
I don't expect any breakage).
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile13 Sep 2015 21:46:41 - 1.97
+++ Makefile10 Oct 2015 08:24:10 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.36.0
+V= 0.37.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 31.0 # 55.0
+SHARED_LIBS += poppler 32.0 # 55.0
SHARED_LIBS += poppler-glib 14.0 # 15.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 17.0 # 12.0
+SHARED_LIBS += poppler-qt4 18.0 # 12.0
SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo13 Sep 2015 21:46:41 - 1.46
+++ distinfo10 Oct 2015 08:16:03 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.36.0.tar.xz) = k8wGeyPE73QhOA0+i9fJQLICdmhEZ1B4fXwctCcgJI4=
+SHA256 (poppler-0.37.0.tar.xz) = uJ+cXq47uxBGsPdncUr9deyhAqBAajowhWd41CpoW+4=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.36.0.tar.xz) = 1629984
+SIZE (poppler-0.37.0.tar.xz) = 1636496
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in 18 Nov 2014 18:59:08 - 1.10
+++ patches/patch-Makefile_in 10 Oct 2015 08:16:42 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.10 2014/11/18 18:59:08 kili Exp $
Makefile.in.orig Tue Nov 4 19:46:21 2014
-+++ Makefile.inSun Nov 16 23:46:02 2014
-@@ -376,6 +376,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Fri Oct 9 18:25:46 2015
Makefile.inSat Oct 10 10:16:15 2015
+@@ -386,6 +386,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2014/
POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
-@@ -438,6 +440,8 @@ infodir = @infodir@
+@@ -448,6 +450,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2014/
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -463,13 +467,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -473,13 +477,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2014/
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -514,6 +520,7 @@ pkgconfig_DATA = \
+@@ -524,6 +530,7 @@ pkgconfig_DATA = \
$(cairo_pc_file)\
$(splash_pc_file) \
$(glib_pc_file) \
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2014/
$(qt4_pc_file) \
$(qt5_pc_file) \
$(cpp_pc_file)
-@@ -586,6 +593,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -595,6 +602,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-glib-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-glib-uninstalled.pc.in
Index: patches/patch-aclocal_m4
===
RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v
retrieving revision 1.8
diff -u -p -r1.8 patch-aclocal_m4
--- patches/patch-aclocal_m425 Aug 2014 19:19:42
update print/poppler
Hi, here's an pdate to poppler-0.33.0. Survived dpb -uR on amd64, also tested with some users of libpoppler on amd64. Any additional tests are welcome. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.93 diff -u -p -r1.93 Makefile --- Makefile30 Mar 2015 21:43:29 - 1.93 +++ Makefile16 May 2015 22:27:12 - @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.32.0 +V= 0.33.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -14,8 +14,8 @@ PKGNAME-qt= poppler-qt-$V PKGNAME-qt4= poppler-qt4-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 27.0 # 51.0 -SHARED_LIBS += poppler-glib 13.1 # 14.0 +SHARED_LIBS += poppler 28.0 # 52.0 +SHARED_LIBS += poppler-glib 14.0 # 15.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 15.0 # 10.0 SHARED_LIBS += poppler-cpp 6.1 # 2.1 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.42 diff -u -p -r1.42 distinfo --- distinfo30 Mar 2015 21:43:29 - 1.42 +++ distinfo16 May 2015 22:14:31 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.32.0.tar.xz) = SWPjG6XhdTCoexZYjiKSi8BE6NKNAjA93tmBv/ZyW5g= +SHA256 (poppler-0.33.0.tar.xz) = pfptf33FOCtIysqCsUfFS9/9oCaYYRr3bbUya6ZJlaY= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.32.0.tar.xz) = 1609624 +SIZE (poppler-0.33.0.tar.xz) = 1613060
Re: (not yet) update print/poppler
> Breakage in orint/cups-filters is this (probably caused by that "GlobalParams > cleaning" > mentioned in the NEWS above): > > filter/pdftoopvp/OPVPOutputDev.cxx: In member function 'void > OPVPOutputDev::startDoc(XRef*)': > filter/pdftoopvp/OPVPOutputDev.cxx:281:23: error: 'class GlobalParams' has no > member named 'getAntialias' > globalParams->getAntialias()); >^ > > Antoine: are you aware of any already available patch or update for > cups-filters dealing with the newest poppler? If not, I'll have a closer Yes. There's a ticket opened upstream for this: https://bugs.linuxfoundation.org/show_bug.cgi?id=1254 -- Antoine
(not yet) update print/poppler
Hi,
this is an update attempt to poppler-0.31.0. Not going to be committed
for now, because unfortunately it breaks print/cups-filters (see
below).
>From the NEWS file (but please note that qt5 is still disabled in
this port):
core:
* CairoOutputDev: support embedding JBIG2 image data
* Accept malformed documents whose root is a Page instead of a Pages.
Bug #88172
* Fix crash on broken documents
* JPEG2000Stream: Inline doGetChar and doLookChar
* GlobalParams cleaning
utils:
* pdftops: Add rasterization option. Bug #85934
qt4:
* Expose whole-words search option
qt5:
* Expose whole-words search option
Breakage in orint/cups-filters is this (probably caused by that "GlobalParams
cleaning"
mentioned in the NEWS above):
filter/pdftoopvp/OPVPOutputDev.cxx: In member function 'void
OPVPOutputDev::startDoc(XRef*)':
filter/pdftoopvp/OPVPOutputDev.cxx:281:23: error: 'class GlobalParams' has no
member named 'getAntialias'
globalParams->getAntialias());
^
Antoine: are you aware of any already available patch or update for
cups-filters dealing with the newest poppler? If not, I'll have a closer
look on both the changes in poppler and the necessary changes to
cups-filter.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile7 Jan 2015 14:53:01 - 1.91
+++ Makefile10 Feb 2015 09:01:11 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.30.0
+V= 0.31.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 25.0 # 49.0
+SHARED_LIBS += poppler 26.0 # 50.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 14.0 # 9.0
+SHARED_LIBS += poppler-qt4 15.0 # 10.0
SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo7 Jan 2015 14:53:01 - 1.40
+++ distinfo10 Feb 2015 08:29:24 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.30.0.tar.xz) = thbuhp0LH4p6LHHPNG9Vwb/2JMzkut6+F/UG7Izn3fU=
+SHA256 (poppler-0.31.0.tar.xz) = lDKQJw3KOQ2PFEZ9VLBqJdnW9w3FhTsKm4nGL3RXBpQ=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.30.0.tar.xz) = 1605292
+SIZE (poppler-0.31.0.tar.xz) = 1607300
update print/poppler
Hi,
Antoine reminded me that there's a new stable release of poppler
available ;-)
I'm currently running a bulk update on amd64 to see wether there's
any fallout from the change of the PSOutputDev constructor.
As always, independent tests and comments are welcome.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- Makefile13 Dec 2014 19:02:07 - 1.90
+++ Makefile5 Jan 2015 14:29:03 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.29.0
+V= 0.30.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,11 +14,11 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 24.0 # 48.0
+SHARED_LIBS += poppler 25.0 # 49.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 14.0 # 9.0
-SHARED_LIBS += poppler-cpp 6.0 # 2.0
+SHARED_LIBS += poppler-cpp 6.1 # 2.1
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo13 Dec 2014 19:02:07 - 1.39
+++ distinfo5 Jan 2015 14:29:03 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.29.0.tar.xz) = PB4W3I1dhG0IW69lhE7T4Fy95dRPZoL58eKxINZsYsQ=
+SHA256 (poppler-0.30.0.tar.xz) = thbuhp0LH4p6LHHPNG9Vwb/2JMzkut6+F/UG7Izn3fU=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.29.0.tar.xz) = 1600980
+SIZE (poppler-0.30.0.tar.xz) = 1605292
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure_ac
--- patches/patch-configure_ac 13 Dec 2014 19:02:07 - 1.12
+++ patches/patch-configure_ac 5 Jan 2015 14:29:03 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.12 2014/12/13 19:02:07 kili Exp $
configure.ac.orig Thu Dec 4 22:52:06 2014
-+++ configure.ac Mon Dec 8 10:41:54 2014
-@@ -563,6 +563,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Sun Jan 4 23:15:57 2015
configure.ac Mon Jan 5 14:19:19 2015
+@@ -590,6 +590,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014
dnl
dnl Try Qt4
dnl
-@@ -595,7 +613,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -622,7 +640,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
AC_SUBST(POPPLER_QT4_TEST_LIBS)
if test x$enable_poppler_qt4 = xyes; then
@@ -35,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
mocversiongrep=`echo $mocversion | grep "Qt 4"`
-@@ -866,6 +884,9 @@ glib/reference/Makefile
+@@ -907,6 +925,9 @@ glib/reference/Makefile
glib/reference/version.xml
glib/demo/Makefile
test/Makefile
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.12 2014
qt4/Makefile
qt4/src/Makefile
qt4/tests/Makefile
-@@ -898,6 +919,7 @@ echo "Building poppler with support for:"
+@@ -939,6 +960,7 @@ echo "Building poppler with support for:"
echo " font configuration: $with_font_configuration"
echo " splash output: $enable_splash_output"
echo " cairo output: $use_cairo"
Index: patches/patch-qt_poppler-document_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt_poppler-document_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_poppler-document_cc
--- patches/patch-qt_poppler-document_cc13 Jul 2012 15:04:46 -
1.1
+++ patches/patch-qt_poppler-document_cc5 Jan 2015 14:29:03 -
@@ -1,12 +1,16 @@
$OpenBSD: patch-qt_poppler-document_cc,v 1.1 2012/07/13 15:04:46 kili Exp $
qt/poppler-document.cc.origMon Jul 9 19:01:04 2012
-+++ qt/poppler-document.cc Mon Jul 9 22:37:00 2012
-@@ -326,7 +326,7 @@ bool Document::print(const QString &fileName, QValueLi
+--- qt/poppler-document.cc.origMon Jan 5 14:53:48 2015
qt/poppler-document.cc Mon Jan 5 15:02:20 2015
+@@ -326,7 +326,11 @@ bool Document::print(const QString &fileName, QValueLi
bool Document::print(const QString &file, QValueList pageList, double
hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
{
- PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc),
data->doc.getXRef(),
Re: graphics/inkscape (was: update print/poppler)
On Mon, Dec 08, 2014 at 11:50:39PM +0100, Matthias Kilian wrote:
> The only failure is graphics/inkscape. Anyone using it and want to
> investigate? But be aware that there's already a more than insane
> #ifdef maze using POPPLER_NEW_COLOR_SPACE_API and
> POPPLER_EVEN_NEWER_COLOR_SPACE_API, so what's next?
Obviously, noone cares. So here's my best effort diff (untested,
because I'm not using it).
Update to inkscape-0.48.5 and fix for poppler-0.29.0.
Please test (if possible, with the poppler diff I sent some days
ago) and comment.
Index: Makefile
===
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile10 Jul 2014 10:19:45 - 1.39
+++ Makefile11 Dec 2014 20:48:38 -
@@ -2,8 +2,7 @@
COMMENT= SVG vector drawing application
-DISTNAME= inkscape-0.48.4
-REVISION = 1
+DISTNAME= inkscape-0.48.5
CATEGORIES=graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
Index: distinfo
===
RCS file: /cvs/ports/graphics/inkscape/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo22 Oct 2013 00:14:59 - 1.8
+++ distinfo11 Dec 2014 20:48:59 -
@@ -1,2 +1,2 @@
-SHA256 (inkscape-0.48.4.tar.gz) = bhnuCHp5ASoM7JxubRlDV+JWt+xThTbvy990/fLTHVo=
-SIZE (inkscape-0.48.4.tar.gz) = 26452454
+SHA256 (inkscape-0.48.5.tar.gz) = /1GU94BXqyQjTtcbjnqiJ9SEfUIWbG1EOR76hvPK8TA=
+SIZE (inkscape-0.48.5.tar.gz) = 26301353
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/graphics/inkscape/patches/patch-configure_ac,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure_ac
--- patches/patch-configure_ac 10 Jul 2014 10:19:45 - 1.7
+++ patches/patch-configure_ac 11 Dec 2014 21:08:32 -
@@ -1,13 +1,10 @@
$OpenBSD: patch-configure_ac,v 1.7 2014/07/10 10:19:45 robert Exp $
-First chunk reported to upstream and committed on trunk and the
-0.48 branch: https://bugs.launchpad.net/inkscape/+bug/1315142
-
Hardcoded -dl.
configure.ac.orig Sat Dec 15 17:50:19 2012
-+++ configure.ac Thu Jul 10 11:39:49 2014
-@@ -263,7 +263,7 @@ if test "x$gc_ok" = "xyes" && test "x$cross_compiling"
+--- configure.ac.orig Fri Jun 20 22:29:03 2014
configure.ac Thu Dec 11 22:08:27 2014
+@@ -241,7 +241,7 @@ if test "x$gc_ok" = "xyes" && test "x$cross_compiling"
# include
#endif
#include
@@ -16,19 +13,19 @@ Hardcoded -dl.
int main(void){
unsigned min = ((6 << 16) | (4 << 8) | 0);
printf("%d.%d.%d ",GC_version >> 16,
(GC_version >> 8) & 0xFF, GC_version & 0xFF);
-@@ -610,6 +610,11 @@ else
- AC_MSG_RESULT(no)
+@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = "xyes"; then
+ AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color
space API from Poppler >= 0.26.0])
fi
-+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_COLOR_SPACE_API, poppler >= 0.26.0,
popplernewercolorspaceapi=yes, popplernewercolorspaceapi=no)
-+if test "x$popplernewercolorspaceapi" = "xyes"; then
-+ AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color
space API from Poppler >= 0.26.0])
++PKG_CHECK_MODULES(POPPLER_REALLY_NEWEWST_COLOR_SPACE_API, poppler >= 0.29.0,
popplernewestcolorspaceapi=yes, popplernewestcolorspaceapi=no)
++if test "x$popplernewestcolorspaceapi" = "xyes"; then
++ AC_DEFINE(POPPLER_REALLY_NEWEST_COLOR_SPACE_API, 1, [Use really newest
color space API from Poppler >= 0.29.0])
+fi
+
# Poppler's b604a008 commit changes this
AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
popplergfxcolor="no"
-@@ -780,7 +785,7 @@ if test "x$cairo_pdf" = "xyes"; then
+@@ -757,7 +762,7 @@ if test "x$cairo_pdf" = "xyes"; then
fi
dnl Shouldn't we test for libpng and libz?
Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===
RCS file:
/cvs/ports/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp13 Jun
2014 20:52:52 - 1.8
+++ patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp11 Dec
2014 22:45:19 -
@@ -1,128 +1,83 @@
$OpenBSD: patch-src_extension_internal_pdfinput_pdf-parser_cpp,v 1.8
2014/06/13 20:52:52 kili Exp $
-Reported to upstream and committed on trunk and the 0.48 branch:
-https://bugs.launchpad.net/inkscape/+bug/1315142
+This patch is dedicated to Joe Zawinul for his famous tune "mercy
+mercy mercy".
src/extension/internal/pdfinput/pdf-
graphics/inkscape (was: update print/poppler)
On Mon, Dec 08, 2014 at 11:02:27AM +0100, Matthias Kilian wrote: > Update to poppler-0.29.0 (yes, upstream dropped "stable" vs. > "development" branches). [...] > There were some incompatible changes to the GfxColorTransform > constructor and to GfxColorSpace:parse(); I'll run a bulk update > to see wether anything in the tree uses them. The only failure is graphics/inkscape. Anyone using it and want to investigate? But be aware that there's already a more than insane #ifdef maze using POPPLER_NEW_COLOR_SPACE_API and POPPLER_EVEN_NEWER_COLOR_SPACE_API, so what's next? Ciao, Kili
update print/poppler
Update to poppler-0.29.0 (yes, upstream dropped "stable" vs. "development" branches). >From the release notes: core: * Use correct LAB byte array for lcms input. Bug #86388 * Write correct size in trailer dict. Bug #86063 * Use Default colorspaces if present instead of Device colorspaces * Solve blend mode problem in CYMK and DeviceN for separable blend modes * Compilation/warning fixes on SunOS * Regression test improvements glib: * demo: Compilation fixlets build system: * cofigure: print "no" instead of "auto" if lcms not found There were some incompatible changes to the GfxColorTransform constructor and to GfxColorSpace:parse(); I'll run a bulk update to see wether anything in the tree uses them. Until then, please test the update with your favorite PDF tools. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.88 diff -u -p -r1.88 Makefile --- Makefile18 Nov 2014 18:59:08 - 1.88 +++ Makefile8 Dec 2014 09:26:19 - @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.28.1 +V= 0.29.0 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -14,7 +14,7 @@ PKGNAME-qt= poppler-qt-$V PKGNAME-qt4= poppler-qt4-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 23.0 # 47.0 +SHARED_LIBS += poppler 24.0 # 48.0 SHARED_LIBS += poppler-glib 13.1 # 14.0 SHARED_LIBS += poppler-qt 12.0 # 3.0 SHARED_LIBS += poppler-qt4 14.0 # 9.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.38 diff -u -p -r1.38 distinfo --- distinfo18 Nov 2014 18:59:08 - 1.38 +++ distinfo7 Dec 2014 21:05:15 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.28.1.tar.xz) = LM9uI0IJqlCCupnTVH5nmM2HWOepIccsAK7fDVeT/QY= +SHA256 (poppler-0.29.0.tar.xz) = PB4W3I1dhG0IW69lhE7T4Fy95dRPZoL58eKxINZsYsQ= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.28.1.tar.xz) = 1600332 +SIZE (poppler-0.29.0.tar.xz) = 1600980 Index: patches/patch-configure_ac === RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v retrieving revision 1.11 diff -u -p -r1.11 patch-configure_ac --- patches/patch-configure_ac 18 Nov 2014 18:59:08 - 1.11 +++ patches/patch-configure_ac 8 Dec 2014 09:41:59 - @@ -1,6 +1,6 @@ $OpenBSD: patch-configure_ac,v 1.11 2014/11/18 18:59:08 kili Exp $ configure.ac.orig Tue Nov 4 19:45:17 2014 -+++ configure.ac Sun Nov 16 23:41:54 2014 +--- configure.ac.orig Thu Dec 4 22:52:06 2014 configure.ac Mon Dec 8 10:41:54 2014 @@ -563,6 +563,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) @@ -35,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2014 AC_MSG_CHECKING([for Qt4 moc]) mocversion=`$MOCQT4 -v 2>&1` mocversiongrep=`echo $mocversion | grep "Qt 4"` -@@ -864,6 +882,9 @@ glib/reference/Makefile +@@ -866,6 +884,9 @@ glib/reference/Makefile glib/reference/version.xml glib/demo/Makefile test/Makefile @@ -45,7 +45,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2014 qt4/Makefile qt4/src/Makefile qt4/tests/Makefile -@@ -896,6 +917,7 @@ echo "Building poppler with support for:" +@@ -898,6 +919,7 @@ echo "Building poppler with support for:" echo " font configuration: $with_font_configuration" echo " splash output: $enable_splash_output" echo " cairo output: $use_cairo"
update print/poppler
Hi,
I already sent this diff to Antoine last night, but now I can confirm
that it doesn't break any builds and that our pdf viewers using
poppler still work (tested on amd64).
Further tests and comments are welcome.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile1 Oct 2014 21:44:48 - 1.87
+++ Makefile16 Nov 2014 22:58:52 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.26.5
+V= 0.28.1
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,10 +14,10 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 22.0 # 46.0
+SHARED_LIBS += poppler 23.0 # 47.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 13.1 # 8.0
+SHARED_LIBS += poppler-qt4 14.0 # 9.0
SHARED_LIBS += poppler-cpp 6.0 # 2.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo1 Oct 2014 21:44:48 - 1.37
+++ distinfo16 Nov 2014 21:27:25 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.26.5.tar.xz) = 3n3l+jN0MeXR83LoV3s3BzIvHbwdwopw8pJ0dvE00e4=
+SHA256 (poppler-0.28.1.tar.xz) = LM9uI0IJqlCCupnTVH5nmM2HWOepIccsAK7fDVeT/QY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.26.5.tar.xz) = 1595232
+SIZE (poppler-0.28.1.tar.xz) = 1600332
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 10 Aug 2014 07:56:40 - 1.9
+++ patches/patch-Makefile_in 16 Nov 2014 22:46:15 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.9 2014/08/10 07:56:40 ajacoutot Exp $
Makefile.in.orig Sun Jul 20 18:22:03 2014
-+++ Makefile.inThu Jul 24 11:09:52 2014
+--- Makefile.in.orig Tue Nov 4 19:46:21 2014
Makefile.inSun Nov 16 23:46:02 2014
@@ -376,6 +376,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2014/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -463,6 +467,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -463,13 +467,15 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -28,16 +28,15 @@ $OpenBSD: patch-Makefile_in,v 1.9 2014/0
@BUILD_POPPLER_QT5_TRUE@qt5_subdir = qt5
@BUILD_POPPLER_QT5_TRUE@qt5_pc_file = poppler-qt5.pc
@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
-@@ -470,7 +476,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+ @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
- @BUILD_UTILS_TRUE@utils_subdir = utils
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
-+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
$(qt_subdir) test $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
+-SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test
$(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
++SUBDIRS = goo fofi $(splash_subdir) poppler utils $(glib_subdir) test
$(qt_subdir) $(qt4_subdir) $(qt5_subdir) $(cpp_subdir)
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -515,6 +521,7 @@ pkgconfig_DATA = \
+@@ -514,6 +520,7 @@ pkgconfig_DATA = \
$(cairo_pc_file)\
$(splash_pc_file) \
$(glib_pc_file) \
@@ -45,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2014/0
$(qt4_pc_file) \
$(qt5_pc_file) \
$(cpp_pc_file)
-@@ -587,6 +594,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -586,6 +593,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-gl
update print/poppler
Minor update to poppler-0.26.1, plus some wantlib adjustion.
core:
* Use field value V for radio buttons. Bug #75979
* Fix extraction of text in some files. Bug #78145
* Only add annotations of the current page when splitting.
Bug #77549
build system:
* autoconf: Fix libopenjpeg 1.5 detection on some systems.
Bug #78389
glib:
* Fix multiple definition of PopplerTextSpan
Everything still builds fine. Test and comments are welcome.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile28 Apr 2014 16:48:27 - 1.82
+++ Makefile27 May 2014 19:06:03 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.26.0
+V= 0.26.1
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,7 +14,7 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 21.0 # 46.0
+SHARED_LIBS += poppler 21.1 # 46.0
SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
SHARED_LIBS += poppler-qt4 13.1 # 8.0
@@ -84,9 +84,10 @@ WANTLIB-main=${cWANTLIB} Xext ffi gio-2
${MODGETTEXT_WANTLIB}
WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
${MODQT3_WANTLIB}
-WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 \
- Xext Xi Xinerama Xrender lcms2 openjpeg png poppler \
- pthread-stubs QtCore QtGui QtXml
+WANTLIB-qt4=${cWANTLIB} ${MODQT4_WANTLIB} ICE QtCore QtGui QtXml \
+ SM X11 Xext Xi Xinerama Xrender ffi glib-2.0 \
+ gobject-2.0 gthread-2.0 iconv intl lcms2 openjpeg \
+ png poppler pcre pthread-stubs xcb
WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
png pthread-stubs xcb xcb-render xcb-shm openjpeg \
poppler z ${cWANTLIB}
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo28 Apr 2014 16:48:27 - 1.33
+++ distinfo27 May 2014 18:35:07 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.26.0.tar.xz) = hUcDL8j/NLpfR7R+3f5n0PL/D/zc9dGJ9S3FFncMYh8=
+SHA256 (poppler-0.26.1.tar.xz) = yMlZw/YFoX7SHiz+wtk3m+XgyAHbTtrV57LkSmzvIUw=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.26.0.tar.xz) = 1591180
+SIZE (poppler-0.26.1.tar.xz) = 1592884
Index: patches/patch-aclocal_m4
===
RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v
retrieving revision 1.6
diff -u -p -r1.6 patch-aclocal_m4
--- patches/patch-aclocal_m417 Dec 2013 18:48:25 - 1.6
+++ patches/patch-aclocal_m427 May 2014 18:35:54 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-aclocal_m4,v 1.6 2013/12/17 18:48:25 kili Exp $
aclocal.m4.origWed Nov 27 00:17:01 2013
-+++ aclocal.m4 Fri Dec 13 22:01:25 2013
-@@ -2315,6 +2315,7 @@ m4_include([m4/define-dir.m4])
+--- aclocal.m4.origFri May 23 20:10:53 2014
aclocal.m4 Tue May 27 20:35:49 2014
+@@ -2370,6 +2370,7 @@ m4_include([m4/define-dir.m4])
m4_include([m4/gtk-doc.m4])
m4_include([m4/iconv.m4])
m4_include([m4/introspection.m4])
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure_ac
--- patches/patch-configure_ac 28 Apr 2014 16:48:27 - 1.9
+++ patches/patch-configure_ac 27 May 2014 18:35:54 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.9 2014/04/28 16:48:27 kili Exp $
configure.ac.orig Fri Apr 25 00:40:07 2014
-+++ configure.ac Sun Apr 27 12:07:50 2014
-@@ -554,6 +554,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Fri May 23 20:05:06 2014
configure.ac Tue May 27 20:35:49 2014
+@@ -557,6 +557,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2014/
dnl
dnl Try Qt4
dnl
-@@ -586,7 +604,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -589,7 +607,7 @@ AC_SUBST(POPPLER_QT4_LIBS)
AC_SUBST(POPPLER_QT4_TEST_LIBS)
if test x$enable_poppler_qt4 = xyes; then
@@ -35,7 +35,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2014/
AC_MSG_CHECKING([for Qt4 moc])
mocversion=`$MOCQT4 -v 2>&1`
update print/poppler
Update to poppler-0.26.0.
This breaks graphics/inkscape (patch for this will follow in a
separate mail).
Everything else still builds fine on amd64 (tested with dpb -uR).
Runtime testing done with gummi and a couple of pdf viewers (evince,
epdfview, apvlv).
ok?
Ciao,
Kili
ps: the only relevant change in patches/ is patches/patch-glib_poppler_h
(which is kind of funny, because without it, the build fails); all
other changes are only context changes.
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile3 Jan 2014 13:50:04 - 1.81
+++ Makefile28 Apr 2014 10:35:17 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.24.5
+V= 0.26.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,11 +14,11 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 20.0 # 44.0
-SHARED_LIBS += poppler-glib 13.0 # 14.0
+SHARED_LIBS += poppler 21.0 # 46.0
+SHARED_LIBS += poppler-glib 13.1 # 14.0
SHARED_LIBS += poppler-qt 12.0 # 3.0
-SHARED_LIBS += poppler-qt4 13.0 # 7.0
-SHARED_LIBS += poppler-cpp 5.0 # 2.0
+SHARED_LIBS += poppler-qt4 13.1 # 8.0
+SHARED_LIBS += poppler-cpp 6.0 # 2.0
DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo3 Jan 2014 13:50:04 - 1.32
+++ distinfo28 Apr 2014 10:35:17 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.24.5.tar.xz) = omVJEBAMkjxE42YkJJXiJtsnmCVPL6J4ETiGc0h1n4Q=
+SHA256 (poppler-0.26.0.tar.xz) = hUcDL8j/NLpfR7R+3f5n0PL/D/zc9dGJ9S3FFncMYh8=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.24.5.tar.xz) = 1512476
+SIZE (poppler-0.26.0.tar.xz) = 1591180
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in 15 Aug 2013 18:40:20 - 1.7
+++ patches/patch-Makefile_in 28 Apr 2014 10:35:17 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.7 2013/08/15 18:40:20 kili Exp $
Makefile.in.orig Mon Jul 29 19:13:28 2013
-+++ Makefile.inSat Aug 3 22:06:57 2013
-@@ -376,6 +376,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Fri Apr 25 00:42:56 2014
Makefile.inSun Apr 27 12:07:50 2014
+@@ -377,6 +377,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
-@@ -438,6 +440,8 @@ infodir = @infodir@
+@@ -439,6 +441,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -463,6 +467,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -464,6 +468,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
@BUILD_POPPLER_QT5_TRUE@qt5_subdir = qt5
@BUILD_POPPLER_QT5_TRUE@qt5_pc_file = poppler-qt5.pc
@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
-@@ -470,7 +476,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -471,7 +477,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
@BUILD_UTILS_TRUE@utils_subdir = utils
@@ -37,7 +37,7 @@ $OpenBSD: patch-Makefile_in,v 1.7 2013/0
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -515,6 +521,7 @@ pkgconfig_DATA = \
+@@ -516,6 +522,7 @@ pkgconfig_DATA = \
$(cairo_pc_file)\
$(splash_pc_file) \
$(glib_pc_file) \
@@ -45,7 +45,7 @@ $OpenBSD: patch-Makefile_i
update print/poppler
Update to poppler-0.24.3. Only bug fixes (no interface changes). Survived a bulk build on amd64, tested by aja@ with evince (and already ok@ aja). If there are no complaints, I'll commit this tomorrow morning. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.78 diff -u -p -r1.78 Makefile --- Makefile14 Sep 2013 09:51:59 - 1.78 +++ Makefile30 Oct 2013 18:16:06 - @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.24.1 +V= 0.24.3 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.29 diff -u -p -r1.29 distinfo --- distinfo14 Sep 2013 09:51:59 - 1.29 +++ distinfo30 Oct 2013 18:16:25 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.24.1.tar.xz) = XO/AGqAYS9krCzmZkitizwlZnrs9lfVTwvPeAnOO/8Y= +SHA256 (poppler-0.24.3.tar.xz) = 0s0CUJ5FgRffdTS2BwMXHVZ/JoZaubf5yExTcns1N04= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.24.1.tar.xz) = 1504620 +SIZE (poppler-0.24.3.tar.xz) = 1506152 Index: patches/patch-aclocal_m4 === RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v retrieving revision 1.4 diff -u -p -r1.4 patch-aclocal_m4 --- patches/patch-aclocal_m422 Jun 2013 20:16:46 - 1.4 +++ patches/patch-aclocal_m430 Oct 2013 18:28:31 - @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.4 2013/06/22 20:16:46 kili Exp $ aclocal.m4.origSun Jun 16 18:24:08 2013 -+++ aclocal.m4 Mon Jun 17 20:42:57 2013 -@@ -2202,6 +2202,7 @@ m4_include([m4/define-dir.m4]) +--- aclocal.m4.origSat Oct 26 19:07:31 2013 aclocal.m4 Wed Oct 30 19:28:17 2013 +@@ -2205,6 +2205,7 @@ m4_include([m4/define-dir.m4]) m4_include([m4/gtk-doc.m4]) m4_include([m4/iconv.m4]) m4_include([m4/introspection.m4])
update print/poppler (needs testing)
Hi,
here's an update to poppler-0.24.0. I didn't yet test it to death,
but I hope to do so during this week. It currently breaks
print/cups-filters (for which I'll send a fix in a few minutes) and
textproc/calibre.
It *may* break editors/libreoffice, which I refuse to give a try
here because of thermal problems (it's too fucking hot at my place).
General tests, tests for the -qt flavor (used by kdegraphics and
koffice) and suggestions (or even diffs) for calibre are welcome.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- Makefile22 Jun 2013 20:16:46 - 1.76
+++ Makefile5 Aug 2013 11:29:47 -
@@ -5,22 +5,22 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.22.5
+V= 0.24.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
PKGNAME-utils= poppler-utils-$V
PKGNAME-qt=poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
-OLDSHIT = poppler-0.16.7
+OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 18.0 # 37.0
-SHARED_LIBS += poppler-glib 12.0 # 14.0
-SHARED_LIBS += poppler-qt 11.0 # 3.0
-SHARED_LIBS += poppler-qt4 12.0 # 6.0
-SHARED_LIBS += poppler-cpp 4.0 # 2.0
+SHARED_LIBS += poppler 19.0 # 43.0
+SHARED_LIBS += poppler-glib 13.0 # 14.0
+SHARED_LIBS += poppler-qt 12.0 # 3.0
+SHARED_LIBS += poppler-qt4 13.0 # 7.0
+SHARED_LIBS += poppler-cpp 5.0 # 2.0
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
+DISTFILES = ${DISTNAME}.tar.xz ${OLDSHIT}.tar.gz
HOMEPAGE= http://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo22 Jun 2013 20:16:46 - 1.27
+++ distinfo5 Aug 2013 11:29:47 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.22.5.tar.gz) = 90KjkPG/SmgkUvWWeOYa3TqPK5gQJKL2yrunkWl26Bg=
+SHA256 (poppler-0.24.0.tar.xz) = vcUX6mSKP47L4HRaeftsv5p+LvZH1hVhVESc9QxtDCE=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.22.5.tar.gz) = 2239107
+SIZE (poppler-0.24.0.tar.xz) = 1503420
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in 22 Jun 2013 20:16:46 - 1.6
+++ patches/patch-Makefile_in 5 Aug 2013 11:29:47 -
@@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.6 2013/06/22 20:16:46 kili Exp $
Makefile.in.orig Sun Jun 16 18:24:09 2013
-+++ Makefile.inMon Jun 17 20:42:57 2013
-@@ -370,6 +370,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Mon Jul 29 19:13:28 2013
Makefile.inSat Aug 3 22:06:57 2013
+@@ -376,6 +376,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
+POPPLER_QT_CXXFLAGS = @POPPLER_QT_CXXFLAGS@
+POPPLER_QT_LIBS = @POPPLER_QT_LIBS@
- POPPLER_VERSION = @POPPLER_VERSION@
- PTHREAD_CC = @PTHREAD_CC@
- PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -426,6 +428,8 @@ infodir = @infodir@
+ POPPLER_QT5_CFLAGS = @POPPLER_QT5_CFLAGS@
+ POPPLER_QT5_CXXFLAGS = @POPPLER_QT5_CXXFLAGS@
+ POPPLER_QT5_LIBS = @POPPLER_QT5_LIBS@
+@@ -438,6 +440,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,31 +19,33 @@ $OpenBSD: patch-Makefile_in,v 1.6 2013/0
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -451,12 +455,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
+@@ -463,6 +467,8 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
+@BUILD_POPPLER_QT_TRUE@qt_subdir = qt
+@BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc
+ @BUILD_POPPLER_QT5_TRUE@qt5_subdir = qt5
+ @BUILD_POPPLER_QT5_TRUE@qt5_pc_file = poppler-qt5.pc
@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4
- @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc
+@@ -470,7 +476,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-te
@BUILD_POPPLER_CPP_TRUE@cpp_subdir = cpp
@BUILD_POPPLER_CPP_TRUE@cpp_pc_file = poppler-cpp.pc
@BUILD_UTILS_TRUE@utils_subdir = utils
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir)
test $(
Re: update print/poppler
On Tue, Jun 18, 2013 at 09:04:41AM +0200, Matthias Kilian wrote:
> ... so here's a preview update to 0.22.5.
s/preview //
Tested on amd64 with a couple of pdf viewers (*not* libreoffice or
koffice) feeding some file of my zombie pdf collection.
aja@ did some light testing, too, and is happy with it.
So this will go in next day if there are no complaints.
Ciao,
Kili
> Summaries of changes at http://poppler.freedesktop.org/releases.html
>
> There's an incompatible change in the constructor of CTStream, so
> libpoppler gets a moajor bump. I didn't spot any interface changes
> or extensions in the other libraries, so no bumps here.
>
> I also replaced the wantlib mess by a different wantlib mess.
>
> Not yet tested seriously (except for building it, comparing build
> logs, looking at diffs betwwen 0.22.2 and 0.22.5 etc.). I'll do
> some real tests (on amd64) until next weekend.
>
> Comments, test reports (and oks) are welcome.
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.75
> diff -u -p -r1.75 Makefile
> --- Makefile 4 Jun 2013 18:41:56 - 1.75
> +++ Makefile 17 Jun 2013 21:33:32 -
> @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
> COMMENT-qt4= qt4 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 0.22.2
> +V= 0.22.5
> DISTNAME=poppler-$V
> CATEGORIES= print
> PKGNAME-main=poppler-$V
> @@ -14,7 +14,7 @@ PKGNAME-qt= poppler-qt-$V
> PKGNAME-qt4= poppler-qt4-$V
> OLDSHIT = poppler-0.16.7
>
> -SHARED_LIBS += poppler 17.0 # 35.0
> +SHARED_LIBS += poppler 18.0 # 37.0
> SHARED_LIBS += poppler-glib 12.0 # 14.0
> SHARED_LIBS += poppler-qt 11.0 # 3.0
> SHARED_LIBS += poppler-qt4 12.0 # 6.0
> @@ -73,23 +73,20 @@ LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
> LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
> print/poppler
>
> -LIB_DEPENDS-utils=${MODGETTEXT_LIB_DEPENDS} \
> - print/poppler
> +LIB_DEPENDS-utils= print/poppler
>
> -WANTLIB-main=${cWANTLIB} Xext ffi \
> - gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
> - pixman-1 openjpeg \
> - X11 Xau Xdmcp Xrender cairo pcre png \
> - pthread-stubs xcb xcb-render lcms2 \
> - xcb-shm ${MODGETTEXT_WANTLIB}
> -WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
> -WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
> -Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui
> QtXml
> -WANTLIB-utils= X11 Xau Xdmcp Xext Xrender \
> - c cairo expat ffi fontconfig freetype glib-2.0 \
> - gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
> - pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
> - openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}
> +WANTLIB-main=${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
> + gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \
> + png pthread-stubs xcb xcb-render lcms2 xcb-shm \
> + ${MODGETTEXT_WANTLIB}
> +WANTLIB-qt= ${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
> + ${MODQT3_WANTLIB}
> +WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 \
> + Xext Xi Xinerama Xrender lcms2 openjpeg png poppler \
> + pthread-stubs QtCore QtGui QtXml
> +WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
> + png pthread-stubs xcb xcb-render xcb-shm openjpeg \
> + poppler z ${cWANTLIB}
>
> CONFIGURE_STYLE=autoconf
> AUTOCONF_VERSION=2.69
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.26
> diff -u -p -r1.26 distinfo
> --- distinfo 19 Mar 2013 19:58:06 - 1.26
> +++ distinfo 17 Jun 2013 21:33:32 -
> @@ -1,4 +1,4 @@
> SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
> -SHA256 (poppler-0.22.2.tar.gz) = EIc274QGkxf2xb6stSaPO3mez0AeNT4jlhF3Lq6KZi0=
> +SHA256 (poppler-0.22.5.tar.gz) = 90KjkPG/SmgkUvWWeOYa3TqPK5gQJKL2yrunkWl26Bg=
> SIZE (poppler-0.16.7.tar.gz) = 1952179
> -SIZE (poppler-0.22.2.tar.gz) = 2215737
> +SIZE (poppler-0.22.5.tar.gz) = 2239107
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-Makefile_in
> --- patches/patch-Makefile_in 27 Sep 2012 18:45:34 - 1.5
> +++ patches/patch-Makefile_in 17 Jun 2013 21:33:32 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Makefile_
update print/poppler
aja@ wants a new poppler, so here's a preview update to 0.22.5.
Summaries of changes at http://poppler.freedesktop.org/releases.html
There's an incompatible change in the constructor of CTStream, so
libpoppler gets a moajor bump. I didn't spot any interface changes
or extensions in the other libraries, so no bumps here.
I also replaced the wantlib mess by a different wantlib mess.
Not yet tested seriously (except for building it, comparing build
logs, looking at diffs betwwen 0.22.2 and 0.22.5 etc.). I'll do
some real tests (on amd64) until next weekend.
Comments, test reports (and oks) are welcome.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.75
diff -u -p -r1.75 Makefile
--- Makefile4 Jun 2013 18:41:56 - 1.75
+++ Makefile17 Jun 2013 21:33:32 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.22.2
+V= 0.22.5
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,7 +14,7 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 17.0 # 35.0
+SHARED_LIBS += poppler 18.0 # 37.0
SHARED_LIBS += poppler-glib 12.0 # 14.0
SHARED_LIBS += poppler-qt 11.0 # 3.0
SHARED_LIBS += poppler-qt4 12.0 # 6.0
@@ -73,23 +73,20 @@ LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
print/poppler
-LIB_DEPENDS-utils=${MODGETTEXT_LIB_DEPENDS} \
- print/poppler
+LIB_DEPENDS-utils= print/poppler
-WANTLIB-main= ${cWANTLIB} Xext ffi \
- gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
- pixman-1 openjpeg \
- X11 Xau Xdmcp Xrender cairo pcre png \
- pthread-stubs xcb xcb-render lcms2 \
- xcb-shm ${MODGETTEXT_WANTLIB}
-WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
-WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
-Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui QtXml
-WANTLIB-utils= X11 Xau Xdmcp Xext Xrender \
- c cairo expat ffi fontconfig freetype glib-2.0 \
- gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
- pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
- openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}
+WANTLIB-main= ${cWANTLIB} Xext ffi gio-2.0 glib-2.0 gmodule-2.0 \
+ gobject-2.0 pixman-1 openjpeg X11 Xrender cairo pcre \
+ png pthread-stubs xcb xcb-render lcms2 xcb-shm \
+ ${MODGETTEXT_WANTLIB}
+WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png pthread-stubs \
+ ${MODQT3_WANTLIB}
+WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 \
+ Xext Xi Xinerama Xrender lcms2 openjpeg png poppler \
+ pthread-stubs QtCore QtGui QtXml
+WANTLIB-utils= X11 Xext Xrender c cairo fontconfig lcms2 m pixman-1 \
+ png pthread-stubs xcb xcb-render xcb-shm openjpeg \
+ poppler z ${cWANTLIB}
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.69
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo19 Mar 2013 19:58:06 - 1.26
+++ distinfo17 Jun 2013 21:33:32 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.22.2.tar.gz) = EIc274QGkxf2xb6stSaPO3mez0AeNT4jlhF3Lq6KZi0=
+SHA256 (poppler-0.22.5.tar.gz) = 90KjkPG/SmgkUvWWeOYa3TqPK5gQJKL2yrunkWl26Bg=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.22.2.tar.gz) = 2215737
+SIZE (poppler-0.22.5.tar.gz) = 2239107
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 27 Sep 2012 18:45:34 - 1.5
+++ patches/patch-Makefile_in 17 Jun 2013 21:33:32 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2012/09/27 18:45:34 ajacoutot Exp $
Makefile.in.orig Mon Sep 10 19:33:11 2012
-+++ Makefile.inThu Sep 27 18:19:15 2012
-@@ -312,6 +312,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Sun Jun 16 18:24:09 2013
Makefile.inMon Jun 17 20:42:57 2013
+@@ -370,6 +370,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TES
update print/poppler
Update to poppler-0.22.2. Changes since 0.22.0: Release 0.22.2 core: * Correct rendering of underline and strike out annotations (Bug #61518) * Workaround broken jpeg stream definitions (Bug #61994) * SplashOutputDev: Restore CTM on early exits (Bug #61413) * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432) * Fix latin page labels. (Bug #61034) * Fix compilation with jpeglib9 * Fix minor valgrind warning utils: * pdfimages: Fix extraction of some images (Bug #61168) build system: * Fix the build with automake-1.13 Release 0.22.1 core: * Fix crash in some pdf files when extracting text (Bug #59561) * Fix crashes in wrongly formed files * Fix wrong warning when opening some files (Bug #58966) build system: * Improve autoconf jpeglib.h detection (Bug #59186) The constructor of class DCTStream got an additional third argument (an Object *dict), so I think libpoppler itself needs a major bump (and while writing this mail, I just noticed that this time even upstream applied a major bump). I didn't see any other incompatible changes, not even additions, in the other libraries. I successfully built the following ports on amd64 with it: editors/gummi editors/libreoffice editors/texmaker editors/texworks graphics/evince graphics/gimp/stable graphics/inkscape print/apvlv print/cups-filters print/epdfview print/py-poppler print/texlive/base productivity/impressive textproc/calibre textproc/zathura x11/kde/graphics3 x11/kde/office3 x11/xfce4/tumbler I did some manual tests on some evil pdf files with evince and epdfview. There may be a regression on one pdf file, I'll check tomorrow if this is a real regression. Anyway, tests, comments and oks are welcome. If you want to give it a try, don't forget to explicitely reset the flavor, i.e. run something like env FLAVOR= make ... or you'll end up without the qt and qt4 libraries. Ciao, Kili Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.72 diff -u -p -r1.72 Makefile --- Makefile11 Mar 2013 11:37:54 - 1.72 +++ Makefile18 Mar 2013 23:22:15 - @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.22.0 +V= 0.22.2 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -14,7 +14,7 @@ PKGNAME-qt= poppler-qt-$V PKGNAME-qt4= poppler-qt4-$V OLDSHIT = poppler-0.16.7 -SHARED_LIBS += poppler 16.0 # 34.0 +SHARED_LIBS += poppler 17.0 # 35.0 SHARED_LIBS += poppler-glib 12.0 # 14.0 SHARED_LIBS += poppler-qt 11.0 # 3.0 SHARED_LIBS += poppler-qt4 12.0 # 6.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- distinfo21 Jan 2013 19:08:00 - 1.25 +++ distinfo18 Mar 2013 23:22:15 - @@ -1,4 +1,4 @@ SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.22.0.tar.gz) = hGhFCRwtEl9bYDaA1ieoAHmoK5PRmfNMxJc2utXVueY= +SHA256 (poppler-0.22.2.tar.gz) = EIc274QGkxf2xb6stSaPO3mez0AeNT4jlhF3Lq6KZi0= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.22.0.tar.gz) = 2210986 +SIZE (poppler-0.22.2.tar.gz) = 2215737 Index: patches/patch-aclocal_m4 === RCS file: /cvs/ports/print/poppler/patches/patch-aclocal_m4,v retrieving revision 1.2 diff -u -p -r1.2 patch-aclocal_m4 --- patches/patch-aclocal_m413 Jul 2012 15:03:19 - 1.2 +++ patches/patch-aclocal_m418 Mar 2013 23:22:15 - @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.2 2012/07/13 15:03:19 kili Exp $ aclocal.m4.origSun Jun 10 20:45:31 2012 -+++ aclocal.m4 Mon Jul 9 14:47:58 2012 -@@ -2203,6 +2203,7 @@ m4_include([m4/define-dir.m4]) +--- aclocal.m4.origMon Mar 11 18:47:31 2013 aclocal.m4 Sun Mar 17 23:41:08 2013 +@@ -2191,6 +2191,7 @@ m4_include([m4/define-dir.m4]) m4_include([m4/gtk-doc.m4]) m4_include([m4/iconv.m4]) m4_include([m4/introspection.m4]) Index: patches/patch-configure_ac === RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure_ac --- patches/patch-configure_ac 21 Jan 2013 19:08:00 - 1.5 +++ patches/patch-configure_ac 18 Mar 2013 23:22:15 - @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2013/01/21 19:08:00 kili Exp $ configure.ac.orig Sat Dec 29 19:45:50 2012 -+++ configure.ac Fri Jan 18 19:23:0
update print/poppler
Update to poppler-0.22.0.
I successfully built the following ports with it on amd64:
editors/gummi
editors/texmaker
editors/texworks,-main
graphics/evince,-main
graphics/gimp/stable
graphics/inkscape
print/apvlv
print/epdfview
print/py-poppler
print/texlive/base
productivity/impressive
textproc/calibre
textproc/zathura
x11/kde/graphics3,-main
x11/kde/office3
x11/xfce4/tumbler
Tested gummi, evince, aplvl, epdfview, impressive, zathura, tumbler.
This one needs a patch I'll send in a separate mail:
print/cups-filters
I did not yet even try to build editors/libreoffice with it.
Please test/comment/ok.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile5 Nov 2012 19:32:27 - 1.70
+++ Makefile19 Jan 2013 19:08:40 -
@@ -5,24 +5,20 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.20.5
+V= 0.22.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
-REVISION-main= 0
PKGNAME-utils= poppler-utils-$V
-REVISION-utils=0
PKGNAME-qt=poppler-qt-$V
-REVISION-qt= 0
PKGNAME-qt4= poppler-qt4-$V
-REVISION-qt4= 0
OLDSHIT = poppler-0.16.7
-SHARED_LIBS += poppler 15.0 # 28.0
-SHARED_LIBS += poppler-glib 11.0 # 12.0
-SHARED_LIBS += poppler-qt 10.0 # 3.0
-SHARED_LIBS += poppler-qt4 11.0 # 4.0
-SHARED_LIBS += poppler-cpp 3.0 # 2.0
+SHARED_LIBS += poppler 16.0 # 34.0
+SHARED_LIBS += poppler-glib 12.0 # 14.0
+SHARED_LIBS += poppler-qt 11.0 # 3.0
+SHARED_LIBS += poppler-qt4 12.0 # 6.0
+SHARED_LIBS += poppler-cpp 4.0 # 2.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
@@ -83,17 +79,17 @@ LIB_DEPENDS-qt4=${MODQT4_LIB_DEPENDS} \
LIB_DEPENDS-utils=${MODGETTEXT_LIB_DEPENDS} \
print/poppler
-WANTLIB-main= ${cWANTLIB} Xext Xfixes ffi \
- glib-2.0 gobject-2.0 gthread-2.0 \
+WANTLIB-main= ${cWANTLIB} Xext ffi \
+ gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
pixman-1 openjpeg \
- X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
- pthread-stubs xcb xcb-render lcms2 GL Xxf86vm \
- drm xcb-shm ${MODGETTEXT_WANTLIB}
+ X11 Xau Xdmcp Xrender cairo pcre png \
+ pthread-stubs xcb xcb-render lcms2 \
+ xcb-shm ${MODGETTEXT_WANTLIB}
WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui QtXml
-WANTLIB-utils= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm \
- c cairo drm expat ffi fontconfig freetype glib-2.0 \
+WANTLIB-utils= X11 Xau Xdmcp Xext Xrender \
+ c cairo expat ffi fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- distinfo15 Oct 2012 17:44:33 - 1.24
+++ distinfo19 Jan 2013 19:08:40 -
@@ -1,4 +1,4 @@
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.20.5.tar.gz) = xtcEil8BHb3h9XnSG8/dZStHLZ0cYH3emqie/5YEVLY=
+SHA256 (poppler-0.22.0.tar.gz) = hGhFCRwtEl9bYDaA1ieoAHmoK5PRmfNMxJc2utXVueY=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.20.5.tar.gz) = 2158387
+SIZE (poppler-0.22.0.tar.gz) = 2210986
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure_ac
--- patches/patch-configure_ac 13 Jul 2012 15:03:19 - 1.4
+++ patches/patch-configure_ac 19 Jan 2013 19:08:40 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.4 2012/07/13 15:03:19 kili Exp $
configure.ac.orig Sun Jun 10 20:40:14 2012
-+++ configure.ac Mon Jul 9 14:49:52 2012
-@@ -564,6 +564,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
+--- configure.ac.orig Sat Dec 29 19:45:50 2012
configure.ac Fri Jan 18 19:23:07 2013
+@@ -565,6 +565,24 @@ AC_SUBST(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
@@ -26,7 +26,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2012/
dnl
dnl Try Qt4
dnl
-@@ -596,7 +614,7 @@ AC_SUB
update print/poppler-data
Update to poppler-data-0.4.6. Index: Makefile === RCS file: /cvs/ports/print/poppler-data/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile26 Nov 2011 19:51:13 - 1.10 +++ Makefile4 Nov 2012 18:22:04 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.10 2011/11/26 19:51:13 kili Exp $ COMMENT = encoding files for poppler -DISTNAME = poppler-data-0.4.5 +DISTNAME = poppler-data-0.4.6 CATEGORIES = print HOMEPAGE = http://poppler.freedesktop.org/ Index: distinfo === RCS file: /cvs/ports/print/poppler-data/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo26 Nov 2011 19:51:13 - 1.7 +++ distinfo4 Nov 2012 18:22:04 - @@ -1,5 +1,2 @@ -MD5 (poppler-data-0.4.5.tar.gz) = RI3XxQd1cONANAcGzvkxqg== -RMD160 (poppler-data-0.4.5.tar.gz) = V7cdf7BB/q3gSRPeZyOZ99ILD+Q= -SHA1 (poppler-data-0.4.5.tar.gz) = cDNyEyQVbeXcY1kwuZ7pc9nPj3Y= -SHA256 (poppler-data-0.4.5.tar.gz) = MZC8RXuv5LFY95oI6KPxgkAx7BKs78NZ5o4PBNoPcP0= -SIZE (poppler-data-0.4.5.tar.gz) = 4126275 +SHA256 (poppler-data-0.4.6.tar.gz) = 8waQHfpb2pDNZmPU7tscdzw8cJ3ngBjHnxKCssj5Cvo= +SIZE (poppler-data-0.4.6.tar.gz) = 4182141
update print/poppler
Update to poppler-0.20.3. Depending ports still build fine here (amd64 only -- I'm still not in the situtation to use my other hardware). Tested with some pdf viewers using poppler. Major bump for libpoppler, because of changes to classes PSOutputDev and Splash. Please test/comment/ok. Index: Makefile === RCS file: /cvs/ports/print/poppler/Makefile,v retrieving revision 1.65 diff -u -p -r1.65 Makefile --- Makefile1 Sep 2012 14:36:58 - 1.65 +++ Makefile1 Sep 2012 20:52:42 - @@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin COMMENT-qt4= qt4 interface to PDF rendering library COMMENT-utils= PDF conversion tools and utilities -V= 0.20.2 +V= 0.20.3 DISTNAME= poppler-$V CATEGORIES=print PKGNAME-main= poppler-$V @@ -14,9 +14,7 @@ PKGNAME-qt= poppler-qt-$V PKGNAME-qt4= poppler-qt4-$V OLDSHIT = poppler-0.16.7 -REVISION= 0 - -SHARED_LIBS += poppler 12.0 +SHARED_LIBS += poppler 13.0 SHARED_LIBS += poppler-cpp 2.0 SHARED_LIBS += poppler-glib 10.0 SHARED_LIBS += poppler-qt 9.0 Index: distinfo === RCS file: /cvs/ports/print/poppler/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo13 Jul 2012 15:03:19 - 1.21 +++ distinfo1 Sep 2012 20:52:42 - @@ -1,10 +1,4 @@ -MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg== -MD5 (poppler-0.20.2.tar.gz) = Rd0sFsjE0aOegw5FdFxOJQ== -RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww= -RMD160 (poppler-0.20.2.tar.gz) = i5NhqXLUPHySOYweIFXN9b4QwaI= -SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8= -SHA1 (poppler-0.20.2.tar.gz) = D3RbWT52TSeg4hZF5v69atitKrk= SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80= -SHA256 (poppler-0.20.2.tar.gz) = LevFA04OhUApV9hPsmdHN2WKPb6KPGMeF5Lj+MiM42k= +SHA256 (poppler-0.20.3.tar.gz) = L/71dvbegAKF4BZPJEuwyk8C1X82VA1ESaaej7i3KSM= SIZE (poppler-0.16.7.tar.gz) = 1952179 -SIZE (poppler-0.20.2.tar.gz) = 2146312 +SIZE (poppler-0.20.3.tar.gz) = 2144857
Re: update print/poppler
On Wed, Jul 11, 2012 at 06:13:32AM -0600, Matthias Kilian wrote: > Update to poppler-0.20.2. Builds on sparc64. I can let you know if it works when I go to work on Monday. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
update print/poppler
Update to poppler-0.20.2.
Mostly untested so far (I'm currently building ports depending on
it, and I already know that texlive/base needs patching).
I'd appreciate tests especially for the (legacy) poppler-qt subpackage
(kdegraphics and koffice). Of course, tests with other packages
using poppler are welcome, too.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile6 Jun 2012 18:27:34 - 1.62
+++ Makefile11 Jul 2012 12:11:31 -
@@ -5,7 +5,7 @@ COMMENT-qt= qt interface to PDF renderin
COMMENT-qt4= qt4 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 0.18.4
+V= 0.20.2
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -14,15 +14,11 @@ PKGNAME-qt= poppler-qt-$V
PKGNAME-qt4= poppler-qt4-$V
OLDSHIT = poppler-0.16.7
-REVISION-main= 0
-REVISION-qt= 0
-REVISION-qt4= 0
-
-SHARED_LIBS += poppler 11.0
-SHARED_LIBS += poppler-cpp 1.0
-SHARED_LIBS += poppler-glib 9.0
-SHARED_LIBS += poppler-qt 8.0
-SHARED_LIBS += poppler-qt4 8.0
+SHARED_LIBS += poppler 12.0
+SHARED_LIBS += poppler-cpp 2.0
+SHARED_LIBS += poppler-glib 10.0
+SHARED_LIBS += poppler-qt 9.0
+SHARED_LIBS += poppler-qt4 9.0
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} ${OLDSHIT}${EXTRACT_SUFX}
HOMEPAGE= http://poppler.freedesktop.org/
@@ -67,7 +63,7 @@ BUILD_DEPENDS+= devel/gobject-introspect
LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
devel/glib2 \
graphics/cairo \
- graphics/lcms \
+ graphics/lcms2 \
graphics/openjpeg \
graphics/png \
graphics/tiff
@@ -85,14 +81,14 @@ WANTLIB-main= ${cWANTLIB} Xext Xfixes ff
glib-2.0 gobject-2.0 gthread-2.0 \
pixman-1 openjpeg \
X11 Xau Xdamage Xdmcp Xrender cairo pcre png \
- pthread-stubs xcb xcb-render lcms GL Xxf86vm \
+ pthread-stubs xcb xcb-render lcms2 GL Xxf86vm \
drm xcb-shm ${MODGETTEXT_WANTLIB}
-WANTLIB-qt=${cWANTLIB} lcms openjpeg poppler png ${MODQT3_WANTLIB}
+WANTLIB-qt=${cWANTLIB} lcms2 openjpeg poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ${MODQT4_WANTLIB} ICE QtGui QtXml SM X11 Xext Xi \
-Xinerama Xrender lcms openjpeg png poppler QtCore QtGui QtXml
+Xinerama Xrender lcms2 openjpeg png poppler QtCore QtGui QtXml
WANTLIB-utils= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm \
c cairo drm expat ffi fontconfig freetype glib-2.0 \
- gobject-2.0 gthread-2.0 jpeg lcms m pcre pixman-1 png \
+ gobject-2.0 gthread-2.0 jpeg lcms2 m pcre pixman-1 png \
pthread pthread-stubs stdc++ tiff xcb xcb-render xcb-shm \
openjpeg poppler z ${cWANTLIB} ${MODGETTEXT_WANTLIB}
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo27 Mar 2012 06:31:05 - 1.20
+++ distinfo11 Jul 2012 12:11:31 -
@@ -1,10 +1,10 @@
MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg==
-MD5 (poppler-0.18.4.tar.gz) = EmWPMwhZflfz+v9TjMc7rw==
+MD5 (poppler-0.20.2.tar.gz) = Rd0sFsjE0aOegw5FdFxOJQ==
RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww=
-RMD160 (poppler-0.18.4.tar.gz) = FVMBfpsmDL1iTUPXf89BCvqlfko=
+RMD160 (poppler-0.20.2.tar.gz) = i5NhqXLUPHySOYweIFXN9b4QwaI=
SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8=
-SHA1 (poppler-0.18.4.tar.gz) = N1PK7Lpxr68p8JfgucUuD4OhClk=
+SHA1 (poppler-0.20.2.tar.gz) = D3RbWT52TSeg4hZF5v69atitKrk=
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.18.4.tar.gz) = M0IRSM3I4EPaKR3s4szhzqYiDUmlDADFbVbWQ1UB1C4=
+SHA256 (poppler-0.20.2.tar.gz) = LevFA04OhUApV9hPsmdHN2WKPb6KPGMeF5Lj+MiM42k=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.18.4.tar.gz) = 1992993
+SIZE (poppler-0.20.2.tar.gz) = 2146312
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 27 Mar 2012 06:31:05 - 1.3
+++ patches/patch-Makefile_in 11 Jul 2012 12:11:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.3 2012/03/27 06:31:05 kili Exp $
Makefile.in.orig Wed Feb 15 18:22:45 2012
-+++ Makefile.inMon Mar 26 06:01:36 2012
-@@ -276,6 +276,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Sun Jun 10 20:45:33 2012
Makefile.in
update print/poppler
Update to poppler-0.18.4.
No bumps for shared libs required, because there's no API/ABI change
(except for utils/HtmlOutputDev.{h,cc}, but that's only used by
pdftohtml and *not* included in any of the libaries).
Lightly tested on amd64 (with epdfview and evince on some parts of
my evil pdf file collection).
ok?
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile27 Feb 2012 18:53:58 - 1.60
+++ Makefile26 Mar 2012 18:51:20 -
@@ -4,11 +4,10 @@ COMMENT-main= PDF rendering library
COMMENT-qt=qt interface to PDF rendering library
COMMENT-qt4= qt4 interface to PDF rendering library
-V= 0.18.2
+V= 0.18.4
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
-REVISION-main= 0
FULLPKGNAME-qt=poppler-qt-$V
FULLPKGNAME-qt4=poppler-qt4-$V
OLDSHIT = poppler-0.16.7
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo10 Dec 2011 22:04:12 - 1.19
+++ distinfo26 Mar 2012 18:51:20 -
@@ -1,10 +1,10 @@
MD5 (poppler-0.16.7.tar.gz) = Ovoo48jE8GsPvKPJHgY5Tg==
-MD5 (poppler-0.18.2.tar.gz) = OGFpJ4I+8Bk3qrJoculX5A==
+MD5 (poppler-0.18.4.tar.gz) = EmWPMwhZflfz+v9TjMc7rw==
RMD160 (poppler-0.16.7.tar.gz) = J5Mw5v6vl6IH8zluqxr4NtPR8Ww=
-RMD160 (poppler-0.18.2.tar.gz) = X7Mi95/Zk0EIgYtEiMxvmAO6hiw=
+RMD160 (poppler-0.18.4.tar.gz) = FVMBfpsmDL1iTUPXf89BCvqlfko=
SHA1 (poppler-0.16.7.tar.gz) = Jsc1+GNoj2K1fVFZhj/a1Ccr6J8=
-SHA1 (poppler-0.18.2.tar.gz) = fvTuwg6EkCTAzdeknEKNIOs96HU=
+SHA1 (poppler-0.18.4.tar.gz) = N1PK7Lpxr68p8JfgucUuD4OhClk=
SHA256 (poppler-0.16.7.tar.gz) = +rTory001BQqcYgZ/XR9QJMLce9SDuDmvMlOLETyK80=
-SHA256 (poppler-0.18.2.tar.gz) = sV9rRh/SulnPmOZHUbom7cSpl2+Jb7IBnYs7GqjJW1I=
+SHA256 (poppler-0.18.4.tar.gz) = M0IRSM3I4EPaKR3s4szhzqYiDUmlDADFbVbWQ1UB1C4=
SIZE (poppler-0.16.7.tar.gz) = 1952179
-SIZE (poppler-0.18.2.tar.gz) = 1982853
+SIZE (poppler-0.18.4.tar.gz) = 1992993
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/print/poppler/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 10 Dec 2011 22:04:12 - 1.2
+++ patches/patch-Makefile_in 26 Mar 2012 18:51:20 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2011/12/10 22:04:12 kili Exp $
Makefile.in.orig Sun Dec 4 15:46:38 2011
-+++ Makefile.inFri Dec 9 20:57:20 2011
-@@ -274,6 +274,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
+--- Makefile.in.orig Wed Feb 15 18:22:45 2012
Makefile.inMon Mar 26 06:01:36 2012
+@@ -276,6 +276,8 @@ POPPLER_QT4_CXXFLAGS = @POPPLER_QT4_CXXFLAGS@
POPPLER_QT4_LIBS = @POPPLER_QT4_LIBS@
POPPLER_QT4_TEST_CFLAGS = @POPPLER_QT4_TEST_CFLAGS@
POPPLER_QT4_TEST_LIBS = @POPPLER_QT4_TEST_LIBS@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/1
POPPLER_VERSION = @POPPLER_VERSION@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-@@ -329,6 +331,8 @@ infodir = @infodir@
+@@ -331,6 +333,8 @@ infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/1
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -354,12 +358,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+@@ -356,12 +360,14 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
@BUILD_CAIRO_OUTPUT_TRUE@cairo_pc_file = poppler-cairo.pc
@BUILD_POPPLER_GLIB_TRUE@glib_subdir = glib
@BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/1
# Add CMake buildsystem files here so they get added on make dist
EXTRA_DIST = README-XPDF poppler.pc.in poppler-uninstalled.pc.in \
-@@ -397,6 +403,7 @@ pkgconfig_DATA = \
+@@ -399,6 +405,7 @@ pkgconfig_DATA = \
$(cairo_pc_file)\
$(splash_pc_file) \
$(glib_pc_file) \
@@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2011/1
$(qt4_pc_file) \
$(cpp_pc_file)
-@@ -470,6 +477,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
+@@ -472,6 +479,10 @@ poppler-splash-uninstalled.pc: $(top_builddir)/config.
poppler-glib.pc: $(top_builddir)/config.status $(srcdir)/poppler-glib.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
poppler-glib-uninstalled.pc: $(top_builddir)/config.status
$(srcdir)/poppler-glib-uninstalled.pc.in
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/print/poppler/patches/patch-configure_ac,v
retrieving revision 1
