[arch-commits] Commit in kdebindings-python/kde-unstable (PKGBUILD fix.patch)

[Andrea Scarpino]

    Date: Monday, January 7, 2013 @ 15:26:42
  Author: andrea
Revision: 174842

Use the upstream patch to fix the missing symbols; provide the /usr/bin/pykde4uic symlink; add missing mesa makedeps

Modified:
  kdebindings-python/kde-unstable/PKGBUILD
  kdebindings-python/kde-unstable/fix.patch

-----------+
 PKGBUILD  |   15 ++++++---------
 fix.patch |   35 +++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-07 20:22:41 UTC (rev 174841)
+++ PKGBUILD	2013-01-07 20:26:42 UTC (rev 174842)
@@ -6,19 +6,17 @@
          'kdebindings-python2'
          'kdebindings-python-common')
 pkgver=4.9.97
-pkgrel=1
+pkgrel=2
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
+             'pyqt' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
 source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'fix.patch'
-        'pykdeuic4-symlink.patch')
+        'fix.patch')
 sha1sums=('3e8aef059de39184be505718094e67aa0d84273e'
-          'c02432fbe0e0c600a2c422f5d2221ece73fce017'
-          '17256fde8404347043b007f736f10e8da91a4313')
+          '4dbb98bb87d7431d471b94ca3583d24805c78494')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
@@ -26,9 +24,6 @@
   cd pykde4-${pkgver}
   # KDEBUG#312618
   patch -p1 -i "${srcdir}"/fix.patch
-
-  # Fixed upstream
-  patch -p1 -i "${srcdir}"/pykdeuic4-symlink.patch
   cd ../
 
   mkdir build
@@ -62,6 +57,8 @@
   # Provided by kdebindings-python-common
   rm -r "${pkgdir}"/usr/share/apps/pykde4/examples
   rm -r "${pkgdir}"/usr/share/sip/PyKDE4
+
+  ln -s /usr/bin/pykdeuic4-3.3 "${pkgdir}"/usr/bin/pykdeuic4
 }
 
 package_kdebindings-python2() {

Modified: fix.patch
===================================================================
--- fix.patch	2013-01-07 20:22:41 UTC (rev 174841)
+++ fix.patch	2013-01-07 20:26:42 UTC (rev 174842)
@@ -1,10 +1,29 @@
---- pykde4-4.9.97/CMakeLists.txt~	2013-01-04 16:49:33.259672808 +0000
-+++ pykde4-4.9.97/CMakeLists.txt	2013-01-04 16:52:26.535208136 +0000
-@@ -1,7 +1,5 @@
- project(pykde4)
+From: Luca Beltrame <lbeltrame at kde.org>
+Date: Mon, 07 Jan 2013 19:34:41 +0000
+Subject: Fix unresolved symbols appearing in PyKDE4.
+X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=bdab774f1f0874d7f0a6e14d7885d73c8101b3e9
+---
+Fix unresolved symbols appearing in PyKDE4.
+
+Apparently the CMake policy responsible for this is getting set back
+somewhere in the build system.
+
+Reporter, please close the bug if the issue is no longer applicable. I
+can't reproduce it.
+
+CCBUG: 312618
+---
+
+
+--- a/kpythonpluginfactory/CMakeLists.txt
++++ b/kpythonpluginfactory/CMakeLists.txt
+@@ -4,7 +4,7 @@
+     kpythonpluginfactory.cpp)
  
--cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
--
- # search packages used by KDE
- find_package(KDE4 4.9.4 REQUIRED)
+ GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARIES} NAME)
+-ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
++ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}")
+ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
  
+ kde4_add_plugin(kpythonpluginfactory ${kpythonpluginfactory_SRCS})
+