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

2 files changed, 9 insertions, 68 deletions

diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 5a2bab348..3fc7ee10d 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105523 2011-01-10 10:25:14Z jgc $
+# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.4
-pkgrel=2
+pkgver=2.4.6
+pkgrel=1
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -12,9 +12,8 @@ depends=('zlib')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.3.0-enable-spr.patch
-        freetype-2.2.1-enable-valid.patch
-        allow-hlineto-vlineto-without-arguments.patch)
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
+        freetype-2.2.1-enable-valid.patch)
+md5sums=('5e6510613f612809d2d7862592b92ab7'
          '816dc8619a6904a7385769433c0a8653'
          '214119610444c9b02766ccee5e220680')
 
@@ -22,13 +21,12 @@ build() {
   cd "${srcdir}/freetype-${pkgver}"
   patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
   patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
-  patch -Np1 -i "${srcdir}/allow-hlineto-vlineto-without-arguments.patch"
 
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/freetype-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('b3e2b6e2f1c3e0dffa1fd2a0f848b671'
-         '816dc8619a6904a7385769433c0a8653'
-         '214119610444c9b02766ccee5e220680'
-         'bb094e147b25892f1d04cfb5ff877bce')
diff --git a/extra/freetype2/allow-hlineto-vlineto-without-arguments.patch b/extra/freetype2/allow-hlineto-vlineto-without-arguments.patch
deleted file mode 100644
index 5990041aa..000000000
--- a/extra/freetype2/allow-hlineto-vlineto-without-arguments.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 396b11b840f84e8bff62f3c361d0b592e77ee703 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Thu, 09 Dec 2010 22:16:18 +0000
-Subject: [cff] Allow `hlineto' and `vlineto' without arguments.
-
-We simply ignore such instructions.  This is invalid, but it doesn't
-harm; and indeed, there exist such subsetted fonts in PDFs.
-
-Reported by Albert Astals Cid <aacid@kde.org>.
-
-* src/cff/cffgload.c (cff_decoder_parse_charstrings)
-[cff_op_hlineto]: Ignore instruction if there aren't any arguments
-on the stack.
----
-diff --git a/ChangeLog b/ChangeLog
-index b7aea52..579ae62 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,16 @@
-+2010-12-09  Werner Lemberg  <wl@gnu.org>
-+
-+	[cff] Allow `hlineto' and `vlineto' without arguments.
-+
-+	We simply ignore such instructions.  This is invalid, but it doesn't
-+	harm; and indeed, there exist such subsetted fonts in PDFs.
-+
-+	Reported by Albert Astals Cid <aacid@kde.org>.
-+
-+	* src/cff/cffgload.c (cff_decoder_parse_charstrings)
-+	[cff_op_hlineto]: Ignore instruction if there aren't any arguments
-+	on the stack.
-+
- 2010-11-28  Werner Lemberg  <wl@gnu.org>
- 
- 	* Version 2.4.4 released.
-diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
-index e99ee70..99c5b0c 100644
---- a/src/cff/cffgload.c
-+++ b/src/cff/cffgload.c
-@@ -1438,9 +1438,14 @@
-             FT_TRACE4(( op == cff_op_hlineto ? " hlineto\n"
-                                              : " vlineto\n" ));
- 
--            if ( num_args < 1 )
-+            if ( num_args < 0 )
-               goto Stack_Underflow;
- 
-+            /* there exist subsetted fonts (found in PDFs) */
-+            /* which call `hlineto' without arguments      */
-+            if ( num_args == 0 )
-+              break;
-+
-             if ( cff_builder_start_point ( builder, x, y ) ||
-                  check_points( builder, num_args )         )
-               goto Fail;
---
-cgit v0.8.3.2