FIX textproc/podofo

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

FIX textproc/podofo

Björn Ketelaars
jca@ found that textproc/podofo uses -std=c++98 but cppunit now uses
c++11 features for which ports-gcc insists that -std=c/gnu++11 should be
used.

/usr/local/include/c++/8.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard....

This issue has been addressed upstream [0]. Updating podofo to the
latest version is kind of a thing as it breaks one of the consumers [1].
As such, I propose to cherry-pick the fix.

OK?

[0] https://sourceforge.net/p/podofo/code/1826
[1] https://marc.info/?l=openbsd-ports&m=156512669427812&w=2


diff --git Makefile Makefile
index f4d66b611bf..5cd0e969e22 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT= library and tools to modify and parse PDF documents
 
 DISTNAME= podofo-0.9.5
-REVISION= 1
+REVISION= 2
 
 SHARED_LIBS += podofo                    2.0 # 0.9
 
diff --git patches/patch-CMakeLists_txt patches/patch-CMakeLists_txt
index 18dacdea78c..54d760c5b6d 100644
--- patches/patch-CMakeLists_txt
+++ patches/patch-CMakeLists_txt
@@ -1,12 +1,20 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.4 2017/02/07 15:10:10 sthen Exp $
---- CMakeLists.txt.orig Wed Feb  1 21:23:03 2017
-+++ CMakeLists.txt Tue Feb  7 14:51:41 2017
-@@ -298,7 +298,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+
+Do not force c++98 standard for GNUCXX compiler. Adapted from
+https://sourceforge.net/p/podofo/code/1826.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -296,9 +296,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+         SET(PODOFO_USE_VISIBILITY ${PODOFO_HAVE_GCC4})
+     ENDIF(NOT DEFINED PODOFO_USE_VISIBILITY)
 
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 -    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder")
-+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wreorder")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wreorder -Wno-deprecated-declarations")
 
      #
      # Note that we do not need debug definitions here. Set
diff --git pkg/PLIST pkg/PLIST
index 905eb627d4b..787fb017c3d 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -127,7 +127,7 @@ include/podofo/doc/PdfTilingPattern.h
 include/podofo/doc/PdfXObject.h
 include/podofo/podofo-base.h
 include/podofo/podofo.h
-lib/libpodofo.a
+@static-lib lib/libpodofo.a
 @lib lib/libpodofo.so.${LIBpodofo_VERSION}
 lib/pkgconfig/libpodofo-0.pc
 @man man/man1/podofobox.1

Reply | Threaded
Open this post in threaded view
|

Re: FIX textproc/podofo

Jeremie Courreges-Anglas-5

+cc sthen@ (maintainer)

On Sat, Dec 14 2019, Björn Ketelaars <[hidden email]> wrote:

> jca@ found that textproc/podofo uses -std=c++98 but cppunit now uses
> c++11 features for which ports-gcc insists that -std=c/gnu++11 should be
> used.
>
> /usr/local/include/c++/8.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard....
>
> This issue has been addressed upstream [0]. Updating podofo to the
> latest version is kind of a thing as it breaks one of the consumers [1].
> As such, I propose to cherry-pick the fix.
>
> OK?

With this podofo builds and packages on sparc64.  ok jca@

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: FIX textproc/podofo

Stuart Henderson
On 2019/12/14 17:28, Jeremie Courreges-Anglas wrote:
>
> +cc sthen@ (maintainer)

Thanks for the cc.

> On Sat, Dec 14 2019, Björn Ketelaars <[hidden email]> wrote:
> > jca@ found that textproc/podofo uses -std=c++98 but cppunit now uses
> > c++11 features for which ports-gcc insists that -std=c/gnu++11 should be
> > used.
> >
> > /usr/local/include/c++/8.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard....
> >
> > This issue has been addressed upstream [0]. Updating podofo to the
> > latest version is kind of a thing as it breaks one of the consumers [1].
> > As such, I propose to cherry-pick the fix.
> >
> > OK?
>
> With this podofo builds and packages on sparc64.  ok jca@

OK.