summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2020-08-01 18:40:32 +0200
committerAlbert Astals Cid <aacid@kde.org>2020-08-01 19:36:47 +0200
commit175370fda156c1f19072f98bdd236ee4561e4620 (patch)
treef3af74641681ea63f9530f944c8e8367a4a6f726
parent3a9bfd6ef981692b391e63c32725c12817a2d08f (diff)
-rw-r--r--CMakeLists.txt13
-rw-r--r--NEWS12
-rw-r--r--cpp/Doxyfile2
-rw-r--r--qt5/src/Doxyfile2
4 files changed, 22 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76502a8c..f9157312 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,10 +35,13 @@ if (ECM_FOUND)
endif()
endif()
-set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "90")
-set(POPPLER_MICRO_VERSION "1")
-set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
+set(POPPLER_MAJOR_VERSION "20")
+set(POPPLER_MINOR_VERSION_STRING "08")
+# We want the string version to have 08 but the integer version can't have a leading 0 since otherwise it's considered octal
+# So strip a leading 0 if found in POPPLER_MINOR_VERSION_STRING and store the result in POPPLER_MINOR_VERSION
+string(REGEX REPLACE "^0?(.+)$" "\\1" POPPLER_MINOR_VERSION "${POPPLER_MINOR_VERSION_STRING}")
+set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION_STRING}.${POPPLER_MICRO_VERSION}")
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_EXTENSIONS OFF)
@@ -550,7 +553,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else()
add_library(poppler ${poppler_SRCS})
endif()
-set_target_properties(poppler PROPERTIES VERSION 101.0.0 SOVERSION 101)
+set_target_properties(poppler PROPERTIES VERSION 102.0.0 SOVERSION 102)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_SOVERSION poppler SOVERSION)
set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
diff --git a/NEWS b/NEWS
index e3744276..2f97d35d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Release 20.08.0:
+ core:
+ * Sub-page objects: initialize clip max values considering the render resolution. Issue #937
+ * Splash: Set initial line width to 1. Issue #674
+ * Fix stack overflow with specially crafted files
+ * GfxShading: Simplify holding the Function
+ * Splash: Fix x86 + windows asm build
+
+ qt5:
+ * Deprecate Document::toc
+ * Deprecate AnnotationUtils
+
Release 0.90.1:
core:
* Fix regression on PS conversion.
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 262a05ef..d17f2456 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.90.1
+PROJECT_NUMBER = 20.08.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 376542fc..9d8afeb3 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.90.1
+PROJECT_NUMBER = 20.08.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.