| 1 |
eva 08/04/09 23:32:04 |
| 2 |
|
| 3 |
Added: nautilus-2.22.2-no-esound.patch |
| 4 |
Log: |
| 5 |
bump to 2.22.2. Bug fixing and startup enhancements. |
| 6 |
(Portage version: 2.1.5_rc2) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 gnome-base/nautilus/files/nautilus-2.22.2-no-esound.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.2-no-esound.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.2-no-esound.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nautilus-2.22.2-no-esound.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.in 2008-01-08 04:29:18.000000000 -0500 |
| 17 |
+++ configure.in 2008-01-08 12:06:58.000000000 -0500 |
| 18 |
@@ -5,7 +5,6 @@ dnl ==================================== |
| 19 |
m4_define(bonobo_activation_minver, 2.1.0) |
| 20 |
m4_define(bonobo_minver, 2.1.0) |
| 21 |
m4_define(eel_minver, 2.21.90) |
| 22 |
-m4_define(esound_minver, 0.2.27) |
| 23 |
m4_define(glib_minver, 2.15.6) |
| 24 |
m4_define(gnome_desktop_minver, 2.9.91) |
| 25 |
m4_define(gnome_minver, 2.14.0) |
| 26 |
@@ -43,7 +42,6 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL |
| 27 |
AC_SUBST(BONOBO_ACTIVATION_REQUIRED, [bonobo_activation_minver]) |
| 28 |
AC_SUBST(BONOBO_REQUIRED, [bonobo_minver]) |
| 29 |
AC_SUBST(EEL_REQUIRED, [eel_minver]) |
| 30 |
-AC_SUBST(ESOUND_REQUIRED, [esound_minver]) |
| 31 |
AC_SUBST(GLIB_REQUIRED [glib_minver]) |
| 32 |
AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver]) |
| 33 |
AC_SUBST(GNOME_REQUIRED, [gnome_minver]) |
| 34 |
@@ -87,7 +85,6 @@ fi |
| 35 |
AC_SUBST(STARTUP_NOTIFICATION_PACKAGE) |
| 36 |
|
| 37 |
PKG_CHECK_MODULES(ALL, [ |
| 38 |
- esound >= esound_minver |
| 39 |
bonobo-activation-2.0 >= bonobo_activation_minver |
| 40 |
eel-2.0 >= eel_minver |
| 41 |
glib-2.0 >= glib_minver |
| 42 |
@@ -403,7 +403,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG |
| 43 |
AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) |
| 44 |
|
| 45 |
dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") |
| 46 |
-CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES" |
| 47 |
+CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES" |
| 48 |
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS" |
| 49 |
AC_SUBST(CORE_CFLAGS) |
| 50 |
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" |
| 51 |
--- src/file-manager/fm-icon-view.c 2007-12-14 05:23:13.000000000 -0500 |
| 52 |
+++ src/file-manager/fm-icon-view.c 2008-01-08 12:06:32.000000000 -0500 |
| 53 |
@@ -68,7 +68,6 @@ |
| 54 |
#include <sys/types.h> |
| 55 |
#include <sys/wait.h> |
| 56 |
#include <unistd.h> |
| 57 |
-#include <esd.h> |
| 58 |
|
| 59 |
#include "nautilus-audio-mime-types.h" |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
-- |
| 65 |
gentoo-commits@l.g.o mailing list |
Archives