Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-11 03:44:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

KDE SC 4.5.3 try#1

Browse Source
This commit is contained in:
Phil Miller 2010-10-29 18:22:17 +02:00
parent c30c368981
commit f2a97de52b
8 changed files with 83 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kde-common/kde-common.install
View File

@ -3,7 +3,7 @@
# #
post_install() { post_install() {
echo " " echo " "
echo " > KDE Software Compilation 4.5.2" echo " > KDE Software Compilation 4.5.3"
echo " > packaged by the Chakra Project" echo " > packaged by the Chakra Project"
echo " " echo " "
echo " Installation Prefix : /usr" echo " Installation Prefix : /usr"
@ -15,6 +15,8 @@ post_install() {
echo " Wiki : http://chakra-project.org/wiki/" echo " Wiki : http://chakra-project.org/wiki/"
echo " Forums : http://chakra-project.org/bbs/" echo " Forums : http://chakra-project.org/bbs/"
echo " Bugtracker: http://chakra-project.org/bugs/" echo " Bugtracker: http://chakra-project.org/bugs/"
echo " CCR : http://chakra-project.org/ccr/"
echo " Bundles : http://chakra-project.org/bundles.html"
echo " ChangeLogs: http://gitorious.org/chakra-packages" echo " ChangeLogs: http://gitorious.org/chakra-packages"
echo " " echo " "
} }

150
kde-sc.md5
View File

@ -1,75 +1,75 @@
4110603b3c0c3cabbb514cb4c0517520 kdeaccessibility-4.5.2.tar.bz2 8866b1594bcb426234a70640bfed5472 kdeaccessibility-4.5.3.tar.bz2
6363315b99bc7f7915ad38e557d1c99f kdeadmin-4.5.2.tar.bz2 30c77e654c966e8d9e41e74e8d951af2 kdeadmin-4.5.3.tar.bz2
7fdcd18386829451b8bced1336238436 kdeartwork-4.5.2.tar.bz2 8fcfcc1515cd1ee16dc6909cd7e98787 kdeartwork-4.5.3.tar.bz2
d93b5d73390d9f40739d9af09d4e8a87 kdebase-4.5.2.tar.bz2 1efd11492bada8063ad5b3bd9b728e5c kdebase-4.5.3.tar.bz2
6503a445c52fc1055152d46fca56eb0a kdebase-runtime-4.5.2.tar.bz2 4b5d4e1a56280490e6f7559cd953ceec kdebase-runtime-4.5.3.tar.bz2
0174c22b75e9a2b477ee166da2ca7319 kdebase-workspace-4.5.2.tar.bz2 9537fb2e759c8bff53bd73512b006539 kdebase-workspace-4.5.3.tar.bz2
02f6a8397beb6a034fe9025f03f6bd02 kdebindings-4.5.2.tar.bz2 639a3ff6de7b19ca9437560a134f8629 kdebindings-4.5.3.tar.bz2
65ff4441860ffc8442dac7a2d3d88e31 kdeedu-4.5.2.tar.bz2 d2787a8872c74b2b447408f588c57da0 kdeedu-4.5.3.tar.bz2
3e7c5ff0f0b3482d1b927cc00e033111 kdegames-4.5.2.tar.bz2 df43122fa0d53c011ac1867144c7ba25 kdegames-4.5.3.tar.bz2
f65c05227f4d4870eb62b0cd1679393f kdegraphics-4.5.2.tar.bz2 b5542bfaf9fb43775c48e2950ae05a9c kdegraphics-4.5.3.tar.bz2
9ab26a768abe0fda5c1c0eb290b87d9d kde-l10n-ar-4.5.2.tar.bz2 8fd66b89a6d5acc1d624c3626287204d kde-l10n-ar-4.5.3.tar.bz2
d6e05d20134ab82e3383f4564a80e9ee kde-l10n-bg-4.5.2.tar.bz2 9da430bdaccbc5b3c8ae40b8ac99f935 kde-l10n-bg-4.5.3.tar.bz2
96eb0c95ef1eb2addd81289ebf55acc2 kde-l10n-ca-4.5.2.tar.bz2 e1a284c60d2cdb58bb11f8dbbcd273c6 kde-l10n-ca-4.5.3.tar.bz2
9b886553ba2218ae3eed2d15ca7e2018 kde-l10n-ca@valencia-4.5.2.tar.bz2 472dfd1b820c80aeb736948365258aac kde-l10n-ca@valencia-4.5.3.tar.bz2
90e533f949603a99a2fd90d88a3d81ce kde-l10n-cs-4.5.2.tar.bz2 4851622198f6cd1cb92d222d571ee8bd kde-l10n-cs-4.5.3.tar.bz2
944504de86406d42cc191e3b43cd4f78 kde-l10n-da-4.5.2.tar.bz2 fdbf2d08b877343d33d734648c5e2c68 kde-l10n-da-4.5.3.tar.bz2
97168bf0f356994749ce559f7ccdc1da kde-l10n-de-4.5.2.tar.bz2 9c8a52dd469b0e1b9af38f5c8723a5e4 kde-l10n-de-4.5.3.tar.bz2
0c71d2c10db55f1097efe6d5c7c958ca kde-l10n-el-4.5.2.tar.bz2 bb0be0e05e73da7b28af90d04c6707e8 kde-l10n-el-4.5.3.tar.bz2
16ea4866d9b8016032799896bd6ce84f kde-l10n-en_GB-4.5.2.tar.bz2 81e2ad0563c3267e75f1a0bf69f01548 kde-l10n-en_GB-4.5.3.tar.bz2
e910fa7793612481305a37c4c09e8eb9 kde-l10n-eo-4.5.2.tar.bz2 e3a2f7efcdd236cfde02285f52bf6937 kde-l10n-eo-4.5.3.tar.bz2
d61eaeb26a2dcc132129d2fbc128ac68 kde-l10n-es-4.5.2.tar.bz2 5b37d43a5732ae3ebdac5f94f3552723 kde-l10n-es-4.5.3.tar.bz2
45a8aefa17f0a7a94e951e90d87d03e4 kde-l10n-et-4.5.2.tar.bz2 52bce3ec1d0e595f0ba3fcb22a3b5235 kde-l10n-et-4.5.3.tar.bz2
312cbe29e49e52336a3c3082cd65100b kde-l10n-eu-4.5.2.tar.bz2 5df355a7241cf05b29fc79a6e3a98197 kde-l10n-eu-4.5.3.tar.bz2
3f713099b2bfa2cbfa4c79ee22e2f5f3 kde-l10n-fi-4.5.2.tar.bz2 2419e661f97a310b5643fe7f71665928 kde-l10n-fi-4.5.3.tar.bz2
636d1c634f67f8961df915bcee9334b2 kde-l10n-fr-4.5.2.tar.bz2 67977703fd07cd649e282a18bcaf36ab kde-l10n-fr-4.5.3.tar.bz2
fab58d2f769672962766abdf6195f46b kde-l10n-fy-4.5.2.tar.bz2 06f7181502927b47443563ac5c98870d kde-l10n-fy-4.5.3.tar.bz2
d1f2c106b6d4b333618b674f9a1f36c5 kde-l10n-ga-4.5.2.tar.bz2 15365068e751e1dc61585600881d3688 kde-l10n-ga-4.5.3.tar.bz2
f0ecfb3c9b935608dd92efe379b40ab0 kde-l10n-gl-4.5.2.tar.bz2 72db71fdc774be70aca21f83eaea5161 kde-l10n-gl-4.5.3.tar.bz2
dd4321142a2144fbfee4e1f7680e79a3 kde-l10n-gu-4.5.2.tar.bz2 62d9abb5c99b07aaee21845dc5574ca8 kde-l10n-gu-4.5.3.tar.bz2
dc3c80c88c32e0c076b7ef1445fb4955 kde-l10n-he-4.5.2.tar.bz2 57e42d8981b5f821504f6b0d9ed98883 kde-l10n-he-4.5.3.tar.bz2
3cf2c84d930a24cd65c3c73b03c5d29f kde-l10n-hi-4.5.2.tar.bz2 c5a7518c3af10f82213e7ec51ca8f154 kde-l10n-hi-4.5.3.tar.bz2
974830a78dfa6d62ce943b577d53d489 kde-l10n-hr-4.5.2.tar.bz2 36d7cc30be4e67e6da3b20159a3d4ebe kde-l10n-hr-4.5.3.tar.bz2
cb709a33e8020b8358fb00c2e6aede8e kde-l10n-hu-4.5.2.tar.bz2 ed85120640076a8269eaff4e5643efee kde-l10n-hu-4.5.3.tar.bz2
f52d37d0b38eda20faca151c198d16a9 kde-l10n-ia-4.5.2.tar.bz2 ca132d4b2a2755d21caf1e26376b42c0 kde-l10n-ia-4.5.3.tar.bz2
a3c9d1ebdb974ab6a605af96d509f5bf kde-l10n-id-4.5.2.tar.bz2 b550a12773152a56bc7f96fbf97127da kde-l10n-id-4.5.3.tar.bz2
680599693a87453a04182edbe0e5a967 kde-l10n-is-4.5.2.tar.bz2 7919dce2a3e860971ee833bc9ff14974 kde-l10n-is-4.5.3.tar.bz2
b07cd1f1bef0fe36a1f40e2f1c3c5eb9 kde-l10n-it-4.5.2.tar.bz2 3cbd562a7e1bf4abe6a3892f879955a0 kde-l10n-it-4.5.3.tar.bz2
e71147163b8cfecc5114e4bd7e752253 kde-l10n-ja-4.5.2.tar.bz2 fc523e641df9267611f5bbba79a7b5a2 kde-l10n-ja-4.5.3.tar.bz2
c677eaed7df8a7135e4ae31caf861ec8 kde-l10n-kk-4.5.2.tar.bz2 68cefc484606acd4ab257f7c66ccd28a kde-l10n-kk-4.5.3.tar.bz2
dd3900a5bf7d1e372c33dc253fafc949 kde-l10n-km-4.5.2.tar.bz2 17beabaf9b5d4e022f5ae45610d2d7e3 kde-l10n-km-4.5.3.tar.bz2
4efedfab3bbcc9419f61777bebad47ca kde-l10n-kn-4.5.2.tar.bz2 c9f50fcd29395a170e3a6b17f6be555c kde-l10n-kn-4.5.3.tar.bz2
9b32cd519006d1934a358983c30f9a8a kde-l10n-ko-4.5.2.tar.bz2 2e21fe16f0e283c26a510d397841b141 kde-l10n-ko-4.5.3.tar.bz2
b0fc8332500eb25b4a44d3cbc4b93ddb kde-l10n-lt-4.5.2.tar.bz2 3d618b409f7f2f075072c16511c3cf9b kde-l10n-lt-4.5.3.tar.bz2
0ce9baaec744ed3a6c7b5b4f92ea0dec kde-l10n-lv-4.5.2.tar.bz2 047ef7931c058953e4cc43f30b1adc43 kde-l10n-lv-4.5.3.tar.bz2
f09dcd086498b5691f28c749914d3d7b kde-l10n-ml-4.5.2.tar.bz2 5f52270f88ed39ae72af681e7f9a4657 kde-l10n-ml-4.5.3.tar.bz2
d70d2de92fe7ede3f9f1ce1e779c6fa3 kde-l10n-nb-4.5.2.tar.bz2 38ec41617e1696a934d604fa71b925ad kde-l10n-nb-4.5.3.tar.bz2
7eaf3e795e62f5442b12285438bb08c9 kde-l10n-nds-4.5.2.tar.bz2 6851e763e08c5852918c7e294d62a777 kde-l10n-nds-4.5.3.tar.bz2
0efa67b22adef40d14e981b6ef1c23c8 kde-l10n-nl-4.5.2.tar.bz2 4d31c157f45789dc6c271acbec799be6 kde-l10n-nl-4.5.3.tar.bz2
42e4281e0dd502dc61f6e0d58bb05abd kde-l10n-nn-4.5.2.tar.bz2 f66dc1b00724272441d29dadba2a703c kde-l10n-nn-4.5.3.tar.bz2
7dea3a9342f359f8e9a189fde2703dea kde-l10n-pa-4.5.2.tar.bz2 636014d6cbc1176617a1bc7a008edeb7 kde-l10n-pa-4.5.3.tar.bz2
83d751c113635977c9b3df5256fee8f7 kde-l10n-pl-4.5.2.tar.bz2 4fd4d3d7cd81f98e4c71894c1441622a kde-l10n-pl-4.5.3.tar.bz2
0a719ae8688fb088b456ea82d548573f kde-l10n-pt-4.5.2.tar.bz2 2359c6672309691b6051e77250803944 kde-l10n-pt-4.5.3.tar.bz2
916edb81333163bb0b14adf3e27d2624 kde-l10n-pt_BR-4.5.2.tar.bz2 7052c59a34a11f8323d8372ae52e7a2e kde-l10n-pt_BR-4.5.3.tar.bz2
62e4e93bcfbb212918eded76156fee2d kde-l10n-ro-4.5.2.tar.bz2 b243da7403cfdc8dea8ed7459b11c0d5 kde-l10n-ro-4.5.3.tar.bz2
664108c46f0f67d1bdd8aafe09801473 kde-l10n-ru-4.5.2.tar.bz2 d3806a075ff3a7e1337253baae22ac74 kde-l10n-ru-4.5.3.tar.bz2
fab3784c6362ed369cde375e75fd556e kde-l10n-sk-4.5.2.tar.bz2 5b1b4ef49da0aa1d811a311d9d29b486 kde-l10n-sk-4.5.3.tar.bz2
60061dcd93d9d9f59f5193d523f47db1 kde-l10n-sl-4.5.2.tar.bz2 99b8e87f8cd304c1521c2ed22fcb3f3a kde-l10n-sl-4.5.3.tar.bz2
f09a1a379305b6d8f63ced337b9cbb2b kde-l10n-sr-4.5.2.tar.bz2 1f8090ae07cd238806c9172872e5f575 kde-l10n-sr-4.5.3.tar.bz2
8e3851686473cd8dd12a15e57846f010 kde-l10n-sv-4.5.2.tar.bz2 e75a0104d6760af2e6982b6225ee6453 kde-l10n-sv-4.5.3.tar.bz2
708499add7cf02b9dc005ac0d7ab869a kde-l10n-th-4.5.2.tar.bz2 4b50bbfc68d6e72480cb489240d2f96e kde-l10n-th-4.5.3.tar.bz2
ce1253ecb360cb9b0d55fcd67f4dd2f1 kde-l10n-tr-4.5.2.tar.bz2 1133224fb2338a0ec2b561f0ab6b1684 kde-l10n-tr-4.5.3.tar.bz2
01dd08dfba031075cb7583bb338ab3b2 kde-l10n-uk-4.5.2.tar.bz2 8282d9025731bc7dea98139629be50f5 kde-l10n-uk-4.5.3.tar.bz2
bd63914d2586798f732fa468ef5b4a4c kde-l10n-wa-4.5.2.tar.bz2 d6d38edfad4be314bd0cada64f0a1f76 kde-l10n-wa-4.5.3.tar.bz2
512e477307a0da63774b8988b64c22db kde-l10n-zh_CN-4.5.2.tar.bz2 8d2d68c935463e02157f95b1f3bcb7f5 kde-l10n-zh_CN-4.5.3.tar.bz2
b702ac400360e0f723401a38bd95ab14 kde-l10n-zh_TW-4.5.2.tar.bz2 4658888ad6cf87fcb7c5ab79d1ac577b kde-l10n-zh_TW-4.5.3.tar.bz2
9f2ad67a40f233a72d374800e1c2d2e2 kdelibs-4.5.2.tar.bz2 f412739c8e9bdb7b92487ee79ba3b5bd kdelibs-4.5.3.tar.bz2
63613acce56cbc393588f7b2d15e758b kdemultimedia-4.5.2.tar.bz2 7b17cf0f43b3934dd0604f451b6963ff kdemultimedia-4.5.3.tar.bz2
5fa30d2c8bf911dd24e277b001f015e9 kdenetwork-4.5.2.tar.bz2 5170966aad6ab3eb8107d3a00d3f595b kdenetwork-4.5.3.tar.bz2
01a85ceba5f9761eeba9548b05b8f0a2 kdepimlibs-4.5.2.tar.bz2 6c8906b12635dd4c8fff89118cc3fffd kdepimlibs-4.5.3.tar.bz2
27913e1470b9bdf889fadc0a32993bdc kdeplasma-addons-4.5.2.tar.bz2 f23d0d5d465e314c05c5282cddfa6ab6 kdeplasma-addons-4.5.3.tar.bz2
ef8b55b47e66bfd86993f60075097f54 kdesdk-4.5.2.tar.bz2 d523900d164e60edf952a767827e2bee kdesdk-4.5.3.tar.bz2
4ac497a3b30d728b2c69af44feabf87f kdetoys-4.5.2.tar.bz2 675d4aee3d18a0a696742704ab45ee02 kdetoys-4.5.3.tar.bz2
f87f29de2b5ffed215e5c46a05851804 kdeutils-4.5.2.tar.bz2 a90c2914752c517cfb4a5549943cdcb6 kdeutils-4.5.3.tar.bz2
b3269db8c1a6a1383b1d381f97dea02e kdewebdev-4.5.2.tar.bz2 a5430df45a1c4b35e2fd3ef2dab12130 kdewebdev-4.5.3.tar.bz2
64cd34251378251d56b9e56a9d4d7bf6 oxygen-icons-4.5.2.tar.bz2 d7b615f73a927a5a315ca53b492e06c2 oxygen-icons-4.5.3.tar.bz2

2
kdebase-workspace/PKGBUILD
View File

@ -26,7 +26,7 @@ pkgname=('kdebase-workspace'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"

6
kdebindings/PKGBUILD
View File

@ -30,7 +30,7 @@ pkgname=('kdebindings-common'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"
@ -43,10 +43,8 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" 'pyqt'
'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}") # "kdepim-runtime>=${_kdever}" 'ruby' 'mono' "kdegraphics-okular>=${_kdever}" "kdegraphics-common>=${_kdever}") # "kdepim-runtime>=${_kdever}"
source=($_mirror/${_origname}-$_kdever.tar.bz2 source=($_mirror/${_origname}-$_kdever.tar.bz2
fix-generator-segfaults.patch
fix-ruby-bindings.patch) fix-ruby-bindings.patch)
md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1` md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
e870fe57c933a076c3e8319604edb63d
95efe147489fdd8acb421a0a450e635a) 95efe147489fdd8acb421a0a450e635a)
@ -57,8 +55,6 @@ build()
{ {
cd ${srcdir}/${_origname}-${pkgver} cd ${srcdir}/${_origname}-${pkgver}
# Already fixed in 4.5.3
patch -Np4 -i ${srcdir}/fix-generator-segfaults.patch
patch -Np3 -i ${srcdir}/fix-ruby-bindings.patch patch -Np3 -i ${srcdir}/fix-ruby-bindings.patch
#fix ruby #fix ruby

63
kdebindings/fix-generator-segfaults.patch
View File

@ -1,63 +0,0 @@
--- branches/KDE/4.5/kdebindings/generator/generators/smoke/helpers.cpp 2010/10/09 06:54:13 1184023
+++ branches/KDE/4.5/kdebindings/generator/generators/smoke/helpers.cpp 2010/10/09 06:57:13 1184024
@@ -131,10 +131,10 @@
// map this method to the function, so we can later retrieve the header it was defined in
globalFunctionMap[&parent->methods().last()] = &fn;
- int methIndex = parent->methods().length() - 1;
+ int methIndex = parent->methods().size() - 1;
addOverloads(meth);
// handle the methods appended by addOverloads()
- for (int i = parent->methods().length() - 1; i > methIndex; --i)
+ for (int i = parent->methods().size() - 1; i > methIndex; --i)
globalFunctionMap[&parent->methods()[i]] = &fn;
(*usedTypes) << meth.type();
@@ -458,7 +458,11 @@
return munge(&resolved);
}
- if (type->pointerDepth() > 1 || (type->getClass() && type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode && type->getClass()->name() != "QFlags"))) ||
+ if (type->name().contains("long long") || type->name() == "size_t") {
+ // Special case 'long long' types as '$'.
+ // Hack: 'size_t' isn't being fully resolved for some reason.
+ return '$';
+ } else if (type->pointerDepth() > 1 || (type->getClass() && type->getClass()->isTemplate() && (!Options::qtMode || (Options::qtMode && type->getClass()->name() != "QFlags"))) ||
(Options::voidpTypes.contains(type->name()) && !Options::scalarTypes.contains(type->name())) )
{
// QString and QStringList are both mapped to Smoke::t_voidp, but QString is a scalar as well
--- branches/KDE/4.5/kdebindings/generator/type_compiler.cpp 2010/10/09 06:54:13 1184023
+++ branches/KDE/4.5/kdebindings/generator/type_compiler.cpp 2010/10/09 06:57:13 1184024
@@ -182,7 +182,7 @@
TypeCompiler tc(m_session, m_visitor);
tc.run(node->type_specifier, node->declarator);
NameCompiler name_cc(m_session, m_visitor);
- if (tc.type().isFunctionPointer())
+ if (tc.type().isFunctionPointer() && node->declarator && node->declarator->sub_declarator)
name_cc.run(node->declarator->sub_declarator->id);
else if (node->declarator)
name_cc.run(node->declarator->id);
--- branches/KDE/4.5/kdebindings/generator/parser/rpp/pp-macro-expander.cpp 2010/10/09 06:54:13 1184023
+++ branches/KDE/4.5/kdebindings/generator/parser/rpp/pp-macro-expander.cpp 2010/10/09 06:57:13 1184024
@@ -268,10 +268,10 @@
output << '\"';
while (!is.atEnd()) {
- if (input == '"') {
+ if (is == '"') {
output << '\\' << is;
- } else if (input == '\n') {
+ } else if (is == '\n') {
output << '"' << is << '"';
} else {
@@ -338,7 +338,7 @@
skip_blanks(input, devnull());
//Omit paste tokens behind empty used actuals, else we will merge with the previous text
- if(input == '#' && (++input) == '#') {
+ if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') {
++input;
//We have skipped a paste token
}else{

2
kdeedu/PKGBUILD
View File

@ -43,7 +43,7 @@ pkgname=('kdeedu-common'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=3 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"

2
kdegraphics/PKGBUILD
View File

@ -30,7 +30,7 @@ pkgname=('kdegraphics-common'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"

2
kdenetwork/PKGBUILD
View File

@ -28,7 +28,7 @@ pkgname=('kdenetwork-common'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=2 pkgrel=1
pkgdesc="split package" pkgdesc="split package"
url="http://www.kde.org" url="http://www.kde.org"