Add patch for configuration without gconf. Fixes bug 301932.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 83 insertions, 5 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index 581f7a5430f7..0bd4b94b56ab 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.28 2010/01/22 18:08:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.29 2010/01/26 21:55:52 yngwin Exp $
+
+  26 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+  gecko-mediaplayer-0.9.8_p347.ebuild,
+  +files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch:
+  Add patch for configuration without gconf. Fixes bug 301932.
 
   22 Jan 2010; Jeroen Roovers <jer@gentoo.org>
   files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch:
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index 9c45eb027270..7e980662609b 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,11 +1,12 @@
 AUX gecko-mediaplayer-0.9.6-xul.patch 687 RMD160 f31e072487afa241cd35d9649b5284c7ead24167 SHA1 25ce0ce8b1b1f33c4dc5ba5be8118b120c53553f SHA256 a618947606fd92efa779d6939146c2e5b6b49541c1f6520f1d34a4a2ca40f856
 AUX gecko-mediaplayer-0.9.8-asneeded.patch 3787 RMD160 afcfb3d75fdfadab10903b622d386921651096a9 SHA1 a8f0dcbe369c2bfbbf0d3ebfcdf01d2f6d18aada SHA256 0ac9d19b1e44195b19a3c0afde58bf3b150b65b07d1f9055655c9d2bb6df4ea1
+AUX gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch 2805 RMD160 a9830135f6468857d24808d90c417f565e4dfd52 SHA1 a23a8fbe15d8d760464183e8239e48a34d8d7c5a SHA256 9aed347405ace41d2b383fef0518011c846d464e63f31e4b15ab935ef8b312fb
 AUX gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch 1791 RMD160 94c6790279b6e9f48000d52dbeb7c1b5fb746aca SHA1 2137864b2f93515eed6be5b109d75c2a421a7576 SHA256 e7ad7d53969cd6c49ce71326a8c759096134feb6248cf318eedf89efd45fd881
 DIST gecko-mediaplayer-0.9.6.tar.gz 389598 RMD160 d50463aeec54ac25404b915f7e659e41b2070e5c SHA1 8de13d93a92729ad9ea2e9e0ccaa1f019c7a44ac SHA256 27fba7e5c1ff53d7b88742a40e85d045a25b9da05b6e3d77fd9de4b4c39687a0
 DIST gecko-mediaplayer-0.9.8.tar.gz 257788 RMD160 46ae679d112f7853b58268de7d6e5a4444a4797d SHA1 a1f90176c0447374ac6518f1eb23984bc2a88ae3 SHA256 a51ebf00021b1d5d43837edebd0fb28d8f6d2626111c4c391e8b0f6515004aa1
 DIST gecko-mediaplayer-r347.tar.bz2 207434 RMD160 75b1ca46b2170aca7ec1a9b5177f37ed0a538ec0 SHA1 c556ffb11dcd893e63e7fa7ccd963b51e14e6c46 SHA256 46155b01f8c1af03db93dd85464f01562d5231d21fd4082b6b8f2451cd78de41
 EBUILD gecko-mediaplayer-0.9.6.ebuild 1341 RMD160 440b0015de715bf32ecad0b0408834f0bde06109 SHA1 77df1397664c6ce9fbd71abc700f2813ef87ced1 SHA256 2043db79bbeb558b3b716743493c0a7674f9dac853db609a41a63db5de24042f
 EBUILD gecko-mediaplayer-0.9.8.ebuild 1573 RMD160 0b6f2bc227f7ce8668b8b2e8bf6aded2a92c83a8 SHA1 a6d51fb17f5f845e35be4f60002565a71a9f697a SHA256 036a0537f500f86afb7489eb9551810c961364ec1322ba1e8e4c00a7b1f59857
-EBUILD gecko-mediaplayer-0.9.8_p347.ebuild 1556 RMD160 0b862c5f11f35c6701a8e39bb7e3cb41c3a0ac63 SHA1 8b8a7583a77d9676342dbbea3c9105ced499183f SHA256 719c5aa052f479db5efead720dbdffc13f58b0e96d61153dde79829f17c823d2
-MISC ChangeLog 6189 RMD160 0891ef06f20565e0fb21e60f9d10a5e521138270 SHA1 ac4d9bd3f327a92f6af732a6ac0466f83e656dcf SHA256 33c40389849be2269bf375884b97edbb08909c48c65170261954d38e6e68c4d7
+EBUILD gecko-mediaplayer-0.9.8_p347.ebuild 1600 RMD160 09eefc9f4d22b5ebc937fe9c77473b0997e45b1c SHA1 45d0fd21f3c910c7b19686226eeb482425dd471f SHA256 d6f4045dae165e12f09df62b76f737fd35959ba7a18fdb15a423212594db7880
+MISC ChangeLog 6399 RMD160 99898be4bdec1a1388ec34f7f2845e4169d6402e SHA1 f12b71dfe3319e53107c07a5ff519f9faede1858 SHA256 47a732141f149f038331af9fdebcabb0da926de7c3fa631aab1c96075fd723d4
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch
new file mode 100644
index 000000000000..95064b96278c
--- /dev/null
+++ b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch
@@ -0,0 +1,71 @@
+--- gecko-mediaplayer-r347/Makefile.in.orig	2010-01-26 22:14:23.000000000 +0100
++++ gecko-mediaplayer-r347/Makefile.in	2010-01-26 22:15:32.000000000 +0100
+@@ -39,7 +39,8 @@
+ 	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
+ 	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in \
++					  $(top_srcdir)/gconf-2.m4
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+diff -burN gecko-mediaplayer-r347.orig/gconf-2.m4 gecko-mediaplayer-r347/gconf-2.m4
+--- gecko-mediaplayer-r347.orig/gconf-2.m4	1970-01-01 01:00:00.000000000 +0100
++++ gecko-mediaplayer-r347/gconf-2.m4	2010-01-26 21:59:08.000000000 +0100
+@@ -0,0 +1,44 @@
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl  (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl  you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++  else
++    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++  fi
++
++  AC_ARG_WITH([gconf-source],
++	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
++			     [Config database for installing schema files.]),
++	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
++
++  AC_ARG_WITH([gconf-schema-file-dir],
++	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++			     [Directory for installing schema files.]),
++	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
++
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++  AC_ARG_ENABLE(schemas-install,
++  	AC_HELP_STRING([--disable-schemas-install],
++		       [Disable the schemas installation]),
++     [case ${enableval} in
++       yes|no) ;;
++       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++      esac])
++  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
+--- gecko-mediaplayer-r347/configure.in.orig	2010-01-26 22:43:08.000000000 +0100
++++ gecko-mediaplayer-r347/configure.in	2010-01-26 22:43:41.000000000 +0100
+@@ -6,6 +6,8 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ 
++m4_include([gconf-2.m4])
++
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_STDC
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8_p347.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8_p347.ebuild
index 9f0c6bc265f8..7e99720f4791 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8_p347.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8_p347.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8_p347.ebuild,v 1.3 2010/01/22 14:25:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.8_p347.ebuild,v 1.4 2010/01/26 21:55:52 yngwin Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -38,8 +38,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-gconf-2.m4.patch
 	epatch "${FILESDIR}"/${P}-xulrunner-detection.patch
+	gnome2_src_prepare
 	eautoreconf
 }