fixup! Disable Pango

Disable cairo in addition to Pango

While disabling pango and not cairo builds currently, it doesn't allow
building with shared component. src/build/linux/system.gyp has a single
target pangocairo. It's difficult to untangle pango and cairo in
chromium build system.

Cairo is only used in BitmapPlatformDevice (in src/skia/ext). We don't
use cairo here. For screenshot for example, we use skia for
BitmapPlatformDevice.

So, it's probably safe to disable cairo. The alternatives are either to
modify chromium build system to disentangle cairo and pango, or to
revert the the Disable Pango patch for the moment.

Also, we had a dependency to fontconfig. fontconfig is used in content/
But after disabling pango and cairo, fontcongig dependency is not
computed by gyp for non aura builds. We could fix that by modifying
src/content/content_browser.gypi, but it's easier and less troublesome
to maintain to add the dependency in our gyp files.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=13279
Reviewed by: Antonio Gomes, DaeHyun Ko

Change-Id: I277b98a236a0935a7f14958d51eef8b0426429b3
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh
index e319546..3091631 100755 (executable)
--- a/tizen_src/build/gyp_chromiumefl.sh
+++ b/tizen_src/build/gyp_chromiumefl.sh
@@ -65,6 +65,7 @@ COMMON_GYP_PARAMETERS="
                       -Dozone_platform_wayland=0
                       -Duse_gnome_keyring=0
                       -Duse_pango=0
+                      -Duse_cairo=0
                       -Duse_openssl=1
                       -Duse_openssl_certs=1
                       -Dtizen_multimedia_eme_support=0

diff --git a/tizen_src/build/system.gyp b/tizen_src/build/system.gyp
index 2c10f9e..5cfea5e 100644 (file)
--- a/tizen_src/build/system.gyp
+++ b/tizen_src/build/system.gyp
@@ -702,26 +702,5 @@
         }],
       ],
     }, # xkbcommon
-    {
-      'target_name': 'cairo',
-      'type': 'none',
-      'conditions': [
-        ['use_cairo==1 and use_pango==0', {
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(<(pkg-config) --cflags cairo)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other cairo)',
-            ],
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l cairo)',
-            ],
-          },
-        }],
-      ],
-    }, # cairo
   ],
 }

diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi
index 3d968a5..29b404c 100644 (file)
--- a/tizen_src/chromium_impl/content/content_efl.gypi
+++ b/tizen_src/chromium_impl/content/content_efl.gypi
@@ -9,6 +9,7 @@
       '<(DEPTH)/tizen_src/build/system.gyp:capi-system-system-settings',
       '<(DEPTH)/tizen_src/build/system.gyp:gstreamer',
       '<(DEPTH)/tizen_src/build/system.gyp:tts',
+      '<(DEPTH)/build/linux/system.gyp:fontconfig',
     ],
     'external_content_browser_deps': [
       '<(DEPTH)/tizen_src/build/system.gyp:ecore',
@@ -62,11 +63,6 @@
           '<(DEPTH)/tizen_src/build/system.gyp:ecore-wayland',
         ],
       }],
-      ['use_cairo==1 and use_pango==0', {
-        'external_content_browser_deps': [
-          '<(DEPTH)/tizen_src/build/system.gyp:cairo',
-        ],
-      }],
     ],
   },
 

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index 420a36a..92e3d37 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -114,7 +114,6 @@ BuildRequires: pkgconfig(location)
 BuildRequires: pkgconfig(minizip)
 BuildRequires: pkgconfig(nspr)
 BuildRequires: pkgconfig(openssl)
-BuildRequires: pkgconfig(cairo)
 BuildRequires: pkgconfig(scim)
 BuildRequires: pkgconfig(speex)
 BuildRequires: pkgconfig(sqlite3)