[poppler] 5 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/JBIG2Stream.cc qt4/src qt5/src

Albert Astals Cid aacid at kemper.freedesktop.org
Thu Jan 2 15:53:53 PST 2014


 CMakeLists.txt         |    2 +-
 NEWS                   |   23 +++++++++++++++++++++++
 configure.ac           |    8 ++++----
 cpp/Doxyfile           |    2 +-
 poppler/JBIG2Stream.cc |    1 +
 qt4/src/Doxyfile       |    2 +-
 qt5/src/Doxyfile       |    2 +-
 7 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit de9643b6f76774ebe131c4787df82dd213181c71
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jan 3 00:53:37 2014 +0100

    0.25.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2eb0aa..297cc95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "25")
-set(POPPLER_MICRO_VERSION "0")
+set(POPPLER_MICRO_VERSION "1")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index 6d5140e..8da297e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Release 0.25.1
+        core:
+         * GooString format: Added some tests + improved documentation
+         * GooString format: fixed bug with printing LLONG_MIN
+         * regression test improvements
+
+        qt4:
+         * Arthur backend font rendering improvements
+         * test program to save to file
+
+        qt5:
+         * Arthur backend font rendering improvements
+         * Improve detection of Qt5 moc. Bug #72744
+         * test program to save to file
+
+        utils:
+         * pdfunite: Work even if there's a single file given
+         * pdfunite: do not lose fonts when merging some files
+
 Release 0.25.0
         core:
          * Annotation improvements
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 3d51934..ccfc347 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.25.0
+PROJECT_NUMBER         = 0.25.1
 
 # 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 a1acf72..3aad825 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.25.0
+PROJECT_NUMBER         = 0.25.1
 
 # 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 ced525a..cb2b794 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.25.0
+PROJECT_NUMBER         = 0.25.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit e238c1f83fd5f667336bfbb0e9a59569ff638ecc
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jan 3 00:29:28 2014 +0100

    Fix qt5 moc detection fix

diff --git a/configure.ac b/configure.ac
index b248149..9c5c7ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[25])
-m4_define([poppler_version_micro],[0])
+m4_define([poppler_version_micro],[1])
 m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
 
 AC_PREREQ(2.59)
@@ -661,20 +661,20 @@ if test x$enable_poppler_qt5 = xyes; then
   AC_CHECK_TOOL(MOCQT5, moc)
   AC_MSG_CHECKING([for Qt5 moc])
   mocversion=`$MOCQT5 -v 2>&1`
-  mocversiongrep=`echo $mocversion | grep "Qt\|moc 5"`
+  mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
   if test x"$mocversiongrep" != x"$mocversion"; then
     AC_MSG_RESULT([no])
     # moc was not the qt5 one, try with moc-qt5
     AC_CHECK_TOOL(MOCQT52, moc-qt5)
     AC_MSG_CHECKING([for Qt5 moc-qt5])
     mocversion=`$MOCQT52 -v 2>&1`
-    mocversiongrep=`echo $mocversion | grep "Qt\|moc 5"`
+    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
     if test x"$mocversiongrep" != x"$mocversion"; then
       AC_CHECK_TOOL(QTCHOOSER, qtchooser)
       AC_MSG_CHECKING([for qtchooser])
       qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
       mocversion=`$qt5tooldir/moc -v 2>&1`
-      mocversiongrep=`echo $mocversion | grep "Qt\|moc 5"`
+      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
       if test x"$mocversiongrep" != x"$mocversion"; then
         # no valid moc found
         enable_poppler_qt5=no;
commit 381ae2877acace4e8908b07ee5fb442bc19bf814
Merge: 64100e7 a2f0e4b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jan 3 00:04:29 2014 +0100

    Merge remote-tracking branch 'origin/poppler-0.24'
    
    Conflicts:
    	CMakeLists.txt
    	NEWS
    	configure.ac
    	cpp/Doxyfile
    	qt4/src/Doxyfile
    	qt5/src/Doxyfile

diff --cc NEWS
index fb08f79,38ef36d..6d5140e
--- a/NEWS
+++ b/NEWS
@@@ -1,26 -1,7 +1,30 @@@
 +Release 0.25.0
 +        core:
 +         * Annotation improvements
 +         * Tagged PDF work
 +         * Improve speed on some files using ICC color space
 +         * Use ICC profile in OutputIntents. Bug #34053
 +         * Limit use of ZapfDingbats character names. Bug #60243
 +         * Splash: correction for knockout transparency groups
 +         * regression test improvements
 +
 +        utils:
 +         * pdftoppm: Added thinlinemode option setting
 +         * pdfinfo: Indicate if pdf contains javascript
 +         * pdfinfo: Add option to print out javascript
 +         * pdfimages: Print size, ratio, and ppi
 +         * pdfimages: More image output format support
 +         * pdfseparate: allow zero-padded pagespecs
 +
 +        glib:
 +         * Annotation improvements
 +         * Add API to get text, text layout and text attributes for a given area
 +         * demo improvements
 +
+ Release 0.24.5
+         core:
+          * Fix crash due to wrong formatting of error message. KDE Bug #328511
+ 
  Release 0.24.4
          core:
           * Fix regression in broken endstream detection. Bug #70854
commit a2f0e4b1fd8b3d9675cc00a561094bd78a63d048
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jan 2 23:48:29 2014 +0100

    0.24.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b66a69..dfd5be6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "24")
-set(POPPLER_MICRO_VERSION "4")
+set(POPPLER_MICRO_VERSION "5")
 set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
 
 # command line switches
diff --git a/NEWS b/NEWS
index ff38e7f..38ef36d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 0.24.5
+        core:
+         * Fix crash due to wrong formatting of error message. KDE Bug #328511
+
 Release 0.24.4
         core:
          * Fix regression in broken endstream detection. Bug #70854
diff --git a/configure.ac b/configure.ac
index 2f44f71..7476021 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([poppler_version_major],[0])
 m4_define([poppler_version_minor],[24])
-m4_define([poppler_version_micro],[4])
+m4_define([poppler_version_micro],[5])
 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 d84579d..40c6cc4 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.24.4
+PROJECT_NUMBER         = 0.24.5
 
 # 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 70665af..bd1417c 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.24.4
+PROJECT_NUMBER         = 0.24.5
 
 # 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 4f70d4c..4e2f9cd 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.24.4
+PROJECT_NUMBER         = 0.24.5
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
commit 523b2731e0489bab58e66b21016bd6f010e616ea
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Jan 2 22:54:42 2014 +0100

    Update copyrights

diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index dbc7bdc..bda7d52 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -21,6 +21,7 @@
 // Copyright (C) 2012 William Bader <williambader at hotmail.com>
 // Copyright (C) 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2013 Fabio D'Urso <fabiodurso at hotmail.it>
 //
 // 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