+++ /dev/null
-diff -u -ruN libgnomeui-2.13.1.orig/configure.in libgnomeui-2.13.1/configure.in
---- libgnomeui-2.13.1.orig/configure.in 2006-01-13 14:49:20.000000000 -0500
-+++ libgnomeui-2.13.1/configure.in 2006-01-17 16:17:43.000000000 -0500
-@@ -17,8 +17,6 @@
- m4_define([libgnomeui_extraversion], [])
-
- dnl Required versions of other packages
--m4_define([esound_required_version], [0.2.26])
--m4_define([audiofile_required_version], [0.2.3])
- m4_define([libgnome_required_version], [2.13.7])
- m4_define([libgnomecanvas_required_version], [2.0.0])
- m4_define([libbonoboui_required_version], [2.13.1])
-@@ -127,39 +125,27 @@
- dnl Start of pkg-config checks
- dnl
-
--dnl We first check for esound and audiofile (which has conditional
--dnl support built in)
--dnl
--SOUND_MODULES="esound >= esound_required_version dnl
-- audiofile >= audiofile_required_version"
--PKG_CHECK_MODULES(SOUND_TEST, [$SOUND_MODULES], [
-- AC_DEFINE(HAVE_LIBAUDIOFILE, 1,
-- [Define to 1 if you have libaudiofile installed])
-- AC_DEFINE(HAVE_ESD, 1,
-- [Define to 1 if you have libesd installed])
-- esd_msg=yes
--],[
-- SOUND_MODULES=""
-- esd_msg=no
--])
--
- dnl
- dnl libjpeg
- dnl
-- if test -z "$LIBJPEG"; then
-- AC_CHECK_LIB(jpeg, jpeg_start_decompress,
-- [AC_CHECK_HEADER(jpeglib.h,
-- jpeg_ok=yes,
-- jpeg_ok=no)],
-- AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
-- if test "$jpeg_ok" = yes; then
-- JPEG='jpeg'; LIBJPEG='-ljpeg'
-- AC_DEFINE(HAVE_LIBJPEG, 1,
-- [Define to 1 if you have libjpeg installed])
-- else
-- AC_MSG_WARN(*** JPEG thumbnail loader will not be built (jpeg header file not found) ***)
-- fi
-- fi
-+
-+AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
-+if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-+ AC_CHECK_LIB(jpeg, jpeg_start_decompress,
-+ [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)],
-+ AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
-+ if test "$jpeg_ok" = yes; then
-+ JPEG='jpeg'; LIBJPEG='-ljpeg'
-+ AC_DEFINE(HAVE_LIBJPEG, 1, [Define to 1 if you have libjpeg installed])
-+ fi
-+fi
-+
-+if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-+ AC_MSG_ERROR([
-+*** Checks for JPEG library failed. You can build without it by passing
-+*** --without-libjpeg to configure but the JPEG thumbnail loader will not
-+*** be built then.])
-+fi
-
- AC_SUBST(LIBJPEG)
-
-@@ -290,6 +276,5 @@
-
- AC_OUTPUT
- echo "configuration:
-- esd support: ${esd_msg}
- doc build: ${enable_gtk_doc}
- "
-diff -u -ruN libgnomeui-2.13.1.orig/libgnomeui/gnome-ui-init.c libgnomeui-2.13.1/libgnomeui/gnome-ui-init.c
---- libgnomeui-2.13.1.orig/libgnomeui/gnome-ui-init.c 2006-01-11 18:40:14.000000000 -0500
-+++ libgnomeui-2.13.1/libgnomeui/gnome-ui-init.c 2006-01-17 16:16:59.000000000 -0500
-@@ -102,8 +102,6 @@
- /* Prototype for a private gnome_stock function */
- void _gnome_stock_icons_init (void);
-
--#ifdef HAVE_ESD
--
- /* Whether to make noises when the user clicks a button, etc. We cache it
- * in a boolean rather than querying GConf every time.
- */
-@@ -112,8 +110,6 @@
- /* GConf client for monitoring the event sounds option */
- static GConfClient *gconf_client = NULL;
-
--#endif /* HAVE_ESD */
--
-
- enum { ARG_DISABLE_CRASH_DIALOG=1, ARG_DISPLAY };
-
-@@ -327,7 +323,6 @@
- #endif
- }
-
--#ifdef HAVE_ESD
- static gboolean
- relay_gnome_signal (GSignalInvocationHint *hint,
- guint n_param_values,
-@@ -534,12 +529,10 @@
-
- use_event_sounds = new_use_event_sounds;
- }
--#endif
-
- static void
- setup_event_listener (void)
- {
--#ifdef HAVE_ESD
- gconf_client = gconf_client_get_default ();
- if (!gconf_client)
- return;
-@@ -561,7 +554,6 @@
- initialize_gtk_signal_relay ();
- initialize_gnome_signal_relay ();
- }
--#endif
- }
-
- static void
+++ /dev/null
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.14.1.ebuild,v 1.14 2007/07/15 05:15:41 mr_bones_ Exp $
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="User Interface routines for Gnome"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="doc jpeg"
-
-RDEPEND=">=gnome-base/libgnome-2.13.7
- >=gnome-base/libgnomecanvas-2
- >=gnome-base/libbonoboui-2.13.1
- >=gnome-base/gconf-2
- >=x11-libs/pango-1.1.2
- >=x11-libs/gtk+-2.6
- >=gnome-base/gnome-vfs-2.7.3
- >=gnome-base/libglade-2
- >=gnome-base/gnome-keyring-0.4
- >=dev-libs/popt-1.5
- >=dev-libs/glib-2.8
- jpeg? ( media-libs/jpeg )"
-
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="x11-themes/gnome-icon-theme"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-pkg_setup() {
- G2CONF="$(use_with jpeg libjpeg)"
-}
-
-src_unpack() {
- unpack "${A}"
- cd "${S}"
-
- # cleanliness is ... (#68698)
- epatch "${FILESDIR}"/${PN}-2.8.0-ditch_ancient_pics.patch
-
- # Remove unnecessary esound/audofile checks and implement the
- # --without-jpeg switch
- epatch "${FILESDIR}"/${PN}-2.13.2-gentoo.patch
-
- cp aclocal.m4 old_macros.m4
- export AT_M4DIR="."
- export WANT_AUTOMAKE=1.7
- eautoreconf
-}
projects / gentoo.git / commitdiff