Attachment 1202051 Details for Bug 1197901 – Patch

[patch] Patch

0001-Update-to-0.9.4.patch (text/plain), 9.24 KB, created by Sandro Mani on 2016-09-17 22:31:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2016-09-17 22:31:33 UTC

Size: 9.24 KB

patch

obsolete

>From 09c5d717dec1c6e843eb1cc33231fb6a290fe455 Mon Sep 17 00:00:00 2001
>From: Sandro Mani <manisandro@gmail.com>
>Date: Sun, 18 Sep 2016 00:28:08 +0200
>Subject: [PATCH] Update to 0.9.4
>
>---
> podofo-0.9.1-lua52.patch                           | 100 ---------------------
> podofo-0.9.1-unistd.patch                          |  11 ---
> ...1-freetype.patch => podofo-0.9.4-freetype.patch |  14 +--
> podofo.spec                                        |  47 +++++-----
> 4 files changed, 31 insertions(+), 141 deletions(-)
> delete mode 100644 podofo-0.9.1-lua52.patch
> delete mode 100644 podofo-0.9.1-unistd.patch
> rename podofo-0.9.1-freetype.patch => podofo-0.9.4-freetype.patch (58%)
>
>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.1-freetype.patch b/podofo-0.9.4-freetype.patch
>similarity index 58%
>rename from podofo-0.9.1-freetype.patch
>rename to podofo-0.9.4-freetype.patch
>index 3035038..71f18ab 100644
>--- a/podofo-0.9.1-freetype.patch
>+++ b/podofo-0.9.4-freetype.patch
>@@ -1,7 +1,7 @@
>-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)
>+diff -rupN podofo-0.9.4/CMakeLists.txt podofo-0.9.4-new/CMakeLists.txt
>+--- podofo-0.9.4/CMakeLists.txt	2016-06-08 22:55:08.000000000 +0200
>++++ podofo-0.9.4-new/CMakeLists.txt	2016-09-17 22:27:38.342555473 +0200
>+@@ -391,8 +391,8 @@ ENDIF(NOT PODOFO_BUILD_LIB_ONLY)
>  
>  FIND_PACKAGE(OpenSSL)
>  
>@@ -12,9 +12,9 @@ diff -up podofo-0.9.1/CMakeLists.txt.freetype podofo-0.9.1/CMakeLists.txt
>  
>  FIND_PACKAGE(LIBSTLPORT)
>  SET(stlport_libraries_if_use_stlport)
>-@@ -448,7 +448,7 @@ INCLUDE_DIRECTORIES(
>-     ${PoDoFo_BINARY_DIR}
>-     ${PoDoFo_SOURCE_DIR}
>+@@ -471,7 +471,7 @@ INCLUDE_DIRECTORIES(BEFORE # before tool
>+ 
>+ INCLUDE_DIRECTORIES(
>      ${PoDoFo_SOURCE_DIR}/src
> -    ${FREETYPE_INCLUDE_DIR}
> +    ${FREETYPE_INCLUDE_DIRS}
>diff --git a/podofo.spec b/podofo.spec
>index 2d25dcb..e985899 100644
>--- a/podofo.spec
>+++ b/podofo.spec
>@@ -1,26 +1,28 @@
> 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
>+# Fix failure to detect FreeType
>+Patch0:         podofo-0.9.4-freetype.patch
> 
>+BuildRequires:  gcc-c++
> BuildRequires:  cmake
>-BuildRequires:  zlib-devel
>+BuildRequires:  cppunit-devel
>+BuildRequires:  doxygen
>+BuildRequires:  fontconfig-devel
>+BuildRequires:  freetype-devel
>+BuildRequires:  ghostscript
>+BuildRequires:  libidn-devel
> BuildRequires:  libjpeg-devel
>-BuildRequires:  libtiff-devel
> BuildRequires:  libpng-devel
>-BuildRequires:  freetype-devel
>-BuildRequires:  fontconfig-devel
>-BuildRequires:  cppunit-devel
>+BuildRequires:  libtiff-devel
> BuildRequires:  lua-devel
>-BuildRequires:  doxygen
>+BuildRequires:  texlive-epstopdf-bin
>+BuildRequires:  zlib-devel
> 
> 
> %description
>@@ -39,7 +41,6 @@ your own application using PoDoFo.
> 
> %package libs
> Summary:        Runtime library for %{name}
>-Group:          System Environment/Libraries
> License:        LGPLv2+
> 
> %description libs
>@@ -48,19 +49,15 @@ Runtime library for %{name}.
> 
> %package devel
> Summary:        Development files for %{name} library
>-Group:          Development/Libraries
> License:        LGPLv2+
>-Requires:       %{name}-libs = %{version}-%{release}
>+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
> 
> %description devel
> Development files and documentation for the %{name} library.
> 
> 
> %prep
>-%setup -q
>-%patch0 -p1 -b .unistd
>-%patch1 -p1 -b .lua52
>-%patch2 -p1 -b .freetype
>+%autosetup
> 
> # disable timestamps in docs
> echo "HTML_TIMESTAMP = NO" >> Doxyfile
>@@ -76,7 +73,7 @@ rm cmake/modules/FindZLIB.cmake
> -DWANT_LIB64=1 \
> %endif
> .
>-make %{?_smp_mflags}
>+%make_build
> 
> # build the docs
> doxygen
>@@ -86,7 +83,7 @@ find doc/html -exec touch -r %{SOURCE0} {} \;
> 
> 
> %install
>-make install DESTDIR=$RPM_BUILD_ROOT
>+%make_install
> 
> 
> %post libs -p /sbin/ldconfig
>@@ -95,12 +92,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
> 
> 
> %files
>-%doc COPYING
>+%license COPYING
> %{_bindir}/%{name}*
> %{_mandir}/man1/%{name}*.1*
> 
> %files libs
>-%doc AUTHORS COPYING.LIB ChangeLog FAQ.html README.html TODO
>+%doc AUTHORS ChangeLog FAQ.html README.html TODO
>+%license COPYING.LIB
> %{_libdir}/*.so.*
> 
> %files devel
>@@ -110,6 +108,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Sat Sep 17 2016 Sandro Mani <manisandro@gmail.com> - 0.9.4-1
>+- Update to 0.9.4
>+
> * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.1-18
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
> 
>-- 
>2.10.0
>

Actions: View | Diff

Attachments on bug 1197901: 1202051 | 1202610