Attachment 1202610 Details for Bug 1197901 – An alternate patch to updated to podofo, also allow building on EL7 as well

[patch] An alternate patch to updated to podofo, also allow building on EL7 as well

0001-Update-to-podofo-v0.9.4-allow-spec-build-on-EL7-as-w.patch (text/plain), 10.25 KB, created by Dax Kelson on 2016-09-19 18:23:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dax Kelson

Created: 2016-09-19 18:23:35 UTC

Size: 10.25 KB

patch

obsolete

>From c185f413625da0deb66d7d7202b74cbe81f228bc Mon Sep 17 00:00:00 2001
>From: Dax Kelson <dkelson@gurulabs.com>
>Date: Tue, 13 Sep 2016 15:12:27 -0600
>Subject: [PATCH] Update to podofo v0.9.4, allow spec build on EL7 as well
>
>---
> podofo-0.9.1-freetype.patch |  23 ----------
> podofo-0.9.1-lua52.patch    | 100 --------------------------------------------
> podofo-0.9.1-unistd.patch   |  11 -----
> podofo-0.9.4-SIZE_MAX.patch |  28 +++++++++++++
> podofo-0.9.4-freetype.patch |  22 ++++++++++
> podofo.spec                 |  30 +++++++------
> sources                     |   2 +-
> 7 files changed, 69 insertions(+), 147 deletions(-)
> delete mode 100644 podofo-0.9.1-freetype.patch
> delete mode 100644 podofo-0.9.1-lua52.patch
> delete mode 100644 podofo-0.9.1-unistd.patch
> create mode 100644 podofo-0.9.4-SIZE_MAX.patch
> create mode 100644 podofo-0.9.4-freetype.patch
>
>diff --git a/podofo-0.9.1-freetype.patch b/podofo-0.9.1-freetype.patch
>deleted file mode 100644
>index 3035038..0000000
>--- a/podofo-0.9.1-freetype.patch
>+++ /dev/null
>@@ -1,23 +0,0 @@
>-diff -up podofo-0.9.1/CMakeLists.txt.freetype podofo-0.9.1/CMakeLists.txt
>---- podofo-0.9.1/CMakeLists.txt.freetype	2011-04-26 20:02:47.000000000 +0200
>-+++ podofo-0.9.1/CMakeLists.txt	2014-06-10 13:53:44.563899433 +0200
>-@@ -351,8 +351,8 @@ ENDIF(CppUnit_FOUND)
>- 
>- FIND_PACKAGE(OpenSSL)
>- 
>--FIND_PACKAGE(FREETYPE REQUIRED)
>--MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}")
>-+FIND_PACKAGE(Freetype REQUIRED)
>-+MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIRS}")
>- 
>- FIND_PACKAGE(LIBSTLPORT)
>- SET(stlport_libraries_if_use_stlport)
>-@@ -448,7 +448,7 @@ INCLUDE_DIRECTORIES(
>-     ${PoDoFo_BINARY_DIR}
>-     ${PoDoFo_SOURCE_DIR}
>-     ${PoDoFo_SOURCE_DIR}/src
>--    ${FREETYPE_INCLUDE_DIR}
>-+    ${FREETYPE_INCLUDE_DIRS}
>-     ${ZLIB_INCLUDE_DIR}
>-     ${EXTRA_INCLUDES}
>-      )
>diff --git a/podofo-0.9.1-lua52.patch b/podofo-0.9.1-lua52.patch
>deleted file mode 100644
>index 8f59c1e..0000000
>--- a/podofo-0.9.1-lua52.patch
>+++ /dev/null
>@@ -1,100 +0,0 @@
>-diff -up podofo-0.9.1/tools/podofocolor/lua_compat.h.lua52 podofo-0.9.1/tools/podofocolor/lua_compat.h
>---- podofo-0.9.1/tools/podofocolor/lua_compat.h.lua52	2010-12-29 18:36:59.000000000 +0100
>-+++ podofo-0.9.1/tools/podofocolor/lua_compat.h	2013-08-20 16:23:00.356712464 +0200
>-@@ -11,14 +11,38 @@ extern "C" {
>- #define LUA_VERSION_NUM 0
>- #endif
>- 
>--// Handle an API difference in the dofile call between
>-+// Handle an API difference in the lua_open call between
>-+// Lua 5.1 and Lua 5.2.
>-+#if LUA_VERSION_NUM >= 502
>-+inline lua_State* imp_lua_open(void) {
>-+    return luaL_newstate();
>-+}
>-+inline size_t imp_lua_objlen(lua_State *L, int index) {
>-+    return lua_rawlen(L, index);
>-+}
>-+#else
>-+inline lua_State* imp_lua_open(void) {
>-+    return lua_open();
>-+}
>-+inline size_t imp_lua_objlen(lua_State *L, int index) {
>-+    return lua_objlen(L, index);
>-+}
>-+#endif
>-+
>-+// Handle an API difference in the dofile and getn calls between
>- // Lua 5.0 and Lua 5.1.
>- #if LUA_VERSION_NUM >= 501
>- inline int imp_lua_dofile(lua_State* L, const char * path) {
>-     return luaL_dofile(L, path);
>- }
>-+inline int imp_lua_getn(lua_State *L, int t) {
>-+    return imp_lua_objlen(L, t);
>-+}
>- #else
>- inline int imp_lua_dofile(lua_State* L, const char * path) {
>-     return lua_dofile(L, path);
>- }
>-+inline int imp_lua_getn(lua_State *L, int t) {
>-+    return luaL_getn(L, t);
>-+}
>- #endif
>-diff -up podofo-0.9.1/tools/podofocolor/luaconverter.cpp.lua52 podofo-0.9.1/tools/podofocolor/luaconverter.cpp
>---- podofo-0.9.1/tools/podofocolor/luaconverter.cpp.lua52	2010-12-29 19:08:31.000000000 +0100
>-+++ podofo-0.9.1/tools/podofocolor/luaconverter.cpp	2013-08-20 16:23:00.356712464 +0200
>-@@ -44,7 +44,7 @@ using namespace PoDoFo;
>- LuaMachina::LuaMachina()
>- {
>- 	/* Init the Lua interpreter */
>--	L = lua_open();
>-+	L = imp_lua_open();
>- 	if (!L)
>- 	{
>- 		throw std::runtime_error("Whoops! Failed to open lua!");
>-@@ -117,7 +117,7 @@ PdfColor LuaConverter::GetColorFromRetur
>-     size_t len;
>- 
>-     luaL_checktype(m_machina.State(), 1, LUA_TTABLE);
>--    len = luaL_getn( m_machina.State(), -1 );
>-+    len = imp_lua_getn( m_machina.State(), -1 );
>-     // Lua 5.1 only
>-     //len = lua_objlen( m_machina.State(), -1 );
>- 
>-diff -up podofo-0.9.1/tools/podofoimpose/lua_compat.h.lua52 podofo-0.9.1/tools/podofoimpose/lua_compat.h
>---- podofo-0.9.1/tools/podofoimpose/lua_compat.h.lua52	2008-10-16 11:10:18.000000000 +0200
>-+++ podofo-0.9.1/tools/podofoimpose/lua_compat.h	2013-08-20 16:23:00.357712447 +0200
>-@@ -11,7 +11,19 @@ extern "C" {
>- #define LUA_VERSION_NUM 0
>- #endif
>- 
>--// Handle an API difference in the dofile call between
>-+// Handle an API difference in the lua_open call between
>-+// Lua 5.1 and Lua 5.2.
>-+#if LUA_VERSION_NUM >= 502
>-+inline lua_State* imp_lua_open(void) {
>-+    return luaL_newstate();
>-+}
>-+#else
>-+inline lua_State* imp_lua_open(void) {
>-+    return lua_open();
>-+}
>-+#endif
>-+
>-+// Handle an API difference in the dofile and getn calls between
>- // Lua 5.0 and Lua 5.1.
>- #if LUA_VERSION_NUM >= 501
>- inline int imp_lua_dofile(lua_State* L, const char * path) {
>-diff -up podofo-0.9.1/tools/podofoimpose/planreader_lua.cpp.lua52 podofo-0.9.1/tools/podofoimpose/planreader_lua.cpp
>---- podofo-0.9.1/tools/podofoimpose/planreader_lua.cpp.lua52	2013-08-20 16:23:00.357712447 +0200
>-+++ podofo-0.9.1/tools/podofoimpose/planreader_lua.cpp	2013-08-20 16:24:50.856848739 +0200
>-@@ -24,7 +24,7 @@ LuaMachina::LuaMachina()
>- {
>- 	int error;
>- 	/* Init the Lua interpreter */
>--	L = lua_open();
>-+	L = imp_lua_open();
>- 	if (!L)
>- 	{
>- 		throw std::runtime_error("Whoops! Failed to open lua!");
>diff --git a/podofo-0.9.1-unistd.patch b/podofo-0.9.1-unistd.patch
>deleted file mode 100644
>index 5cb9ad6..0000000
>--- a/podofo-0.9.1-unistd.patch
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-diff -up podofo-0.9.1/test/unit/TestUtils.cpp.unistd podofo-0.9.1/test/unit/TestUtils.cpp
>---- podofo-0.9.1/test/unit/TestUtils.cpp.unistd	2012-01-16 18:12:52.000000000 +0100
>-+++ podofo-0.9.1/test/unit/TestUtils.cpp	2012-01-16 18:13:00.000000000 +0100
>-@@ -23,6 +23,7 @@
>- #include <stdio.h>
>- #include <stdlib.h>
>- #include <string.h>
>-+#include <unistd.h>
>- 
>- #if defined(_WIN32) || defined(_WIN64)
>- #include <windows.h>
>diff --git a/podofo-0.9.4-SIZE_MAX.patch b/podofo-0.9.4-SIZE_MAX.patch
>new file mode 100644
>index 0000000..7525626
>--- /dev/null
>+++ b/podofo-0.9.4-SIZE_MAX.patch
>@@ -0,0 +1,28 @@
>+diff -ur podofo-0.9.4/src/base/PdfMemoryManagement.h podofo-0.9.4-centos7/src/base/PdfMemoryManagement.h
>+--- podofo-0.9.4/src/base/PdfMemoryManagement.h	2016-05-13 08:04:34.000000000 -0600
>++++ podofo-0.9.4-centos7/src/base/PdfMemoryManagement.h	2016-09-13 14:27:49.184230658 -0600
>+@@ -34,6 +34,10 @@
>+ #ifndef _PDF_MEMORY_MANAGEMENT_H_
>+ #define _PDF_MEMORY_MANAGEMENT_H_
>+ 
>++#ifndef __STDC_LIMIT_MACROS
>++#define __STDC_LIMIT_MACROS
>++#endif
>++
>+ #include "PdfDefines.h"
>+ #include <stdlib.h>
>+ 
>+diff -ur podofo-0.9.4/src/base/PdfParser.h podofo-0.9.4-centos7/src/base/PdfParser.h
>+--- podofo-0.9.4/src/base/PdfParser.h	2016-05-08 11:03:27.000000000 -0600
>++++ podofo-0.9.4-centos7/src/base/PdfParser.h	2016-09-13 14:33:09.995802817 -0600
>+@@ -34,6 +34,10 @@
>+ #ifndef _PDF_PARSER_H_
>+ #define _PDF_PARSER_H_
>+ 
>++#ifndef __STDC_LIMIT_MACROS
>++#define __STDC_LIMIT_MACROS
>++#endif
>++
>+ #include "PdfDefines.h"
>+ #include "PdfTokenizer.h"
>+ #include "PdfVecObjects.h"
>diff --git a/podofo-0.9.4-freetype.patch b/podofo-0.9.4-freetype.patch
>new file mode 100644
>index 0000000..67d406e
>--- /dev/null
>+++ b/podofo-0.9.4-freetype.patch
>@@ -0,0 +1,22 @@
>+--- podofo-0.9.4/CMakeLists.txt.freetype	2016-09-13 14:13:48.461502544 -0600
>++++ podofo-0.9.4/CMakeLists.txt	2016-09-13 14:14:22.364258955 -0600
>+@@ -391,8 +391,8 @@
>+ 
>+ FIND_PACKAGE(OpenSSL)
>+ 
>+-FIND_PACKAGE(FREETYPE REQUIRED)
>+-MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIR}")
>++FIND_PACKAGE(Freetype REQUIRED)
>++MESSAGE("Found freetype library at ${FREETYPE_LIBRARIES}, headers ${FREETYPE_INCLUDE_DIRS}")
>+ 
>+ FIND_PACKAGE(LIBSTLPORT)
>+ SET(stlport_libraries_if_use_stlport)
>+@@ -471,7 +471,7 @@
>+ 
>+ INCLUDE_DIRECTORIES(
>+     ${PoDoFo_SOURCE_DIR}/src
>+-    ${FREETYPE_INCLUDE_DIR}
>++    ${FREETYPE_INCLUDE_DIRS}
>+     ${ZLIB_INCLUDE_DIR}
>+     ${EXTRA_INCLUDES}
>+      )
>diff --git a/podofo.spec b/podofo.spec
>index 2d25dcb..3f97c6f 100644
>--- a/podofo.spec
>+++ b/podofo.spec
>@@ -1,16 +1,16 @@
> Name:           podofo
>-Version:        0.9.1
>-Release:        18%{?dist}
>+Version:        0.9.4
>+Release:        1%{?dist}
> Summary:        Tools and libraries to work with the PDF file format
> 
> Group:          Applications/Publishing
> License:        GPLv2+
> URL:            http://podofo.sourceforge.net
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
>-Patch0:         %{name}-0.9.1-unistd.patch
>-Patch1:         %{name}-0.9.1-lua52.patch
>-Patch2:         %{name}-0.9.1-freetype.patch
>+Patch0:         %{name}-0.9.4-freetype.patch
>+Patch1:         %{name}-0.9.4-SIZE_MAX.patch
> 
>+%{?el7:BuildRequires: cmake3}
> BuildRequires:  cmake
> BuildRequires:  zlib-devel
> BuildRequires:  libjpeg-devel
>@@ -58,9 +58,10 @@ Development files and documentation for the %{name} library.
> 
> %prep
> %setup -q
>-%patch0 -p1 -b .unistd
>-%patch1 -p1 -b .lua52
>-%patch2 -p1 -b .freetype
>+%patch0 -p1 -b .freetype
>+%if %{?el7:1}%{!?el7:0}
>+%patch1 -p1 -b .SIZE_MAX
>+%endif
> 
> # disable timestamps in docs
> echo "HTML_TIMESTAMP = NO" >> Doxyfile
>@@ -71,11 +72,12 @@ rm cmake/modules/FindZLIB.cmake
> 
> 
> %build
>-%cmake -DPODOFO_BUILD_SHARED=1 \
>-%if 0%{?__isa_bits} == 64
>--DWANT_LIB64=1 \
>+
>+%if %{?el7:1}%{!?el7:0}
>+%cmake3 -DPODOFO_BUILD_SHARED=1 -DWANT_LIB64=1 .
>+%else
>+%cmake -DPODOFO_BUILD_SHARED=1 -DWANT_LIB64=1 .
> %endif
>-.
> make %{?_smp_mflags}
> 
> # build the docs
>@@ -110,6 +112,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Tue Sep 13 2016 Dax Kelson <dkelson[at]gurulabs.com> - 0.9.4-1
>+- Update to v0.9.4, redo patches
>+- Also spec to build on EL7 as well
>+
> * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-18
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 26bc8bf..d224a09 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-cec586ab69f92bc88d38b5d4b8eee5a0  podofo-0.9.1.tar.gz
>+929c9d2bd367fb6cb1f178cd4eb93dd3  podofo-0.9.4.tar.gz
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 1197901: 1202051 | 1202610