update print/poppler

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

update print/poppler

Matthias Kilian
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
--- Makefile 11 Oct 2015 15:50:49 -0000 1.98
+++ Makefile 18 Nov 2015 20:16:15 -0000
@@ -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 -0000 1.47
+++ distinfo 18 Nov 2015 19:45:32 -0000
@@ -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 -0000 1.11
+++ patches/patch-Makefile_in 18 Nov 2015 19:45:32 -0000
@@ -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

Reply | Threaded
Open this post in threaded view
|

Re: update print/poppler

Antoine Jacoutot-7
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 -0000 1.98
> +++ Makefile 18 Nov 2015 20:16:15 -0000
> @@ -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 -0000 1.47
> +++ distinfo 18 Nov 2015 19:45:32 -0000
> @@ -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 -0000 1.11
> +++ patches/patch-Makefile_in 18 Nov 2015 19:45:32 -0000
> @@ -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

Reply | Threaded
Open this post in threaded view
|

Re: update print/poppler

Antoine Jacoutot-7
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@