summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-18 12:36:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-18 12:36:10 +0000
commitf616464780740bb114ded2a0369387823364ecfd (patch)
treed1625233b79379f85c8817444ab7b083cf439b42 /www-plugins/gecko-mediaplayer/files
parentVersion bump. (diff)
downloadgentoo-2-f616464780740bb114ded2a0369387823364ecfd.tar.gz
gentoo-2-f616464780740bb114ded2a0369387823364ecfd.tar.bz2
gentoo-2-f616464780740bb114ded2a0369387823364ecfd.zip
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-plugins/gecko-mediaplayer/files')
-rw-r--r--www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch71
-rw-r--r--www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch46
-rw-r--r--www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch17
3 files changed, 0 insertions, 134 deletions
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
deleted file mode 100644
index 95064b96278c..000000000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-gconf-2.m4.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch
deleted file mode 100644
index 4eb0b757e222..000000000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- gecko-mediaplayer-r347/configure.in-orig 2010-01-22 08:08:06.672212390 -0600
-+++ gecko-mediaplayer-r347/configure.in 2010-01-22 08:09:11.427185920 -0600
-@@ -40,6 +40,21 @@
- ],
- [])
-
-+
-+if test "$GECKO_CFLAGS" = ""; then
-+PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([libxul < 1.9.2 found])
-+ ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
-+fi
-+if test "$GECKO_CFLAGS" = ""; then
-+PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([libxul >= 1.9.2 found])
-+ ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
-+fi
-+
-+if test "$GECKO_CFLAGS" = ""; then
-+PKG_CHECK_MODULES(GECKO, [libxul-unstable],[
-+ ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
-+fi
-+
- if test "$GECKO_CFLAGS" = ""; then
- PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[
- ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
-@@ -61,21 +76,6 @@
- fi
-
- if test "$GECKO_CFLAGS" = ""; then
--PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([libxul < 1.9.2 found])
-- ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
--fi
--if test "$GECKO_CFLAGS" = ""; then
--PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 1.9.2 or higher]) AC_MSG_NOTICE([libxul >= 1.9.2 found])
-- ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
--fi
--
--if test "$GECKO_CFLAGS" = ""; then
--PKG_CHECK_MODULES(GECKO, [libxul-unstable],[
-- ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
--fi
--
--
--if test "$GECKO_CFLAGS" = ""; then
- PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[
- ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
- fi \ No newline at end of file
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch
deleted file mode 100644
index f1315ac07d4d..000000000000
--- a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.9-without-gconf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur gecko-mediaplayer-0.9.9.orig/configure.in gecko-mediaplayer-0.9.9/configure.in
---- gecko-mediaplayer-0.9.9.orig/configure.in 2010-02-01 18:00:42.000000000 +0200
-+++ gecko-mediaplayer-0.9.9/configure.in 2010-02-10 18:27:16.000000000 +0200
-@@ -96,11 +96,11 @@
- AC_ARG_WITH([gconf],
- [AS_HELP_STRING([--with-gconf],
- [Use Gconf to store preferences])],
-- [],
-+ [AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[1])],
- [with_gconf=check])
- AS_IF([test "x$with_gconf" != xno],
- [PKG_CHECK_MODULES(GCONF, [gconf-2.0],[AM_GCONF_SOURCE_2
-- GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],AC_MSG_NOTICE([Using keystore for preferences]))
-+ GCONF_DEFINES="-DHAVE_GCONF" AC_DEFINE([HAVE_GCONF],[1],[Define to 1 to use GConf to store preferences])],[AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[1]) AC_MSG_NOTICE([Using keystore for preferences])])
- AC_SUBST(GCONF_DEFINES)
- AC_SUBST(GCONF_CFLAGS)
- AC_SUBST(GCONF_LIBS)