Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2014-07-16 16:19:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2014-06-25 10:48:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2014-07-16 16:20:26.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:34:53 UTC 2014 - [email protected] + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- python3-kde4.changes: same change Old: ---- pykde4-4.13.2.tar.xz New: ---- pykde4-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.lqyRMx/_old 2014-07-16 16:20:27.000000000 +0200 +++ /var/tmp/diff_new_pack.lqyRMx/_new 2014-07-16 16:20:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-kde4 -Version: 4.13.2 +Version: 4.13.80 Release: 0 Summary: Python bindings for KDE 4 License: LGPL-2.1+ and GPL-2.0+ python3-kde4.spec: same change ++++++ pykde4-4.13.2.tar.xz -> pykde4-4.13.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.2/CMakeLists.txt new/pykde4-4.13.80/CMakeLists.txt --- old/pykde4-4.13.2/CMakeLists.txt 2014-03-10 07:36:53.000000000 +0100 +++ new/pykde4-4.13.80/CMakeLists.txt 2014-06-20 11:08:31.000000000 +0200 @@ -113,15 +113,27 @@ # Use an extra option when compiling on Python 3. if (PYTHON_VERSION_MAJOR GREATER 2) if(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt - set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) + # Disable for features in newer Qt + if (PYQT4_VERSION STRGREATER "040a04") + # GLuint + QVector (PyQt > 4.11) + set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint) + else () + # QVector (PyQt < 4.11) + set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) + endif () else () set(SIP_EXTRA_OPTIONS -g) endif() else (PYTHON_VERSION_MAJOR GREATER 2) if(PYQT4_VERSION STRGREATER "040904") # Disable for newer PyQt - set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) + if (PYQT4_VERSION STRGREATER "040a04") + # GLuint + QVector (PyQt > 4.11) + set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint) + else () + # QVector (PyQt < 4.11) + set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) + endif () else () set(SIP_EXTRA_OPTIONS -g -x Py_v3) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.2/sip/plasma/glapplet.sip new/pykde4-4.13.80/sip/plasma/glapplet.sip --- old/pykde4-4.13.2/sip/plasma/glapplet.sip 2014-03-10 07:36:53.000000000 +0100 +++ new/pykde4-4.13.80/sip/plasma/glapplet.sip 2014-06-20 11:08:31.000000000 +0200 @@ -18,8 +18,13 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //force + +%Feature PyKDE_GLuint + +%If (PyKDE_GLuint) typedef unsigned int GLuint; typedef unsigned int GLenum; +%End namespace Plasma { ++++++ python-sip-4.15.5.fixes.diff ++++++ --- /var/tmp/diff_new_pack.lqyRMx/_old 2014-07-16 16:20:28.000000000 +0200 +++ /var/tmp/diff_new_pack.lqyRMx/_new 2014-07-16 16:20:28.000000000 +0200 @@ -24,58 +24,3 @@ ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}") ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf133d7..5233da8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,15 +113,27 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) - # Use an extra option when compiling on Python 3. - if (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") -- # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) -+ # Disable for features in newer Qt -+ if (PYQT4_VERSION STRGREATER "040a04") -+ # GLuint + QVector (PyQt > 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint) -+ else () -+ # QVector (PyQt < 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) -+ endif () - else () - set(SIP_EXTRA_OPTIONS -g) - endif() - else (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) -+ if (PYQT4_VERSION STRGREATER "040a04") -+ # GLuint + QVector (PyQt > 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint) -+ else () -+ # QVector (PyQt < 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) -+ endif () - else () - set(SIP_EXTRA_OPTIONS -g -x Py_v3) - endif() -diff --git a/sip/plasma/glapplet.sip b/sip/plasma/glapplet.sip -index ab35ccb..15dbd47 100644 ---- a/sip/plasma/glapplet.sip -+++ b/sip/plasma/glapplet.sip -@@ -18,8 +18,13 @@ - // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - //force -+ -+%Feature PyKDE_GLuint -+ -+%If (PyKDE_GLuint) - typedef unsigned int GLuint; - typedef unsigned int GLenum; -+%End - - namespace Plasma - { - - \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
