diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-06-21 22:09:37 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2011-06-21 22:09:37 +0200 |
| commit | b89611106eacb53221f1ee84b7ecde046ac3944b (patch) | |
| tree | cc05d793b977f8e8abef1e5c93ebe0fbc854cb8c | |
| parent | f03dea2141635a64ff6c272aa850bb11ef0e5570 (diff) | |
| download | kde-b89611106eacb53221f1ee84b7ecde046ac3944b.tar.gz kde-b89611106eacb53221f1ee84b7ecde046ac3944b.tar.bz2 kde-b89611106eacb53221f1ee84b7ecde046ac3944b.zip | |
[kde-base/pykde4] Make pykdeuic work with >=PyQt4-4.7.5, bug 349453.
(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
| -rw-r--r-- | kde-base/pykde4/Manifest | 29 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch | 21 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.6.49.9999.ebuild | 2 |
3 files changed, 38 insertions, 14 deletions
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest index 5564e4a91a5..9217414a4b4 100644 --- a/kde-base/pykde4/Manifest +++ b/kde-base/pykde4/Manifest @@ -2,25 +2,26 @@ Hash: SHA512 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2 +AUX pykde4-4.6.4-pyqt475.patch 859 RMD160 26310ab2ca9f7b9c3a51d39a2888c855bc578014 SHA1 f44979aa3f5bbd110cb60a9f4e3264b7177ba605 SHA256 3fdfc6d26ca8cb0108f171fa20a2568207c7c5aa7a9ca637728df610724ed8b4 DIST pykde4-4.6.80.tar.bz2 2106824 RMD160 f12aa3b512e4e1566dcc10cbbcca560cc74c49d0 SHA1 f45e40298046ecea382f9b85c34b3e21d856a9da SHA256 51bf720c4f298dca56244b99252611377603234d43508650c8f9494a21494102 -EBUILD pykde4-4.6.49.9999.ebuild 2058 RMD160 81ad294d12fa2ce0afe580e9a7deebea8cc960fe SHA1 135ecdd11e2a38ee770a50c7157d68cda26bed11 SHA256 d2ce3d178e727144a56fdef83c92a9d99009a8d5e9d97510cf6d5a4e4a233a57 +EBUILD pykde4-4.6.49.9999.ebuild 2111 RMD160 63d97fb523ac0ba36e23121f846338cf9745ce27 SHA1 85ca7b7a0dacf811f1939346ad06ff3d2b943269 SHA256 b32756479bd4d8ae9836cf46e27bfaaf707cc8c8720b9c2b0ed9a47356d4b56d EBUILD pykde4-4.6.80.ebuild 1952 RMD160 ec53ac19571e0b8d6138deef4afce9bd96709d83 SHA1 735e2fdda231086c25ca99d92cf3c2f022f84b57 SHA256 f50743849ac1679e2d95752427f955aa9aaf2818eeed95904b05ff81e557a47b EBUILD pykde4-9999.ebuild 1917 RMD160 6ea07c8386be5606395af892443136eee4daaf3b SHA1 eb2fe7b10046b0bd5c91204e1ddc60d8f7b99e94 SHA256 2a032679b53dade0f51935090ed38235e40d9e6472934eef0e4a3eb891e3e731 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJN9HdsAAoJELHSF2kinlg4VKMP/180nz2OTndhdsu2vZp1LPxW -8G16hw1MBSZKfGMEljOq11rVuGOg+bMM4g6X4/LWnuvKQ1GvRNm47ABtvEFq2cxj -vhhxSouYvU2CCmujNODyFPH3v7qTO5qU8Jb6v2tEeq8bmaAd/c8OCXP+Js1HlNxJ -+Q9fAii1sxMsn/kZKesgjauh7xIXRQS6CGb4HSL6664ziK6jnNDC5j9EAqin109D -rWjs1uc3/f7DZBAKmsu+8dO/1iak6jlf6hvILS6u1lvmsFdbAUYUcD3B5HAcFZmf -g8iBMNAShAFuqkDmaeildkg5GYAjjjB/bG2LMfnLEvGNM0VwhjNPN4Y7fXYYAqmY -/8VfCv2C9sF7LECEuDRm3JzPuUyWjP80lGBGl+pzVECCyfiG2JGmkEIpSusLDRdB -qq/Ot10z4vcCS91MI/4zc5QRFJLo4/gGoxBArqYKAPpDm/MSnEuyukii5hy5brL4 -sHA7qypWnDTv16cCdWNvUYbwl4t5MmxtsEKP314BTSQ2jI/DWVUcC3PKfR/6rE29 -z7IyMxOKWM+eaoeokVZ9y0DsZ/X01T6H3n1TpcNoe0rYKmLIPCM0xjnicAlTJSgg -gIx/D2m0qMnPjFeZ4Mtr8Icl3t3YeZe2/8QNCCFwVSY0whgeX/V8+JAI1auFnOQk -/F64VIG2AORVn7u7ZbPS -=ApJ5 +iQIcBAEBCgAGBQJOAPqBAAoJENwGBM22xffeH+UP/Ag4hb2hDyk8f6siodS72+i0 +5Wst645Fn53iasyS91uekLwFIWudXUfV5dH5EPWqRsCY8Uv3r/s7anTsFekvEflM +A/i9u0CpqYE/Xk6cKeKM7NIAtJq47RDj/FR1e3khZ7EutEFegBQY9cdKcMSD5K2m +vyaJIdcJ22t0ffKxqL42I3rumfGTMuKeL6ewBbnSuPZZ7zGYCGP1ibvrboO/byW9 +mUXdHgSYqWi4Qg74pONtC3ilkO7TDch5ZprrtoUhTsuJgwhSXnzuQeYcCT1BM/++ +aC6Bkq0WXyssC/q7ViSEzYJrVqNU8iX7JVp6joH1HkndH5wUDbpmObuL9SvDbDo0 +mjfDfeCIEF1d07OGWDMncW0pmDCWYl6R9LCuM/ohe6W+FIvc/bheqFegOihNbFBw +JQvSzKvjCmT3h60igfqSW34Od6VLDq1LiGjIihsTWOqwrfbCpsqFfuAnkOO3g1jn +uKifTb9v+TdUBwSkD2dGeRmJPssSifQ9tqBniJcTUAxtvAOyMOiOtPz10lHgtL4K +R3nmKAEfMTW+84yZAPM6pVGYryUyFeD+ibAHqzutYXoyz1q6JZxp+z3bCjdFQ7zO +00IZisnMgcj0it+W0zNwbKkusO1PkHmOm8ER3C/brMXT/ogFifrcLdbrjpUju4tF +d9jb4J8JMbP9rr6239f8 +=AWOe -----END PGP SIGNATURE----- diff --git a/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch b/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch new file mode 100644 index 00000000000..55f61f0c872 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.6.4-pyqt475.patch @@ -0,0 +1,21 @@ +diff -ruN pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py +--- pykde4-4.6.4.orig/python/pykde4/tools/pykdeuic4/pykdeuic4.py 2011-06-02 12:03:32.000000000 +0200 ++++ pykde4-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py 2011-06-21 21:59:16.310764723 +0200 +@@ -78,7 +78,7 @@ + indenter.indentwidth = indent + comp = compiler.UICompiler() + comp.factory._cwFilters.append(kdeFilter()) +- winfo = comp.compileUi(uifile, output) ++ winfo = comp.compileUi(uifile, output, None) + + if exe: + output.write(""" +@@ -111,7 +111,7 @@ + app = kdeui.KApplication() + mainWindow = MainWin(None, "main window") + mainWindow.show() +- app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit) ++ app.lastWindowClosed.connect(app.quit) + app.exec_ () + """) + diff --git a/kde-base/pykde4/pykde4-4.6.49.9999.ebuild b/kde-base/pykde4/pykde4-4.6.49.9999.ebuild index ac6ed420625..694ee8debe3 100644 --- a/kde-base/pykde4/pykde4-4.6.49.9999.ebuild +++ b/kde-base/pykde4/pykde4-4.6.49.9999.ebuild @@ -33,6 +33,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" ) + pkg_setup() { python_pkg_setup kde4-meta_pkg_setup |