Author: belegdol Update of /cvs/free/rpms/gecko-mediaplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv24816 Modified Files: gecko-mediaplayer.spec Added Files: gecko-mediaplayer-1.0.0-libxul2.patch Log Message: Fixed xulrunner 2 detection gecko-mediaplayer-1.0.0-libxul2.patch: configure | 16 ++++++++-------- configure.in | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) --- NEW FILE gecko-mediaplayer-1.0.0-libxul2.patch --- diff -up gecko-mediaplayer-1.0.0/configure.in.libxul2 gecko-mediaplayer-1.0.0/configure.in --- gecko-mediaplayer-1.0.0/configure.in.libxul2 2010-11-05 17:13:24.000000000 +0100 +++ gecko-mediaplayer-1.0.0/configure.in 2010-11-06 10:59:41.000000000 +0100 @@ -50,7 +50,7 @@ AC_ARG_WITH([xulrunner-sdk], []) if test "$GECKO_CFLAGS" = ""; then -PKG_CHECK_MODULES(GECKO, [libxul >= 2.0],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC" AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 2.0.0 or higher]) AC_MSG_NOTICE([Using libxul >= 2.0 beta 5]) +PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC" AC_DEFINE([HAVE_NEW_XULRUNNER],[1],[Define to 1 if using libxul 2.0.0 or higher]) AC_MSG_NOTICE([Using libxul >= 2.0 beta 5]) ],[AC_MSG_NOTICE([libxul >= 2.0 beta 5 not found, trying another])]) fi diff -up gecko-mediaplayer-1.0.0/configure.libxul2 gecko-mediaplayer-1.0.0/configure --- gecko-mediaplayer-1.0.0/configure.libxul2 2010-11-05 17:13:48.000000000 +0100 +++ gecko-mediaplayer-1.0.0/configure 2010-11-06 11:00:00.000000000 +0100 @@ -7237,12 +7242,12 @@ if test -n "$GECKO_CFLAGS"; then pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libxul >= 2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxul >= 2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul >= 2.0" 2>/dev/null` + pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "libxul >= 2" 2>/dev/null` else pkg_failed=yes fi @@ -7253,12 +7258,12 @@ if test -n "$GECKO_LIBS"; then pkg_cv_GECKO_LIBS="$GECKO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libxul >= 2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxul >= 2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxul >= 2") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul >= 2.0" 2>/dev/null` + pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "libxul >= 2" 2>/dev/null` else pkg_failed=yes fi @@ -7276,9 +7281,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul >= 2.0" 2>&1` + GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul >= 2" 2>&1` else - GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul >= 2.0" 2>&1` + GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul >= 2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GECKO_PKG_ERRORS" >&5 Index: gecko-mediaplayer.spec =================================================================== RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gecko-mediaplayer.spec 6 Nov 2010 01:18:40 -0000 1.23 +++ gecko-mediaplayer.spec 6 Nov 2010 10:06:38 -0000 1.24 @@ -7,6 +7,7 @@ License: GPLv2+ URL: http://kdekorte.googlepages.com/gecko-mediaplayer Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz +Patch0: gecko-mediaplayer-1.0.0-libxul2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dbus-glib-devel @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p1 -b .libxul2 %build @@ -92,6 +94,7 @@ %changelog * Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0.0-1 - Updated to 1.0.0 +- Fixed xulrunner 2 detection * Thu Feb 25 2010 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.9.2-1 - Updated to 0.9.9.2