diff options
Diffstat (limited to 'kde')
-rwxr-xr-x | kde/kde-l10n-es/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kde-l10n-fr/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kde-l10n-nl/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdeadmin/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdeartwork/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdebase-runtime/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdebase-workspace/Pkgfile | 4 | ||||
-rwxr-xr-x | kde/kdebase/Pkgfile | 2 | ||||
-rw-r--r-- | kde/kdebindings/.md5sum | 1 | ||||
-rwxr-xr-x | kde/kdebindings/Pkgfile | 8 | ||||
-rw-r--r-- | kde/kdebindings/fix-generator-segfaults.patch | 63 | ||||
-rwxr-xr-x | kde/kdeedu/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdegames/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdegraphics/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdelibs/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdemultimedia/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdenetwork/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdepimlibs/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdeplasma-addons/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdesdk/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdetoys/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdeutils/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/kdewebdev/Pkgfile | 2 | ||||
-rwxr-xr-x | kde/oxygen-icons/Pkgfile | 2 |
24 files changed, 91 insertions, 25 deletions
diff --git a/kde/kde-l10n-es/Pkgfile b/kde/kde-l10n-es/Pkgfile index 6dd2f0d72..29ad6f45c 100755 --- a/kde/kde-l10n-es/Pkgfile +++ b/kde/kde-l10n-es/Pkgfile @@ -7,7 +7,7 @@ name=kde-l10n-es version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/kde-l10n/$name-$version.tar.bz2) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/kde-l10n/$name-$version.tar.bz2) build() { cd $name-$version mkdir build diff --git a/kde/kde-l10n-fr/Pkgfile b/kde/kde-l10n-fr/Pkgfile index 99b19c4cd..9ea929414 100755 --- a/kde/kde-l10n-fr/Pkgfile +++ b/kde/kde-l10n-fr/Pkgfile @@ -8,7 +8,7 @@ name=kde-l10n-fr version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/kde-l10n/$name-$version.tar.bz2) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/kde-l10n/$name-$version.tar.bz2) build() { diff --git a/kde/kde-l10n-nl/Pkgfile b/kde/kde-l10n-nl/Pkgfile index f4938f74f..a8378b2a2 100755 --- a/kde/kde-l10n-nl/Pkgfile +++ b/kde/kde-l10n-nl/Pkgfile @@ -8,7 +8,7 @@ name=kde-l10n-nl version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/kde-l10n/$name-$version.tar.bz2) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/kde-l10n/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdeadmin/Pkgfile b/kde/kdeadmin/Pkgfile index 663425c92..083d27bc3 100755 --- a/kde/kdeadmin/Pkgfile +++ b/kde/kdeadmin/Pkgfile @@ -7,7 +7,7 @@ name=kdeadmin version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdeartwork/Pkgfile b/kde/kdeartwork/Pkgfile index ab33ac9dd..22a0cccdf 100755 --- a/kde/kdeartwork/Pkgfile +++ b/kde/kdeartwork/Pkgfile @@ -7,7 +7,7 @@ name=kdeartwork version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdebase-runtime/Pkgfile b/kde/kdebase-runtime/Pkgfile index ad30d0e96..bb895d0f0 100755 --- a/kde/kdebase-runtime/Pkgfile +++ b/kde/kdebase-runtime/Pkgfile @@ -7,7 +7,7 @@ name=kdebase-runtime version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile index 4286fe571..485a29219 100755 --- a/kde/kdebase-workspace/Pkgfile +++ b/kde/kdebase-workspace/Pkgfile @@ -8,7 +8,7 @@ name=kdebase-workspace version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 \ +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 \ lxde.desktop ede.desktop Xsession.kde4 \ http://kiao.no-ip.info/NuTyX/files/kdm-nutyx-attapu.tar.bz2 \ http://kiao.no-ip.info/NuTyX/files/absolute-nutyx.tar.bz2 \ @@ -25,7 +25,7 @@ build() { -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_QEdje=OFF \ - -DBUILD_doc=OFF + -DBUILD_doc=OFF make make DESTDIR=$PKG install cd .. diff --git a/kde/kdebase/Pkgfile b/kde/kdebase/Pkgfile index b4897a5db..0dcc14eb1 100755 --- a/kde/kdebase/Pkgfile +++ b/kde/kdebase/Pkgfile @@ -7,7 +7,7 @@ name=kdebase version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdebindings/.md5sum b/kde/kdebindings/.md5sum index da98f3b93..c12d78b3b 100644 --- a/kde/kdebindings/.md5sum +++ b/kde/kdebindings/.md5sum @@ -1,2 +1,3 @@ +e870fe57c933a076c3e8319604edb63d fix-generator-segfaults.patch 0f194ec6cb172ca1b958f4257020d24c fix-pyqt4-build.patch 02f6a8397beb6a034fe9025f03f6bd02 kdebindings-4.5.2.tar.bz2 diff --git a/kde/kdebindings/Pkgfile b/kde/kdebindings/Pkgfile index 81d57b0e7..432d9bce1 100755 --- a/kde/kdebindings/Pkgfile +++ b/kde/kdebindings/Pkgfile @@ -6,15 +6,17 @@ name=kdebindings version=4.5.2 -release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 - fix-pyqt4-build.patch) +release=2 +source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 + fix-pyqt4-build.patch + fix-generator-segfaults.patch) build() { unset MAKEFLAGS cd $name-$version patch -Np0 -i ../fix-pyqt4-build.patch + patch -Np4 -i ../fix-generator-segfaults.patch mkdir build cd build diff --git a/kde/kdebindings/fix-generator-segfaults.patch b/kde/kdebindings/fix-generator-segfaults.patch new file mode 100644 index 000000000..5b69b5961 --- /dev/null +++ b/kde/kdebindings/fix-generator-segfaults.patch @@ -0,0 +1,63 @@ +--- 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{ diff --git a/kde/kdeedu/Pkgfile b/kde/kdeedu/Pkgfile index a5be65d30..56675cc82 100755 --- a/kde/kdeedu/Pkgfile +++ b/kde/kdeedu/Pkgfile @@ -7,7 +7,7 @@ name=kdeedu version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdegames/Pkgfile b/kde/kdegames/Pkgfile index eb959f99a..c6ba4d867 100755 --- a/kde/kdegames/Pkgfile +++ b/kde/kdegames/Pkgfile @@ -7,7 +7,7 @@ name=kdegames version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdegraphics/Pkgfile b/kde/kdegraphics/Pkgfile index b97f9c915..f603951d3 100755 --- a/kde/kdegraphics/Pkgfile +++ b/kde/kdegraphics/Pkgfile @@ -7,7 +7,7 @@ name=kdegraphics version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdelibs/Pkgfile b/kde/kdelibs/Pkgfile index 5987d4caa..a914180df 100755 --- a/kde/kdelibs/Pkgfile +++ b/kde/kdelibs/Pkgfile @@ -7,7 +7,7 @@ name=kdelibs version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 +source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 kde-applications-menu.patch) build() { diff --git a/kde/kdemultimedia/Pkgfile b/kde/kdemultimedia/Pkgfile index 259ad5d92..e8d0a29c5 100755 --- a/kde/kdemultimedia/Pkgfile +++ b/kde/kdemultimedia/Pkgfile @@ -7,7 +7,7 @@ name=kdemultimedia version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdenetwork/Pkgfile b/kde/kdenetwork/Pkgfile index e1555b684..3817696d3 100755 --- a/kde/kdenetwork/Pkgfile +++ b/kde/kdenetwork/Pkgfile @@ -7,7 +7,7 @@ name=kdenetwork version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 ) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 ) build() { cd $name-$version diff --git a/kde/kdepimlibs/Pkgfile b/kde/kdepimlibs/Pkgfile index 3f6c4b7fe..2bcad5af2 100755 --- a/kde/kdepimlibs/Pkgfile +++ b/kde/kdepimlibs/Pkgfile @@ -8,7 +8,7 @@ name=kdepimlibs version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdeplasma-addons/Pkgfile b/kde/kdeplasma-addons/Pkgfile index 91fc89001..2732295f4 100755 --- a/kde/kdeplasma-addons/Pkgfile +++ b/kde/kdeplasma-addons/Pkgfile @@ -7,7 +7,7 @@ name=kdeplasma-addons version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdesdk/Pkgfile b/kde/kdesdk/Pkgfile index 07b046961..d422ba861 100755 --- a/kde/kdesdk/Pkgfile +++ b/kde/kdesdk/Pkgfile @@ -7,7 +7,7 @@ name=kdesdk version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version mkdir build diff --git a/kde/kdetoys/Pkgfile b/kde/kdetoys/Pkgfile index 3b9def166..6cd7bbbe0 100755 --- a/kde/kdetoys/Pkgfile +++ b/kde/kdetoys/Pkgfile @@ -8,7 +8,7 @@ name=kdetoys version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdeutils/Pkgfile b/kde/kdeutils/Pkgfile index 116b2b14b..5e40c12ce 100755 --- a/kde/kdeutils/Pkgfile +++ b/kde/kdeutils/Pkgfile @@ -7,7 +7,7 @@ name=kdeutils version=4.5.2 release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/kdewebdev/Pkgfile b/kde/kdewebdev/Pkgfile index 9ee550a4d..22d3f9898 100755 --- a/kde/kdewebdev/Pkgfile +++ b/kde/kdewebdev/Pkgfile @@ -7,7 +7,7 @@ name=kdewebdev version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2) +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2) build() { cd $name-$version diff --git a/kde/oxygen-icons/Pkgfile b/kde/oxygen-icons/Pkgfile index c5cba01f6..8d7dad498 100755 --- a/kde/oxygen-icons/Pkgfile +++ b/kde/oxygen-icons/Pkgfile @@ -7,7 +7,7 @@ name=oxygen-icons version=4.5.2 release=1 -source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 \ +source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 \ NuTyXlogo.png) build() { |