diff options
author | tnut <thierryn1 at hispeed dot ch> | 2010-10-22 15:26:03 +0200 |
---|---|---|
committer | tnut <thierryn1 at hispeed dot ch> | 2010-10-22 15:26:03 +0200 |
commit | 29a518b51bd6746654d5fcf0d82fe23a2171dd37 (patch) | |
tree | 7fadc8e23e98b8a7ec16f7eadb133eabb82e2db9 | |
parent | 0781f7cd815218296f9cd4f4d14dce388738a843 (diff) | |
parent | 1e78016f022ba5551dcaea56c893a6d5494c36cf (diff) | |
download | nutyx-extra-29a518b51bd6746654d5fcf0d82fe23a2171dd37.tar.gz nutyx-extra-29a518b51bd6746654d5fcf0d82fe23a2171dd37.tar.bz2 nutyx-extra-29a518b51bd6746654d5fcf0d82fe23a2171dd37.tar.xz nutyx-extra-29a518b51bd6746654d5fcf0d82fe23a2171dd37.zip |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu
-rw-r--r-- | kde/oxygen-icons/.footprint | 2 | ||||
-rwxr-xr-x | kde/polkit-kde/Pkgfile | 12 | ||||
-rw-r--r-- | kde/polkit-kde/gcc45.patch | 11 | ||||
-rw-r--r-- | kde/rekonq/.md5sum | 2 | ||||
-rwxr-xr-x | kde/rekonq/Pkgfile | 2 |
5 files changed, 21 insertions, 8 deletions
diff --git a/kde/oxygen-icons/.footprint b/kde/oxygen-icons/.footprint index 7cddf571e..9b5825f13 100644 --- a/kde/oxygen-icons/.footprint +++ b/kde/oxygen-icons/.footprint @@ -3287,7 +3287,7 @@ drwxr-xr-x root/root usr/share/icons/oxygen/256x256/mimetypes/ -rw-r--r-- root/root usr/share/icons/oxygen/256x256/mimetypes/unknown.png -rw-r--r-- root/root usr/share/icons/oxygen/256x256/mimetypes/video-x-generic.png drwxr-xr-x root/root usr/share/icons/oxygen/256x256/places/ --rwxr-xr-x root/root usr/share/icons/oxygen/256x256/places/NuTyXlogo.png +-rw-r--r-- root/root usr/share/icons/oxygen/256x256/places/NuTyXlogo.png -rw-r--r-- root/root usr/share/icons/oxygen/256x256/places/certificate-server.png -rw-r--r-- root/root usr/share/icons/oxygen/256x256/places/favorites.png -rw-r--r-- root/root usr/share/icons/oxygen/256x256/places/folder-blue.png diff --git a/kde/polkit-kde/Pkgfile b/kde/polkit-kde/Pkgfile index 234ba712d..8195e7674 100755 --- a/kde/polkit-kde/Pkgfile +++ b/kde/polkit-kde/Pkgfile @@ -2,19 +2,21 @@ # URL: http://www.kde.org # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr -# Depends on: kdelibs +# Depends on: cmake, kdelibs name=polkit-kde version=0.95.1 -release=1 -source=(ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/$name-1-$version.tar.bz2 +release=3 +source=(ftp://kde.mirrors.pair.com/stable/apps/KDE4.x/admin/$name-1-$version.tar.bz2 xdg-path.patch gcc45.patch) build() { cd $SRC/$name-1-$version - patch -p0 -i $SRC/xdg-path.patch - patch -p0 -i $SRC/gcc45.patch + + patch -Np0 -i ../xdg-path.patch + patch -Np0 -i ../gcc45.patch + cd .. mkdir build cd build diff --git a/kde/polkit-kde/gcc45.patch b/kde/polkit-kde/gcc45.patch new file mode 100644 index 000000000..478b1660c --- /dev/null +++ b/kde/polkit-kde/gcc45.patch @@ -0,0 +1,11 @@ +--- agent/AuthDialog.cpp 2010-04-10 10:13:18.634941750 +0200 ++++ agent/AuthDialog.cpp 2010-04-10 10:13:56.021565836 +0200 +@@ -169,7 +169,7 @@ + foreach(PolkitQt1::Identity *identity, identities) { + // First check to see if the user is valid + qDebug() << "User: " << identity; +- KUser user = KUser::KUser(identity->toString().remove("unix-user:")); ++ KUser user = KUser(identity->toString().remove("unix-user:")); + if (!user.isValid()) { + kWarning() << "User invalid: " << user.loginName(); + continue; diff --git a/kde/rekonq/.md5sum b/kde/rekonq/.md5sum index beba6b5bf..f5a5ffe84 100644 --- a/kde/rekonq/.md5sum +++ b/kde/rekonq/.md5sum @@ -1 +1 @@ -68875a7a00dccc8fc7daec2245320314 rekonq-0.6.0.tar.bz2 +3c67de04fe21bb3cd52509e45c821da5 rekonq-0.6.1.tar.bz2 diff --git a/kde/rekonq/Pkgfile b/kde/rekonq/Pkgfile index 7df29aa5c..9968d3d33 100755 --- a/kde/rekonq/Pkgfile +++ b/kde/rekonq/Pkgfile @@ -5,7 +5,7 @@ # Depends on: kdebase, gtk name=rekonq -version=0.6.0 +version=0.6.1 release=1 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 ) |