# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1397524462 -7200
# Node ID e1ee172acb7b1ca09bac1dcdf95c8c9b85678e35
# Parent  04916c01e7c98c441ca5709e54fbda584ba6d1fc
ARM: add sox, libunique, libao, libnotify

diff -r 04916c01e7c9 -r e1ee172acb7b flxine/receipt
--- a/flxine/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/flxine/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -17,7 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	export ac_cv_lib_pthread_pthread_create=yes
+	#export ac_cv_lib_pthread_pthread_create=yes
 	./bootstrap.sh &&
 	./configure $CONFIGURE_ARGS && 
 	make && make install
diff -r 04916c01e7c9 -r e1ee172acb7b glib/receipt
--- a/glib/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/glib/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -11,8 +11,6 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 HOST_ARCH="i486 arm"
 
-CROSS_BUGS="arm: glib 2.32.4 error: cannot compute alignment of guint32"
-
 DEPENDS="pcre libffi libxml2 elfutils"
 BUILD_DEPENDS="pcre-dev libffi-dev gettext zlib-dev perl python-dev \
 elfutils-dev libxml2-dev libxml2-tools automake"
@@ -49,7 +47,7 @@
 				--sysconfdir=/etc \
 				--with-pcre=system \
 				--build=i486-slitaz-linux \
-				--host=arm-slitaz-linux-gnueabi \
+				--host=$ARCH-slitaz-linux-gnueabi \
 				--enable-shared=yes \
 				--enable-static=yes ;;
 	esac && 
diff -r 04916c01e7c9 -r e1ee172acb7b libao-dev/receipt
--- a/libao-dev/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/libao-dev/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -8,6 +8,7 @@
 LICENSE="GPL2"
 WANTED="libao"
 WEB_SITE="http://downloads.xiph.org/releases/ao/" 
+HOST_ARCH="i486 arm"
 
 DEPENDS="pkg-config"
 
diff -r 04916c01e7c9 -r e1ee172acb7b libao/receipt
--- a/libao/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/libao/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://downloads.xiph.org/releases/ao/" 
 WGET_URL="$WEB_SITE/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="glibc-base alsa-lib"
 BUILD_DEPENDS="alsa-lib-dev"
