diff options
author | Joe McCann <joem@gentoo.org> | 2005-08-19 20:29:53 +0000 |
---|---|---|
committer | Joe McCann <joem@gentoo.org> | 2005-08-19 20:29:53 +0000 |
commit | 92b7375a49c74e08b97cfb55d71fba84c22d9dac (patch) | |
tree | a3757f96ba0fb9e09714299fdca1198a6550fb8b /gnome-base | |
parent | New beta version (diff) | |
download | historical-92b7375a49c74e08b97cfb55d71fba84c22d9dac.tar.gz historical-92b7375a49c74e08b97cfb55d71fba84c22d9dac.tar.bz2 historical-92b7375a49c74e08b97cfb55d71fba84c22d9dac.zip |
New beta version
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-panel/Manifest | 8 | ||||
-rw-r--r-- | gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91 | 1 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild | 76 | ||||
-rw-r--r-- | gnome-base/gnome-session/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gnome-session/Manifest | 22 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/digest-gnome-session-2.11.91 | 2 | ||||
-rw-r--r-- | gnome-base/gnome-session/gnome-session-2.11.91.ebuild | 77 | ||||
-rw-r--r-- | gnome-base/nautilus/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-base/nautilus/Manifest | 7 | ||||
-rw-r--r-- | gnome-base/nautilus/files/digest-nautilus-2.11.91 | 1 | ||||
-rw-r--r-- | gnome-base/nautilus/files/nautilus-2.11.91-icon_view_gst.patch | 244 | ||||
-rw-r--r-- | gnome-base/nautilus/nautilus-2.11.91.ebuild | 89 |
12 files changed, 525 insertions, 17 deletions
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest index 8e5e8cbe2866..5fabe021edb9 100644 --- a/gnome-base/gnome-panel/Manifest +++ b/gnome-base/gnome-panel/Manifest @@ -1,12 +1,14 @@ MD5 cb8adfff3d8c056031f0fb014124d099 ChangeLog 18441 MD5 f7e2e4cf2f4edcca0070acfc88ebec43 gnome-panel-1.4.1.ebuild 1821 MD5 1ab5abca58ed191a20538e5298dbf5bf gnome-panel-1.4.2-r2.ebuild 2079 -MD5 2b7852739e5647ed45bbbbbfd4d18a24 gnome-panel-2.6.2.ebuild 1553 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 e396d648e215308e9b6f3b10c57ffd00 gnome-panel-2.10.0-r1.ebuild 1896 MD5 4bfe7ea07b71345aa8efe5fcbf148b5c gnome-panel-2.10.2.ebuild 1981 +MD5 2b7852739e5647ed45bbbbbfd4d18a24 gnome-panel-2.6.2.ebuild 1553 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 0e8264d57748ca300c41fb43c7374fc0 gnome-panel-2.11.91.ebuild 1952 MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70 MD5 a810fac56997cf9a6ee29adec5fb19cf files/digest-gnome-panel-2.10.0-r1 72 -MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71 MD5 3fb66501747e994bb5ac1d787b52a02c files/digest-gnome-panel-2.10.2 72 +MD5 afd54e022092a94648da54cd0c646241 files/digest-gnome-panel-2.6.2 71 +MD5 9519d1c688ac6efb1156b207e75051a5 files/digest-gnome-panel-2.11.91 73 diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91 new file mode 100644 index 000000000000..161f837bc362 --- /dev/null +++ b/gnome-base/gnome-panel/files/digest-gnome-panel-2.11.91 @@ -0,0 +1 @@ +MD5 6b44787f4970f10c42e031176aa65da7 gnome-panel-2.11.91.tar.bz2 2494229 diff --git a/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild b/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild new file mode 100644 index 000000000000..fbf4377eb772 --- /dev/null +++ b/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.11.91.ebuild,v 1.1 2005/08/19 20:25:26 joem Exp $ + +inherit eutils gnome2 + +DESCRIPTION="The GNOME panel" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="doc eds static" + +RDEPEND=">=x11-libs/gtk+-2.7.1 + >=x11-libs/libwnck-2.9.92 + >=gnome-base/orbit-2.4 + >=gnome-base/gnome-vfs-2.9.1 + >=gnome-base/gnome-desktop-2.9.91 + >=gnome-base/libbonoboui-2.1.1 + >=gnome-base/libglade-2.5 + >=gnome-base/libgnome-2.1.1 + >=gnome-base/libgnomeui-2.5.4 + >=gnome-base/gconf-2.6.1 + >=gnome-base/gnome-menus-2.11.1 + media-libs/libpng + eds? ( >=gnome-extra/evolution-data-server-1.1.4.2 ) + !gnome-extra/system-tray-applet" +# we need eds-1.1 for libecal-1.2 + +DEPEND="${RDEPEND} + app-text/scrollkeeper + dev-util/pkgconfig + >=dev-util/intltool-0.31 + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +USE_DESTDIR="1" +G2CONF="${G2CONF} $(use_enable eds) $(use_enable static) --disable-scrollkeeper" + +src_compile() { + + gnome2_src_configure + + # FIXME : uh yeah, this is nice + # We should patch in a switch here and send it upstream + sed -i 's:--load:-v:' gnome-panel/Makefile || die + + emake || die + +} + +pkg_postinst() { + + local entries="/etc/gconf/schemas/panel-default-setup.entries" + if [ -e "$entries" ]; then + einfo "setting panel gconf defaults..." + GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source` + ${ROOT}/usr/bin/gconftool-2 --direct --config-source \ + ${GCONF_CONFIG_SOURCE} --load=${entries} + rm -f ${entries} + fi + + local updater=`which gtk-update-icon-cache` + if [ -x "$updater" ]; then + einfo "Updating icon cache" + $updater -qf ${ROOT}/usr/share/icons/hicolor + fi + + # Calling this late so it doesn't process the GConf schemas file we already + # took care of. + gnome2_pkg_postinst + +} + diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog index f1cd3081230f..95c9b67c9596 100644 --- a/gnome-base/gnome-session/ChangeLog +++ b/gnome-base/gnome-session/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gnome-session # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.111 2005/08/19 19:46:36 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.112 2005/08/19 20:29:53 joem Exp $ + +*gnome-session-2.11.91 (19 Aug 2005) + + 19 Aug 2005; Joe McCann <joem@gentoo.org> +gnome-session-2.11.91.ebuild: + New beta version 19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> gnome-session-2.10.0-r3.ebuild: diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest index 324703543f86..5db2aa699c69 100644 --- a/gnome-base/gnome-session/Manifest +++ b/gnome-base/gnome-session/Manifest @@ -1,16 +1,18 @@ -MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586 +MD5 4cdad2a9578c7673e8d4bc89c339d6fa ChangeLog 14871 MD5 1976d8749f4396a7a44fb78c8b2f8ef6 gnome-session-2.10.0-r2.ebuild 1992 -MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 1bb72e1082a198a93b245fa8dfec093c gnome-session-2.10.0-r3.ebuild 2127 -MD5 4cdad2a9578c7673e8d4bc89c339d6fa ChangeLog 14871 +MD5 4499ec98ae9a50f5de83b8ce43411a80 gnome-session-2.10.0.ebuild 1586 MD5 c9b685052085b1c022785575a65aa502 gnome-session-2.8.1.ebuild 1580 -MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469 -MD5 b3685e6ab1ec8736038735270ae11fb5 files/gnome-session-2.10.0-no_smproxy.patch 2103 -MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648 -MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133 -MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r2 134 -MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134 +MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 +MD5 c5dc0f91391078e84d73b8ba9573d103 gnome-session-2.11.91.ebuild 2069 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464 +MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0 134 +MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r2 134 +MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r3 134 +MD5 20d1fd1924d8b4f8aed2a43547bd77db files/digest-gnome-session-2.8.1 133 MD5 ef9c116121d03af45e5f6f00050da2d6 files/gnome-session-2.10.0-esd_switch.patch 1910 +MD5 b3685e6ab1ec8736038735270ae11fb5 files/gnome-session-2.10.0-no_smproxy.patch 2103 +MD5 1472ffe4555c4aab66d8359a4031544d files/gnome-session-2.10.0-schema_defaults.patch 648 MD5 9c41a7c69837eba927f8d546d3c13b8d files/gnome-session-2.6-schema_defaults.patch 1484 -MD5 39beb568f51916dc9351460344445640 files/digest-gnome-session-2.10.0-r3 134 +MD5 b6e2c49cdafa0d5d8fe9ab4e28f5fc3d files/gnome-session-2.8.1-hide_splash.patch 1469 +MD5 978c8881fbbaaaba52db38c0dddfb7be files/digest-gnome-session-2.11.91 135 diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.11.91 b/gnome-base/gnome-session/files/digest-gnome-session-2.11.91 new file mode 100644 index 000000000000..09888bd67ff9 --- /dev/null +++ b/gnome-base/gnome-session/files/digest-gnome-session-2.11.91 @@ -0,0 +1,2 @@ +MD5 31db21bcf1bc19a33c620de06cee6073 gnome-session-2.11.91.tar.bz2 680273 +MD5 f02a80d3f1435547a479312c15cc1030 gentoo-splash.png 78064 diff --git a/gnome-base/gnome-session/gnome-session-2.11.91.ebuild b/gnome-base/gnome-session/gnome-session-2.11.91.ebuild new file mode 100644 index 000000000000..fdda5c029b03 --- /dev/null +++ b/gnome-base/gnome-session/gnome-session-2.11.91.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.11.91.ebuild,v 1.1 2005/08/19 20:29:53 joem Exp $ + +inherit eutils gnome2 + +DESCRIPTION="Gnome session manager" +HOMEPAGE="http://www.gnome.org/" +SRC_URI="${SRC_URI} mirror://gentoo/gentoo-splash.png" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86" +IUSE="esd ipv6" + +RDEPEND=">=x11-libs/gtk+-2.3.1 + esd? ( >=media-sound/esound-0.2.26 ) + >=gnome-base/libgnomeui-2.2 + >=sys-apps/tcp-wrappers-7.6 + >=gnome-base/gconf-2 + gnome-base/gnome-keyring" + +DEPEND="${RDEPEND} + >=sys-devel/gettext-0.10.40 + >=dev-util/pkgconfig-0.17 + dev-util/intltool + !gnome-base/gnome-core" +# gnome-base/gnome-core overwrite /usr/bin/gnome-session + +G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd)" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +USE_DESTDIR="1" + +src_unpack() { + unpack ${P}.tar.bz2 + cd ${S} + + # Patch for logout dialog and automatic session save now reverted. See bug + # #95745. Patch to set the Gentoo splash by default in the gconf key + # (#42687) + epatch ${FILESDIR}/${PN}-2.10.0-schema_defaults.patch + + # Implement switch to enable/disable esound support. See bug #6920. + epatch ${FILESDIR}/${PN}-2.10.0-esd_switch.patch + + + # Hide the splash after defaults have been loaded, a temp workaround + # for http://bugzilla.gnome.org/show_bug.cgi?id=116814 + epatch ${FILESDIR}/${PN}-2.8.1-hide_splash.patch + + export WANT_AUTOMAKE=1.7 + cp aclocal.m4 old_macros.m4 + einfo "Running aclocal" + aclocal -I . || die "aclocal failed" + einfo "Running autoconf" + autoconf || die "autoconf failed" + einfo "Running automake" + automake || die "automake failed" + einfo "Running libtoolize" + libtoolize --copy --force +} + +src_install() { + + gnome2_src_install + + dodir /etc/X11/Sessions + exeinto /etc/X11/Sessions + doexe ${FILESDIR}/Gnome + + # Our own splash for world domination + insinto /usr/share/pixmaps/splash/ + doins ${DISTDIR}/gentoo-splash.png + +} diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index 77d2588e9c6d..5c8d74ab5a74 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/nautilus # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.148 2005/08/08 14:46:12 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.149 2005/08/19 20:22:47 joem Exp $ + +*nautilus-2.11.91 (19 Aug 2005) + + 19 Aug 2005; Joe McCann <joem@gentoo.org> + +files/nautilus-2.11.91-icon_view_gst.patch, +nautilus-2.11.91.ebuild: + New beta version 08 Aug 2005; Markus Rothe <corsair@gentoo.org> nautilus-2.10.1-r1.ebuild: Stable on ppc64 diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 19f025aac904..70125215eaa5 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -3,15 +3,18 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 00c95b6b319c4650c8e666dbe2354c7a nautilus-1.0.6-r9.ebuild 3398 MD5 c0ed9135a2a082d9b804280bbbf62c57 nautilus-2.10.0.ebuild 2587 MD5 f11acb7ee4aa0ecd49a8278bf667c16c nautilus-2.10.1-r1.ebuild 2552 +MD5 b9b13c883f2cbe3eccdec3299a5089b6 nautilus-2.11.91.ebuild 2283 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68 MD5 d3f1a79cced5768f96e22c17df92261b files/digest-nautilus-2.10.0 69 +MD5 567191aa3b9ef17acb8e3b0ba006afdf files/digest-nautilus-2.10.1-r1 69 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632 MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920 MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709 MD5 ddc1abbf275436c7fa5fd5c04a27cc94 files/nautilus-1.0.6-mozilla-embed-1.0_rc3.diff 526 MD5 889a29f6bea75973eafb3d64a1801a5f files/nautilus-2.10.1-deselect.patch 802 -MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136 -MD5 567191aa3b9ef17acb8e3b0ba006afdf files/digest-nautilus-2.10.1-r1 69 MD5 29bf62fc0e7eaa6cd6aa5cf4e2dd291d files/nautilus-2.10.1-font_sizes.patch 1532 +MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136 +MD5 8d19dc3a85c8be1c904b24d4a302350f files/digest-nautilus-2.11.91 70 +MD5 48ff9ab600b9230470a12bb5b60ff68f files/nautilus-2.11.91-icon_view_gst.patch 8321 MD5 7cb2f285f24e86a90c6a65b0b9356d39 files/macros/gnome.m4 16426 MD5 486b971d706aec59655a72282d3feb0b files/macros/nautilus-macros.m4 7993 diff --git a/gnome-base/nautilus/files/digest-nautilus-2.11.91 b/gnome-base/nautilus/files/digest-nautilus-2.11.91 new file mode 100644 index 000000000000..f3f540ffdadd --- /dev/null +++ b/gnome-base/nautilus/files/digest-nautilus-2.11.91 @@ -0,0 +1 @@ +MD5 20b3d9551afc4f40fd5c90d2fc4dfd35 nautilus-2.11.91.tar.bz2 4007088 diff --git a/gnome-base/nautilus/files/nautilus-2.11.91-icon_view_gst.patch b/gnome-base/nautilus/files/nautilus-2.11.91-icon_view_gst.patch new file mode 100644 index 000000000000..0d5a65101473 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-2.11.91-icon_view_gst.patch @@ -0,0 +1,244 @@ +--- configure.in.orig 2005-08-18 19:41:42.591059200 -0500 ++++ configure.in 2005-08-18 19:48:06.499696216 -0500 +@@ -19,6 +19,7 @@ + m4_define(xml_minver, 2.4.7) + m4_define(startup_notification_minver, 0.8) + m4_define(exif_minver, 0.5.12) ++m4_define(gstreamer_minver, 0.6.0) + + AC_INIT(nautilus, 2.11.91, + [http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus]) +@@ -48,7 +49,7 @@ + AC_SUBST(RSVG_REQUIRED, [rsvg_minver]) + AC_SUBST(XML_REQUIRED, [xml_minver]) + AC_SUBST(STARTUP_NOTIFICATION_REQUIRED, [startup_notification_minver]) +- ++AC_SUBST(GSTREAMER_REQUIRED, [gstreamer_minver]) + + AC_C_BIGENDIAN + AC_C_CONST +@@ -270,6 +271,52 @@ + + dnl ========================================================================== + ++dnl gstreamer checking ++ ++AC_ARG_ENABLE(gstreamer, ++ AC_HELP_STRING([--enable-gstreamer],[use GStreamer for sound preview]), ++ [case "${enableval}" in ++ yes) ENABLE_GST=yes ;; ++ no) ENABLE_GST=no ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-gstreamer) ;; ++ esac], ++ [ENABLE_GST=no]) dnl Default value ++ ++AC_MSG_CHECKING(for backend libraries) ++ ++if test x$ENABLE_GST = xyes; then ++ ++dnl Now we're ready to ask for gstreamer libs and cflags ++dnl And we can also ask for the right version of gstreamer ++ HAVE_GSTREAMER=no ++ ++dnl start with 0.7 ++ GST_MAJORMINOR=0.8 ++ PKG_CHECK_MODULES(GST, \ ++ gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED, ++ HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no) ++ ++dnl try 0.6 ++ if test "x$HAVE_GSTREAMER" = "xno"; then ++ GST_MAJORMINOR=0.6 ++ PKG_CHECK_MODULES(GST, \ ++ gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED, ++ HAVE_GSTREAMER=yes,HAVE_GSTREAMER=no) ++ fi ++ ++dnl Give error and exit if we don't have gstreamer ++ if test "x$HAVE_GSTREAMER" = "xno"; then ++ AC_MSG_ERROR(you need gstreamer development packages installed !) ++ fi ++ ++ MM="gstreamer-libs-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED gstreamer-gconf-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED" ++ ++ AC_MSG_RESULT(GStreamer) ++ AC_DEFINE(USE_GST_AUDIO_PREVIEW,1,[Define if you want to use the GStreamer media framework]) ++ ++fi ++ ++ + dnl gimphwrapbox + GIMPHWRAPBOX_MODULES="gtk+-2.0" + GIMPHWRAPBOX_CFLAGS="`$PKG_CONFIG --cflags $GIMPHWRAPBOX_MODULES`" +@@ -293,7 +340,7 @@ + AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) + + dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") +-CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" ++CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 $MM $EXTRA_CORE_MODULES" + CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" + AC_SUBST(CORE_CFLAGS) + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" +diff -urN nautilus-2.11.91.org/src/file-manager/fm-icon-view.c nautilus-2.11.91/src/file-manager/fm-icon-view.c +--- nautilus-2.11.91.org/src/file-manager/fm-icon-view.c 2005-08-18 18:31:25.411167992 -0500 ++++ nautilus-2.11.91/src/file-manager/fm-icon-view.c 2005-08-18 18:45:05.592481480 -0500 +@@ -79,8 +79,13 @@ + #include <unistd.h> + #include <esd.h> + +-#define USE_OLD_AUDIO_PREVIEW 1 +-#define READ_CHUNK_SIZE 16384 ++#ifdef USE_GST_AUDIO_PREVIEW ++#include <gst/gst.h> ++#include <gst/gconf/gconf.h> ++#else ++ #define USE_OLD_AUDIO_PREVIEW 1 ++ #define READ_CHUNK_SIZE 16384 ++#endif + + #define POPUP_PATH_ICON_APPEARANCE "/selection/Icon Appearance Items" + +@@ -168,6 +173,10 @@ + static int preview_sound_auto_value; + static gboolean gnome_esd_enabled_auto_value; + ++#ifdef USE_GST_AUDIO_PREVIEW ++static GstElement *thread; ++#endif ++ + #if USE_OLD_AUDIO_PREVIEW + static pid_t audio_preview_pid = 0; + #endif +@@ -1688,6 +1697,22 @@ + fm_directory_view_stop_batching_selection_changes (FM_DIRECTORY_VIEW (icon_view)); + } + ++#ifdef USE_GST_AUDIO_PREVIEW ++static void ++gst_end_of_stream_callback (GstElement *src, gpointer callback_data) ++{ ++ FMIconView *icon_view; ++ icon_view = FM_ICON_VIEW (callback_data); ++ ++ gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL); ++ ++ if (icon_view->details->audio_preview_timeout != 0 ) { ++ g_source_remove (icon_view->details->audio_preview_timeout); ++ icon_view->details->audio_preview_timeout = 0; ++ } ++} ++#endif ++ + /* handle the preview signal by inspecting the mime type. For now, we only preview local sound files. */ + + /* here's the timer task that actually plays the file using mpg123, ogg123 or play. */ +@@ -1695,6 +1720,35 @@ + static gboolean + play_file (gpointer callback_data) + { ++#ifdef USE_GST_AUDIO_PREVIEW ++ gchar *file_uri; ++ GstElement *filesrc, *decoder, *audiosink; ++ FMIconView *icon_view; ++ ++ icon_view = FM_ICON_VIEW (callback_data); ++ file_uri = nautilus_file_get_uri (icon_view->details->audio_preview_file); ++ ++ if (file_uri != NULL && gst_init_check (NULL, NULL)) { ++ thread = gst_thread_new ("thread"); ++ filesrc = gst_element_factory_make ("gnomevfssrc", "disk_source"); ++ decoder = gst_element_factory_make ("spider", "spider"); ++ audiosink = gst_gconf_get_default_audio_sink (); ++ ++ g_object_set (G_OBJECT (filesrc), "location", file_uri, NULL); ++ g_signal_connect (G_OBJECT (filesrc), "eos", G_CALLBACK (gst_end_of_stream_callback), icon_view); ++ ++ gst_bin_add_many (GST_BIN (thread), filesrc, decoder, audiosink, NULL); ++ gst_element_link_many (filesrc, decoder, audiosink, NULL); ++ ++ gst_element_set_state (GST_ELEMENT (thread), GST_STATE_PLAYING); ++ } ++ ++ g_free (file_uri); ++ ++ icon_view->details->audio_preview_file = NULL; ++ icon_view->details->audio_preview_timeout = 0; ++#else ++ + #if USE_OLD_AUDIO_PREVIEW + NautilusFile *file; + FMIconView *icon_view; +@@ -1823,6 +1877,7 @@ + icon_view->details->audio_preview_timeout = 0; + icon_view->details->audio_preview_file = NULL; + #endif ++#endif /* End USE_GST_AUDIO_PREVIEW */ + return FALSE; + } + +@@ -1836,7 +1891,24 @@ + + static void + preview_audio (FMIconView *icon_view, NautilusFile *file, gboolean start_flag) +-{ ++{ ++ ++#ifdef USE_GST_AUDIO_PREVIEW ++ if (thread != NULL) { ++ gst_element_set_state (GST_ELEMENT (thread), GST_STATE_NULL); ++ } ++ ++ if (icon_view->details->audio_preview_timeout != 0) { ++ g_source_remove (icon_view->details->audio_preview_timeout); ++ icon_view->details->audio_preview_timeout = 0; ++ } ++ ++ if (start_flag) { ++ icon_view->details->audio_preview_file = file; ++ icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view); ++ } ++#else ++ + /* Stop current audio playback */ + #if USE_OLD_AUDIO_PREVIEW + if (audio_preview_pid > 0) { +@@ -1870,11 +1942,13 @@ + static gboolean + should_preview_sound (NautilusFile *file) + { ++#ifndef USE_GST_AUDIO_PREVIEW ++ + /* Check gnome config sound preference */ + if (!gnome_esd_enabled_auto_value) { + return FALSE; + } +- ++#endif /* USE_GST_AUDIO_PREVIEW * + /* Check user performance preference */ + if (preview_sound_auto_value == NAUTILUS_SPEED_TRADEOFF_NEVER) { + return FALSE; +@@ -1927,11 +2001,24 @@ + mime_type = nautilus_file_get_mime_type (file); + + if ((eel_istr_has_prefix (mime_type, "audio/") ++#ifdef USE_GST_AUDIO_PREVIEW ++ || eel_istr_has_prefix (mime_type, "application/ogg") ++ || eel_istr_has_prefix (mime_type, "application/x-ogg") ++ || eel_istr_has_prefix (mime_type, "application/flac") ++ || eel_istr_has_prefix (mime_type, "application/x-flac")) ++ && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0 ++ && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0 ++ ) { ++#else ++ ++ + || eel_istr_has_prefix (mime_type, "application/ogg") + || eel_istr_has_prefix (mime_type, "application/x-ogg")) + && eel_strcasecmp (mime_type, "audio/x-pn-realaudio") != 0 + && eel_strcasecmp (mime_type, "audio/x-mpegurl") != 0 + && can_play_sound ()) { ++ ++#endif + result = 1; + preview_audio (icon_view, file, start_flag); + } diff --git a/gnome-base/nautilus/nautilus-2.11.91.ebuild b/gnome-base/nautilus/nautilus-2.11.91.ebuild new file mode 100644 index 000000000000..ede7ed6d82a2 --- /dev/null +++ b/gnome-base/nautilus/nautilus-2.11.91.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.11.91.ebuild,v 1.1 2005/08/19 20:22:47 joem Exp $ + +inherit gnome2 eutils + +DESCRIPTION="A filemanager for the Gnome2 desktop" +HOMEPAGE="http://www.gnome.org/projects/nautilus/" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~x86" +IUSE="oggvorbis gstreamer mad flac" +# cups + +RDEPEND=">=dev-libs/glib-2.6 + >=x11-libs/pango-1.2 + >=x11-libs/gtk+-2.3 + >=dev-libs/libxml2-2.4.7 + =gnome-base/eel-${PV}* + >=gnome-base/gnome-vfs-2.11.1 + >=media-sound/esound-0.2.27 + >=gnome-base/gconf-2 + >=gnome-base/libgnome-2.6 + >=gnome-base/libgnomeui-2.6 + >=gnome-base/gnome-desktop-2.9.91 + >=media-libs/libart_lgpl-2.3.10 + >=gnome-base/libbonobo-2.2 + >=gnome-base/librsvg-2.0.1 + >=gnome-base/orbit-2.4 + >=x11-libs/startup-notification-0.8 + >=media-libs/libexif-0.5.12 + dev-libs/popt + virtual/fam + virtual/eject + !gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) ) + gstreamer? ( + >=media-libs/gstreamer-0.8 + >=media-libs/gst-plugins-0.8 + >=media-plugins/gst-plugins-gnomevfs-0.8 + mad? ( >=media-plugins/gst-plugins-mad-0.8 ) + oggvorbis? ( + >=media-plugins/gst-plugins-ogg-0.8 + >=media-plugins/gst-plugins-vorbis-0.8 + ) + flac? ( >=media-plugins/gst-plugins-flac-0.8 ) + )" + +# FIXME : what to do with exif/jpeg config stuff ? + +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.29 + >=app-text/scrollkeeper-0.3.11 + >=dev-util/pkgconfig-0.12.0" + +PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91 + x11-themes/gnome-themes" + +RESTRICT="test" + +DOCS="AUTHORS ChangeLo* HACKING MAINTAINERS NEWS README THANKS TODO" + +G2CONF="${G2CONF} $(use_enable gstreamer)" + +src_unpack() { + + unpack ${A} + cd ${S} + + #FIX ME:Port this for 2.12 final + + # use gstreamer for audio preview (patch by <foser@gentoo.org>) + #use gstreamer && epatch ${FILESDIR}/${P}-icon_view_gst.patch + + # -- Component architecture has changed in 2.9 -- libgnomeprint patches + # no longer apply. + + # stop nautilus linking to cdda/paranoia + sed -i -e "/^CORE_LIBS/s/\$CDDA_LIBS//" configure.in + + #if use gstreamer; then + #WANT_AUTOCONF=2.5 autoheader || die + #WANT_AUTOCONF=2.5 autoconf || die + #WANT_AUTOMAKE=1.7 automake || die + #fi +} + +USE_DESTDIR="1" |