Hello community, here is the log from the commit of package podofo for openSUSE:Factory checked in at 2013-12-13 12:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/podofo (Old) and /work/SRC/openSUSE:Factory/.podofo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "podofo" Changes: -------- --- /work/SRC/openSUSE:Factory/podofo/podofo.changes 2013-04-02 12:39:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.podofo.new/podofo.changes 2013-12-13 12:00:29.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 11 20:46:51 UTC 2013 - hrvoje.sen...@gmail.com + +- Added remove-internal-findfreetype-references.patch: fixes build + with freetype2 2.5.1 as internal copy is broken. It is also better + practice to use cmake's FindPackage modules + +------------------------------------------------------------------- New: ---- remove-internal-findfreetype-references.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ podofo.spec ++++++ --- /var/tmp/diff_new_pack.MTKbHl/_old 2013-12-13 12:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.MTKbHl/_new 2013-12-13 12:00:30.000000000 +0100 @@ -28,6 +28,9 @@ Source0: http://downloads.sourceforge.net/podofo/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM podofo-0.9.2-soname.patch http://sourceforge.net/apps/mantisbt/podofo/view.php?id=54 asterios.dra...@gmail.com -- Update the soname of the library Patch0: podofo-0.9.2-soname.patch +# PATCH-FIX-UPSTREAM remove-internal-findfreetype-references.patch -- fixes build with freetype2 2.5.1 as internal +# copy is broken. It is also better practice to use cmake's FindPackage modules +Patch1: remove-internal-findfreetype-references.patch BuildRequires: cmake >= 2.5 BuildRequires: doxygen BuildRequires: fdupes @@ -72,6 +75,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # Remove build time references so build-compare can do its work echo "HTML_TIMESTAMP = NO" >> Doxyfile ++++++ remove-internal-findfreetype-references.patch ++++++ diff -Naur podofo-0.9.2.orig/CMakeLists.txt podofo-0.9.2/CMakeLists.txt --- podofo-0.9.2.orig/CMakeLists.txt 2012-12-12 23:55:46.000000000 +0100 +++ podofo-0.9.2/CMakeLists.txt 2013-12-11 21:39:31.799099677 +0100 @@ -369,8 +369,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_LIBRARY}, headers ${FREETYPE_INCLUDE_DIRS}") FIND_PACKAGE(LIBSTLPORT) SET(stlport_libraries_if_use_stlport) @@ -466,7 +466,7 @@ ${PoDoFo_BINARY_DIR} ${PoDoFo_SOURCE_DIR} ${PoDoFo_SOURCE_DIR}/src - ${FREETYPE_INCLUDE_DIR} + ${FREETYPE_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR} ${EXTRA_INCLUDES} ) @@ -487,7 +487,7 @@ ${LIBJPEG_LIBRARIES} ${PLATFORM_SYSTEM_LIBRARIES} ${stlport_libraries_if_use_stlport} - ${FREETYPE_LIBRARIES} + ${FREETYPE_LIBRARY} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