@@ -16,11 +17,11 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr --enable-alsa09 --disable-arts \
+	./configure \
+		--enable-alsa09 \
+		--disable-arts \
 		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -29,8 +30,6 @@
 	mkdir -p $fs/usr/lib/ao/plugins-4 $fs/etc
 	cp -a $install/usr/lib/ao/plugins-4/*.so $fs/usr/lib/ao/plugins-4
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	
 	# Add conf file
-	cp -a $stuff/libao.conf $fs/etc/
-
+	cp -a $stuff/libao.conf $fs/etc
 }
diff -r 04916c01e7c9 -r e1ee172acb7b libnotify-dev/receipt
--- a/libnotify-dev/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/libnotify-dev/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -8,6 +8,7 @@
 LICENSE="LGPL2.1"
 WANTED="libnotify"
 WEB_SITE="http://www.galago-project.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libnotify dbus-glib-dev pkg-config"
 
diff -r 04916c01e7c9 -r e1ee172acb7b libnotify/receipt
--- a/libnotify/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/libnotify/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -9,18 +9,23 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.galago-project.org/"
 WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="dbus gtk+ dbus-glib xorg-libXdamage"
-BUILD_DEPENDS="dbus-dev gtk+-dev dbus-glib dbus-glib-dev perl expat-dev"
+BUILD_DEPENDS="dbus-dev gtk+-dev dbus-glib dbus-glib-dev expat-dev"
+
+# Handle cross compilation
+case "$ARCH" in
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS perl"
+esac
 
 # Rules to configure and make the package.
 compile_rules()
 {
-    cd $src
-    ./configure --prefix=/usr --infodir=/usr/share/info \
-    --mandir=/usr/share/man --disable-static $CONFIGURE_ARGS &&
-    make &&
-    make DESTDIR=$DESTDIR install
+	./configure \
+		--disable-static \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 04916c01e7c9 -r e1ee172acb7b libunique-dev/receipt
--- a/libunique-dev/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/libunique-dev/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -8,6 +8,7 @@
 LICENSE="LGPL2.1"
 WEB_SITE="http://live.gnome.org/LibUnique"
 WANTED="libunique"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libunique pkg-config"
 
@@ -15,8 +16,11 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
+	[ -d "$install/usr/share/gir-1.0" ] && \
+		cp -a $install/usr/share/gir-1.0 $fs/usr/share
+	[ -d "$install/usr/lib/girepository-1.0" ] && \
+		cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
 	cp -a $install/usr/include $fs/usr
 	cp -a $install/usr/lib/*.*a $fs/usr/lib
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/share/gir-1.0 $fs/usr/share
 }
diff -r 04916c01e7c9 -r e1ee172acb7b libunique/receipt
--- a/libunique/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/libunique/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -9,21 +9,23 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://live.gnome.org/LibUnique"
 WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
-DEPENDS="cairo gtk+ dbus dbus-glib"
-BUILD_DEPENDS="cairo-dev gtk+-dev glib-dev dbus-dev dbus-glib-dev expat-dev"
+DEPENDS="cairo gtk+"
+BUILD_DEPENDS="cairo-dev gtk+-dev glib-dev expat-dev"
 
 case "$ARCH" in
-	i?86)	BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev perl"
+	i?86)
+		BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev perl"
 		export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
 esac
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -Np1 -i $stuff/remove_G_CONST_RETURN.patch
+	patch -Np1 -i $stuff/remove_G_CONST_RETURN.patch || return 1
 	./configure \
+		--disable-dbus \
 		$CONFIGURE_ARGS &&
 	make && make install
 }
@@ -33,6 +35,5 @@
 {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
 }
 
diff -r 04916c01e7c9 -r e1ee172acb7b midori/receipt
--- a/midori/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/midori/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -11,12 +11,19 @@
 WEB_SITE="http://twotoasts.de/index.php/midori/"
 #WGET_URL="http://midori-browser.org/downloads/$TARBALL"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION:0:3}/$TARBALL"
+#HOST_ARCH="i486 arm"
+
 GENERIC_MENUS="no"
+DEPENDS="libnotify libunique libsoup libwebkit xorg-libXss libxslt"
+BUILD_DEPENDS="glib-dev libnotify-dev gtk+-dev xorg-libXss-dev \
+libwebkit-dev libunique-dev libsoup-dev libxslt-dev"
 
-DEPENDS="libnotify libunique libsoup libwebkit xorg-libXss"
-BUILD_DEPENDS="python vala glib-dev librsvg-apps libnotify-dev gtk+-dev \
-xorg-libXss-dev libwebkit-dev libunique-dev desktop-file-utils-extra \
-libsoup-dev cmake"
+# Handle cross compilation
+case "$ARCH" in
+	i?86) 
+		BUILD_DEPENDS="$BUILD_DEPENDS cmake desktop-file-utils-extra 
+		librsvg-apps python vala"
+esac
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 04916c01e7c9 -r e1ee172acb7b sox-dev/receipt
--- a/sox-dev/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/sox-dev/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -7,10 +7,10 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL LGPL"
 WEB_SITE="http://sox.sourceforge.net/"
+HOST_ARCH="i486 arm"
+
 WANTED="sox"
 
-DEPENDS="sox"
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
diff -r 04916c01e7c9 -r e1ee172acb7b sox/receipt
--- a/sox/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/sox/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -9,19 +9,31 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://sox.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="libltdl libsamplerate alsa-lib flac libid3tag libmad libvorbis libpng \
-lame libmagic libgomp libao ffmpeg libsndfile"
-BUILD_DEPENDS="$DEPENDS ffmpeg-dev libsndfile-dev libid3tag-dev libmad-dev libvorbis-dev libpng-dev \
- lame-dev libsamplerate-dev alsa-lib-dev flac-dev libao-dev libogg-dev libmagic-dev"
+DEPENDS="libltdl libsamplerate alsa-lib libid3tag libmad libvorbis \
+libpng lame libmagic libgomp libao ffmpeg libsndfile"
+BUILD_DEPENDS="ffmpeg-dev libsndfile-dev libid3tag-dev libmad-dev \
+libvorbis-dev libpng-dev lame-dev libsamplerate-dev alsa-lib-dev \
+libao-dev libogg-dev libmagic-dev"
+ 
+# Handle SliTaz arch
+case "$SLITAZ_ARCH" in
+	i?86) DEPENDS="$DEPENDS flac"
+esac
+
+# Handle cross compilation
+case "$ARCH" in
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS flac-dev"
+esac
  
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	./configure \
+		--with-distro="SliTaz" \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 04916c01e7c9 -r e1ee172acb7b tinyxml/receipt
--- a/tinyxml/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/tinyxml/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -9,14 +9,14 @@
 TARBALL="${PACKAGE}_$VERSION.zip"
 WEB_SITE="http://wiki.lxde.org/en/LXMusic"
 WGET_URL="$SF_MIRROR/project/$PACKAGE/$PACKAGE/2.6.2/$TARBALL"
-HOST_ARCH="i486 arm"
+#HOST_ARCH="i486 arm"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	make &&
 	${HOST_SYSTEM}-g++ -m32 -fPIC "$CXXFLAGS" -shared \
-		-o libtinyxml.so.0.${pkgver} \
+		-o libtinyxml.so.0.2.6.2 \
 		-Wl,-soname,libtinyxml.so.0 $(ls *.o | grep -v xmltest)
 }
 
diff -r 04916c01e7c9 -r e1ee172acb7b wbar2/receipt
--- a/wbar2/receipt	Tue Apr 15 02:04:52 2014 +0200
+++ b/wbar2/receipt	Tue Apr 15 03:14:22 2014 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.4"
 CATEGORY="system-tools"
 SHORT_DESC="Quick launch bar."
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 SOURCE="wbar"
 TARBALL="$SOURCE-$VERSION.tgz"
@@ -15,11 +15,11 @@
 HOST_ARCH="i486 arm"
 
 DEPENDS="ttf-dejavu imlib2 gtk+ libglade"
-BUILD_DEPENDS="imlib2-dev file"
+BUILD_DEPENDS="imlib2-dev gtk+-dev libglade-dev"
 
 # Handle cross compilation
 case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gtk+-dev libglade-dev intltool" ;;
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool file" ;;
 	arm*) ARCH_ARGS="--disable-wbar-config" ;;
 esac
 
@@ -29,7 +29,7 @@
 	./configure \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
-		$CONFIGURE_ARGS ${ARCH_ARGS} &&
+		$CONFIGURE_ARGS &&
 	make && make install
 }