diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2009-04-12 15:14:59 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2009-04-12 15:14:59 +0000 |
| commit | 60d3da0ffd6c21f55d432f598d11bbb0b18a75ea (patch) | |
| tree | 2c704ea19b20c8fcb644f26a2e2a5aab4449b2a7 /kde-base | |
| parent | Bump (diff) | |
| download | historical-60d3da0ffd6c21f55d432f598d11bbb0b18a75ea.tar.gz historical-60d3da0ffd6c21f55d432f598d11bbb0b18a75ea.tar.bz2 historical-60d3da0ffd6c21f55d432f598d11bbb0b18a75ea.zip | |
add missing patch (bug #265846)
Package-Manager: portage-2.2_rc30/cvs/Linux x86_64
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kalzium/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kalzium/Manifest | 9 | ||||
| -rw-r--r-- | kde-base/kalzium/files/kalzium-4.2.2-include-order.patch | 26 |
3 files changed, 36 insertions, 5 deletions
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog index 260e84f36fca..a42a9acac0b5 100644 --- a/kde-base/kalzium/ChangeLog +++ b/kde-base/kalzium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kalzium # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.118 2009/04/12 08:33:43 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.119 2009/04/12 15:14:59 alexxy Exp $ + + 12 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> + +files/kalzium-4.2.2-include-order.patch: + add missing patch (bug #265846) 11 Apr 2009; Raúl Porcel <armin76@gentoo.org> kalzium-4.2.1.ebuild: Add ~alpha/~ia64 diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest index 245fab5b84c7..7440d421a5f8 100644 --- a/kde-base/kalzium/Manifest +++ b/kde-base/kalzium/Manifest @@ -3,6 +3,7 @@ Hash: SHA1 AUX kalzium-3.5.7-copy_string.patch 418 RMD160 224df144846b3ff6a45c304dccfcf5b9b738d440 SHA1 dcbde42a2fdf631f3bdc32bb2bdc81d6fc05f1f7 SHA256 c59a1571de5b3ada80cd48c20e74b501ea5b2bb131001ee11ae3023e7cde38f0 AUX kalzium-4.2.1-include-order.patch 869 RMD160 a5c0529a625d2a7754b8ca2d15d682647480f157 SHA1 844538eed8d246734faed9f788ef1d516a29caad SHA256 f07de6f154bdbe6e6bff8cd2fce22cb8dc702ed255edbe549eba263281df57c6 +AUX kalzium-4.2.2-include-order.patch 869 RMD160 a5c0529a625d2a7754b8ca2d15d682647480f157 SHA1 844538eed8d246734faed9f788ef1d516a29caad SHA256 f07de6f154bdbe6e6bff8cd2fce22cb8dc702ed255edbe549eba263281df57c6 DIST kdeedu-3.5.10.tar.bz2 30181670 RMD160 312d0384fbf243d580b0d3d90e3e21b46a117d0d SHA1 c43f7bcd9cb7af7c77a78bc0bd7f51c0e572f589 SHA256 0a60caf3b599e04413b0846645483b884a9f7fd61d24cd5f12443dc4ceb8ed11 DIST kdeedu-3.5.9.tar.bz2 30174459 RMD160 8b1afa1e80e1f688ab86ad3de62eb294293fca6b SHA1 7374f4335b34ed0225cfcaaf22e0d939e48bed7d SHA256 063251e41c192d41b4902d9749807fb98bd9157ec8cc7551a3189e1526acd240 DIST kdeedu-4.2.1.tar.bz2 59459156 RMD160 1d934e175d4897c224d3a9843e1fbdd18e5e7e80 SHA1 f2381f33f6586b950e925423d135b9e66b7bf428 SHA256 768e05f1bc99b307e348fb97ad77a2d266fefb47dfc5fa2e28badbfebaae22a6 @@ -11,12 +12,12 @@ EBUILD kalzium-3.5.10.ebuild 1671 RMD160 a638271b3ed94c945c70fb879ca2f42a57d8fd7 EBUILD kalzium-3.5.9.ebuild 1667 RMD160 f7bf2c995e7178c31d34852f249782a5e7a28568 SHA1 ec24d6af9d11523ffefaf1635e7dcd69d72a8cc3 SHA256 e5fd7c899502ac19e7577d64f698700e520d671b6b858295e743cb29b2afd47b EBUILD kalzium-4.2.1.ebuild 1647 RMD160 a1607979eeb552a2012f3c40c2ebab9ca6711717 SHA1 eda721a568521e173091b68f40fb00c3c7406722 SHA256 a70ad49903e233adc51ba13e092d8366d69699ffc26acba147952c8ee4950b07 EBUILD kalzium-4.2.2.ebuild 1088 RMD160 25634dac532f59e4d2ca5386084ef392b819fc8f SHA1 660bf8e064120aa2f1c4950e197e25c85a752ca8 SHA256 c7d4bad5838cb8fd1719b5a39814ef72081705141f58a190f37ef4acaf692ff5 -MISC ChangeLog 14763 RMD160 bf2bb7cf7bff5a20e1f3c4fea95f1b6ffd5d4156 SHA1 9c300f7638d9921e71792a4e58b3c4a83dc595eb SHA256 344d2a6f592027325772e00fb00a6cbc8f3b82d575bf0e94e6f612f120f4edbe +MISC ChangeLog 14893 RMD160 7d14f87e867f2497d141d09cdb7100c78372c9bb SHA1 a19646a6df07169b7beda7fe0eee184314538201 SHA256 d92148ff282dc7819005b539491e3649e06927ce9a93a99815f693838f55425b MISC metadata.xml 295 RMD160 398bff32e939c3fbd95b9c2f0fe26b088ea12b7c SHA1 bf599c6c0998b2b9f7a172f4561dec68b6d31d08 SHA256 568cc42713217c2057a2d61f81a385eed081cdb70b4aac4044b2fb63a1e401bc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAknhp3oACgkQ5BmOA85PVLiiuQCeMEwOaMg1/JePrWyC29uwQnV3 -Mz8An1CpP06BFfCedCtHgKBG17zhxUZo -=R4UB +iEYEARECAAYFAkniBYwACgkQ5BmOA85PVLi8dQCeJhUFacIs+cM0ob21tZUKuf2S +X0wAn056F8Cgk/hpBxhDbYtTJsMgXvSp +=HFix -----END PGP SIGNATURE----- diff --git a/kde-base/kalzium/files/kalzium-4.2.2-include-order.patch b/kde-base/kalzium/files/kalzium-4.2.2-include-order.patch new file mode 100644 index 000000000000..1faffa2e3812 --- /dev/null +++ b/kde-base/kalzium/files/kalzium-4.2.2-include-order.patch @@ -0,0 +1,26 @@ +--- kalzium-4.2.1/work/kalzium-4.2.1/kalzium/libavogadro-kalzium/src/CMakeLists.txt 2009-02-26 09:17:16.000000000 -0500 ++++ /root/CMakeLists.txt 2009-03-11 18:19:48.000000000 -0400 +@@ -15,10 +15,12 @@ + ${CMAKE_CURRENT_BINARY_DIR}/config.h + ) + +-include(${QT_USE_FILE}) ++# Ensure the Avogadro include directory is always first ++get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES) ++set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES ++ "${libavogadro-kalzium_SOURCE_DIR}/include;${tmp_include_dirs}") + + include_directories( +- ${libavogadro-kalzium_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/.. +@@ -26,6 +28,8 @@ + ${EIGEN_INCLUDE_DIR} + ) + ++include(${QT_USE_FILE}) ++ + # Need to build with visibility enabled if KDE is + if(__KDE_HAVE_GCC_VISIBILITY) + add_definitions(-DHAVE_GCC_VISIBILITY) |