CMakeLists.txt | 4 ++-- NEWS | 15 +++++++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- poppler/CairoOutputDev.cc | 2 +- poppler/Makefile.am | 2 +- qt4/src/Doxyfile | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-)
New commits: commit 30a519f21dd5df8d41a43a58b2cbd95fe657df73 Merge: 998a9e7 0c0aef2 Author: Albert Astals Cid <[email protected]> Date: Mon May 13 20:40:04 2013 +0200 Merge remote-tracking branch 'origin/poppler-0.22' diff --cc CMakeLists.txt index 5694761,2c5715e..9d3f7ac --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -396,11 -396,8 +396,11 @@@ add_library(poppler STATIC ${poppler_SR else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) - set_target_properties(poppler PROPERTIES VERSION 36.0.0 SOVERSION 36) + set_target_properties(poppler PROPERTIES VERSION 37.0.0 SOVERSION 37) target_link_libraries(poppler ${poppler_LIBS}) +if(HAVE_PTHREAD) + target_link_libraries(poppler -lpthread) +endif() target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) commit 0c0aef20d9cecaee1de0badc6cd56dd6e5b5bf12 Author: Albert Astals Cid <[email protected]> Date: Mon May 13 19:57:02 2013 +0200 0.22.4 version Also increase soversion since Gfx.h got a new member diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f362b5..2c5715e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN) set(POPPLER_MAJOR_VERSION "0") set(POPPLER_MINOR_VERSION "22") -set(POPPLER_MICRO_VERSION "3") +set(POPPLER_MICRO_VERSION "4") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") # command line switches @@ -396,7 +396,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else(MSVC) add_library(poppler SHARED ${poppler_SRCS}) endif(MSVC) -set_target_properties(poppler PROPERTIES VERSION 36.0.0 SOVERSION 36) +set_target_properties(poppler PROPERTIES VERSION 37.0.0 SOVERSION 37) target_link_libraries(poppler ${poppler_LIBS}) target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "") install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) diff --git a/configure.ac b/configure.ac index bb8e3ae..86aa19c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([poppler_version_major],[0]) m4_define([poppler_version_minor],[22]) -m4_define([poppler_version_micro],[3]) +m4_define([poppler_version_micro],[4]) m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro]) AC_PREREQ(2.59) diff --git a/cpp/Doxyfile b/cpp/Doxyfile index 89d680a..a651685 100644 --- a/cpp/Doxyfile +++ b/cpp/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.22.3 +PROJECT_NUMBER = 0.22.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/poppler/Makefile.am b/poppler/Makefile.am index bc78ff5..52fea4c 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -177,7 +177,7 @@ libpoppler_la_LIBADD = \ $(PTHREAD_LIBS) \ $(win32_libs) -libpoppler_la_LDFLAGS = -version-info 36:0:0 @create_shared_lib@ @auto_import_flags@ +libpoppler_la_LDFLAGS = -version-info 37:0:0 @create_shared_lib@ @auto_import_flags@ if ENABLE_XPDF_HEADERS diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile index 965cd52..90a0645 100644 --- a/qt4/src/Doxyfile +++ b/qt4/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 " # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.22.3 +PROJECT_NUMBER = 0.22.4 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit 4d6662d05f6b652af97ac6e0eb1f1c1dca8e9550 Author: Albert Astals Cid <[email protected]> Date: Mon May 13 19:55:21 2013 +0200 0.22.4 NEWS diff --git a/NEWS b/NEWS index 452dc97..b374a9c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,18 @@ +Release 0.22.4 + core: + * Always consider a softmask transfer function (Bug #63587) + * Fix crash on malformed files (Bug #63190) + * Splash: Fix compilation with fixed point mode enabled + + utils: + * Fix crash on some files (Bug #63909) + + qt4: + * Fix name decoding of some attachments (KDE Bug #307786) + + build system: + * Fix compilation with mingw-w64 compiler + Release 0.22.3 core: * Check order bounding box values in tiling pattern (Bug #62369) commit 93e08d96867d636a70ab04ee4ad22c2214ae4b6a Author: Albert Astals Cid <[email protected]> Date: Mon May 13 19:51:52 2013 +0200 Update copyright years diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc index a27559e..34d5a70 100644 --- a/poppler/CairoOutputDev.cc +++ b/poppler/CairoOutputDev.cc @@ -18,7 +18,7 @@ // Copyright (C) 2005, 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2005, 2009, 2012 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Nickolay V. Shmyrev <[email protected]> -// Copyright (C) 2006-2011 Carlos Garcia Campos <[email protected]> +// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2008 Carl Worth <[email protected]> // Copyright (C) 2008-2013 Adrian Johnson <[email protected]> // Copyright (C) 2008 Michael Vrable <[email protected]>
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
