diff options
| -rw-r--r-- | core/glibc/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/imagemagick/PKGBUILD | 8 | ||||
| -rw-r--r-- | kde-unstable/kdeplasma-addons/fix-twitter-auth.patch | 40 |
3 files changed, 4 insertions, 46 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index d0fe32545..2cef407e5 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -41,7 +41,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch if [ "${CARCH}" = "mips64el" ]; then - ln -s ../glibc-ports ports + ln -s ../glibc-ports-${pkgver} ports # Fix typo making util-linux build fail. sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index ef9db324c..bd7a46067 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.8.6 +pkgver=6.7.8.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,8 +12,6 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('4965710cf4dca18583691d121e22b114c84e0643' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} @@ -80,5 +78,5 @@ package_imagemagick-doc() { install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" } -sha1sums=('d24aa783d4cd98e276ee80f177e96fb0deb2d1a2' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') +md5sums=('c12aa1fafac9ebdca42464ba872fac86' + 'ff9974decbfe9846f8e347239d87e4eb') diff --git a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch deleted file mode 100644 index 0a55ce6ce..000000000 --- a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit edc7699f4f4b6d9fc0568b031143cb653ae4294e -Author: Sebastian Kügler <sebas@kde.org> -Date: Tue Jul 10 00:56:58 2012 +0200 - - fix authorization from twitter applet - - user in authorize() can be empty when it's already set in d->user, - respect that and successfully authorize. - - Thanks to phoenix_fbrd for finding this issue and the patch. - - REVIEW:105498 - BUG:302267 - - Please reopen the bug report if you still encounter crashes. - - Cherry-picked from 28f6d7cee7e81fda9ba396cc6477370a8ed3ada7 - -diff --git a/dataengines/microblog/koauth.cpp b/dataengines/microblog/koauth.cpp -index 565d79f..7566b95 100644 ---- a/dataengines/microblog/koauth.cpp -+++ b/dataengines/microblog/koauth.cpp -@@ -168,13 +168,15 @@ void KOAuth::run() - - void KOAuth::authorize(const QString &serviceBaseUrl, const QString &user, const QString &password) - { -- d->user = user; -+ if (!user.isEmpty()) { -+ d->user = user; -+ } - d->password = password; - d->serviceBaseUrl = serviceBaseUrl; - d->accessToken = QByteArray(); - d->accessTokenSecret = QByteArray(); - -- d->w->setUser(user); -+ d->w->setUser(d->user); - d->w->setServiceBaseUrl(serviceBaseUrl); - d->w->setPassword(password); - |