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

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	core/mlocate/PKGBUILD
	core/procps-ng/PKGBUILD
	core/sysvinit/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	extra/audacious/PKGBUILD
	extra/libsigc++/PKGBUILD
	extra/postgresql-old-upgrade/PKGBUILD
	extra/qt/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	gnome-unstable/webkitgtk3/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/openmpi/PKGBUILD
	testing/run-parts/PKGBUILD
	testing/systemd/PKGBUILD
	testing/transmission/PKGBUILD
	testing/transmission/transmission-cli.install
	testing/transmission/transmission.systemd

1 files changed, 18 insertions, 17 deletions

diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD
index 06e425336..db7b71343 100644
--- a/elementary/gtk-engine-equinox/PKGBUILD
+++ b/elementary/gtk-engine-equinox/PKGBUILD
@@ -1,33 +1,34 @@
-# created 16:18:42 - 21/03/10
-# Maintainer: Frikilinux <frikilinux at frikilinux.com.ar>
+# Maintainer : SpepS <dreamspepser at yahoo dot it>
+# Contributor: Frikilinux <frikilinux at frikilinux.com.ar>
 
 pkgname=gtk-engine-equinox
 pkgver=1.50
-pkgrel=2
+pkgrel=3
 pkgdesc="A heavily modified version of the beautiful Aurora engine"
 url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881"
-license=('GPL2')
+license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2')
-makedepends=('pkgconfig')
-conflicts=()
+makedepends=('libtool')
 options=('!libtool')
-source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-${pkgver}.tar.gz")
+source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-$pkgver.tar.gz")
 sha256sums=('0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227')
 
 build() {
-        # extract engine files
-        #tar xzf equinox-gtk-engine.tar.gz
-        cd "${srcdir}"/equinox-$pkgver
+  cd "$srcdir/equinox-$pkgver"
 
-	# Toolbar Fix
-	sed -i "s|\(EQUINOX_IS_TOOLBAR.*parent\)|widget \&\& \1|" src/equinox_style.c
-        
-	./configure --prefix=/usr --enable-animation
-        make
+  # toolbar fix
+  sed -i "s/=\( EQUINOX_IS_TOOLBAR\)/= widget \&\&\1/" \
+    src/equinox_style.c
 
+  # glib2 fix
+  sed -i "/gtimer/d" src/animation.c
+        
+  ./configure --prefix=/usr \
+              --enable-animation
+  make
 }
 package() {
-	cd "${srcdir}"/equinox-$pkgver
-        make DESTDIR="${pkgdir}" install
+  cd "$srcdir/equinox-$pkgver"
+  make DESTDIR="$pkgdir/" install
 }