diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 13:36:36 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 13:36:36 -0300 |
commit | 8c1cd392b43a7018099ce64f9359b76c2de14640 (patch) | |
tree | b3c0d54454025b6bc478768a07b9cf7bdcca2289 /extra/parted | |
parent | 5a01c45ea1ee67df43e376e2e4aa1833edd2ff30 (diff) | |
parent | 991d38faccf4e1fb27f31f236ad58ee840103734 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/i3-wm/PKGBUILD
community/jack2/PKGBUILD
community/perl-list-moreutils/PKGBUILD
community/qc-usb-messenger/PKGBUILD
community/sword/PKGBUILD
community/virtualbox/PKGBUILD
community/vuze/PKGBUILD
extra/archboot/PKGBUILD
extra/ardour/PKGBUILD
extra/boost/PKGBUILD
extra/digikam/PKGBUILD
extra/jack/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebindings-kimono/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdebindings/PKGBUILD
extra/kdeedu-blinken/PKGBUILD
extra/kdeedu-blinken/kdeedu-blinken.install
extra/kdeedu-cantor/PKGBUILD
extra/kdeedu-cantor/kdeedu-cantor.install
extra/kdeedu-kalgebra/PKGBUILD
extra/kdeedu-kalgebra/kdeedu-kalgebra.install
extra/kdeedu-kalzium/PKGBUILD
extra/kdeedu-kalzium/kdeedu-kalzium.install
extra/kdeedu-kanagram/PKGBUILD
extra/kdeedu-kanagram/kdeedu-kanagram.install
extra/kdeedu-kbruch/PKGBUILD
extra/kdeedu-kbruch/kdeedu-kbruch.install
extra/kdeedu-kgeography/PKGBUILD
extra/kdeedu-kgeography/kdeedu-kgeography.install
extra/kdeedu-khangman/PKGBUILD
extra/kdeedu-khangman/kdeedu-khangman.install
extra/kdeedu-kig/PKGBUILD
extra/kdeedu-kig/kdeedu-kig.install
extra/kdeedu-kiten/PKGBUILD
extra/kdeedu-kiten/kdeedu-kiten.install
extra/kdeedu-klettres/PKGBUILD
extra/kdeedu-klettres/kdeedu-klettres.install
extra/kdeedu-kmplot/PKGBUILD
extra/kdeedu-kmplot/kdeedu-kmplot.install
extra/kdeedu-kstars/PKGBUILD
extra/kdeedu-kstars/kdeedu-kstars.install
extra/kdeedu-ktouch/PKGBUILD
extra/kdeedu-ktouch/kdeedu-ktouch.install
extra/kdeedu-kturtle/PKGBUILD
extra/kdeedu-kturtle/kdeedu-kturtle.install
extra/kdeedu-kwordquiz/PKGBUILD
extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
extra/kdeedu-marble/PKGBUILD
extra/kdeedu-marble/gpsd-2.96.patch
extra/kdeedu-marble/kdeedu-marble.install
extra/kdeedu-parley/PKGBUILD
extra/kdeedu-parley/kdeedu-parley.install
extra/kdeedu-rocs/PKGBUILD
extra/kdeedu-step/PKGBUILD
extra/kdeedu-step/kdeedu-step.install
extra/kdegraphics-gwenview/PKGBUILD
extra/kdegraphics-gwenview/kdegraphics-gwenview.install
extra/kdegraphics-kamera/PKGBUILD
extra/kdegraphics-kcolorchooser/PKGBUILD
extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
extra/kdegraphics-kgamma/PKGBUILD
extra/kdegraphics-kolourpaint/PKGBUILD
extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
extra/kdegraphics-kruler/PKGBUILD
extra/kdegraphics-kruler/kdegraphics-kruler.install
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-ksnapshot/PKGBUILD
extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
extra/kdegraphics-okular/PKGBUILD
extra/kdegraphics-okular/kdegraphics-okular.install
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdegraphics/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/kdesdk-kate/kdebase-kwrite.install
extra/kdesdk-kate/kdesdk-kate.install
extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
extra/kdeutils/PKGBUILD
extra/kipi-plugins/PKGBUILD
extra/koffice/PKGBUILD
extra/konq-plugins/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdcraw/libkdcraw.install
extra/libkdeedu/PKGBUILD
extra/libkdeedu/libkdeedu.install
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libkipi/libkipi.install
extra/libksane/PKGBUILD
extra/libksane/libksane.install
extra/liblrdf/PKGBUILD
extra/maxima/PKGBUILD
extra/mysql/PKGBUILD
extra/partitionmanager/PKGBUILD
extra/pygobject/PKGBUILD
extra/samba/PKGBUILD
extra/sbcl/PKGBUILD
extra/texlive-bin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-freetype2/PKGBUILD
multilib/lib32-jack/PKGBUILD
multilib/lib32-libsndfile/PKGBUILD
testing/mesa/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'extra/parted')
-rw-r--r-- | extra/parted/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/parted/linux.c.patch | 25 |
2 files changed, 34 insertions, 4 deletions
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index a9be13e80..3a50e33ea 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132447 2011-07-24 17:00:59Z giovanni $ +# $Id: PKGBUILD 133576 2011-07-29 18:39:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -13,12 +13,17 @@ depends=('device-mapper' 'e2fsprogs') makedepends=('pkgconfig') options=('!libtool') install=${pkgname}.install -source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz") -md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7') +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" + linux.c.patch) +md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' + '08c942e212424e238271217f52c59706') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # FS#25307 + patch -Np1 -i ${srcdir}/linux.c.patch + ./configure --prefix=/usr \ --disable-debug \ --disable-rpath diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch new file mode 100644 index 000000000..c9feea142 --- /dev/null +++ b/extra/parted/linux.c.patch @@ -0,0 +1,25 @@ +--- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 ++++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 +@@ -601,17 +601,17 @@ + static int kver = -1; + + struct utsname uts; +- int major; +- int minor; +- int teeny; ++ int major = 0; ++ int minor = 0; ++ int teeny = 0; + + if (kver != -1) + return kver; + + if (uname (&uts)) + return kver = 0; +- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) +- return kver = 0; ++ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); ++ assert (n == 2 || n == 3); + + return kver = KERNEL_VERSION (major, minor, teeny); + } |