Commits

arsooy committed 36e3a50

Python 3.3 build priority, source url update.

* shiboken changes
* source url update, downloads from qt-project.org
* prioritize 3.3 over 3.2 when both exists when looking for
python3 interpreter (and libs)
* pyside source url update
* pyside-tools source url update

  • Participants
  • Parent commits 63749ed

Comments (0)

Files changed (4)

pyside-tools/PKGBUILD

 depends=('python-pyside>=1.1.2')
 makedepends=('cmake' 'automoc4' 'python-shiboken>=1.1.2')
 replaces=('pyside-tools-py3')
-source=("https://distfiles.macports.org/py-pyside-tools/pyside-tools-$pkgver.tar.bz2"
+source=("http://qt-project.org/uploads/pyside/pyside-tools-$pkgver.tar.bz2"
         'py3build.patch')
 md5sums=('0a683e1dc426df5834cb1e540d0c6e3f'
          '02003622eeeebb9ce302375dce05dc05')
 depends=('qt>=4.8' 'phonon' 'mesa')
 makedepends=('automoc4' 'shiboken-common>=1.1.2')
 replaces=('pyside')
-source=("https://distfiles.macports.org/py-pyside/pyside-qt4.8+$pkgver.tar.bz2")
+source=("http://qt-project.org/uploads/pyside/pyside-qt4.8+$pkgver.tar.bz2")
 md5sums=('59c8653734b020b0128b82adc98ee704')
 
 

shiboken/PKGBUILD

 depends=('qt>=4.8' 'openssl')
 makedepends=('cmake' 'automoc4')
 replaces=('shibokengenerator' 'libshiboken')
-source=("https://distfiles.macports.org/py-shiboken/shiboken-$pkgver.tar.bz2"
+source=("http://qt-project.org/uploads/pyside/shiboken-$pkgver.tar.bz2"
         'lookup_python33.patch')
 md5sums=('0a37b5011b3a7276bf4584317412a4b6'
-         '408d7e957cdc24c47a45edc88898e55b')
+         '2055906a070e9c3bb32c6ab346a474a1')
 
 build() {
     echo ""

shiboken/lookup_python33.patch

+diff --git a/cmake/Modules/FindPython3Interp.cmake b/cmake/Modules/FindPython3Interp.cmake
+index 373982e..9c6c148 100644
+--- a/cmake/Modules/FindPython3Interp.cmake
++++ b/cmake/Modules/FindPython3Interp.cmake
+@@ -20,16 +20,18 @@
+ #  License text for the above reference.)
+ 
+ FIND_PROGRAM(PYTHON3_EXECUTABLE
+-  NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3
++  NAMES python3.3mu python3.3m python3.3u python3.3 python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3
+   PATHS
++  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.3\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.0\\InstallPath]
+   )
+ 
+ FIND_PROGRAM(PYTHON3_DBG_EXECUTABLE
+-  NAMES python3.2dmu python3.2dm python3.2du python3.2d python3.1-dbg python3.0-dbg python3-dbg
++  NAMES python3.3dmu python3.3dm python3.3du python3.3d python3.2dmu python3.2dm python3.2du python3.2d python3.1-dbg python3.0-dbg python3-dbg
+   PATHS
++  [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.3\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath]
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.0\\InstallPath]
 diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake
 index 03fe8b8..263a610 100644
 --- a/cmake/Modules/FindPython3Libs.cmake