diff options
| -rw-r--r-- | gnome-base/libgnomeui/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/libgnomeui/Manifest | 15 | ||||
| -rw-r--r-- | gnome-base/libgnomeui/files/digest-libgnomeui-2.13.90 | 3 | ||||
| -rw-r--r-- | gnome-base/libgnomeui/files/libgnomeui-2.13.2-gentoo.patch | 127 | ||||
| -rw-r--r-- | gnome-base/libgnomeui/libgnomeui-2.13.90.ebuild | 59 |
5 files changed, 208 insertions, 4 deletions
diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog index ee72c6cbffd1..3ccaf4e3f272 100644 --- a/gnome-base/libgnomeui/ChangeLog +++ b/gnome-base/libgnomeui/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/libgnomeui # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.106 2006/02/07 01:02:34 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.107 2006/03/14 20:06:46 joem Exp $ + +*libgnomeui-2.13.90 (14 Mar 2006) + + 14 Mar 2006; Joe McCann <joem@gentoo.org> + +files/libgnomeui-2.13.2-gentoo.patch, +libgnomeui-2.13.90.ebuild: + New release for gnome-2.14 *libgnomeui-2.12.1 (07 Feb 2006) diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest index 3b241ec7afb3..9a1949473baa 100644 --- a/gnome-base/libgnomeui/Manifest +++ b/gnome-base/libgnomeui/Manifest @@ -1,6 +1,6 @@ -MD5 90e235d661fb48b1a9a314f5fbd1d059 ChangeLog 12189 -RMD160 23a4f122d5cbb62b27c89c02b0165875e069e805 ChangeLog 12189 -SHA256 c45348527f47b4fc85a1fe7df8615437ea545781f167ad2a125976153d3875e2 ChangeLog 12189 +MD5 fb5a427dfc6924260fd3b00b2848eab1 ChangeLog 12363 +RMD160 38706a50ca679e1eeb06e23ecfe38e1f6b8ea04e ChangeLog 12363 +SHA256 78f2481bf09f6ec10719274a9ea3abe5ec34c6d8ab57a879b696c8d6c4ffa52a ChangeLog 12363 MD5 de45532214b2589e59dfdafcc4bfaea6 files/digest-libgnomeui-2.10.0 71 RMD160 beba78610fadc90a9d72f04d072eacf5970313d5 files/digest-libgnomeui-2.10.0 71 SHA256 33c1fc3ec51036b7eb9ea4dab369aeeb39e24da8bcc4b8eb99366bd893ed1a76 files/digest-libgnomeui-2.10.0 71 @@ -13,9 +13,15 @@ SHA256 ae466caf2db3ebe0cd53577926e81057a3fc6b89bbda292978eb5970c6f122bd files/di MD5 5482e0e160bb1fd381e810ff3c82367c files/digest-libgnomeui-2.12.1 259 RMD160 b0d6317654847579871d86631b0524b21a53699c files/digest-libgnomeui-2.12.1 259 SHA256 36ed359ceae4e79a195d2971a7adb2eb37d995409f3a9969c19ef21ae8f4b8da files/digest-libgnomeui-2.12.1 259 +MD5 80133c1f52318e79b39aca30f64db711 files/digest-libgnomeui-2.13.90 262 +RMD160 a30e31ec4574fd27ee2fde834993aeb58521cc41 files/digest-libgnomeui-2.13.90 262 +SHA256 5074999df2af1c0eddfb06f9c8035f2af14b74c4d2887fea7bd952dea5cf94ba files/digest-libgnomeui-2.13.90 262 MD5 675ca0714915ab850a823d726c0c5f4c files/libgnomeui-2.10.1-gentoo.patch 3902 RMD160 20bd4a2222975d74d3303028a7a66ea88fa05c63 files/libgnomeui-2.10.1-gentoo.patch 3902 SHA256 d64d034d76aff735e46a50ebe1480b0fe9d5455c1b5fee17906ba8ee92470d7f files/libgnomeui-2.10.1-gentoo.patch 3902 +MD5 b7ab109f9a0fa0592832f15427911d8a files/libgnomeui-2.13.2-gentoo.patch 3851 +RMD160 7939b9a03e8eed1e04a2b2482a2a185c99d9254f files/libgnomeui-2.13.2-gentoo.patch 3851 +SHA256 db4a93f86075ff1b719de5a4342c9371cd2d887453d7c7be4a39525534178db5 files/libgnomeui-2.13.2-gentoo.patch 3851 MD5 4becd0494324e4349c245e2b95b0f663 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505 RMD160 cdba46b36bb82187b5c91616ff11303e7cb7b4e1 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505 SHA256 ad344da3b6d62633463a33388eb5d6673549016f1b89589db2eede7e37abcb63 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505 @@ -31,6 +37,9 @@ SHA256 e084a2fae10867e76957510783c5f565898dd421525b67186e2dc4a8b7b56327 libgnome MD5 ad6d0f4d58eb3b8aef287672afcf050d libgnomeui-2.12.1.ebuild 1455 RMD160 e72a1887e1ca92384baa1753cc468e6d0a6180bc libgnomeui-2.12.1.ebuild 1455 SHA256 749341793a7055c139920d59dec1f21cbfcc21dcc76c40420aa06220efe53389 libgnomeui-2.12.1.ebuild 1455 +MD5 bbbfe33ed52b47ff3e3d8ef5a1d84d3b libgnomeui-2.13.90.ebuild 1537 +RMD160 199742b624ed02cc80cae7329300105310eafe67 libgnomeui-2.13.90.ebuild 1537 +SHA256 4639b3243db08f9bab5c283a585034c48854247c8e6be7c91f870228105da32f libgnomeui-2.13.90.ebuild 1537 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158 diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.13.90 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.13.90 new file mode 100644 index 000000000000..92ca8c95c801 --- /dev/null +++ b/gnome-base/libgnomeui/files/digest-libgnomeui-2.13.90 @@ -0,0 +1,3 @@ +MD5 1a8fb5848e35030b2a90afcf627723da libgnomeui-2.13.90.tar.bz2 1868602 +RMD160 4ecabb979d06cb8900c2bb901d806e4c6b9500fd libgnomeui-2.13.90.tar.bz2 1868602 +SHA256 b248ea23c286f2d3fa7799ce5a8246b5abfd1a3d1bf97d130b27f672d9aebb08 libgnomeui-2.13.90.tar.bz2 1868602 diff --git a/gnome-base/libgnomeui/files/libgnomeui-2.13.2-gentoo.patch b/gnome-base/libgnomeui/files/libgnomeui-2.13.2-gentoo.patch new file mode 100644 index 000000000000..52e69b0862f5 --- /dev/null +++ b/gnome-base/libgnomeui/files/libgnomeui-2.13.2-gentoo.patch @@ -0,0 +1,127 @@ +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 diff --git a/gnome-base/libgnomeui/libgnomeui-2.13.90.ebuild b/gnome-base/libgnomeui/libgnomeui-2.13.90.ebuild new file mode 100644 index 000000000000..f62fd47c96cb --- /dev/null +++ b/gnome-base/libgnomeui/libgnomeui-2.13.90.ebuild @@ -0,0 +1,59 @@ +# 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.13.90.ebuild,v 1.1 2006/03/14 20:06:46 joem Exp $ + +inherit eutils gnome2 + +DESCRIPTION="User Interface routines for Gnome" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc esd jpeg static" + +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 + esd? ( >=media-sound/esound-0.2.26 >=media-libs/audiofile-0.2.3 ) + jpeg? ( media-libs/jpeg )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1 )" + +PDEPEND="x11-themes/gnome-icon-theme + gnome? ( x11-themes/gnome-themes )" + +DOCS="AUTHORS ChangeLog NEWS README" +USE_DESTDIR="1" + + +pkg_setup() { + G2CONF="$(use_enable static) $(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 + aclocal -I . || die "aclocal failed" + autoconf || die "autoconf failed" + automake || die "automake failed" +} |