[poppler] 5 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/CairoOutputDev.cc poppler/Makefile.am poppler/TextOutputDev.cc poppler/TextOutputDev.h qt4/src
Albert Astals Cid
aacid at kemper.freedesktop.org
Thu Apr 11 15:10:35 PDT 2013
CMakeLists.txt | 4 ++--
NEWS | 20 ++++++++++++++++++++
configure.ac | 2 +-
cpp/Doxyfile | 2 +-
poppler/CairoOutputDev.cc | 2 +-
poppler/Makefile.am | 2 +-
poppler/TextOutputDev.cc | 2 +-
poppler/TextOutputDev.h | 2 +-
qt4/src/Doxyfile | 2 +-
9 files changed, 29 insertions(+), 9 deletions(-)
New commits:
commit bbd27dc4ce7b24af890d80f597f74e5d7ee0215a
Merge: ea3698c 5bc0080
Author: Albert Astals Cid <aacid at kde.org>
Date: Fri Apr 12 00:10:27 2013 +0200
Merge remote-tracking branch 'origin/poppler-0.22'
Conflicts:
poppler/TextOutputDev.h
diff --cc CMakeLists.txt
index 3caa648,6f362b5..5694761
--- 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 35.0.0 SOVERSION 35)
+ set_target_properties(poppler PROPERTIES VERSION 36.0.0 SOVERSION 36)
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})
diff --cc poppler/TextOutputDev.cc
index d7f0c64,d054697..801f347
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@@ -30,10 -30,9 +30,10 @@@
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
// Copyright (C) 2011 Sam Liao <phyomh at gmail.com>
// Copyright (C) 2012 Horst Prote <prote at fmi.uni-stuttgart.de>
- // Copyright (C) 2012 Jason Crain <jason at aquaticape.us>
+ // Copyright (C) 2012, 2013 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2012 Peter Breitenlohner <peb at mppmu.mpg.de>
// Copyright (C) 2013 José Aliste <jaliste at src.gnome.org>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --cc poppler/TextOutputDev.h
index 08eab0b,73109d6..664f9d1
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@@ -19,8 -19,7 +19,8 @@@
// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008, 2010 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2010 Brian Ewins <brian.ewins at gmail.com>
- // Copyright (C) 2012 Jason Crain <jason at aquaticape.us>
+ // Copyright (C) 2012, 2013 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
commit 5bc00809ebe560a180d5df93eb50bdf0ff0e97e6
Author: Albert Astals Cid <aacid at kde.org>
Date: Thu Apr 11 23:29:00 2013 +0200
Increase poppler core soname
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c67eb3c..6f362b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 35.0.0 SOVERSION 35)
+set_target_properties(poppler PROPERTIES VERSION 36.0.0 SOVERSION 36)
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/poppler/Makefile.am b/poppler/Makefile.am
index 9b29591..bc78ff5 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 35:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 36:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
commit 115d4c1465291adde86c3c905f265ac03374441f
Author: Albert Astals Cid <aacid at kde.org>
Date: Thu Apr 11 23:28:17 2013 +0200
Increase version number to 0.22.3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4643ae0..c67eb3c 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 "2")
+set(POPPLER_MICRO_VERSION "3")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/configure.ac b/configure.ac
index fc77b22..5a29315 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],[2])
+m4_define([poppler_version_micro],[3])
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 513f287..89d680a 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.2
+PROJECT_NUMBER = 0.22.3
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 065c643..965cd52 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.2
+PROJECT_NUMBER = 0.22.3
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
commit ae1a3553b85e2616a339aacb6efecd15db373858
Author: Albert Astals Cid <aacid at kde.org>
Date: Thu Apr 11 23:26:44 2013 +0200
News file
diff --git a/NEWS b/NEWS
index c386557..452dc97 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,23 @@
+Release 0.22.3
+ core:
+ * Check order bounding box values in tiling pattern (Bug #62369)
+ * CairoImageOutputDev: Don't change image interpolation when printing (Bug #62418)
+ * TextOutputDev: Set text matrix when painting selection (Bug #61042)
+ * Only write the file once when saving (Bug #62739)
+ * Fix for complete rewrites in repaired files
+ * Fixlet regarding spec interpretation for Link Zoom value
+ * Fix typos in man pages
+ * Fix compile when not using libjpeg
+
+ glib:
+ * Always start from the beginning when starting a new search on a page (Bug #59972)
+
+ qt4:
+ * Fix crash in files with LinkRendition (KDE Bug #317710)
+
+ build system:
+ * Small cmake improvements
+
Release 0.22.2
core:
* Correct rendering of underline and strike out annotations (Bug #61518)
commit 1fefe98fc86cf8449346bdc230dff5758b1bb7a3
Author: Albert Astals Cid <aacid at kde.org>
Date: Thu Apr 11 23:22:20 2013 +0200
Update copyrgihts
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 79d891d..b18e703 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -20,7 +20,7 @@
// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
// Copyright (C) 2006-2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2008 Carl Worth <cworth at cworth.org>
-// Copyright (C) 2008-2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008-2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
// Copyright (C) 2008, 2009 Chris Wilson <chris at chris-wilson.co.uk>
// Copyright (C) 2008, 2012 Hib Eris <hib at hiberis.nl>
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index dde32b8..e8c5c09 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -14,7 +14,7 @@
// under GPL version 2 or later
//
// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh at frogmouth.net>
-// Copyright (C) 2005, 2007-2009, 2011, 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2007-2009, 2011-2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2008 Julien Rebetez <julienr at svn.gnome.org>
// Copyright (C) 2008, 2010 Pino Toscano <pino at kde.org>
// Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index cd1358c..d054697 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -30,7 +30,7 @@
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
// Copyright (C) 2011 Sam Liao <phyomh at gmail.com>
// Copyright (C) 2012 Horst Prote <prote at fmi.uni-stuttgart.de>
-// Copyright (C) 2012 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2012, 2013 Jason Crain <jason at aquaticape.us>
// Copyright (C) 2012 Peter Breitenlohner <peb at mppmu.mpg.de>
// Copyright (C) 2013 José Aliste <jaliste at src.gnome.org>
//
diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index 77facbc..73109d6 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -19,7 +19,7 @@
// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2008, 2010 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2010 Brian Ewins <brian.ewins at gmail.com>
-// Copyright (C) 2012 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2012, 2013 Jason Crain <jason at aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
More information about the poppler
mailing list