packages: chromium-browser/system-libs-gyp.patch (NEW) - chromium-20090916-...
glen
glen at pld-linux.org
Sun Sep 20 12:31:08 CEST 2009
Author: glen Date: Sun Sep 20 10:31:08 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- chromium-20090916-gyp-system-xml2-xslt-libevent-nss-nspr-v8.patch from
http://spot.fedorapeople.org/chromium/F12/chromium-4.0.212.0-0.1.20090916svn26424.fc12.src.rpm
---- Files affected:
packages/chromium-browser:
system-libs-gyp.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/chromium-browser/system-libs-gyp.patch
diff -u /dev/null packages/chromium-browser/system-libs-gyp.patch:1.1
--- /dev/null Sun Sep 20 12:31:08 2009
+++ packages/chromium-browser/system-libs-gyp.patch Sun Sep 20 12:31:03 2009
@@ -0,0 +1,417 @@
+diff -up chromium-20090916svn26424/src/app/app.gyp.system-gyp chromium-20090916svn26424/src/app/app.gyp
+--- chromium-20090916svn26424/src/app/app.gyp.system-gyp 2009-09-16 20:37:14.000000000 -0400
++++ chromium-20090916svn26424/src/app/app.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -193,7 +193,6 @@
+ '../testing/gtest.gyp:gtest',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
+ ],
+ 'sources': [
+ 'animation_unittest.cc',
+@@ -220,6 +219,7 @@
+ # projects are generated by GYP.
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ['OS!="win"', {
+diff -up chromium-20090916svn26424/src/base/base.gyp.system-gyp chromium-20090916svn26424/src/base/base.gyp
+--- chromium-20090916svn26424/src/base/base.gyp.system-gyp 2009-09-16 20:40:38.000000000 -0400
++++ chromium-20090916svn26424/src/base/base.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -493,7 +493,7 @@
+ ],
+ },
+ { # else: OS != "win"
+- 'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
++ 'dependencies': ['../build/linux/system.gyp:event'],
+ 'sources!': [
+ 'third_party/purify/pure_api.c',
+ 'base_drag_source.cc',
+diff -up chromium-20090916svn26424/src/build/all.gyp.system-gyp chromium-20090916svn26424/src/build/all.gyp
+--- chromium-20090916svn26424/src/build/all.gyp.system-gyp 2009-09-16 20:40:29.000000000 -0400
++++ chromium-20090916svn26424/src/build/all.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -26,8 +26,6 @@
+ '../third_party/icu/icu.gyp:*',
+ '../third_party/libjpeg/libjpeg.gyp:*',
+ '../third_party/libpng/libpng.gyp:*',
+- '../third_party/libxml/libxml.gyp:*',
+- '../third_party/libxslt/libxslt.gyp:*',
+ '../third_party/lzma_sdk/lzma_sdk.gyp:*',
+ '../third_party/modp_b64/modp_b64.gyp:*',
+ '../third_party/npapi/npapi.gyp:*',
+@@ -41,7 +39,7 @@
+ 'conditions': [
+ ['javascript_engine=="v8"', {
+ 'dependencies': [
+- '../v8/tools/gyp/v8.gyp:*',
++ 'linux/system.gyp:v8',
+ ],
+ }],
+ ['OS=="linux"', {
+@@ -77,7 +75,7 @@
+ ],
+ }, {
+ 'dependencies': [
+- '../third_party/libevent/libevent.gyp:*',
++ '../build/linux/system.gyp:event',
+ ],
+ }],
+ ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
+diff -up chromium-20090916svn26424/src/build/linux/system.gyp.system-gyp chromium-20090916svn26424/src/build/linux/system.gyp
+--- chromium-20090916svn26424/src/build/linux/system.gyp.system-gyp 2009-09-16 20:40:29.000000000 -0400
++++ chromium-20090916svn26424/src/build/linux/system.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -161,6 +161,70 @@
+ ],
+ },
+ },
++ {
++ 'target_name': 'xml2',
++ 'type': 'settings',
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags libxml-2.0)',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l libxml-2.0)',
++ ],
++ },
++ },
++ {
++ 'target_name': 'xslt',
++ 'type': 'settings',
++ 'direct_dependent_settings': {
++ 'cflags': [
++ '<!@(pkg-config --cflags libxslt)',
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other libxslt)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l libxslt)',
++ ],
++ },
++ },
++ {
++ 'target_name': 'event',
++ 'type': 'settings',
++ 'direct_dependent_settings': {
++ 'cflags': [
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ ],
++ 'libraries': [
++ '-levent',
++ ],
++ },
++ },
++ {
++ 'target_name': 'v8',
++ 'type': 'settings',
++ 'direct_dependent_settings': {
++ 'cflags': [
++ ],
++ },
++ 'link_settings': {
++ 'ldflags': [
++ ],
++ 'libraries': [
++ '-lv8',
++ ],
++ },
++ },
+ # TODO(evanm): temporarily disabled while we figure out whether to depend
+ # on gnome-keyring etc.
+ # http://code.google.com/p/chromium/issues/detail?id=12351
+diff -up chromium-20090916svn26424/src/chrome/chrome.gyp.system-gyp chromium-20090916svn26424/src/chrome/chrome.gyp
+--- chromium-20090916svn26424/src/chrome/chrome.gyp.system-gyp 2009-09-16 20:41:23.000000000 -0400
++++ chromium-20090916svn26424/src/chrome/chrome.gyp 2009-09-16 21:23:09.000000000 -0400
+@@ -413,7 +413,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../third_party/npapi/npapi.gyp:npapi',
+@@ -628,6 +628,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'export_dependent_settings': [
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+@@ -682,7 +683,7 @@
+ '../third_party/bzip2/bzip2.gyp:bzip2',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+ '../webkit/webkit.gyp:glue',
+@@ -2235,6 +2236,7 @@
+ '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:gtkprint',
+ '../build/linux/system.gyp:nss',
++ '../build/linux/system.gyp:xml2',
+ '../base/base.gyp:linux_versioninfo',
+ ],
+ 'sources!': [
+@@ -2774,6 +2776,7 @@
+ ['OS=="linux" or OS=="freebsd"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ],
+@@ -2790,7 +2793,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/hunspell/hunspell.gyp:hunspell',
+ '../webkit/webkit.gyp:glue',
+@@ -2958,6 +2961,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ '../sandbox/sandbox.gyp:sandbox',
+ ],
+ }],
+@@ -2995,6 +2999,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ],
+@@ -3192,6 +3197,7 @@
+ '<@(chromium_dependencies)',
+ # Needed for chrome_dll_main.cc #include of gtk/gtk.h
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'sources': [
+ 'app/chrome_dll_main.cc',
+@@ -3701,6 +3707,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ['OS=="win"', {
+@@ -3746,6 +3753,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ['OS!="win"', {
+@@ -3779,6 +3787,7 @@
+ # test/unit/chrome_test_suite.h
+ # gtk/gtk.h
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ],
+@@ -3795,7 +3804,7 @@
+ 'theme_resources',
+ '../base/base.gyp:base',
+ '../skia/skia.gyp:skia',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+@@ -3836,7 +3845,7 @@
+ '../testing/gtest.gyp:gtest',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'include_dirs': [
+ '..',
+@@ -3888,6 +3897,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'sources!': [
+ # TODO(port)
+@@ -3990,7 +4000,7 @@
+ '../third_party/bzip2/bzip2.gyp:bzip2',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../third_party/npapi/npapi.gyp:npapi',
+ ],
+ 'include_dirs': [
+@@ -4301,6 +4311,7 @@
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:nss',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'sources': [
+ 'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
+@@ -4481,6 +4492,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ['OS=="linux" and toolkit_views==1', {
+@@ -4603,6 +4615,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ['OS=="win" or (OS=="linux" and toolkit_views==1)', {
+@@ -4667,6 +4680,8 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ ],
+@@ -5233,6 +5248,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'sources!': [
+ # TODO(port):
+@@ -5279,7 +5295,7 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/libpng/libpng.gyp:libpng',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../testing/gtest.gyp:gtest',
+ '../third_party/npapi/npapi.gyp:npapi',
+@@ -5307,6 +5323,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ 'sources!': [
+ # TODO(port)
+@@ -5613,7 +5630,7 @@
+ '../testing/gtest.gyp:gtest',
+ '../third_party/icu/icu.gyp:icui18n',
+ '../third_party/icu/icu.gyp:icuuc',
+- '../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../third_party/npapi/npapi.gyp:npapi',
+ ],
+ 'include_dirs': [
+@@ -5660,6 +5677,7 @@
+ ['OS=="linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:xml2',
+ ],
+ }],
+ # Windows-specific rules.
+@@ -5983,8 +6001,8 @@
+ 'test_support_ui',
+ '../skia/skia.gyp:skia',
+ '../testing/gtest.gyp:gtest',
+- '../third_party/libxml/libxml.gyp:libxml',
+- '../third_party/libxslt/libxslt.gyp:libxslt',
++ '../build/linux/system.gyp:xml2',
++ '../build/linux/system.gyp:xslt',
+ '../third_party/npapi/npapi.gyp:npapi',
+ ],
+ 'include_dirs': [
+diff -up chromium-20090916svn26424/src/net/net.gyp.system-gyp chromium-20090916svn26424/src/net/net.gyp
+--- chromium-20090916svn26424/src/net/net.gyp.system-gyp 2009-09-16 20:40:08.000000000 -0400
++++ chromium-20090916svn26424/src/net/net.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -369,7 +369,7 @@
+ 'conditions': [
+ ['javascript_engine=="v8"', {
+ 'dependencies': [
+- '../v8/tools/gyp/v8.gyp:v8',
++ '../build/linux/system.gyp:v8',
+ ],
+ }],
+ [ 'OS == "linux"', {
+diff -up chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp.system-gyp chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp
+--- chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp.system-gyp 2009-09-16 20:37:18.000000000 -0400
++++ chromium-20090916svn26424/src/webkit/default_plugin/default_plugin.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -15,7 +15,7 @@
+ '../../net/net.gyp:net_resources',
+ '../../third_party/icu/icu.gyp:icui18n',
+ '../../third_party/icu/icu.gyp:icuuc',
+- '../../third_party/libxml/libxml.gyp:libxml',
++ '../build/linux/system.gyp:xml2',
+ '../../third_party/npapi/npapi.gyp:npapi',
+ '../webkit.gyp:webkit_resources',
+ '../webkit.gyp:webkit_strings',
+diff -up chromium-20090916svn26424/src/webkit/webkit.gyp.system-gyp chromium-20090916svn26424/src/webkit/webkit.gyp
+--- chromium-20090916svn26424/src/webkit/webkit.gyp.system-gyp 2009-09-16 20:39:51.000000000 -0400
++++ chromium-20090916svn26424/src/webkit/webkit.gyp 2009-09-16 21:19:27.000000000 -0400
+@@ -334,8 +334,8 @@
+ '../skia/skia.gyp:skia',
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '../third_party/libpng/libpng.gyp:libpng',
+- '../third_party/libxml/libxml.gyp:libxml',
+- '../third_party/libxslt/libxslt.gyp:libxslt',
++ '../build/linux/system.gyp:xml2',
++ '../build/linux/system.gyp:xslt',
+ '../third_party/npapi/npapi.gyp:npapi',
+ '../third_party/sqlite/sqlite.gyp:sqlite',
+ ],
+@@ -751,10 +751,10 @@
+ 'conditions': [
+ ['javascript_engine=="v8"', {
+ 'dependencies': [
+- '../v8/tools/gyp/v8.gyp:v8',
++ '../build/linux/system.gyp:v8',
+ ],
+ 'export_dependent_settings': [
+- '../v8/tools/gyp/v8.gyp:v8',
++ '../build/linux/system.gyp:v8',
+ ],
+ }],
+ ['OS=="linux" or OS=="freebsd"', {
+@@ -1472,6 +1472,7 @@
+ ['OS=="linux" or OS=="freebsd"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
++ '../build/linux/system.gyp:nss',
+ '../base/base.gyp:linux_versioninfo',
+ ],
+ 'export_dependent_settings': [
================================================================
More information about the pld-cvs-commit
mailing list