Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/cinepaint/PKGBUILD
	extra/cmake/PKGBUILD
	extra/fltk/PKGBUILD
	extra/foomatic/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libxi/PKGBUILD
	extra/monica/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/soprano/PKGBUILD
	multilib/wine/PKGBUILD
	testing/mesa/PKGBUILD

2 files changed, 56 insertions, 22 deletions

diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE
new file mode 100644
index 000000000..746207229
--- /dev/null
+++ b/extra/cinepaint/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2005, Kai-Uwe Behrmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met: 
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.ntributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index fed92aed9..93b61ee16 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,39 +1,48 @@
-# $Id: PKGBUILD 89858 2010-09-04 14:16:02Z remy $
+# $Id: PKGBUILD 130311 2011-07-04 22:01:41Z eric $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 _srcver=0.22-1
 pkgver=${_srcver/-/.}
-pkgrel=7
-pkgdesc="sophisticated graphics manipulation programm supporting >8bit pictures"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL' 'GPL' 'MIT-OSI')
-url=(http://cinepaint.org.sourceforge.net/)
-depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'fltk>=1.1.9' 'desktop-file-utils' 'ftgl>=2.1.3rc5' 'libjpeg>=8')
-makedepends=('python2' 'gutenprint>=5.2.3')
-optdepends=('python2' 'gutenprint')
+pkgrel=8
+pkgdesc="Sophisticated graphics manipulation programm supporting >8bit pictures"
+arch=('i686' 'x86_64')
+license=('LGPL' 'GPL' 'MIT')
+url="http://www.cinepaint.org"
+depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxpm>=3.5.7' 'fltk' 
+         'desktop-file-utils' 'ftgl>=2.1.3rc5')
+makedepends=('python2' 'gutenprint')
+optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins')
 options=('!libtool')
 install=cinepaint.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz
+        LICENSE
         cinepaint-0.22.1-gcc43.patch
         cinepaint-0.22.1-multiple_parameters_named.patch
         cinepaint-0.22.1-ambiguousawake.patch
 	cinepaint-0.22-gcc44.patch)
-md5sums=('f360587240db6b6d2f0bfd94c420c492' 'f05e17a16d0018e5301aff0e1fa597b0'\
-         '0876510a5ce3d581ebdde7e18199c09f' '4586aa153a0d3cac36120afc1f95a880'\
+md5sums=('f360587240db6b6d2f0bfd94c420c492'
+         '169085743f667c250ea2e4022efecf5f'
+         'f05e17a16d0018e5301aff0e1fa597b0'
+         '0876510a5ce3d581ebdde7e18199c09f'
+         '4586aa153a0d3cac36120afc1f95a880'
          '368e820c27f525e3569d43388f1c119a')
 
 build() {
   cd "${srcdir}/${pkgname}-${_srcver}"
  # FIXES
-  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" || return 1
-  patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" || return 1
-  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" || return 1
-  patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" || return 1
+  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch"
+  patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
+  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch"
+  patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch"
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  find plug-ins/print -type f -exec \
-    sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
+  find plug-ins/print -type f -exec  sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
+  sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' lib/fl_i18n/fl_i18n.cxx
+  sed -i 's|Fl/Fl_Widget.H|FL/Fl_Widget.H|' plug-ins/icc_examin/icc_examin/icc_helfer.h
+  sed -i 's|Fl/Fl.H|FL/Fl.H|' plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
+  sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' plug-ins/icc_examin/icc_examin/fl_i18n/fl_i18n.cxx
+
   # Fix insecure rpath
   sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure
 
@@ -45,11 +54,11 @@ build() {
   sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile
   make
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${_srcver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/applications"
-  install -m755 -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 cinepaint.desktop "${pkgdir}/usr/share/applications/" || return 1
-  install -m644 cinepaint.png "${pkgdir}/usr/share/pixmaps/" || return 1
+  make DESTDIR="${pkgdir}" install
+  sed -i -e "s|-I$srcdir/cinepaint-0.22-1||" -e "s|-I$srcdir/cinepaint-0.22-1/lib||" -e "/libcinepaint.la/d" \
+    -e "s|$srcdir/cinepaint-0.22-1/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
+  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }