rpms/totem/OLPC-2 totem-2.18.2-plugin-build.patch, 1.1, 1.2 totem.spec, 1.112, 1.113
Marco Pesenti Gritti (mpg)
fedora-extras-commits at redhat.com
Wed Oct 31 15:41:47 UTC 2007
- Previous message (by thread): rpms/eclipse/devel eclipse-maxpermsize.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 eclipse.spec, 1.495, 1.496 sources, 1.53, 1.54
- Next message (by thread): rpms/gcompris/devel .cvsignore, 1.12, 1.13 gcompris.spec, 1.31, 1.32 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mpg
Update of /cvs/extras/rpms/totem/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20356
Modified Files:
totem-2.18.2-plugin-build.patch totem.spec
Log Message:
* Wed Oct 31 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-9
- Adapt to latest xulrunner
- Do not advertise mpeg support
totem-2.18.2-plugin-build.patch:
Index: totem-2.18.2-plugin-build.patch
===================================================================
RCS file: /cvs/extras/rpms/totem/OLPC-2/totem-2.18.2-plugin-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- totem-2.18.2-plugin-build.patch 28 Sep 2007 16:29:07 -0000 1.1
+++ totem-2.18.2-plugin-build.patch 31 Oct 2007 15:41:37 -0000 1.2
@@ -1,6 +1,14 @@
---- configure.orig 2007-07-19 17:43:05.000000000 +0200
-+++ configure 2007-07-19 17:43:43.000000000 +0200
-@@ -899,13 +899,13 @@
+--- totem-2.18.2/configure 2007-10-31 16:31:09.000000000 +0100
++++ totem-2.18.2-new/configure 2007-10-31 16:30:31.000000000 +0100
+@@ -858,6 +858,7 @@
+ host_os
+ USE_NLS
+ MSGFMT
++MSGFMT_OPTS
+ GMSGFMT
+ XGETTEXT
+ CATALOGS
+@@ -899,13 +900,13 @@
INTLTOOL_XGETTEXT
ALL_LINGUAS
PKG_CONFIG
@@ -16,15 +24,15 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -968,6 +968,7 @@
- MOZILLA_IDLDIR
- ENABLE_BROWSER_PLUGINS_TRUE
- ENABLE_BROWSER_PLUGINS_FALSE
-+MOZILLA_EXTRA_CXXFLAGS
- LIBXPCOMGLUE_S
- ENABLE_BASIC_PLUGIN_TRUE
- ENABLE_BASIC_PLUGIN_FALSE
-@@ -1032,8 +1033,6 @@
+@@ -962,6 +963,7 @@
+ MOZILLA_XPT_LINK
+ MOZILLA_PREFIX
+ MOZILLA_LIBDIR
++MOZILLA_LIBS
+ MOZILLA_XPCOM_CFLAGS
+ MOZILLA_INCLUDE_ROOT
+ MOZILLA_PLUGINDIR
+@@ -1032,8 +1034,6 @@
CPPFLAGS
CPP
PKG_CONFIG
@@ -33,7 +41,7 @@
CXX
CXXFLAGS
CCC
-@@ -1729,11 +1728,6 @@
+@@ -1729,11 +1729,6 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
@@ -45,7 +53,43 @@
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
-@@ -6328,6 +6322,149 @@
+@@ -5693,6 +5688,35 @@
+ fi
+ done
+
++ MSGFMT_OPTS=
++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
++ cat >conftest.foo <<_ACEOF
++
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++_ACEOF
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++echo "$as_me: failed input was:" >&5
++sed 's/^/| /' conftest.foo >&5
++fi
++
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -6328,6 +6352,149 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
@@ -195,7 +239,7 @@
-@@ -6457,126 +6594,29 @@
+@@ -6457,126 +6624,29 @@
fi
@@ -243,18 +287,18 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
+-else
+- pkg_failed=yes
+-fi
+- fi
+ gdu_cv_have_gdu=yes
else
-- pkg_failed=yes
+- pkg_failed=untried
+ gdu_cv_have_gdu=no
fi
-- fi
--else
-- pkg_failed=untried
--fi
--
-
+-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -333,7 +377,7 @@
# Check whether --with-help-dir was given.
if test "${with_help_dir+set}" = set; then
withval=$with_help_dir;
-@@ -6616,7 +6656,7 @@
+@@ -6616,7 +6686,7 @@
enable_scrollkeeper=yes
fi
@@ -342,7 +386,7 @@
ENABLE_SK_TRUE=
ENABLE_SK_FALSE='#'
else
-@@ -6625,6 +6665,15 @@
+@@ -6625,6 +6695,15 @@
fi
@@ -358,67 +402,67 @@
ac_ext=cpp
-@@ -7651,7 +7700,7 @@
+@@ -7651,7 +7730,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7654 "configure"' > conftest.$ac_ext
-+ echo '#line 7703 "configure"' > conftest.$ac_ext
++ echo '#line 7733 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9436,11 +9485,11 @@
+@@ -9436,11 +9515,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9439: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9518: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9443: \$? = $ac_status" >&5
-+ echo "$as_me:9492: \$? = $ac_status" >&5
++ echo "$as_me:9522: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9704,11 +9753,11 @@
+@@ -9704,11 +9783,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9707: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9756: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9786: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9711: \$? = $ac_status" >&5
-+ echo "$as_me:9760: \$? = $ac_status" >&5
++ echo "$as_me:9790: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9808,11 +9857,11 @@
+@@ -9808,11 +9887,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9811: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9860: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9890: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9815: \$? = $ac_status" >&5
-+ echo "$as_me:9864: \$? = $ac_status" >&5
++ echo "$as_me:9894: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -11273,7 +11322,7 @@
+@@ -11273,7 +11352,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 11276 "configure"' > conftest.$ac_ext
-+ echo '#line 11325 "configure"' > conftest.$ac_ext
++ echo '#line 11355 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -11292,7 +11341,7 @@
+@@ -11292,7 +11371,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -427,25 +471,25 @@
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
-@@ -12137,7 +12186,7 @@
+@@ -12137,7 +12216,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12140 "configure"
-+#line 12189 "configure"
++#line 12219 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12237,7 +12286,7 @@
+@@ -12237,7 +12316,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12240 "configure"
-+#line 12289 "configure"
++#line 12319 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12568,9 +12617,6 @@
+@@ -12568,9 +12647,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC
@@ -455,7 +499,7 @@
# An ERE matcher.
EGREP=$lt_EGREP
-@@ -12704,11 +12750,11 @@
+@@ -12704,11 +12780,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -469,7 +513,7 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-@@ -12720,7 +12766,7 @@
+@@ -12720,7 +12796,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
@@ -478,7 +522,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -12800,7 +12846,7 @@
+@@ -12800,7 +12876,7 @@
link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries
@@ -487,44 +531,44 @@
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -14576,11 +14622,11 @@
+@@ -14576,11 +14652,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14579: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14625: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14655: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14583: \$? = $ac_status" >&5
-+ echo "$as_me:14629: \$? = $ac_status" >&5
++ echo "$as_me:14659: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -14680,11 +14726,11 @@
+@@ -14680,11 +14756,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14683: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14759: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14687: \$? = $ac_status" >&5
-+ echo "$as_me:14733: \$? = $ac_status" >&5
++ echo "$as_me:14763: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15216,7 +15262,7 @@
+@@ -15216,7 +15292,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15219 "configure"' > conftest.$ac_ext
-+ echo '#line 15265 "configure"' > conftest.$ac_ext
++ echo '#line 15295 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -15235,7 +15281,7 @@
+@@ -15235,7 +15311,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -533,7 +577,7 @@
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
-@@ -15620,9 +15666,6 @@
+@@ -15620,9 +15696,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
@@ -543,7 +587,7 @@
# An ERE matcher.
EGREP=$lt_EGREP
-@@ -15756,11 +15799,11 @@
+@@ -15756,11 +15829,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -557,7 +601,7 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-@@ -15772,7 +15815,7 @@
+@@ -15772,7 +15845,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
@@ -566,7 +610,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -15852,7 +15895,7 @@
+@@ -15852,7 +15925,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
@@ -575,44 +619,44 @@
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -16274,11 +16317,11 @@
+@@ -16274,11 +16347,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16277: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16320: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16350: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16281: \$? = $ac_status" >&5
-+ echo "$as_me:16324: \$? = $ac_status" >&5
++ echo "$as_me:16354: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -16378,11 +16421,11 @@
+@@ -16378,11 +16451,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16381: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16424: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16454: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16385: \$? = $ac_status" >&5
-+ echo "$as_me:16428: \$? = $ac_status" >&5
++ echo "$as_me:16458: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17823,7 +17866,7 @@
+@@ -17823,7 +17896,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17826 "configure"' > conftest.$ac_ext
-+ echo '#line 17869 "configure"' > conftest.$ac_ext
++ echo '#line 17899 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -17842,7 +17885,7 @@
+@@ -17842,7 +17915,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -621,7 +665,7 @@
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
-@@ -18227,9 +18270,6 @@
+@@ -18227,9 +18300,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
@@ -631,7 +675,7 @@
# An ERE matcher.
EGREP=$lt_EGREP
-@@ -18363,11 +18403,11 @@
+@@ -18363,11 +18433,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -645,7 +689,7 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-@@ -18379,7 +18419,7 @@
+@@ -18379,7 +18449,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
@@ -654,7 +698,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -18459,7 +18499,7 @@
+@@ -18459,7 +18529,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
@@ -663,58 +707,58 @@
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -18600,11 +18640,11 @@
+@@ -18600,11 +18670,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18603: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18643: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18673: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18607: \$? = $ac_status" >&5
-+ echo "$as_me:18647: \$? = $ac_status" >&5
++ echo "$as_me:18677: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18868,11 +18908,11 @@
+@@ -18868,11 +18938,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18871: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18911: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18941: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18875: \$? = $ac_status" >&5
-+ echo "$as_me:18915: \$? = $ac_status" >&5
++ echo "$as_me:18945: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18972,11 +19012,11 @@
+@@ -18972,11 +19042,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18975: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19015: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19045: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18979: \$? = $ac_status" >&5
-+ echo "$as_me:19019: \$? = $ac_status" >&5
++ echo "$as_me:19049: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -20437,7 +20477,7 @@
+@@ -20437,7 +20507,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 20440 "configure"' > conftest.$ac_ext
-+ echo '#line 20480 "configure"' > conftest.$ac_ext
++ echo '#line 20510 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -20456,7 +20496,7 @@
+@@ -20456,7 +20526,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -723,7 +767,7 @@
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
-@@ -20841,9 +20881,6 @@
+@@ -20841,9 +20911,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
@@ -733,7 +777,7 @@
# An ERE matcher.
EGREP=$lt_EGREP
-@@ -20977,11 +21014,11 @@
+@@ -20977,11 +21044,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -747,7 +791,7 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-@@ -20993,7 +21030,7 @@
+@@ -20993,7 +21060,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
@@ -756,7 +800,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -21073,7 +21110,7 @@
+@@ -21073,7 +21140,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
@@ -765,7 +809,7 @@
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -21324,9 +21361,6 @@
+@@ -21324,9 +21391,6 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
@@ -775,7 +819,7 @@
# An ERE matcher.
EGREP=$lt_EGREP
-@@ -21460,11 +21494,11 @@
+@@ -21460,11 +21524,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -789,7 +833,7 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-@@ -21476,7 +21510,7 @@
+@@ -21476,7 +21540,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
@@ -798,7 +842,7 @@
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
-@@ -21556,7 +21590,7 @@
+@@ -21556,7 +21620,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
@@ -807,136 +851,363 @@
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-@@ -23410,6 +23444,101 @@
+@@ -22893,12 +22957,12 @@
+
+ if test -z "$with_gecko"; then
+ for g in $GECKOS; do
+- if $PKG_CONFIG --exists $g-xpcom; then
++ if $PKG_CONFIG --exists libxul; then
+ gecko=$g
+ break;
+ fi
+ done
+- elif ! $PKG_CONFIG --exists $gecko-xpcom; then
++ elif ! $PKG_CONFIG --exists libxul; then
+ { { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5
+ echo "$as_me: error: Gecko \"$gecko\" not found" >&2;}
+ { (exit 1); exit 1; }; }
+@@ -22954,15 +23018,12 @@
+ pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
+- \$MOZILLA-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin" 2>/dev/null`
++ pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "libxul" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22975,15 +23036,12 @@
+ pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
+- \$MOZILLA-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxul") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin" 2>/dev/null`
++ pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "libxul" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23002,11 +23060,9 @@
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+- MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin"`
++ MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul"`
+ else
+- MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin"`
++ MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5
+@@ -23271,10 +23327,12 @@
+
+ # Sets some variables, and check for xpidl
+ if test "$enable_browser_plugins" = "yes" ; then
+- MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`"
+- MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`"
+- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+- MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul`
++ MOZILLA_PREFIX="`$PKG_CONFIG libxul --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG libxul --variable=libdir`"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir libxul`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`"
++ MOZILLA_LIBS="`$PKG_CONFIG --libs libxul`"
+ MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-$MOZILLA_LIBDIR}"
+
+ # Extract the first word of "xpidl", so it can be a program name with args.
+@@ -23290,7 +23348,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$MOZILLA_LIBDIR:$PATH"
++as_dummy="$LIBXUL_SDK_DIR/bin:$PATH"
+ for as_dir in $as_dummy
+ do
+ IFS=$as_save_IFS
+@@ -23338,7 +23396,7 @@
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$MOZILLA_LIBDIR:$PATH"
++as_dummy="$LIBXUL_SDK_DIR/bin:$PATH"
+ for as_dir in $as_dummy
+ do
+ IFS=$as_save_IFS
+@@ -23378,17 +23436,12 @@
+
-+# Checks for -fshort-wchar compiler variable, and adds it to
-+# MOZILLA_XPCOM_CFLAGS if found
-+
-+# **************************************************************
-+# This is really gcc-only
-+# Do this test using CXX only since some versions of gcc
-+# 2.95-2.97 have a signed wchar_t in c++ only and some versions
-+# only have short-wchar support for c++.
-+# **************************************************************
-+
-+MOZILLA_EXTRA_CXXFLAGS=
-+
-+if test "$enable_browser_plugins" = "yes" ; then
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+ _SAVE_CXXFLAGS=$CXXFLAGS
-+ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS -fshort-wchar"
-+
-+ { echo "$as_me:$LINENO: checking for compiler -fshort-wchar option" >&5
-+echo $ECHO_N "checking for compiler -fshort-wchar option... $ECHO_C" >&6; }
-+if test "${gecko_cv_have_usable_wchar_option+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test "$cross_compiling" = yes; then
-+ gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stddef.h>
-+ int main () {
-+ return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ;
-+ }
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ gecko_cv_have_usable_wchar_option="yes"
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+gecko_cv_have_usable_wchar_option="no"
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $gecko_cv_have_usable_wchar_option" >&5
-+echo "${ECHO_T}$gecko_cv_have_usable_wchar_option" >&6; }
-+
-+ CXXFLAGS="$_SAVE_CXXFLAGS"
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+ if test "$gecko_cv_have_usable_wchar_option" = "yes"; then
-+ MOZILLA_EXTRA_CXXFLAGS="-fshort-wchar"
-+ fi
-+fi
-+
-+
+
- # check for libxpcomglue_s
+ fi
- LIBXPCOMGLUE_S=
-@@ -23429,7 +23558,7 @@
- CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
- CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
- LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
-- LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
-+ LDFLAGS="$LDFLAGS $MOZILLA_EXTRA_CXXFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
-
- { echo "$as_me:$LINENO: checking for libxpcomglue_s" >&5
- echo $ECHO_N "checking for libxpcomglue_s... $ECHO_C" >&6; }
-@@ -23497,7 +23626,7 @@
-
-
- if test "$have_libxpcomglue_s" = "yes"; then
-- LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
-+ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
- else
- { echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5
- echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;}
-@@ -23587,7 +23716,7 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
+- MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
+- if test "x$MOZILLA_IDLDIR" = "x"; then
+- MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
+- fi
+- if test "x$MOZILLA_IDLDIR" = "x"; then
+- MOZILLA_IDLDIR="$MOZILLA_INCLUDE_ROOT/idl"
+- fi
++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/stable"
- __SAVE_CPPFLAGS=$CPPFLAGS
-- CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
-+ CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS $MOZILLA_EXTRA_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
+ fi
+@@ -23577,233 +23630,6 @@
+ fi
+ fi
+-# check for some additional xpcom headers and for string compatibility
+-
+-if test "$enable_browser_plugins" = "yes"; then
+- ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+- __SAVE_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom"
+-
+-
+-
+-for ac_header in nsTArray.h
+-do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- { echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+- ( cat <<\_ASBOX
+-## -------------------------------------------------------------------- ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##
+-## -------------------------------------------------------------------- ##
+-_ASBOX
+- ) | sed "s/^/$as_me: WARNING: /" >&2
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-
+-fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+- { echo "$as_me:$LINENO: checking whether we need string glue" >&5
+-echo $ECHO_N "checking whether we need string glue... $ECHO_C" >&6; }
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+- #include <mozilla-config.h>
+- #include <nsStringAPI.h>
+-
+-int
+-main ()
+-{
+-
+- nsDependentCString test("Test");
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_cxx_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- need_string_glue=no
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- need_string_glue=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- { echo "$as_me:$LINENO: result: $need_string_glue" >&5
+-echo "${ECHO_T}$need_string_glue" >&6; }
+-
+- CPPFLAGS=$__SAVE_CPPFLAGS
+- ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+- if test "$need_string_glue" = "yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define NEED_STRING_GLUE 1
+-_ACEOF
+-
+- fi
+-fi
+-
+ # check which plugins to enable
-@@ -25929,6 +26058,13 @@
+ if test "$enable_browser_plugins" = "yes"; then
+@@ -25929,6 +25755,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -950,7 +1221,31 @@
if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -26774,13 +26910,13 @@
+@@ -26692,6 +26525,7 @@
+ host_os!$host_os$ac_delim
+ USE_NLS!$USE_NLS$ac_delim
+ MSGFMT!$MSGFMT$ac_delim
++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+ GMSGFMT!$GMSGFMT$ac_delim
+ XGETTEXT!$XGETTEXT$ac_delim
+ CATALOGS!$CATALOGS$ac_delim
+@@ -26699,7 +26533,6 @@
+ DATADIRNAME!$DATADIRNAME$ac_delim
+ GMOFILES!$GMOFILES$ac_delim
+ INSTOBJEXT!$INSTOBJEXT$ac_delim
+-INTLLIBS!$INTLLIBS$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -26741,6 +26574,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++INTLLIBS!$INTLLIBS$ac_delim
+ PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
+ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+ POFILES!$POFILES$ac_delim
+@@ -26774,13 +26608,13 @@
INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
@@ -966,79 +1261,41 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26884,6 +27020,7 @@
+@@ -26837,7 +26671,6 @@
+ MOZILLA_XPT_LINK!$MOZILLA_XPT_LINK$ac_delim
+ MOZILLA_PREFIX!$MOZILLA_PREFIX$ac_delim
+ MOZILLA_LIBDIR!$MOZILLA_LIBDIR$ac_delim
+-MOZILLA_XPCOM_CFLAGS!$MOZILLA_XPCOM_CFLAGS$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -26879,6 +26712,8 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim
++MOZILLA_XPCOM_CFLAGS!$MOZILLA_XPCOM_CFLAGS$ac_delim
+ MOZILLA_INCLUDE_ROOT!$MOZILLA_INCLUDE_ROOT$ac_delim
+ MOZILLA_PLUGINDIR!$MOZILLA_PLUGINDIR$ac_delim
MOZILLA_IDLDIR!$MOZILLA_IDLDIR$ac_delim
- ENABLE_BROWSER_PLUGINS_TRUE!$ENABLE_BROWSER_PLUGINS_TRUE$ac_delim
- ENABLE_BROWSER_PLUGINS_FALSE!$ENABLE_BROWSER_PLUGINS_FALSE$ac_delim
-+MOZILLA_EXTRA_CXXFLAGS!$MOZILLA_EXTRA_CXXFLAGS$ac_delim
- LIBXPCOMGLUE_S!$LIBXPCOMGLUE_S$ac_delim
- ENABLE_BASIC_PLUGIN_TRUE!$ENABLE_BASIC_PLUGIN_TRUE$ac_delim
- ENABLE_BASIC_PLUGIN_FALSE!$ENABLE_BASIC_PLUGIN_FALSE$ac_delim
-@@ -26939,7 +27076,7 @@
+@@ -26939,7 +26774,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- browser-plugin/Makefile.in.orig 2007-07-19 17:51:04.000000000 +0200
-+++ browser-plugin/Makefile.in 2007-07-19 17:51:19.000000000 +0200
-@@ -295,8 +295,6 @@
- GCONFTOOL = @GCONFTOOL@
- GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
- GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
--GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
--GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
- GLIB_MKENUMS = @GLIB_MKENUMS@
-@@ -359,6 +357,7 @@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MOZILLA = @MOZILLA@
-+MOZILLA_EXTRA_CXXFLAGS = @MOZILLA_EXTRA_CXXFLAGS@
- MOZILLA_IDLDIR = @MOZILLA_IDLDIR@
- MOZILLA_INCLUDE_ROOT = @MOZILLA_INCLUDE_ROOT@
- MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
-@@ -580,6 +579,7 @@
-
- @ENABLE_BASIC_PLUGIN_TRUE at libtotem_basic_plugin_la_CXXFLAGS = \
- @ENABLE_BASIC_PLUGIN_TRUE@ $(BROWSER_PLUGIN_CFLAGS) \
-+ at ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_EXTRA_CXXFLAGS) \
- @ENABLE_BASIC_PLUGIN_TRUE@ $(MOZILLA_XPCOM_CFLAGS) \
- @ENABLE_BASIC_PLUGIN_TRUE@ $(DBUS_CFLAGS) \
- @ENABLE_BASIC_PLUGIN_TRUE@ $(WARN_CXXFLAGS) \
-@@ -640,6 +640,7 @@
-
- @ENABLE_GMP_PLUGIN_TRUE at libtotem_gmp_plugin_la_CXXFLAGS = \
- @ENABLE_GMP_PLUGIN_TRUE@ $(BROWSER_PLUGIN_CFLAGS) \
-+ at ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_EXTRA_CXXFLAGS) \
- @ENABLE_GMP_PLUGIN_TRUE@ $(MOZILLA_XPCOM_CFLAGS) \
- @ENABLE_GMP_PLUGIN_TRUE@ $(DBUS_CFLAGS) \
- @ENABLE_GMP_PLUGIN_TRUE@ $(WARN_CXXFLAGS) \
-@@ -694,6 +695,7 @@
-
- @ENABLE_COMPLEX_PLUGIN_TRUE at libtotem_complex_plugin_la_CXXFLAGS = \
- @ENABLE_COMPLEX_PLUGIN_TRUE@ $(BROWSER_PLUGIN_CFLAGS) \
-+ at ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_EXTRA_CXXFLAGS) \
- @ENABLE_COMPLEX_PLUGIN_TRUE@ $(MOZILLA_XPCOM_CFLAGS) \
- @ENABLE_COMPLEX_PLUGIN_TRUE@ $(DBUS_CFLAGS) \
- @ENABLE_COMPLEX_PLUGIN_TRUE@ $(WARN_CXXFLAGS) \
-@@ -748,6 +750,7 @@
-
- @ENABLE_NARROWSPACE_PLUGIN_TRUE at libtotem_narrowspace_plugin_la_CXXFLAGS = \
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(BROWSER_PLUGIN_CFLAGS) \
-+ at ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_EXTRA_CXXFLAGS) \
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(MOZILLA_XPCOM_CFLAGS) \
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(DBUS_CFLAGS) \
- @ENABLE_NARROWSPACE_PLUGIN_TRUE@ $(WARN_CXXFLAGS) \
-@@ -802,6 +805,7 @@
-
- @ENABLE_MULLY_PLUGIN_TRUE at libtotem_mully_plugin_la_CXXFLAGS = \
- @ENABLE_MULLY_PLUGIN_TRUE@ $(BROWSER_PLUGIN_CFLAGS) \
-+ at ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_EXTRA_CXXFLAGS) \
- @ENABLE_MULLY_PLUGIN_TRUE@ $(MOZILLA_XPCOM_CFLAGS) \
- @ENABLE_MULLY_PLUGIN_TRUE@ $(DBUS_CFLAGS) \
- @ENABLE_MULLY_PLUGIN_TRUE@ $(WARN_CXXFLAGS) \
+--- totem-2.18.2/browser-plugin/totemPlugin.h 2007-03-26 02:50:03.000000000 +0200
++++ totem-2.18.2-new/browser-plugin/totemPlugin.h 2007-10-31 16:30:31.000000000 +0100
+@@ -33,6 +33,9 @@
+ #include "totemStringGlue.h"
+ #endif
+
++#define NS_STATIC_CAST(__type, __ptr) static_cast< __type >(__ptr)
++#define NS_REINTERPRET_CAST(__type, __expr) reinterpret_cast< __type >(__expr)
++
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+ #include <nsTArray.h>
+ #endif /* TOTEM_COMPLEX_PLUGIN */
Index: totem.spec
===================================================================
RCS file: /cvs/extras/rpms/totem/OLPC-2/totem.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- totem.spec 30 Oct 2007 23:52:00 -0000 1.112
+++ totem.spec 31 Oct 2007 15:41:37 -0000 1.113
@@ -88,7 +88,7 @@
%setup -q
%patch0 -p1 -b .gtk-init-gst
%patch1 -p1 -b .remove-libsn
-%patch2 -p0 -b .plugin-build
+%patch2 -p1 -b .plugin-build
%patch3 -p1 -b .pluginmime
%patch4 -p0 -b .pluginvolume
@@ -195,6 +195,7 @@
%changelog
* Wed Oct 31 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-9
+- Adapt to latest xulrunner
- Do not advertise mpeg support
* Thu Oct 4 2007 Marco Pesenti Gritti <mpg at redhat.com> - 2.18.2-7
- Previous message (by thread): rpms/eclipse/devel eclipse-maxpermsize.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 eclipse.spec, 1.495, 1.496 sources, 1.53, 1.54
- Next message (by thread): rpms/gcompris/devel .cvsignore, 1.12, 1.13 gcompris.spec, 1.31, 1.32 sources, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list