4 files changed, 4 insertions, 113 deletions
diff --git a/print/podofo/patches/patch-CMakeLists.txt b/print/podofo/patches/patch-CMakeLists.txt
index 6e446963bd1..218d18ffd2b 100644
--- a/print/podofo/patches/patch-CMakeLists.txt
+++ b/print/podofo/patches/patch-CMakeLists.txt
@@ -1,45 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2016/08/01 13:39:34 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2019/11/09 12:33:29 nia Exp $
 
-Make LUA optional (PR/43054). Make sure man pages are installed
-at the right place.
-Dont look for CppUnit as we dont want to build tests.
+Install man pages to correct directory.
 
---- CMakeLists.txt.orig	2016-06-08 20:55:08.000000000 +0000
+--- CMakeLists.txt.orig	2018-07-08 10:33:27.000000000 +0000
 +++ CMakeLists.txt
-@@ -377,7 +377,7 @@ ENDIF(PNG_FOUND)
- 
- IF(NOT PODOFO_BUILD_LIB_ONLY)
- 
--FIND_PACKAGE(CppUnit)
-+# FIND_PACKAGE(CppUnit)
- 
- IF(CppUnit_FOUND)
-   MESSAGE("Found cppunit. Unit tests will be built.")
-@@ -426,7 +426,9 @@ ELSE(WANT_FONTCONFIG)
- ENDIF(WANT_FONTCONFIG)
- 
- IF(NOT PODOFO_BUILD_LIB_ONLY)
--FIND_PACKAGE(LUA)
-+IF(DEFINED LUA_ENABLED)
-+	FIND_PACKAGE(LUA)
-+ENDIF(DEFINED LUA_ENABLED)
- IF(LUA_FOUND)
- 	# If we have lua, we can build podofoimpose.
- 	MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
-@@ -502,15 +504,16 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
-   INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
- ENDIF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
- 
--SET(PODOFO_LIB
--    podofo
--    ${PODOFO_LIB_DEPENDS}
--    )
-+IF(DEFINED PODOFO_BUILD_SHARED)
-+	SET(PODOFO_LIB podofo_shared ${PODOFO_LIB_DEPENDS})
-+ELSE(DEFINED PODOFO_BUILD_SHARED)
-+	SET(PODOFO_LIB podofo_static ${PODOFO_LIB_DEPENDS})
-+ENDIF(DEFINED PODOFO_BUILD_SHARED)
- 
+@@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
  #
  # Setup directories we will need
  #
diff --git a/print/podofo/patches/patch-src_base_PdfCompilerCompat.h b/print/podofo/patches/patch-src_base_PdfCompilerCompat.h
deleted file mode 100644
index 26b33e6de23..00000000000
--- a/print/podofo/patches/patch-src_base_PdfCompilerCompat.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-src_base_PdfCompilerCompat.h,v 1.3 2017/09/25 22:26:27 joerg Exp $
-
-Ensure alloca exists, even in standard modes on NetBSD.
-
-Merge r1825.
-
---- src/base/PdfCompilerCompat.h.orig	2017-01-11 20:32:50.000000000 +0000
-+++ src/base/PdfCompilerCompat.h
-@@ -74,6 +74,9 @@
- #if defined(_WIN32)
- #include <malloc.h>
- #endif
-+#ifdef __NetBSD__
-+#define	alloca	__builtin_alloca
-+#endif
- 
- // Disable usage of min() and max() macros 
- #if defined(_WIN32) && !defined(__MINGW32__)
-@@ -198,16 +201,6 @@ namespace PoDoFo {
- 
- #endif // defined(_WIN32)
- 
--// Visual C++ 2015 (_MSC_VER 1900) still uses __cplusplus = 199711 so, we need both tests
--// this shrinks enum types from sizeof(int) to sizeof(char) which creates significant
--// space savings on PdfObject / PdfVariant
--#if (defined(_MSC_VER) && _MSC_VER < 1900) || (!defined(_MSC_VER) &&  __cplusplus < 201103)
--#define PODOFO_ENUM_UINT8
--#else 
--#define PODOFO_ENUM_UINT8	: uint8_t
--#endif 
--
--
- /**
-  * \page PoDoFo PdfCompilerCompat Header
-  * 
diff --git a/print/podofo/patches/patch-src_base_PdfDefines.h b/print/podofo/patches/patch-src_base_PdfDefines.h
deleted file mode 100644
index 158a30805e2..00000000000
--- a/print/podofo/patches/patch-src_base_PdfDefines.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_base_PdfDefines.h,v 1.1 2017/09/25 22:26:27 joerg Exp $
-
-Merge r1825.
-
---- src/base/PdfDefines.h.orig	2017-09-25 13:21:28.667585186 +0000
-+++ src/base/PdfDefines.h
-@@ -194,7 +194,7 @@ const EPdfWriteMode ePdfWriteMode_Defaul
-  *
-  * Remember to update PdfVariant::GetDataTypeString() when adding members here.
-  */
--enum EPdfDataType PODOFO_ENUM_UINT8 {
-+enum EPdfDataType {
-     ePdfDataType_Bool,                  /**< Boolean datatype: Accepts the values "true" and "false" */
-     ePdfDataType_Number,                /**< Number datatype for integer values */
-     ePdfDataType_Real,                  /**< Real datatype for floating point numbers */
diff --git a/print/podofo/patches/patch-src_base_PdfVariant.h b/print/podofo/patches/patch-src_base_PdfVariant.h
deleted file mode 100644
index ef327b72c6c..00000000000
--- a/print/podofo/patches/patch-src_base_PdfVariant.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_base_PdfVariant.h,v 1.1 2017/09/25 22:26:27 joerg Exp $
-
-Merge r1825.
-
---- src/base/PdfVariant.h.orig	2017-09-25 13:20:57.927586504 +0000
-+++ src/base/PdfVariant.h
-@@ -513,7 +513,7 @@ class PODOFO_API PdfVariant {
-      *  required to access the correct member of 
-      *  the union UVariant.
-      */
--    EPdfDataType m_eDataType;
-+    pdf_int8 m_eDataType;
- 
-     // No touchy. Only for use by PdfVariant's internal tracking of the delayed
-     // loading state. Use DelayedLoadDone() to test this if you need to.
-@@ -574,7 +574,7 @@ EPdfDataType PdfVariant::GetDataType() c
- {
-     DelayedLoad();
- 
--    return m_eDataType;
-+    return static_cast<EPdfDataType>(m_eDataType);
- }
- 
- // -----------------------------------------------------