Re: [poppler] Build fail on Ubuntu 14.04

2016-09-27 Thread Jason Crain
On Tue, Sep 27, 2016 at 10:31:21PM +0200, Albert Astals Cid wrote:
> El dijous, 15 de setembre de 2016, a les 15:30:08 CEST, Jason Crain va 
> escriure:
> > On 2016-09-15, Alex Korobkin  wrote:
> > > poppler-document.cc:1521:25: error: invalid conversion from 'int' to
> > > 'GParamFlags' [-fpermissive]
> > > 
> > > G_PARAM_READWRITE));
> > 
> > ...
> > 
> > > Does it need a newer version of glib-2.0 since 0.47 release? Or am I
> > > missing something other library or reference?
> > 
> > It needs a newer version of glib.  See https://bugs.freedesktop.org/97432.
> > Old glib has G_PARAM_READWRITE as a #define and C++ doesn't like that.
> 
> Anyone knows what's that newer glib version so we can update the checks?

It's changed in commit 6c395244, in glib version 2.41.0.
___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler


[poppler] cmake/modules configure.ac utils/pdfinfo.1 utils/pdfinfo.cc

2016-09-27 Thread Adrian Johnson
 cmake/modules/PopplerMacros.cmake |2 
 configure.ac  |1 
 utils/pdfinfo.1   |4 -
 utils/pdfinfo.cc  |  140 --
 4 files changed, 2 insertions(+), 145 deletions(-)

New commits:
commit 86e50e156952713f0ce3ecc7b6f03f06dc0902c1
Author: Adrian Johnson 
Date:   Wed Sep 28 06:10:20 2016 +0930

Revert "pdfinfo: add -dests option to print named destinations"

This reverts commit 183dbf3249e8db2398b63a749eb010bc0a89dc35.

diff --git a/cmake/modules/PopplerMacros.cmake 
b/cmake/modules/PopplerMacros.cmake
index e9b75b9..6cadf40 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions 
-fno-check-new -fno-common")
   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 
-D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith 
-Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions 
-fno-check-new -fno-common")
 
