Hello community,
here is the log from the commit of package python-poppler-qt4 for
openSUSE:Factory checked in at 2017-01-25 23:36:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-23 11:57:32.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python-poppler-qt4.new/python-poppler-qt4.changes
2017-01-25 23:36:39.322318244 +0100
@@ -1,0 +2,5 @@
+Wed Jan 25 08:44:15 UTC 2017 - [email protected]
+
+- Added buildfix_python-sip-419.patch to fix build with new python-sip
+
+-------------------------------------------------------------------
New:
----
buildfix_python-sip-419.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-poppler-qt4.spec ++++++
--- /var/tmp/diff_new_pack.CVcL1V/_old 2017-01-25 23:36:39.754253167 +0100
+++ /var/tmp/diff_new_pack.CVcL1V/_new 2017-01-25 23:36:39.758252565 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-poppler-qt4
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 LISA GmbH, Bingen, Germany.
# Copyright (c) 2012 Johannes Engel <[email protected]>
#
@@ -29,6 +29,8 @@
Url: https://github.com/wbsoft/python-poppler-qt4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.gz
+# Patch Build: fix building using SIP 4.19+
+Patch0: buildfix_python-sip-419.patch
%description
Python binding to poppler-qt4
@@ -36,6 +38,7 @@
%prep
%setup -q
+%patch0 -p1
%build
python3 setup.py build
++++++ buildfix_python-sip-419.patch ++++++
>From 46fd6a237aefe33a18edee601e548a33ba6f2a50 Mon Sep 17 00:00:00 2001
From: Laurent Coustet <[email protected]>
Date: Wed, 4 Jan 2017 18:07:30 +0100
Subject: [PATCH] Build: fix building using SIP 4.19+
---
poppler-qt4.sip | 2 +-
types.sip | 22 +++++++++++++++-------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/poppler-qt4.sip b/poppler-qt4.sip
index 96c1fcd..f779c3d 100644
--- a/poppler-qt4.sip
+++ b/poppler-qt4.sip
@@ -1,4 +1,4 @@
-%Module(name=popplerqt4, version=0)
+%Module(name=popplerqt4)
/*
* Bindings for Poppler-Qt4 to Python
diff --git a/types.sip b/types.sip
index c692d55..0928f30 100644
--- a/types.sip
+++ b/types.sip
@@ -182,7 +182,7 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;
- const sipMappedType* qlinkedlist_type =
sipFindMappedType("QLinkedList<TYPE>");
+ const sipTypeDef* qlinkedlist_type = sipFindType("QLinkedList<TYPE>");
// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
@@ -190,7 +190,7 @@ template <TYPE>
QLinkedList<TYPE>* t = new QLinkedList<TYPE>(sipCpp->at(i));
PyObject *tobj;
- if ((tobj = sipConvertFromMappedType(t, qlinkedlist_type, sipTransferObj))
== NULL)
+ if ((tobj = sipConvertFromType(t, qlinkedlist_type, sipTransferObj)) ==
NULL)
{
Py_DECREF(l);
delete t;
@@ -203,7 +203,7 @@ template <TYPE>
%End
%ConvertToTypeCode
- const sipMappedType* qlinkedlist_type =
sipFindMappedType("QLinkedList<TYPE>");
+ const sipTypeDef* qlinkedlist_type = sipFindType("QLinkedList<TYPE>");
// Check the type if that is all that is required.
if (sipIsErr == NULL)
@@ -212,7 +212,7 @@ template <TYPE>
return 0;
for (int i = 0; i < PySequence_Size(sipPy); ++i)
- if (!sipCanConvertToMappedType(PySequence_ITEM(sipPy, i),
qlinkedlist_type, SIP_NOT_NONE))
+ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type,
SIP_NOT_NONE))
return 0;
return 1;
@@ -224,16 +224,24 @@ template <TYPE>
for (int i = 0; i < PySequence_Size(sipPy); ++i)
{
int state;
- QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> *
>(sipConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type,
sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+ QLinkedList<TYPE> *t = reinterpret_cast<QLinkedList<TYPE> *>(
+ sipConvertToType(PySequence_ITEM(sipPy, i),
+ qlinkedlist_type,
+ sipTransferObj,
+ SIP_NOT_NONE,
+ &state,
+ sipIsErr
+ )
+ );
if (*sipIsErr)
{
- sipReleaseInstance(t, sipClass_TYPE, state);
+ sipReleaseType(t, qlinkedlist_type, state);
delete ql;
return 0;
}
ql->append(*t);
- sipReleaseInstance(t, sipClass_TYPE, state);
+ sipReleaseType(t, qlinkedlist_type, state);
}
*sipCppPtr = ql;
