diff options
| author | Alexey Shvetsov <alexxy@gentoo.org> | 2010-06-25 03:01:15 +0400 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2010-06-25 03:01:15 +0400 |
| commit | 17bd60ba41232b38633df2c04c9277e15512c50b (patch) | |
| tree | f7aced11c74609fbab8898f6b0ad7dde1a177911 | |
| parent | 0e7bbca4e9126ac93949ac995ad8a6537729d5f5 (diff) | |
| download | kde-17bd60ba41232b38633df2c04c9277e15512c50b.tar.gz kde-17bd60ba41232b38633df2c04c9277e15512c50b.tar.bz2 kde-17bd60ba41232b38633df2c04c9277e15512c50b.zip | |
[kde-base/kdelibs] Update patch for qt 4.7 pre
NOTICE: This patch should be removed when Qt 4.7 will be released!
| -rw-r--r-- | kde-base/kdelibs/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch | 23 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.4.90.ebuild | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 085065fdc12..477cb16799f 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -13,10 +13,11 @@ AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925 AUX kdelibs-4.4.3-mimetypes.patch 1887 RMD160 f1f371f6b405ce93b12a7ebc2631142fa1fa20a9 SHA1 64005d1d00ffb1e58572327a8aece9761e8008ab SHA256 4c724b2c3a569661b3b6035b8011293543d6c3cc6d59fe74310d9d1716e0881d AUX kdelibs-4.4.66-macos-unbundle.patch 4618 RMD160 a968d41e3b8c3f05e3b64a7487b0da0ae34fa8cc SHA1 36412cbe6b50b8b3ac5ae598910ac51dd37a48b7 SHA256 3a3b753af670cfadfb67a591c6cca5ed62ceffb97dcb326b9f2e684db1ba596d AUX kdelibs-4.4.80-icon-name-qt47.patch 822 RMD160 96a08e4cb42f919153387bbcb675d15012da9775 SHA1 70786a2a32d0d5373e9f00703608253e85f9f157 SHA256 c362fdccf62166437e71a955b3808615151eb99fe7f1d021feff70dc27fb671f +AUX kdelibs-4.4.90-icon-name-qt47.patch 926 RMD160 ec6819250b05a5afcfab8155db31377482afc6fb SHA1 cfcb3e04594f6accf9e0e292753d0edb43b9959c SHA256 e6c49345bdeb531a15d7aba75725af828751ee9ea9b242849f3748ac01956997 DIST kdelibs-4.4.85.tar.bz2 14368623 RMD160 c7f2bb97cd514f458d0c30729c2a0ea7a5f26486 SHA1 07040104cb14d71d2a66f2ccdf4a8ec2a56fcad1 SHA256 792ad9431fd3d231c3ad86425c0a24813a84ca81a6b29bc4b609ab14503a5d35 DIST kdelibs-4.4.90.tar.bz2 13833752 RMD160 ce0dd546f7c3f7ec942374b2c276cd0dba635e9c SHA1 8aebbaebeeb5936b2571b718ebaf5e09ec3f7479 SHA256 5f2c3f29db7daebe71825bcfe239cee8bdbe5b13aa5fb65b42dc3df72e6f221b EBUILD kdelibs-4.4.85.ebuild 9275 RMD160 df1d3c24bf532330f98c7091f36f61e79399372b SHA1 7df96510acf792154e515fc905fee396cf608989 SHA256 6f0fcb63e1594d9391e18db1612c073a23d00ba392d3fd38cef64a25f42beff8 -EBUILD kdelibs-4.4.90.ebuild 9275 RMD160 df1d3c24bf532330f98c7091f36f61e79399372b SHA1 7df96510acf792154e515fc905fee396cf608989 SHA256 6f0fcb63e1594d9391e18db1612c073a23d00ba392d3fd38cef64a25f42beff8 +EBUILD kdelibs-4.4.90.ebuild 9275 RMD160 724c04189e250d23c6da930f8d2238716bf3a8dd SHA1 deaa41d8799cef91b6ca91b4bf30d99cb9f15e81 SHA256 128e2e09d04ec8f03d6593fb84da949ed86ee791974733d19ad7afa64be4e501 EBUILD kdelibs-4.4.9999.ebuild 9097 RMD160 416d2e0adc2e01970aac1dbea0a83eb73e196f3e SHA1 3ebab451783dc43b46ab2eb45d270bd02581fe60 SHA256 b82e0e81012fc90b140f7a9124c94bd72139f8e360ba94c609f09f8fea7dfd0a EBUILD kdelibs-9999.ebuild 9144 RMD160 b4a28a44d3726a557f681db9cb1c4419fe0c2ff5 SHA1 dad2f795a9ba5e10e831b2d0e7ac654a92c9c96d SHA256 a81a63e9c6a98812484c802db341429382a8f7b4f98f8aa32e661ef61de7ade6 MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch new file mode 100644 index 00000000000..2f4be1a4b41 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.4.90-icon-name-qt47.patch @@ -0,0 +1,23 @@ +--- /var/tmp/portage/kde-base/kdelibs-4.4.90/work/kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp.orig 2010-06-25 02:58:37.000000000 +0400 ++++ /var/tmp/portage/kde-base/kdelibs-4.4.90/work/kdelibs-4.4.90/kdeui/notifications/kstatusnotifieritem.cpp 2010-06-25 02:59:43.000000000 +0400 +@@ -65,12 +65,6 @@ + virtual QString iconNameForAction(QAction *action) + { + KIcon icon(action->icon()); +-#if QT_VERSION >= 0x040700 +- // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP. +- // If you get a build error here, you need to update your pre-release +- // of Qt 4.7. +- return icon.isNull() ? QString() : icon.name(); +-#else + // Qt 4.6: If the icon was created by us, via our engine, serializing it + // will let us get to the name. + if (!icon.isNull()) { +@@ -94,7 +88,6 @@ + } + + return QString(); +-#endif + } + }; + diff --git a/kde-base/kdelibs/kdelibs-4.4.90.ebuild b/kde-base/kdelibs/kdelibs-4.4.90.ebuild index d03dd442df3..75f6ba88361 100644 --- a/kde-base/kdelibs/kdelibs-4.4.90.ebuild +++ b/kde-base/kdelibs/kdelibs-4.4.90.ebuild @@ -128,7 +128,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.3.3-klauncher_kioslave.patch" "${FILESDIR}/${PN}-4.3.3-klauncher_mac.patch" "${FILESDIR}/${PN}-4.4.3-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.80-icon-name-qt47.patch" + "${FILESDIR}/${PN}-4.4.90-icon-name-qt47.patch" ) src_prepare() { |