Hello community,
here is the log from the commit of package python-poppler-qt4 for
openSUSE:Factory checked in at 2015-03-16 07:01:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-poppler-qt4 (Old)
and /work/SRC/openSUSE:Factory/.python-poppler-qt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-poppler-qt4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-poppler-qt4/python-poppler-qt4.changes
2015-02-16 07:36:31.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.python-poppler-qt4.new/python-poppler-qt4.changes
2015-03-16 07:01:24.000000000 +0100
@@ -1,0 +2,12 @@
+Sun Mar 8 14:41:35 UTC 2015 - [email protected]
+
+- Update to 0.24.0:
+ * Added version() function, returning the version of python-poppler-qt4
+ as a tuple of ints e.g. (0, 18, 3)
+ * Added poppler_version() function, returning the version of the Poppler-
+ Qt4 library (if the version could be determined on build time), as a
+ tuple of ints, e.g. (0, 24, 5). If on build time the version of
+ Poppler-Qt4 could not be determined and was not specified, an empty
+ tuple might be returned.
+
+-------------------------------------------------------------------
Old:
----
python-poppler-qt4-0.18.2.tar.gz
New:
----
python-poppler-qt4-0.24.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-poppler-qt4.spec ++++++
--- /var/tmp/diff_new_pack.2pSEpc/_old 2015-03-16 07:01:25.000000000 +0100
+++ /var/tmp/diff_new_pack.2pSEpc/_new 2015-03-16 07:01:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-poppler-qt4
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 LISA GmbH, Bingen, Germany.
# Copyright (c) 2012 Johannes Engel <[email protected]>
#
@@ -24,7 +24,7 @@
Summary: Python binding to poppler-qt4
License: LGPL-2.1+
Group: Development/Libraries/Python
-Version: 0.18.2
+Version: 0.24.0
Release: 0
Url: https://github.com/wbsoft/python-poppler-qt4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -45,7 +45,7 @@
%files
%defattr(-,root,root)
-%doc ChangeLog LICENSE README TODO
+%doc ChangeLog LICENSE README.rst TODO
%{python_sitearch}/popplerqt4.so
%{python_sitearch}/python_poppler_qt4*.egg-info
++++++ python-poppler-qt4-0.18.2.tar.gz -> python-poppler-qt4-0.24.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/.gitignore
new/python-poppler-qt4-0.24.0/.gitignore
--- old/python-poppler-qt4-0.18.2/.gitignore 2015-01-09 13:29:37.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/.gitignore 2015-02-18 00:09:12.000000000
+0100
@@ -1,3 +1,4 @@
+version.sip
*.pyc
*~
build/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/ChangeLog
new/python-poppler-qt4-0.24.0/ChangeLog
--- old/python-poppler-qt4-0.18.2/ChangeLog 2015-01-09 13:29:37.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/ChangeLog 2015-02-18 00:09:12.000000000
+0100
@@ -1,3 +1,13 @@
+Version 0.18.3 --
+
+* Added version() function, returning the version of python-poppler-qt4
+ as a tuple of ints e.g. (0, 18, 3)
+* Added poppler_version() function, returning the version of the Poppler-
+ Qt4 library (if the version could be determined on build time), as a
+ tuple of ints, e.g. (0, 24, 5). If on build time the version of
+ Poppler-Qt4 could not be determined and was not specified, an empty
+ tuple might be returned.
+
Version 0.18.2 -- January 9th, 2015
* Tested with Python 2.6, 2.7, 3.2, 3.3, 3.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/MANIFEST.in
new/python-poppler-qt4-0.24.0/MANIFEST.in
--- old/python-poppler-qt4-0.18.2/MANIFEST.in 2015-01-09 13:29:37.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/MANIFEST.in 2015-02-18 00:09:12.000000000
+0100
@@ -1,3 +1,5 @@
-include README INSTALL LICENSE TODO ChangeLog MANIFEST.in
+include README.rst INSTALL LICENSE TODO ChangeLog
+include MANIFEST.in setup.cfg
include *.py
include *.sip
+exclude version.sip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/README
new/python-poppler-qt4-0.24.0/README
--- old/python-poppler-qt4-0.18.2/README 2015-01-09 13:29:37.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/README 1970-01-01 01:00:00.000000000
+0100
@@ -1,49 +0,0 @@
-python-poppler-qt4
-==================
-
-A Python binding for libpoppler-qt4 that aims for completeness and for being
-actively maintained.
-
-Created and currently maintained by Wilbert Berendsen <[email protected]>.
-
-Homepage: https://pypi.python.org/pypi/python-poppler-qt4/
-
-
-Usage:
-======
-
-import popplerqt4
-
-d = popplerqt4.Poppler.Document.load('file.pdf')
-
-
-Documentation:
-==============
-
-The Python API closely follows the Poppler Qt4 C++ interface library API,
-documented at http://people.freedesktop.org/~aacid/docs/qt4/ .
-
-Whereever the C++ API requires QList, QSet or QLinkedList, any Python sequence
-can be used. API calls that return QList, QSet or QLinkedList all return
Python
-lists.
-
-There are a few differences:
-
-Poppler::Document::getPdfVersion(int *major, int *minor) can simply be called
as
-d.getPdfVersion() [where d is a Poppler::Document instance]; it will return
-a tuple of two integers (major, minor).
-
-Poppler::FontIterator (returned by Poppler::Document::newFontIterator) is also
-a Python iterable (e.g. has __iter__() and __next__() methods). So although you
-can use:
-
- it = document.newFontIterator()
- while it.hasNext():
- fonts = it.next() # list of FontInfo objects
- ...
-
-you can also use the more Pythonic:
-
- for fonts in document.newFontIterator():
- ...
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/README.rst
new/python-poppler-qt4-0.24.0/README.rst
--- old/python-poppler-qt4-0.18.2/README.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/README.rst 2015-02-18 00:09:12.000000000
+0100
@@ -0,0 +1,64 @@
+==================
+python-poppler-qt4
+==================
+
+A Python binding for libpoppler-qt4 that aims for completeness and for being
+actively maintained.
+
+Created and currently maintained by Wilbert Berendsen <[email protected]>.
+
+Homepage: https://pypi.python.org/pypi/python-poppler-qt4/
+
+
+Usage::
+
+ import popplerqt4
+ d = popplerqt4.Poppler.Document.load('file.pdf')
+
+
+Documentation
+-------------
+
+The Python API closely follows the Poppler Qt4 C++ interface library API,
+documented at http://people.freedesktop.org/~aacid/docs/qt4/ .
+
+Whereever the C++ API requires ``QList``, ``QSet`` or ``QLinkedList``, any
+Python sequence can be used.
+API calls that return ``QList``, ``QSet`` or ``QLinkedList`` all return Python
+lists.
+
+There are a few differences:
+
+``Poppler::Document::getPdfVersion(int *major, int *minor)`` can simply be
+called as ``d.getPdfVersion()``, (where ``d`` is a ``Poppler::Document``
+instance); it will return a tuple of two integers (major, minor).
+
+``Poppler::FontIterator`` (returned by ``Poppler::Document::newFontIterator``)
+is also a Python iterable (e.g. has ``__iter__()`` and ``__next__()`` methods).
+So although you can use::
+
+ it = document.newFontIterator()
+ while it.hasNext():
+ fonts = it.next() # list of FontInfo objects
+ ...
+
+you can also use the more Pythonic::
+
+ for fonts in document.newFontIterator():
+ ...
+
+In addition to the Poppler namespace, there are two toplevel module
+functions:
+
+ ``popplerqt4.version()``
+ returns the version of the ``python-poppler-qt4`` package as a
+ tuple of ints, e.g. ``(0, 18, 2)``.
+
+ ``popplerqt4.poppler_version()``
+ returns the version of the linked Poppler-Qt4 library as a
+ tuple of ints, e.g. ``(0, 24, 5)``.
+
+ This is determined at build time. If at build time the Poppler-Qt4
+ version could not be determined and was not specified, an empty
+ tuple might be returned.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-annotation.sip
new/python-poppler-qt4-0.24.0/poppler-annotation.sip
--- old/python-poppler-qt4-0.18.2/poppler-annotation.sip 2015-01-09
13:29:37.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-annotation.sip 2015-02-18
00:09:12.000000000 +0100
@@ -331,51 +331,53 @@
StrikeOut,
};
struct Quad {
- QPointF * points;
-%GetCode
- sipPy = PyList_New(4);
- PyObject* obj;
- for (SIP_SSIZE_T i = 0; i < 4; ++i)
- {
- QPointF *point = new QPointF(sipCpp->points[i]);
- obj = sipConvertFromNewType(point, sipType_QPointF, NULL);
- PyList_SET_ITEM(sipPy, i, obj);
- }
-%End
-%SetCode
- SIP_SSIZE_T len;
- if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) != 4)
- sipErr = 1;
- else
- {
- for (SIP_SSIZE_T i = 0; i < 4; ++i)
+ QPointF * points
{
- PyObject *itm = PySequence_ITEM(sipPy, i);
- bool ok = (itm && sipCanConvertToType(itm, sipType_QPointF,
SIP_NOT_NONE));
- Py_XDECREF(itm);
+ %GetCode
+ sipPy = PyList_New(4);
+ PyObject* obj;
+ for (SIP_SSIZE_T i = 0; i < 4; ++i)
+ {
+ QPointF *point = new QPointF(sipCpp->points[i]);
+ obj = sipConvertFromNewType(point, sipType_QPointF, NULL);
+ PyList_SET_ITEM(sipPy, i, obj);
+ }
+ %End
+ %SetCode
+ SIP_SSIZE_T len;
+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy))
!= 4)
+ sipErr = 1;
+ else
+ {
+ for (SIP_SSIZE_T i = 0; i < 4; ++i)
+ {
+ PyObject *itm = PySequence_ITEM(sipPy, i);
+ bool ok = (itm && sipCanConvertToType(itm,
sipType_QPointF, SIP_NOT_NONE));
+ Py_XDECREF(itm);
- if (!ok)
- {
- sipErr = 1;
- break;
- }
- }
- }
-
- if (sipErr == 1)
- PyErr_SetString(PyExc_ValueError, "Quad.points must be a sequence of
exactly 4 QPointF() instances");
- else
- {
- int iserr = 0;
- for (SIP_SSIZE_T i = 0; i < 4; ++i)
- {
- PyObject *itm = PySequence_ITEM(sipPy, i);
- QPointF *point = reinterpret_cast<QPointF *>(sipConvertToType(itm,
sipType_QPointF, 0, 0, 0, &iserr));
- sipCpp->points[i] = *point;
- Py_DECREF(itm);
- }
- }
-%End
+ if (!ok)
+ {
+ sipErr = 1;
+ break;
+ }
+ }
+ }
+
+ if (sipErr == 1)
+ PyErr_SetString(PyExc_ValueError, "Quad.points must be a
sequence of exactly 4 QPointF() instances");
+ else
+ {
+ int iserr = 0;
+ for (SIP_SSIZE_T i = 0; i < 4; ++i)
+ {
+ PyObject *itm = PySequence_ITEM(sipPy, i);
+ QPointF *point = reinterpret_cast<QPointF
*>(sipConvertToType(itm, sipType_QPointF, 0, 0, 0, &iserr));
+ sipCpp->points[i] = *point;
+ Py_DECREF(itm);
+ }
+ }
+ %End
+ };
bool capStart;
bool capEnd;
double feather;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-document.sip
new/python-poppler-qt4-0.24.0/poppler-document.sip
--- old/python-poppler-qt4-0.18.2/poppler-document.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-document.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,120 @@
+namespace Poppler {
+
+class Document {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+%If(POPPLER_V0_22_0 -)
+ enum FormType {
+ NoForm,
+ AcroForm,
+ XfaForm,
+ };
+%End
+ enum PageMode {
+ UseNone,
+ UseOutlines,
+ UseThumbs,
+ FullScreen,
+ UseOC,
+ UseAttach,
+ };
+ enum PageLayout {
+ NoLayout,
+ SinglePage,
+ OneColumn,
+ TwoColumnLeft,
+ TwoColumnRight,
+ TwoPageLeft,
+ TwoPageRight,
+ };
+ enum RenderBackend {
+ SplashBackend,
+ ArthurBackend,
+ };
+ enum RenderHint {
+ Antialiasing = 0x00000001,
+ TextAntialiasing = 0x00000002,
+%If(POPPLER_V0_12_1 -)
+ TextHinting = 0x00000004,
+%End
+%If(POPPLER_V0_18_0 -)
+ TextSlightHinting = 0x00000008,
+%End
+%If(POPPLER_V0_22_0 -)
+ OverprintPreview = 0x00000010,
+%End
+%If(POPPLER_V0_24_0 -)
+ ThinLineSolid = 0x00000020,
+ ThinLineShape = 0x00000040,
+%End
+ };
+ typedef QFlags<Poppler::Document::RenderHint> RenderHints;
+
+ void setColorDisplayProfile(void *outputProfileA);
+ void setColorDisplayProfileName(const QString &name);
+ void* colorRgbProfile() const;
+ void* colorDisplayProfile() const;
+ static Poppler::Document *load(const QString & filePath,
+ const QByteArray &ownerPassword=QByteArray(),
+ const QByteArray &userPassword=QByteArray())
/Factory, ReleaseGIL/;
+ static Poppler::Document *loadFromData(const QByteArray &fileContents,
+ const QByteArray &ownerPassword=QByteArray(),
+ const QByteArray &userPassword=QByteArray())
/Factory, ReleaseGIL/;
+ Poppler::Page *page(int index) const /Factory/;
+ Poppler::Page *page(const QString &label) const /Factory/;
+ int numPages() const;
+ PageMode pageMode() const;
+ PageLayout pageLayout() const;
+ bool unlock(const QByteArray &ownerPassword, const QByteArray
&userPassword);
+ bool isLocked() const;
+ QDateTime date( const QString & data ) const;
+ QString info( const QString & data ) const;
+ QStringList infoKeys() const;
+ bool isEncrypted() const;
+ bool isLinearized() const;
+ bool okToPrint() const;
+ bool okToPrintHighRes() const;
+ bool okToChange() const;
+ bool okToCopy() const;
+ bool okToAddNotes() const;
+ bool okToFillForm() const;
+ bool okToCreateFormFields() const;
+ bool okToExtractForAccessibility() const;
+ bool okToAssemble() const;
+%If(POPPLER_V0_16_0 -)
+ bool getPdfId(QByteArray *permanentId, QByteArray *updateId) const;
+%End
+ void getPdfVersion(int *major, int *minor) const;
+ QList<Poppler::FontInfo> fonts() const /ReleaseGIL/;
+%If(POPPLER_V0_22_0 -)
+ FormType formType() const;
+%End
+ Poppler::FontIterator* newFontIterator( int startPage = 0 ) const
/Factory/;
+ QByteArray fontData(const Poppler::FontInfo &font) const;
+ QList<Poppler::EmbeddedFile*> embeddedFiles() const;
+ bool hasEmbeddedFiles() const;
+ QDomDocument *toc() const;
+ Poppler::LinkDestination *linkDestination( const QString &name ) /Factory,
ReleaseGIL/;
+ void setPaperColor(const QColor &color);
+ QColor paperColor() const;
+ void setRenderBackend( RenderBackend backend );
+ RenderBackend renderBackend() const;
+ static QSet<Poppler::Document::RenderBackend> availableRenderBackends();
+ void setRenderHint( RenderHint hint, bool on = true );
+ RenderHints renderHints() const;
+ Poppler::PSConverter *psConverter() const /Factory/;
+ Poppler::PDFConverter *pdfConverter() const /Factory/;
+ QString metadata() const;
+ bool hasOptionalContent() const;
+ Poppler::OptContentModel *optionalContentModel() /Factory/;
+ QStringList scripts() const;
+private:
+ Document();
+ Document(const Poppler::Document &);
+
+}; // class Document
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-embedded-file.sip
new/python-poppler-qt4-0.24.0/poppler-embedded-file.sip
--- old/python-poppler-qt4-0.18.2/poppler-embedded-file.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-embedded-file.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,25 @@
+namespace Poppler {
+
+class EmbeddedFile {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+// EmbeddedFile(EmbFile *embfile);
+ ~EmbeddedFile();
+ QString name() const;
+ QString description() const;
+ int size() const;
+ QDateTime modDate() const;
+ QDateTime createDate() const;
+ QByteArray checksum() const;
+ QString mimeType() const;
+ QByteArray data();
+ bool isValid() const;
+
+private:
+ EmbeddedFile(const Poppler::EmbeddedFile&);
+}; // class EmbeddedFile
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-font-info.sip
new/python-poppler-qt4-0.24.0/poppler-font-info.sip
--- old/python-poppler-qt4-0.18.2/poppler-font-info.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-font-info.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,36 @@
+namespace Poppler {
+
+class FontInfo {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+ enum Type {
+ unknown,
+ Type1,
+ Type1C,
+ Type1COT,
+ Type3,
+ TrueType,
+ TrueTypeOT,
+ CIDType0,
+ CIDType0C,
+ CIDType0COT,
+ CIDTrueType,
+ CIDTrueTypeOT,
+ };
+ FontInfo();
+// FontInfo( const FontInfoData &fid );
+ FontInfo( const Poppler::FontInfo &fi );
+ ~FontInfo();
+ QString name() const;
+ QString file() const;
+ bool isEmbedded() const;
+ bool isSubset() const;
+ Type type() const;
+ QString typeName() const;
+
+}; // class FontInfo
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-font-iterator.sip
new/python-poppler-qt4-0.24.0/poppler-font-iterator.sip
--- old/python-poppler-qt4-0.18.2/poppler-font-iterator.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-font-iterator.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,33 @@
+namespace Poppler {
+
+class FontIterator {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+ ~FontIterator();
+ QList<Poppler::FontInfo> next();
+ bool hasNext() const;
+ int currentPage() const;
+
+ Poppler::FontIterator * __iter__();
+%MethodCode
+ sipRes = sipCpp;
+%End
+ SIP_PYOBJECT __next__();
+%MethodCode
+ if (sipCpp->hasNext()) {
+ QList<Poppler::FontInfo> next = sipCpp->next();
+ sipRes = sipConvertFromType(&next,
sipFindType("QList<Poppler::FontInfo>"), Py_None);
+ } else {
+ PyErr_SetNone(PyExc_StopIteration);
+ }
+%End
+
+private:
+ FontIterator(const Poppler::FontIterator&);
+// FontIterator( int, DocumentData *dd );
+}; // class FontIterator
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-poppler-qt4-0.18.2/poppler-link-destination.sip
new/python-poppler-qt4-0.24.0/poppler-link-destination.sip
--- old/python-poppler-qt4-0.18.2/poppler-link-destination.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-link-destination.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,37 @@
+namespace Poppler {
+
+class LinkDestination {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+#include <qt4/poppler-link.h>
+%End
+
+public:
+ enum Kind {
+ destXYZ = 1,
+ destFit = 2,
+ destFitH = 3,
+ destFitV = 4,
+ destFitR = 5,
+ destFitB = 6,
+ destFitBH = 7,
+ destFitBV = 8,
+ };
+ LinkDestination(const QString &description);
+ LinkDestination(const Poppler::LinkDestination &other);
+ ~LinkDestination();
+ Kind kind() const;
+ int pageNumber() const;
+ double left() const;
+ double bottom() const;
+ double right() const;
+ double top() const;
+ double zoom() const;
+ bool isChangeLeft() const;
+ bool isChangeTop() const;
+ bool isChangeZoom() const;
+ QString toString() const;
+ QString destinationName() const;
+}; // class LinkDestination
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-link.sip
new/python-poppler-qt4-0.24.0/poppler-link.sip
--- old/python-poppler-qt4-0.18.2/poppler-link.sip 2015-01-09
13:29:37.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-link.sip 2015-02-18
00:09:12.000000000 +0100
@@ -1,40 +1,5 @@
namespace Poppler {
-class LinkDestination {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-#include <qt4/poppler-link.h>
-%End
-
-public:
- enum Kind {
- destXYZ = 1,
- destFit = 2,
- destFitH = 3,
- destFitV = 4,
- destFitR = 5,
- destFitB = 6,
- destFitBH = 7,
- destFitBV = 8,
- };
- LinkDestination(const QString &description);
- LinkDestination(const Poppler::LinkDestination &other);
- ~LinkDestination();
- Kind kind() const;
- int pageNumber() const;
- double left() const;
- double bottom() const;
- double right() const;
- double top() const;
- double zoom() const;
- bool isChangeLeft() const;
- bool isChangeTop() const;
- bool isChangeZoom() const;
- QString toString() const;
- QString destinationName() const;
-}; // class LinkDestination
-
-
class Link {
%TypeHeaderCode
#include <qt4/poppler-qt4.h>
@@ -221,7 +186,6 @@
}; // class LinkJavaScript
-
}; // namespace Poppler
/* kate: indent-width 4; space-indent on; hl c++; indent-mode cstyle; */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-movie-object.sip
new/python-poppler-qt4-0.24.0/poppler-movie-object.sip
--- old/python-poppler-qt4-0.18.2/poppler-movie-object.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-movie-object.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,26 @@
+namespace Poppler {
+
+class MovieObject {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+ enum PlayMode {
+ PlayOnce,
+ PlayOpen,
+ PlayRepeat,
+ PlayPalindrome,
+ };
+ ~MovieObject();
+ QString url() const;
+ QSize size() const;
+ int rotation() const;
+ bool showControls() const;
+ PlayMode playMode() const;
+
+private:
+ MovieObject(const Poppler::MovieObject&);
+}; // class MovieObject
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/python-poppler-qt4-0.18.2/poppler-opt-content-model.sip
new/python-poppler-qt4-0.24.0/poppler-opt-content-model.sip
--- old/python-poppler-qt4-0.18.2/poppler-opt-content-model.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-opt-content-model.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,29 @@
+namespace Poppler {
+
+class OptContentModel : QAbstractItemModel {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+#include <qt4/poppler-optcontent.h>
+%End
+
+public:
+ virtual ~OptContentModel();
+
+ QModelIndex index(int row, int column, const QModelIndex &parent) const;
+ QModelIndex parent(const QModelIndex &child) const;
+
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent) const;
+
+ QVariant data(const QModelIndex &index, int role) const;
+ virtual bool setData ( const QModelIndex & index, const QVariant & value,
int role = Qt::EditRole );
+
+ Qt::ItemFlags flags ( const QModelIndex & index ) const;
+
+ virtual QVariant headerData( int section, Qt::Orientation orientation, int
role = Qt::DisplayRole ) const;
+
+private:
+ OptContentModel(const Poppler::OptContentModel&);
+}; // class OptContentModel
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-page.sip
new/python-poppler-qt4-0.24.0/poppler-page.sip
--- old/python-poppler-qt4-0.18.2/poppler-page.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-page.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,78 @@
+namespace Poppler {
+
+class Page {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+ ~Page();
+ enum Rotation {
+ Rotate0 = 0,
+ Rotate90 = 1,
+ Rotate180 = 2,
+ Rotate270 = 3,
+ };
+ enum PageAction {
+ Opening,
+ Closing,
+ };
+%If(POPPLER_V0_16_0 -)
+ enum TextLayout {
+ PhysicalLayout,
+ RawOrderLayout,
+ };
+ enum PainterFlag {
+ DontSaveAndRestore = 0x00000001,
+ };
+ typedef QFlags<Poppler::Page::PainterFlag> PainterFlags;
+%End
+ QImage renderToImage(double xres=72.0, double yres=72.0, int x=-1, int
y=-1, int w=-1, int h=-1, Rotation rotate = Rotate0) const /ReleaseGIL/;
+%If(POPPLER_V0_16_0 -)
+ bool renderToPainter(QPainter* painter, double xres=72.0, double
yres=72.0, int x=-1, int y=-1, int w=-1, int h=-1,
+ Rotation rotate = Rotate0, PainterFlags flags = 0)
const /ReleaseGIL/;
+%End
+ QImage thumbnail() const;
+%If(POPPLER_V0_16_0 -)
+ QString text(const QRectF &rect, TextLayout textLayout) const;
+%End
+ QString text(const QRectF &rect) const;
+ enum SearchDirection {
+ FromTop,
+ NextResult,
+ PreviousResult,
+ };
+ enum SearchMode {
+ CaseSensitive,
+ CaseInsensitive,
+ };
+ bool search(const QString &text, QRectF &rect, SearchDirection direction,
SearchMode caseSensitive, Rotation rotate = Rotate0) const /ReleaseGIL/;
+%If(POPPLER_V0_14_0 -)
+ bool search(const QString &text, double &rectLeft, double &rectTop, double
&rectRight, double &rectBottom, SearchDirection direction, SearchMode
caseSensitive, Rotation rotate = Rotate0) const /ReleaseGIL/;
+%End
+ QList<Poppler::TextBox*> textList(Rotation rotate = Rotate0) const;
+ QSizeF pageSizeF() const;
+ QSize pageSize() const;
+ Poppler::PageTransition *transition() const;
+ Poppler::Link *action( PageAction act ) const;
+ enum Orientation {
+ Landscape,
+ Portrait,
+ Seascape,
+ UpsideDown,
+ };
+ Orientation orientation() const;
+ void defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool
upsideDown);
+ QList<Poppler::Link*> links() const;
+ QList<Poppler::Annotation*> annotations() const;
+ QList<Poppler::FormField*> formFields() const;
+ double duration() const;
+ QString label() const;
+
+private:
+ Page();
+ Page( const Poppler::Page & );
+
+}; // class Page
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-qt4.sip
new/python-poppler-qt4-0.24.0/poppler-qt4.sip
--- old/python-poppler-qt4-0.18.2/poppler-qt4.sip 2015-01-09
13:29:37.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-qt4.sip 2015-02-18
00:09:12.000000000 +0100
@@ -1,4 +1,10 @@
-%Module popplerqt4 0
+%Module(name=popplerqt4, version=0)
+
+/*
+ * Bindings for Poppler-Qt4 to Python
+ * Maintained by Wilbert Berendsen <[email protected]>
+ */
+
%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
@@ -15,413 +21,39 @@
POPPLER_V0_24_0
}
-%Include types.sip
-%Include poppler-link.sip
-%Include poppler-form.sip
-%Include poppler-annotation.sip
-%Include poppler-convert.sip
-%Include poppler-page-transition.sip
-
%ModuleHeaderCode
#include <qt4/poppler-qt4.h>
%End
-/*
- * Bindings for Poppler-Qt4 to Python
- * Maintained by Wilbert Berendsen <[email protected]>
- */
-
-namespace Poppler {
-
-
-class Document {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
-%If(POPPLER_V0_22_0 -)
- enum FormType {
- NoForm,
- AcroForm,
- XfaForm,
- };
-%End
- enum PageMode {
- UseNone,
- UseOutlines,
- UseThumbs,
- FullScreen,
- UseOC,
- UseAttach,
- };
- enum PageLayout {
- NoLayout,
- SinglePage,
- OneColumn,
- TwoColumnLeft,
- TwoColumnRight,
- TwoPageLeft,
- TwoPageRight,
- };
- enum RenderBackend {
- SplashBackend,
- ArthurBackend,
- };
- enum RenderHint {
- Antialiasing = 0x00000001,
- TextAntialiasing = 0x00000002,
-%If(POPPLER_V0_12_1 -)
- TextHinting = 0x00000004,
-%End
-%If(POPPLER_V0_18_0 -)
- TextSlightHinting = 0x00000008,
-%End
-%If(POPPLER_V0_22_0 -)
- OverprintPreview = 0x00000010,
-%End
-%If(POPPLER_V0_24_0 -)
- ThinLineSolid = 0x00000020,
- ThinLineShape = 0x00000040,
-%End
- };
- typedef QFlags<Poppler::Document::RenderHint> RenderHints;
-
- void setColorDisplayProfile(void *outputProfileA);
- void setColorDisplayProfileName(const QString &name);
- void* colorRgbProfile() const;
- void* colorDisplayProfile() const;
- static Poppler::Document *load(const QString & filePath,
- const QByteArray &ownerPassword=QByteArray(),
- const QByteArray &userPassword=QByteArray())
/Factory, ReleaseGIL/;
- static Poppler::Document *loadFromData(const QByteArray &fileContents,
- const QByteArray &ownerPassword=QByteArray(),
- const QByteArray &userPassword=QByteArray())
/Factory, ReleaseGIL/;
- Poppler::Page *page(int index) const /Factory/;
- Poppler::Page *page(const QString &label) const /Factory/;
- int numPages() const;
- PageMode pageMode() const;
- PageLayout pageLayout() const;
- bool unlock(const QByteArray &ownerPassword, const QByteArray
&userPassword);
- bool isLocked() const;
- QDateTime date( const QString & data ) const;
- QString info( const QString & data ) const;
- QStringList infoKeys() const;
- bool isEncrypted() const;
- bool isLinearized() const;
- bool okToPrint() const;
- bool okToPrintHighRes() const;
- bool okToChange() const;
- bool okToCopy() const;
- bool okToAddNotes() const;
- bool okToFillForm() const;
- bool okToCreateFormFields() const;
- bool okToExtractForAccessibility() const;
- bool okToAssemble() const;
-%If(POPPLER_V0_16_0 -)
- bool getPdfId(QByteArray *permanentId, QByteArray *updateId) const;
-%End
- void getPdfVersion(int *major, int *minor) const;
- QList<Poppler::FontInfo> fonts() const /ReleaseGIL/;
-%If(POPPLER_V0_22_0 -)
- FormType formType() const;
-%End
- Poppler::FontIterator* newFontIterator( int startPage = 0 ) const
/Factory/;
- QByteArray fontData(const Poppler::FontInfo &font) const;
- QList<Poppler::EmbeddedFile*> embeddedFiles() const;
- bool hasEmbeddedFiles() const;
- QDomDocument *toc() const;
- Poppler::LinkDestination *linkDestination( const QString &name ) /Factory,
ReleaseGIL/;
- void setPaperColor(const QColor &color);
- QColor paperColor() const;
- void setRenderBackend( RenderBackend backend );
- RenderBackend renderBackend() const;
- static QSet<Poppler::Document::RenderBackend> availableRenderBackends();
- void setRenderHint( RenderHint hint, bool on = true );
- RenderHints renderHints() const;
- Poppler::PSConverter *psConverter() const /Factory/;
- Poppler::PDFConverter *pdfConverter() const /Factory/;
- QString metadata() const;
- bool hasOptionalContent() const;
- Poppler::OptContentModel *optionalContentModel() /Factory/;
- QStringList scripts() const;
-private:
- Document();
- Document(const Poppler::Document &);
-
-}; // class Document
-
-
-class Page {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
- ~Page();
- enum Rotation {
- Rotate0 = 0,
- Rotate90 = 1,
- Rotate180 = 2,
- Rotate270 = 3,
- };
- enum PageAction {
- Opening,
- Closing,
- };
-%If(POPPLER_V0_16_0 -)
- enum TextLayout {
- PhysicalLayout,
- RawOrderLayout,
- };
- enum PainterFlag {
- DontSaveAndRestore = 0x00000001,
- };
- typedef QFlags<Poppler::Page::PainterFlag> PainterFlags;
-%End
- QImage renderToImage(double xres=72.0, double yres=72.0, int x=-1, int
y=-1, int w=-1, int h=-1, Rotation rotate = Rotate0) const /ReleaseGIL/;
-%If(POPPLER_V0_16_0 -)
- bool renderToPainter(QPainter* painter, double xres=72.0, double
yres=72.0, int x=-1, int y=-1, int w=-1, int h=-1,
- Rotation rotate = Rotate0, PainterFlags flags = 0)
const /ReleaseGIL/;
-%End
- QImage thumbnail() const;
-%If(POPPLER_V0_16_0 -)
- QString text(const QRectF &rect, TextLayout textLayout) const;
-%End
- QString text(const QRectF &rect) const;
- enum SearchDirection {
- FromTop,
- NextResult,
- PreviousResult,
- };
- enum SearchMode {
- CaseSensitive,
- CaseInsensitive,
- };
- bool search(const QString &text, QRectF &rect, SearchDirection direction,
SearchMode caseSensitive, Rotation rotate = Rotate0) const /ReleaseGIL/;
-%If(POPPLER_V0_14_0 -)
- bool search(const QString &text, double &rectLeft, double &rectTop, double
&rectRight, double &rectBottom, SearchDirection direction, SearchMode
caseSensitive, Rotation rotate = Rotate0) const /ReleaseGIL/;
-%End
- QList<Poppler::TextBox*> textList(Rotation rotate = Rotate0) const;
- QSizeF pageSizeF() const;
- QSize pageSize() const;
- Poppler::PageTransition *transition() const;
- Poppler::Link *action( PageAction act ) const;
- enum Orientation {
- Landscape,
- Portrait,
- Seascape,
- UpsideDown,
- };
- Orientation orientation() const;
- void defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool
upsideDown);
- QList<Poppler::Link*> links() const;
- QList<Poppler::Annotation*> annotations() const;
- QList<Poppler::FormField*> formFields() const;
- double duration() const;
- QString label() const;
-
-private:
- Page();
- Page( const Poppler::Page & );
-
-}; // class Page
-
-
-class TextBox {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
- TextBox(const QString& text, const QRectF &bBox);
- ~TextBox();
- QString text() const;
- QRectF boundingBox() const;
- Poppler::TextBox *nextWord() const;
- QRectF charBoundingBox(int i) const;
- bool hasSpaceAfter() const;
-
-private:
- TextBox(const Poppler::TextBox&);
-}; // class TextBox
-
-
-class FontInfo {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
- enum Type {
- unknown,
- Type1,
- Type1C,
- Type1COT,
- Type3,
- TrueType,
- TrueTypeOT,
- CIDType0,
- CIDType0C,
- CIDType0COT,
- CIDTrueType,
- CIDTrueTypeOT,
- };
- FontInfo();
-// FontInfo( const FontInfoData &fid );
- FontInfo( const Poppler::FontInfo &fi );
- ~FontInfo();
- QString name() const;
- QString file() const;
- bool isEmbedded() const;
- bool isSubset() const;
- Type type() const;
- QString typeName() const;
-
-}; // class FontInfo
-
-
-class FontIterator {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
- ~FontIterator();
- QList<Poppler::FontInfo> next();
- bool hasNext() const;
- int currentPage() const;
-
- Poppler::FontIterator * __iter__();
-%MethodCode
- sipRes = sipCpp;
-%End
- SIP_PYOBJECT __next__();
-%MethodCode
- if (sipCpp->hasNext()) {
- QList<Poppler::FontInfo> next = sipCpp->next();
- sipRes = sipConvertFromType(&next,
sipFindType("QList<Poppler::FontInfo>"), Py_None);
- } else {
- PyErr_SetNone(PyExc_StopIteration);
- }
-%End
-
-private:
- FontIterator(const Poppler::FontIterator&);
-// FontIterator( int, DocumentData *dd );
-}; // class FontIterator
-
-
-class EmbeddedFile {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
-// EmbeddedFile(EmbFile *embfile);
- ~EmbeddedFile();
- QString name() const;
- QString description() const;
- int size() const;
- QDateTime modDate() const;
- QDateTime createDate() const;
- QByteArray checksum() const;
- QString mimeType() const;
- QByteArray data();
- bool isValid() const;
-
-private:
- EmbeddedFile(const Poppler::EmbeddedFile&);
-}; // class EmbeddedFile
-
-
-class SoundObject {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
- enum SoundType {
- External,
- Embedded,
- };
- enum SoundEncoding {
- Raw,
- Signed,
- muLaw,
- ALaw,
- };
-// SoundObject(Sound *popplersound);
- ~SoundObject();
- SoundType soundType() const;
- QString url() const;
- QByteArray data() const;
- double samplingRate() const;
- int channels() const;
- int bitsPerSample() const;
- SoundEncoding soundEncoding() const;
-
-private:
- SoundObject(const Poppler::SoundObject&);
-}; // class SoundObject
-
-
-class MovieObject {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-%End
-
-public:
- enum PlayMode {
- PlayOnce,
- PlayOpen,
- PlayRepeat,
- PlayPalindrome,
- };
- ~MovieObject();
- QString url() const;
- QSize size() const;
- int rotation() const;
- bool showControls() const;
- PlayMode playMode() const;
-
-private:
- MovieObject(const Poppler::MovieObject&);
-}; // class MovieObject
-
-
-class OptContentModel : QAbstractItemModel {
-%TypeHeaderCode
-#include <qt4/poppler-qt4.h>
-#include <qt4/poppler-optcontent.h>
-%End
-
-public:
- virtual ~OptContentModel();
-
- QModelIndex index(int row, int column, const QModelIndex &parent) const;
- QModelIndex parent(const QModelIndex &child) const;
-
- int rowCount(const QModelIndex &parent = QModelIndex()) const;
- int columnCount(const QModelIndex &parent) const;
-
- QVariant data(const QModelIndex &index, int role) const;
- virtual bool setData ( const QModelIndex & index, const QVariant & value,
int role = Qt::EditRole );
-
- Qt::ItemFlags flags ( const QModelIndex & index ) const;
+%Include version.sip // auto-generated by the setup.py script
+%Include types.sip
- virtual QVariant headerData( int section, Qt::Orientation orientation, int
role = Qt::DisplayRole ) const;
+%Include poppler-annotation.sip
+%Include poppler-convert.sip
+%Include poppler-document.sip
+%Include poppler-embedded-file.sip
+%Include poppler-font-info.sip
+%Include poppler-font-iterator.sip
+%Include poppler-form.sip
+%Include poppler-link.sip
+%Include poppler-link-destination.sip
+%Include poppler-movie-object.sip
+%Include poppler-opt-content-model.sip
+%Include poppler-page.sip
+%Include poppler-page-transition.sip
+%Include poppler-sound-object.sip
+%Include poppler-text-box.sip
-private:
- OptContentModel(const Poppler::OptContentModel&);
-}; // class OptContentModel
+namespace Poppler {
// Functions in Poppler
bool isCmsAvailable();
QDateTime convertDate (char *dateString);
-
+%If(POPPLER_V0_22_0 -)
+bool isOverprintPreviewAvailable();
+%End
}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-sound-object.sip
new/python-poppler-qt4-0.24.0/poppler-sound-object.sip
--- old/python-poppler-qt4-0.18.2/poppler-sound-object.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-sound-object.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,33 @@
+namespace Poppler {
+
+class SoundObject {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+ enum SoundType {
+ External,
+ Embedded,
+ };
+ enum SoundEncoding {
+ Raw,
+ Signed,
+ muLaw,
+ ALaw,
+ };
+// SoundObject(Sound *popplersound);
+ ~SoundObject();
+ SoundType soundType() const;
+ QString url() const;
+ QByteArray data() const;
+ double samplingRate() const;
+ int channels() const;
+ int bitsPerSample() const;
+ SoundEncoding soundEncoding() const;
+
+private:
+ SoundObject(const Poppler::SoundObject&);
+}; // class SoundObject
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/poppler-text-box.sip
new/python-poppler-qt4-0.24.0/poppler-text-box.sip
--- old/python-poppler-qt4-0.18.2/poppler-text-box.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/python-poppler-qt4-0.24.0/poppler-text-box.sip 2015-02-18
00:09:12.000000000 +0100
@@ -0,0 +1,21 @@
+namespace Poppler {
+
+class TextBox {
+%TypeHeaderCode
+#include <qt4/poppler-qt4.h>
+%End
+
+public:
+ TextBox(const QString& text, const QRectF &bBox);
+ ~TextBox();
+ QString text() const;
+ QRectF boundingBox() const;
+ Poppler::TextBox *nextWord() const;
+ QRectF charBoundingBox(int i) const;
+ bool hasSpaceAfter() const;
+
+private:
+ TextBox(const Poppler::TextBox&);
+}; // class TextBox
+
+}; // namespace Poppler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/setup.cfg
new/python-poppler-qt4-0.24.0/setup.cfg
--- old/python-poppler-qt4-0.18.2/setup.cfg 1970-01-01 01:00:00.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/setup.cfg 2015-02-18 00:09:12.000000000
+0100
@@ -0,0 +1,2 @@
+[sdist]
+force-manifest=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-poppler-qt4-0.18.2/setup.py
new/python-poppler-qt4-0.24.0/setup.py
--- old/python-poppler-qt4-0.18.2/setup.py 2015-01-09 13:29:37.000000000
+0100
+++ new/python-poppler-qt4-0.24.0/setup.py 2015-02-18 00:09:12.000000000
+0100
@@ -2,7 +2,7 @@
project = dict(
name = 'python-poppler-qt4',
- version = '0.18.2',
+ version = '0.24.0',
description = 'A Python binding to Poppler-Qt4',
long_description = (
'A Python binding to Poppler-Qt4 that aims for '
@@ -216,13 +216,33 @@
return self._pyqtconfig
+ def write_version_sip(self, poppler_qt4_version,
python_poppler_qt4_version):
+ """Write a version.sip file.
+
+ The file contains code to make version information accessible from
+ the popplerqt4 Python module.
+
+ """
+ with open('version.sip', 'w') as f:
+ f.write(version_sip_template.format(
+ vlen = 'i' * len(python_poppler_qt4_version),
+ vargs = ', '.join(map(format, python_poppler_qt4_version)),
+ pvlen = 'i' * len(poppler_qt4_version),
+ pvargs = ', '.join(map(format, poppler_qt4_version))))
+
def _sip_compile(self, sip_bin, source, sbf):
+ # First check manually specified poppler version
+ ver = self.poppler_version or pkg_config_version('poppler-qt4') or ()
+
+ # our own version:
+ version = tuple(map(int, re.findall(r'\d+', project['version'])))
+
+ # make those accessible from the popplerqt4 module:
+ self.write_version_sip(ver, version)
+
# Disable features if older poppler-qt4 version is found.
# See the defined tags in %Timeline{} in poppler-qt4.sip.
-
- # First check manually specified poppler version
- ver = self.poppler_version or pkg_config_version('poppler-qt4')
if not ver or ver < (0, 12, 1):
tag = 'POPPLER_V0_12_0'
elif ver < (0, 14, 0):
@@ -318,6 +338,36 @@
project['cmdclass']['bdist_egg'] = bdist_egg
except ImportError:
pass
+
+
+version_sip_template = r"""// Generated by setup.py -- Do not edit
+
+PyObject *version();
+%Docstring
+The version of the popplerqt4 python module.
+%End
+
+PyObject *poppler_version();
+%Docstring
+The version of the Poppler library.
+%End
+
+%ModuleCode
+
+PyObject *version()
+{{ return Py_BuildValue("({vlen})", {vargs}); }};
+
+PyObject *poppler_version()
+{{ return Py_BuildValue("({pvlen})", {pvargs}); }};
+
+%End
+"""
+
+### use full README.rst as long description
+with open('README.rst', 'rb') as f:
+ project["long_description"] = f.read().decode('utf-8')
+
+
project['cmdclass']['build_ext'] = build_ext
setup(
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