-  set(CMAKE_CXX_FLAGS"-std=c++11 -Wnon-virtual-dtor 
-Woverloaded-virtual ${CMAKE_CXX_FLAGS}")
+  set(CMAKE_CXX_FLAGS"-Wnon-virtual-dtor -Woverloaded-virtual 
${CMAKE_CXX_FLAGS}")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
   set(CMAKE_CXX_FLAGS_RELEASE"-O2 -DNDEBUG")
   set(CMAKE_CXX_FLAGS_DEBUG  "-g -O2 -fno-reorder-blocks 
-fno-schedule-insns -fno-inline")
diff --git a/configure.ac b/configure.ac
index 9ce36e1..c4cfc2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,6 @@ AC_ARG_ENABLE(build-type,
   enable_build_type=no)
 
 if test "x$GCC" = "xyes"; then
-CXXFLAGS="-std=c++11 $CXXFLAGS"
 case "$enable_build_type" in
 relwithdebinfo)
 CFLAGS="-O2 -g $CFLAGS"
diff --git a/utils/pdfinfo.1 b/utils/pdfinfo.1
index b699dff..741219f 100644
--- a/utils/pdfinfo.1
+++ b/utils/pdfinfo.1
@@ -113,10 +113,6 @@ Prints dates in ISO-8601 format (including the time zone).
 .B \-rawdates
 Prints the raw (undecoded) date strings, directly from the PDF file.
 .TP
-.B \-dests
-Print a list of all named destinations. If a page range is specified using 
"\-f" and "\-l", only
-destinations in the page range are listed.
-.TP
 .BI \-enc " encoding-name"
 Sets the encoding to use for text output. This defaults to "UTF-8".
 .TP
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 50e756e..9cfdc0f 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #include "parseargs.h"
 #include "printencodings.h"
 #include "goo/GooString.h"
@@ -78,7 +77,6 @@ static GBool printHelp = gFalse;
 static GBool printEnc = gFalse;
 static GBool printStructure = gFalse;
 static GBool printStructureText = gFalse;
-static GBool printDests = gFalse;
 
 static const ArgDesc argDesc[] = {
   {"-f",  argInt,  ,0,
@@ -99,8 +97,6 @@ static const ArgDesc argDesc[] = {
"print the dates in ISO-8601 format"},
   {"-rawdates", argFlag,   , 0,
"print the undecoded date strings directly from the PDF file"},
-  {"-dests", argFlag,  ,   0,
-   "print all named destinations in the PDF"},
   {"-enc",argString,   textEncName,sizeof(textEncName),
"output text encoding name"},
   {"-listenc",argFlag, ,  0,
@@ -293,135 +289,6 @@ static void printStruct(const StructElement *element, 
unsigned indent) {
   }
 }
 
-struct RefCompare {
-  bool operator() (const Ref& lhs, const Ref& rhs) const {
-return lhs.num < rhs.num;
-  }
-};
-
-struct GooStringCompare {
-  bool operator() (GooString* lhs, GooString* rhs) const {
-return lhs->cmp(const_cast(rhs)) < 0;
-  }
-};
-
-static void printLinkDest(LinkDest *dest) {
-  char buf[100];
-
-  switch (dest->getKind()) {
-case destXYZ:
-  sprintf(buf, "[ XYZ ");
-  if (dest->getChangeLeft()) {
-   sprintf(buf+strlen(buf), "%4.f ", dest->getLeft());
-  } else {
-   strcat(buf, "null ");
-  }
-  if (dest->getChangeTop()) {
-   sprintf(buf+strlen(buf), "%4.f ", dest->getTop());
-  } else {
-   strcat(buf, "null ");
-  }
-  if (dest->getChangeZoom()) {
-   sprintf(buf+strlen(buf), "%4.2f ", dest->getZoom());
-  } else {
-   strcat(buf, "null ");
-  }
-  break;
-case destFit:
-  sprintf(buf, "[ Fit ");
-  break;
-case destFitH:
-  if (dest->getChangeTop()) {
-   sprintf(buf, "[ FitH %4.f ", dest->getTop());
-  } else {
-   sprintf(buf, "[ FitH null ");
-  }
-  break;
-case destFitV:
-  if (dest->getChangeLeft()) {
-   sprintf(buf, "[ FitV %4.f ", dest->getLeft());
-  } else {
-   strcat(buf, "[ FitV null ");
-  }
-  break;
-case destFitR:
-  sprintf(buf, "[ FitR %4.f %4.f %4.f %4.f ",
- dest->getLeft(),
- 

Re: [poppler] cmake/modules configure.ac utils/pdfinfo.1 utils/pdfinfo.cc

2016-09-27 Thread Albert Astals Cid
The discussion about C++11 was in my opinion not concluded, i.e. noone 
contacted the people that [wrongly] use core library about if they can use C+
+11, i'd prefer if you revert the change that needs C++11.

Cheers,
  Albert


El dissabte, 17 de setembre de 2016, a les 12:55:19 CEST, Adrian Johnson va 
escriure:
>  cmake/modules/PopplerMacros.cmake |2
>  configure.ac  |1
>  utils/pdfinfo.1   |4 +
>  utils/pdfinfo.cc  |  140
> +- 4 files changed, 145 insertions(+),
> 2 deletions(-)
> 
> New commits:
> commit 183dbf3249e8db2398b63a749eb010bc0a89dc35
> Author: Adrian Johnson 
> Date:   Sat Sep 17 22:08:23 2016 +0930
> 
> pdfinfo: add -dests option to print named destinations
> 
> Bug 97262
> 
> diff --git a/cmake/modules/PopplerMacros.cmake
> b/cmake/modules/PopplerMacros.cmake index 6cadf40..e9b75b9 100644
> --- a/cmake/modules/PopplerMacros.cmake
> +++ b/cmake/modules/PopplerMacros.cmake
> @@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
>set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions
> -fno-check-new -fno-common") set(DEFAULT_COMPILE_WARNINGS_KDE
> "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align
> -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security
> -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
> 
> -  set(CMAKE_CXX_FLAGS"-Wnon-virtual-dtor
> -Woverloaded-virtual ${CMAKE_CXX_FLAGS}") +  set(CMAKE_CXX_FLAGS   
> "-std=c++11 -Wnon-virtual-dtor -Woverloaded-virtual
> ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
>set(CMAKE_CXX_FLAGS_RELEASE"-O2 -DNDEBUG")
>set(CMAKE_CXX_FLAGS_DEBUG  "-g -O2 -fno-reorder-blocks
> -fno-schedule-insns -fno-inline") diff --git a/configure.ac b/configure.ac
> index c4cfc2c..9ce36e1 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -85,6 +85,7 @@ AC_ARG_ENABLE(build-type,
>enable_build_type=no)
> 
>  if test "x$GCC" = "xyes"; then
> +CXXFLAGS="-std=c++11 $CXXFLAGS"
>  case "$enable_build_type" in
>  relwithdebinfo)
>  CFLAGS="-O2 -g $CFLAGS"
> diff --git a/utils/pdfinfo.1 b/utils/pdfinfo.1
> index 741219f..b699dff 100644
> --- a/utils/pdfinfo.1
> +++ b/utils/pdfinfo.1
> @@ -113,6 +113,10 @@ Prints dates in ISO-8601 format (including the time
> zone). .B \-rawdates
>  Prints the raw (undecoded) date strings, directly from the PDF file.
>  .TP
> +.B \-dests
> +Print a list of all named destinations. If a page range is specified using
> "\-f" and "\-l", only +destinations in the page range are listed.
> +.TP
>  .BI \-enc " encoding-name"
>  Sets the encoding to use for text output. This defaults to "UTF-8".
>  .TP
> diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
> index 9cfdc0f..50e756e 100644
> --- a/utils/pdfinfo.cc
> +++ b/utils/pdfinfo.cc
> @@ -36,6 +36,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "parseargs.h"
>  #include "printencodings.h"
>  #include "goo/GooString.h"
> @@ -77,6 +78,7 @@ static GBool printHelp = gFalse;
>  static GBool printEnc = gFalse;
>  static GBool printStructure = gFalse;
>  static GBool printStructureText = gFalse;
> +static GBool printDests = gFalse;
> 
>  static const ArgDesc argDesc[] = {
>{"-f",  argInt,  ,0,
> @@ -97,6 +99,8 @@ static const ArgDesc argDesc[] = {
> "print the dates in ISO-8601 format"},
>{"-rawdates", argFlag,   , 0,
> "print the undecoded date strings directly from the PDF file"},
> +  {"-dests", argFlag,  ,   0,
> +   "print all named destinations in the PDF"},
>{"-enc",argString,   textEncName,sizeof(textEncName),
> "output text encoding name"},
>{"-listenc",argFlag, ,  0,
> @@ -289,6 +293,135 @@ static void printStruct(const StructElement *element,
> unsigned indent) { }
>  }
> 
> +struct RefCompare {
> +  bool operator() (const Ref& lhs, const Ref& rhs) const {
> +return lhs.num < rhs.num;
> +  }
> +};
> +
> +struct GooStringCompare {
> +  bool operator() (GooString* lhs, GooString* rhs) const {
> +return lhs->cmp(const_cast(rhs)) < 0;
> +  }
> +};
> +
> +static void printLinkDest(LinkDest *dest) {
> +  char buf[100];
> +
> +  switch (dest->getKind()) {
> +case destXYZ:
> +  sprintf(buf, "[ XYZ ");
> +  if (dest->getChangeLeft()) {
> + sprintf(buf+strlen(buf), "%4.f ", dest->getLeft());
> +  } else {
> + strcat(buf, "null ");
> +  }
> +  if (dest->getChangeTop()) {
> + sprintf(buf+strlen(buf), "%4.f ", dest->getTop());
> +  } else {
> + strcat(buf, "null ");
> +  }
> +  if (dest->getChangeZoom()) {
> + sprintf(buf+strlen(buf), "%4.2f ", dest->getZoom());
> +  } else {
> + strcat(buf, "null ");
> +  }
> +  break;
> +case destFit:
> +  sprintf(buf, "[ Fit ");
> +  break;
> +case destFitH:
> 

Re: [poppler] Build fail on Ubuntu 14.04

2016-09-27 Thread Albert Astals Cid
El dijous, 15 de setembre de 2016, a les 15:30:08 CEST, Jason Crain va 
escriure:
> On 2016-09-15, Alex Korobkin  wrote:
> > poppler-document.cc:1521:25: error: invalid conversion from 'int' to
> > 'GParamFlags' [-fpermissive]
> > 
> > G_PARAM_READWRITE));
> 
> ...
> 
> > Does it need a newer version of glib-2.0 since 0.47 release? Or am I
> > missing something other library or reference?
> 
> It needs a newer version of glib.  See https://bugs.freedesktop.org/97432.
> Old glib has G_PARAM_READWRITE as a #define and C++ doesn't like that.

Anyone knows what's that newer glib version so we can update the checks?

Cheers,
  Albert

> ___
> poppler mailing list
> poppler@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/poppler


___
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler