diff options
author | Landry Breuil <landry@rhaalovely.net> | 2014-03-18 07:59:18 +0100 |
---|---|---|
committer | Landry Breuil <landry@rhaalovely.net> | 2014-03-18 07:59:18 +0100 |
commit | 10138d372ae85805e17d199d4f0ee26535d28a8c (patch) | |
tree | 4b949871d38c7cfbe66b12f769529c9ecb772cb8 /patches/patch-GNUmakefile_in | |
parent | 00f70f1819834de1207aba27888dc292f672dd98 (diff) |
update-patches
Diffstat (limited to 'patches/patch-GNUmakefile_in')
-rw-r--r-- | patches/patch-GNUmakefile_in | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/patches/patch-GNUmakefile_in b/patches/patch-GNUmakefile_in index f7506e4..869e346 100644 --- a/patches/patch-GNUmakefile_in +++ b/patches/patch-GNUmakefile_in @@ -8,9 +8,9 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ (on Source/JavaScriptCore/runtime/NumberPrototype.cpp) - chunk 9->12 : fix variable quoting to properly install doc in a versionned dir ---- GNUmakefile.in.orig Mon Mar 3 12:32:20 2014 -+++ GNUmakefile.in Thu Mar 6 20:36:48 2014 -@@ -12417,11 +12417,11 @@ am__v_P_0 = false +--- GNUmakefile.in.orig Mon Mar 17 09:12:20 2014 ++++ GNUmakefile.in Tue Mar 18 07:58:48 2014 +@@ -12428,11 +12428,11 @@ am__v_P_0 = false am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) @@ -24,7 +24,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/Source/autotools/depcomp -@@ -12431,7 +12431,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES +@@ -12442,7 +12442,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) @@ -33,7 +33,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ -@@ -12439,13 +12439,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG +@@ -12450,13 +12450,13 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) @@ -49,7 +49,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ -@@ -12453,7 +12453,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL +@@ -12464,7 +12464,7 @@ CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOL $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) @@ -58,16 +58,16 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ am__v_CXXLD_1 = SOURCES = $(Libraries_WebExtensions_libWebExtensionTest_la_SOURCES) \ $(Libraries_WebExtensions_libWebProcessTest_la_SOURCES) \ -@@ -12987,7 +12987,7 @@ libwebkitgtkincludedir := $(prefix)/include/webkitgtk- +@@ -13001,7 +13001,7 @@ libwebkitgtkincludedir := $(prefix)/include/webkitgtk- INSPECTOR_SCRIPTS_DIR := $(JavaScriptCore)/inspector/scripts # Libraries and support components -bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) +bin_PROGRAMS := Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) Programs/GtkLauncher$(EXEEXT) noinst_DATA := DerivedSources/webkitdom/webkitdom.symbols \ - $(am__append_31) $(am__append_92) + $(am__append_33) $(am__append_94) noinst_HEADERS := -@@ -72748,7 +72748,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE +@@ -72792,7 +72792,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS) $(CPPFLAGS) $(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS) $(CXXFLAGS) -c -o Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo `test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo '$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo: Source/JavaScriptCore/runtime/NumberPrototype.cpp @@ -76,7 +76,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Tpo Source/JavaScriptCore/runtime/$(DEPDIR)/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Source/JavaScriptCore/runtime/NumberPrototype.cpp' object='Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@@ -81024,14 +81024,12 @@ installdirs: +@@ -81068,14 +81068,12 @@ installdirs: for dir in "$(DESTDIR)$(injectedbundledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(audiodir)" "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(webresourcesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)" "$(DESTDIR)$(libwebkitdomincludedir)" "$(DESTDIR)$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done @@ -93,7 +93,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ installcheck: installcheck-am install-strip: -@@ -82335,8 +82333,8 @@ install-data-local: +@@ -82383,8 +82381,8 @@ install-data-local: @ENABLE_WEBKIT1_TRUE@ then echo 1>&2 'No documentation to install' ; \ @ENABLE_WEBKIT1_TRUE@ else \ @ENABLE_WEBKIT1_TRUE@ DOC_MODULE_VERSION=`cat ./Documentation/webkitgtk/version.xml`; \ @@ -104,7 +104,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ @ENABLE_WEBKIT1_TRUE@ else \ @ENABLE_WEBKIT1_TRUE@ installdir="$(DESTDIR)$(HTML_DIR)/webkitgtk"; \ @ENABLE_WEBKIT1_TRUE@ fi; \ -@@ -82345,9 +82343,9 @@ install-data-local: +@@ -82393,9 +82391,9 @@ install-data-local: @ENABLE_WEBKIT1_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ @ENABLE_WEBKIT1_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ @ENABLE_WEBKIT1_TRUE@ done; \ @@ -116,7 +116,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ @ENABLE_WEBKIT1_TRUE@ fi; \ @ENABLE_WEBKIT1_TRUE@ fi @ENABLE_WEBKIT2_TRUE@ @installfiles=`echo ./Documentation/webkit2gtk/html/*`; \ -@@ -82375,8 +82373,8 @@ install-data-local: +@@ -82423,8 +82421,8 @@ install-data-local: then echo 1>&2 'No documentation to install' ; \ else \ DOC_MODULE_VERSION=`cat ./Documentation/webkitdomgtk/version.xml`; \ @@ -127,7 +127,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.28 2014/01/29 17:28:05 ajacoutot Exp $ else \ installdir="$(DESTDIR)$(HTML_DIR)/webkitdomgtk"; \ fi; \ -@@ -82385,9 +82383,9 @@ install-data-local: +@@ -82433,9 +82431,9 @@ install-data-local: echo ' $(INSTALL_DATA) '$$i ; \ $(INSTALL_DATA) $$i $${installdir}; \ done; \ |