summaryrefslogtreecommitdiffstats
path: root/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-15 13:27:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-15 13:27:24 +0100
commit2300c6464634afa4d02a0cd597804cce124324a4 (patch)
tree4e60a9bbab6f0c43bcaca2e8752d8234f84078d3 /meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
parente1ee329a888bc406a92ba83e33af5fb63c74ce6a (diff)
downloadpoky-2300c6464634afa4d02a0cd597804cce124324a4.tar.gz
mozilla-headless: Update configurefix patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/mozilla-headless/mozilla-headless/configurefix.patch')
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/configurefix.patch68
1 files changed, 40 insertions, 28 deletions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
index 3345dbb13d..d31f91a42d 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
@@ -1,7 +1,7 @@
1Index: offscreen/configure.in 1Index: offscreen/configure.in
2=================================================================== 2===================================================================
3--- offscreen.orig/configure.in 2009-06-12 14:08:51.000000000 +0100 3--- offscreen.orig/configure.in 2009-06-12 14:15:55.000000000 +0100
4+++ offscreen/configure.in 2009-06-12 14:11:18.000000000 +0100 4+++ offscreen/configure.in 2009-06-12 14:15:55.000000000 +0100
5@@ -62,7 +62,6 @@ 5@@ -62,7 +62,6 @@
6 6
7 AC_PREREQ(2.13) 7 AC_PREREQ(2.13)
@@ -290,8 +290,8 @@ Index: offscreen/configure.in
290 if cmp -s config/autoconf.mk config/autoconf.mk.orig; then 290 if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
291Index: offscreen/js/src/configure.in 291Index: offscreen/js/src/configure.in
292=================================================================== 292===================================================================
293--- offscreen.orig/js/src/configure.in 2009-06-12 14:08:52.000000000 +0100 293--- offscreen.orig/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
294+++ offscreen/js/src/configure.in 2009-06-12 14:11:18.000000000 +0100 294+++ offscreen/js/src/configure.in 2009-06-12 14:15:55.000000000 +0100
295@@ -62,7 +62,6 @@ 295@@ -62,7 +62,6 @@
296 296
297 AC_PREREQ(2.13) 297 AC_PREREQ(2.13)
@@ -481,8 +481,8 @@ Index: offscreen/js/src/configure.in
481+ 481+
482Index: offscreen/nsprpub/configure.in 482Index: offscreen/nsprpub/configure.in
483=================================================================== 483===================================================================
484--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:08:54.000000000 +0100 484--- offscreen.orig/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
485+++ offscreen/nsprpub/configure.in 2009-06-12 14:11:18.000000000 +0100 485+++ offscreen/nsprpub/configure.in 2009-06-12 14:15:55.000000000 +0100
486@@ -42,7 +42,6 @@ 486@@ -42,7 +42,6 @@
487 AC_PREREQ(2.12) 487 AC_PREREQ(2.12)
488 AC_INIT(config/libc_r.h) 488 AC_INIT(config/libc_r.h)
@@ -591,8 +591,8 @@ Index: offscreen/nsprpub/configure.in
591+ 591+
592Index: offscreen/js/src/Makefile.in 592Index: offscreen/js/src/Makefile.in
593=================================================================== 593===================================================================
594--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:08:52.000000000 +0100 594--- offscreen.orig/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
595+++ offscreen/js/src/Makefile.in 2009-06-12 14:11:18.000000000 +0100 595+++ offscreen/js/src/Makefile.in 2009-06-12 14:15:55.000000000 +0100
596@@ -514,20 +514,8 @@ 596@@ -514,20 +514,8 @@
597 597
598 export:: jsautocfg.h 598 export:: jsautocfg.h
@@ -625,8 +625,8 @@ Index: offscreen/js/src/Makefile.in
625 625
626Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 626Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
627=================================================================== 627===================================================================
628--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:08:52.000000000 +0100 628--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
629+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:11:18.000000000 +0100 629+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-06-12 14:15:55.000000000 +0100
630@@ -47,6 +47,8 @@ 630@@ -47,6 +47,8 @@
631 631
632 #include <stdarg.h> 632 #include <stdarg.h>
@@ -638,8 +638,8 @@ Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
638 #include "nsCOMPtr.h" 638 #include "nsCOMPtr.h"
639Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 639Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
640=================================================================== 640===================================================================
641--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 18:08:00.000000000 +0100 641--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
642+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:11:18.000000000 +0100 642+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-06-12 14:15:55.000000000 +0100
643@@ -39,6 +39,8 @@ 643@@ -39,6 +39,8 @@
644 * 644 *
645 * ***** END LICENSE BLOCK ***** */ 645 * ***** END LICENSE BLOCK ***** */
@@ -651,8 +651,8 @@ Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
651 #include "mozJSSubScriptLoader.h" 651 #include "mozJSSubScriptLoader.h"
652Index: offscreen/modules/lcms/include/icc34.h 652Index: offscreen/modules/lcms/include/icc34.h
653=================================================================== 653===================================================================
654--- offscreen.orig/modules/lcms/include/icc34.h 2009-04-16 18:08:47.000000000 +0100 654--- offscreen.orig/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
655+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:11:18.000000000 +0100 655+++ offscreen/modules/lcms/include/icc34.h 2009-06-12 14:15:55.000000000 +0100
656@@ -144,7 +144,7 @@ 656@@ -144,7 +144,7 @@
657 */ 657 */
658 658
@@ -664,8 +664,8 @@ Index: offscreen/modules/lcms/include/icc34.h
664 Added the stupid check for autoconf by Marti Maria. 664 Added the stupid check for autoconf by Marti Maria.
665Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in 665Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
666=================================================================== 666===================================================================
667--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:08:56.000000000 +0100 667--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
668+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:11:18.000000000 +0100 668+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-06-12 14:15:55.000000000 +0100
669@@ -60,7 +60,7 @@ 669@@ -60,7 +60,7 @@
670 670
671 LIBS += \ 671 LIBS += \
@@ -677,8 +677,8 @@ Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
677 ifeq ($(OS_ARCH),WINNT) 677 ifeq ($(OS_ARCH),WINNT)
678Index: offscreen/xpcom/sample/program/Makefile.in 678Index: offscreen/xpcom/sample/program/Makefile.in
679=================================================================== 679===================================================================
680--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-04-16 18:09:47.000000000 +0100 680--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
681+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:11:18.000000000 +0100 681+++ offscreen/xpcom/sample/program/Makefile.in 2009-06-12 14:15:55.000000000 +0100
682@@ -57,7 +57,7 @@ 682@@ -57,7 +57,7 @@
683 # that the application be linked against the XPCOM dynamic library or the NSPR 683 # that the application be linked against the XPCOM dynamic library or the NSPR
684 # dynamic libraries. 684 # dynamic libraries.
@@ -690,8 +690,8 @@ Index: offscreen/xpcom/sample/program/Makefile.in
690 # Need to link with CoreFoundation on Mac 690 # Need to link with CoreFoundation on Mac
691Index: offscreen/xpcom/tools/registry/Makefile.in 691Index: offscreen/xpcom/tools/registry/Makefile.in
692=================================================================== 692===================================================================
693--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-04-16 18:09:48.000000000 +0100 693--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
694+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:11:18.000000000 +0100 694+++ offscreen/xpcom/tools/registry/Makefile.in 2009-06-12 14:15:55.000000000 +0100
695@@ -54,7 +54,7 @@ 695@@ -54,7 +54,7 @@
696 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) 696 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
697 697
@@ -703,8 +703,8 @@ Index: offscreen/xpcom/tools/registry/Makefile.in
703 # Need to link with CoreFoundation on Mac 703 # Need to link with CoreFoundation on Mac
704Index: offscreen/xulrunner/app/Makefile.in 704Index: offscreen/xulrunner/app/Makefile.in
705=================================================================== 705===================================================================
706--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:08:56.000000000 +0100 706--- offscreen.orig/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
707+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:11:18.000000000 +0100 707+++ offscreen/xulrunner/app/Makefile.in 2009-06-12 14:15:55.000000000 +0100
708@@ -184,7 +184,7 @@ 708@@ -184,7 +184,7 @@
709 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" 709 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
710 endif 710 endif
@@ -716,8 +716,8 @@ Index: offscreen/xulrunner/app/Makefile.in
716 716
717Index: offscreen/xulrunner/stub/Makefile.in 717Index: offscreen/xulrunner/stub/Makefile.in
718=================================================================== 718===================================================================
719--- offscreen.orig/xulrunner/stub/Makefile.in 2009-04-16 18:09:50.000000000 +0100 719--- offscreen.orig/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
720+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:11:18.000000000 +0100 720+++ offscreen/xulrunner/stub/Makefile.in 2009-06-12 14:15:55.000000000 +0100
721@@ -101,7 +101,7 @@ 721@@ -101,7 +101,7 @@
722 endif 722 endif
723 endif 723 endif
@@ -729,8 +729,8 @@ Index: offscreen/xulrunner/stub/Makefile.in
729 729
730Index: offscreen/modules/plugin/test/testplugin/Makefile.in 730Index: offscreen/modules/plugin/test/testplugin/Makefile.in
731=================================================================== 731===================================================================
732--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:08:54.000000000 +0100 732--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
733+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:11:18.000000000 +0100 733+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-06-12 14:15:55.000000000 +0100
734@@ -63,9 +63,7 @@ 734@@ -63,9 +63,7 @@
735 CMMSRCS = nptest_macosx.mm 735 CMMSRCS = nptest_macosx.mm
736 endif 736 endif
@@ -743,10 +743,22 @@ Index: offscreen/modules/plugin/test/testplugin/Makefile.in
743 CPPSRCS += nptest_os2.cpp 743 CPPSRCS += nptest_os2.cpp
744Index: offscreen/js/src/aclocal.m4 744Index: offscreen/js/src/aclocal.m4
745=================================================================== 745===================================================================
746--- offscreen.orig/js/src/aclocal.m4 2009-04-16 18:07:56.000000000 +0100 746--- offscreen.orig/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
747+++ offscreen/js/src/aclocal.m4 2009-06-12 14:11:18.000000000 +0100 747+++ offscreen/js/src/aclocal.m4 2009-06-12 14:15:55.000000000 +0100
748@@ -9,4 +9,3 @@ 748@@ -9,4 +9,3 @@
749 builtin(include, build/autoconf/moznbytetype.m4)dnl 749 builtin(include, build/autoconf/moznbytetype.m4)dnl
750 builtin(include, build/autoconf/mozprog.m4)dnl 750 builtin(include, build/autoconf/mozprog.m4)dnl
751 751
752-MOZ_PROG_CHECKMSYS() 752-MOZ_PROG_CHECKMSYS()
753Index: offscreen/toolkit/toolkit-makefiles.sh
754===================================================================
755--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-06-12 14:19:59.000000000 +0100
756+++ offscreen/toolkit/toolkit-makefiles.sh 2009-06-12 14:20:09.000000000 +0100
757@@ -342,7 +342,6 @@
758 modules/plugin/sdk/samples/Makefile
759 modules/plugin/sdk/samples/common/Makefile
760 modules/plugin/sdk/samples/basic/windows/Makefile
761- modules/plugin/sdk/samples/basic/unix/Makefile
762 modules/plugin/sdk/samples/winless/windows/Makefile
763 "
764