Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 11 insertions, 9 deletions

diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD
index 4aa34ede2..75b9c4fa7 100644
--- a/community/silly/PKGBUILD
+++ b/community/silly/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 63954 2010-01-19 05:25:26Z eric $
+# $Id: PKGBUILD 63742 2012-02-05 12:11:01Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=silly
 pkgver=0.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cegui.org.uk/wiki/index.php/SILLY"
 license=('MIT')
 depends=('libjpeg' 'libpng' 'gcc-libs')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz)
-md5sums=('c3721547fced7792a36ffc9ce6ec23fd')
-sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869')
+source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz
+        silly-libpng1.5.patch)
+md5sums=('c3721547fced7792a36ffc9ce6ec23fd'
+         '530551c2942aea6fa20f10d06f1e604f')
 
 build() {
   cd "${srcdir}/SILLY-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
+  patch -Np1 < $srcdir/silly-libpng1.5.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }