Merge branch 'master' of ssh://kiao.no-ip.info:443/~/gnome3

10 files changed, 27 insertions, 29 deletions

diff --git a/dasher/Pkgfile b/dasher/Pkgfile
index 077faf8..4562900 100644
--- a/dasher/Pkgfile
+++ b/dasher/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.inference.phy.cam.ac.uk/dasher
 # Maintainer: NuTyX GNOME team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libbonoboui, libgnomeui, at-spi, gnome-speech, libwnck3, gnome-keyring
-# Run on: libbonoboui,libgnomeui,at-spi,gnome-speech,libwnck3,gnome-keyring
+# Depends on: libbonoboui, libgnomeui, at-spi, gnome-speech, libwnck3, gnome-keyring, gnome-doc-utils, desktop-file-utils
+# Run on: libbonoboui,libgnomeui,at-spi,gnome-speech,libwnck3,gnome-keyring,desktop-file-utils
 
 name=dasher
 version=4.11
diff --git a/gcalctool/Pkgfile b/gcalctool/Pkgfile
index 98abc92..27f6fde 100644
--- a/gcalctool/Pkgfile
+++ b/gcalctool/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX GNOME team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui
-# Run on: libgnomeui
+# Depends on: libgnomeui, gnome-doc-utils, desktop-file-utils
+# Run on: libgnomeui,desktop-file-utils
 
 name=gcalctool
 version=6.1.5
diff --git a/gconf-editor/Pkgfile b/gconf-editor/Pkgfile
index 84ac142..1223c55 100644
--- a/gconf-editor/Pkgfile
+++ b/gconf-editor/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.gnome.org
 # Maintainer: NuTyX GNOME team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui
-# Run on: rarian,libgnomeui
+# Depends on: libgnomeui, gnome-doc-utils, desktop-file-utils
+# Run on: rarian,libgnomeui,desktop-file-utils
 
 name=gconf-editor
 version=3.0.0
diff --git a/gedit/Pkgfile b/gedit/Pkgfile
index ccc9307..8bd5c13 100644
--- a/gedit/Pkgfile
+++ b/gedit/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX GNOME team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libgnomeui, libgnomeprintui, gtksourceview, pygtk, libpeas, pygobject3
-# Run on: rarian,libgnomeui,libgnomeprintui,gtksourceview,pygtk,libpeas,pygobject3
+# Depends on: libgnomeui, libgnomeprintui, gtksourceview, pygtk, libpeas, pygobject3, gsettings-desktop-schemas, desktop-file-utils, gnome-doc-utils
+# Run on: rarian,libgnomeui,libgnomeprintui,gtksourceview,pygtk,libpeas,pygobject3,gsettings-desktop-schemas,desktop-file-utils
 
 name=gedit
 version=3.1.5
diff --git a/liboobs/.footprint.i686 b/liboobs/.footprint.i686
index b81e4fb..3c66389 100644
--- a/liboobs/.footprint.i686
+++ b/liboobs/.footprint.i686
@@ -2,6 +2,9 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/liboobs-1.0/
 drwxr-xr-x	root/root	usr/include/liboobs-1.0/oobs/
+-rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-defines.h
+-rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-enum-types.h
+-rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-error.h
 -rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-group.h
 -rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-groupsconfig.h
 -rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-hostsconfig.h
@@ -34,8 +37,8 @@ drwxr-xr-x	root/root	usr/include/liboobs-1.0/oobs/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liboobs-1.a
 -rwxr-xr-x	root/root	usr/lib/liboobs-1.la
-lrwxrwxrwx	root/root	usr/lib/liboobs-1.so -> liboobs-1.so.4.0.0
-lrwxrwxrwx	root/root	usr/lib/liboobs-1.so.4 -> liboobs-1.so.4.0.0
--rwxr-xr-x	root/root	usr/lib/liboobs-1.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/liboobs-1.so -> liboobs-1.so.5.0.1
+lrwxrwxrwx	root/root	usr/lib/liboobs-1.so.5 -> liboobs-1.so.5.0.1
+-rwxr-xr-x	root/root	usr/lib/liboobs-1.so.5.0.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/liboobs-1.pc
diff --git a/liboobs/.footprint.x86_64 b/liboobs/.footprint.x86_64
index b81e4fb..3c66389 100644
--- a/liboobs/.footprint.x86_64
+++ b/liboobs/.footprint.x86_64
@@ -2,6 +2,9 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/liboobs-1.0/
 drwxr-xr-x	root/root	usr/include/liboobs-1.0/oobs/
+-rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-defines.h
+-rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-enum-types.h
+-rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-error.h
 -rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-group.h
 -rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-groupsconfig.h
 -rw-r--r--	root/root	usr/include/liboobs-1.0/oobs/oobs-hostsconfig.h
@@ -34,8 +37,8 @@ drwxr-xr-x	root/root	usr/include/liboobs-1.0/oobs/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liboobs-1.a
 -rwxr-xr-x	root/root	usr/lib/liboobs-1.la
-lrwxrwxrwx	root/root	usr/lib/liboobs-1.so -> liboobs-1.so.4.0.0
-lrwxrwxrwx	root/root	usr/lib/liboobs-1.so.4 -> liboobs-1.so.4.0.0
--rwxr-xr-x	root/root	usr/lib/liboobs-1.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/liboobs-1.so -> liboobs-1.so.5.0.1
+lrwxrwxrwx	root/root	usr/lib/liboobs-1.so.5 -> liboobs-1.so.5.0.1
+-rwxr-xr-x	root/root	usr/lib/liboobs-1.so.5.0.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/liboobs-1.pc
diff --git a/liboobs/Pkgfile b/liboobs/Pkgfile
index 2155156..41bf4bf 100644
--- a/liboobs/Pkgfile
+++ b/liboobs/Pkgfile
@@ -18,4 +18,5 @@ build() {
 		--mandir=/usr/share/man
 	make
 	make DESTDIR=$PKG install
+	rm -r $PKG/usr/share
 }
diff --git a/pulseaudio/Pkgfile b/pulseaudio/Pkgfile
index 017760b..e4ae28d 100644
--- a/pulseaudio/Pkgfile
+++ b/pulseaudio/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.pulseaudio.org
 # Maintainer: NuTyX core team
 # Packager: piernov <piernov@piernov.org>
-# Depends on: consolekit, alsa-lib, gconf, libcap, liboil, policykit, libsamplerate, libsndfile, speex, libvorbis, json-c, xorg-libxtst, xorg-libsm, xorg-xcb-util, imagemagick
-# Run on: consolekit,alsa-lib,gconf,libcap,liboil,policykit,libsamplerate,libsndfile,speex,libvorbis,json-c
+# Depends on: consolekit, alsa-lib, gconf, libcap, liboil, policykit, libsamplerate, libsndfile, speex, libvorbis, json-c, xorg-libxtst, xorg-libsm, xorg-xcb-util, imagemagick, bluez, jack-audio-connection-kit, avahi
+# Run on: consolekit,alsa-lib,gconf,libcap,liboil,policykit,libsamplerate,libsndfile,speex,libvorbis,json-c,bluez,jack-audio-connection-kit,avahi
 
 name=pulseaudio
 version=0.99.3
diff --git a/pulseaudio/post-install b/pulseaudio/post-install
deleted file mode 100755
index ee267d5..0000000
--- a/pulseaudio/post-install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-port=pulseaudio
-
-[[ -f /usr/bin/esd ]] && /bin/mv -f /usr/bin/esd /usr/bin/esd-orig
-/bin/ln -sf esdcompat /usr/bin/esd
-
-/bin/grep shm /etc/fstab > /dev/null 2>&1 || echo "shm             /dev/shm        tmpfs   nodev,nosuid,noexec     0       0" >> /etc/fstab
-/bin/grep shm /etc/mtab > /dev/null 2>&1 || /bin/mount mtab
-
-# End of file
diff --git a/telepathy-python/Pkgfile b/telepathy-python/Pkgfile
index 1f7b57e..f8fdf81 100755
--- a/telepathy-python/Pkgfile
+++ b/telepathy-python/Pkgfile
@@ -11,9 +11,11 @@ release=1
 source=(http://${name%-*}.freedesktop.org/releases/$name/$name-$version.tar.gz)
 
 build() {
+	unset MAKEFLAGS
+	unset CFLAGS
+	unset CXXFLAGS
         cd $name-$version
-	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-		--libexecdir=/usr/lib/${name%-*}
+	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
 }