diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-01-22 18:08:19 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-01-22 18:08:19 +0000 |
| commit | a0be215a2b06adb7dae091259d884bf12fac923d (patch) | |
| tree | 675f43550fe80e80cadd1ad079d171b98e3231fb /www-plugins | |
| parent | Version bump. Removes pysyncml binary object (Funambol support) unconditional... (diff) | |
| download | gentoo-2-a0be215a2b06adb7dae091259d884bf12fac923d.tar.gz gentoo-2-a0be215a2b06adb7dae091259d884bf12fac923d.tar.bz2 gentoo-2-a0be215a2b06adb7dae091259d884bf12fac923d.zip | |
Unix line endings to make patch-2.5.9 happy, thanks to Alexis Ballier.
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'www-plugins')
| -rw-r--r-- | www-plugins/gecko-mediaplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch | 90 |
2 files changed, 50 insertions, 46 deletions
diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog index e488da743224..581f7a5430f7 100644 --- a/www-plugins/gecko-mediaplayer/ChangeLog +++ b/www-plugins/gecko-mediaplayer/ChangeLog @@ -1,6 +1,10 @@ # 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.27 2010/01/22 14:25:11 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.28 2010/01/22 18:08:17 jer Exp $ + + 22 Jan 2010; Jeroen Roovers <jer@gentoo.org> + files/gecko-mediaplayer-0.9.8_p347-xulrunner-detection.patch: + Unix line endings to make patch-2.5.9 happy, thanks to Alexis Ballier. 22 Jan 2010; Ben de Groot <yngwin@gentoo.org> gecko-mediaplayer-0.9.8_p347.ebuild, 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 index 96b881e9a67a..4eb0b757e222 100644 --- 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 @@ -1,46 +1,46 @@ ---- 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])])
+--- 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 |