Attachment 111534 Details for Bug 152816 – file.diff

[patch] file.diff

file.diff (text/plain), 7.36 KB, created by Ruben on 2010-12-04 00:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruben

Created: 2010-12-04 00:20:08 UTC

Size: 7.36 KB

patch

obsolete

>diff -ru chromium.orig/Makefile chromium/Makefile
>--- chromium.orig/Makefile	2010-11-14 13:12:19.000000000 -0800
>+++ chromium/Makefile	2010-12-01 17:45:52.000000000 -0800
>@@ -43,7 +43,7 @@
> USE_GMAKE=	yes
> MAN1=		chrome.1
> USE_XORG=	scrnsaverproto
>-USE_GNOME=	glib20 gtk20 gconf2 libxslt
>+USE_GNOME=	glib20 gtk20 dconf libxslt
> LICENSE_COMB=	multi
> LICENSE=	BSD LGPL21 MPL
> 
>@@ -63,7 +63,9 @@
> #GYP_DEFINES+=	use_system_zlib=1
> 
> OPTIONS=	CODECS		"Compile and enable patented codecs like H.264" off \
>-		VPX		"Use system libvpx for VP8 codec" on
>+		GCONF		"Use gconf2 for preferences"		on \
>+		SSE2		"Use SSE2, disable this for PIII or older" on \
>+		VPX		"Use system libvpx for VP8 codec"	on
> 
> .include <bsd.port.pre.mk>
> 
>@@ -77,6 +79,16 @@
> GYP_DEFINES+=	ffmpeg_branding=Chromium
> .endif
> 
>+.if defined(WITH_GCONF)
>+USE_GNOME+=	gconf2
>+.else
>+GYP_DEFINES+=	use_gconf=0
>+.endif
>+
>+.if defined(WITHOUT_SSE2)
>+GYP_DEFINES+=	disable_sse2=1
>+.endif
>+
> .if defined(WITH_VPX)
> LIB_DEPENDS+=	vpx:${PORTSDIR}/multimedia/libvpx
> GYP_DEFINES+=	use_system_vpx=1
>diff -ru chromium.orig/files/patch-chromium chromium/files/patch-chromium
>--- chromium.orig/files/patch-chromium	2010-11-13 01:22:45.000000000 -0800
>+++ chromium/files/patch-chromium	2010-12-01 16:26:27.000000000 -0800
>@@ -509,7 +509,16 @@
>  
>      # Set Thumb compilation flags.
>      'arm_thumb%': 0,
>-@@ -285,7 +285,7 @@
>+@@ -279,13 +279,16 @@
>+     # whether to compile in the sources for the GPU plugin / process.
>+     'enable_gpu%': 1,
>+ 
>++    # Use GConf, the GNOME configuration system.
>++    'use_gconf%': 1,
>++
>+     'conditions': [
>+       ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
>+         # This will set gcc_version to XY if you are running gcc X.Y.*.
>          # This is used to tweak build flags for gcc 4.4.
>          'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
>          # Figure out the python architecture to decide if we build pyauto.
>@@ -568,6 +577,22 @@
> index 876579a..23d1c6c 100644
> --- build/linux/system.gyp
> +++ build/linux/system.gyp
>+@@ -188,11 +188,14 @@
>+       'target_name': 'gconf',
>+       'type': 'settings',
>+       'conditions': [
>+-        ['_toolset=="target"', {
>++        ['use_gconf==1 and _toolset=="target"', {
>+           'direct_dependent_settings': {
>+             'cflags': [
>+               '<!@(<(pkg-config) --cflags gconf-2.0)',
>+             ],
>++            'defines': [
>++              'USE_GCONF',
>++            ],
>+           },
>+           'link_settings': {
>+             'ldflags': [
> @@ -283,7 +283,6 @@
>              }, {
>                'link_settings': {
>@@ -1174,6 +1199,104 @@
>    void OnGetViewXID(gfx::NativeViewId id, unsigned long* xid);
>  #endif
>  
>+diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc
>+index dea24e6..77adb09 100644
>+--- chrome/browser/gtk/browser_titlebar.cc
>++++ chrome/browser/gtk/browser_titlebar.cc
>+@@ -23,7 +23,9 @@
>+ #include "chrome/browser/gtk/accelerators_gtk.h"
>+ #include "chrome/browser/gtk/browser_window_gtk.h"
>+ #include "chrome/browser/gtk/custom_button.h"
>++#if defined(USE_GCONF)
>+ #include "chrome/browser/gtk/gconf_titlebar_listener.h"
>++#endif
>+ #include "chrome/browser/gtk/gtk_theme_provider.h"
>+ #include "chrome/browser/gtk/gtk_util.h"
>+ #include "chrome/browser/gtk/menu_gtk.h"
>+@@ -193,6 +195,9 @@ void PopupPageMenuModel::Build() {
>+ ////////////////////////////////////////////////////////////////////////////////
>+ // BrowserTitlebar
>+ 
>++// static
>++const char BrowserTitlebar::kDefaultButtonString[] = ":minimize,maximize,close";
>++
>+ BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window,
>+                                  GtkWindow* window)
>+     : browser_window_(browser_window),
>+@@ -299,9 +304,13 @@ void BrowserTitlebar::Init() {
>+   gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_buttons_vbox_,
>+                    FALSE, FALSE, 0);
>+ 
>++#if defined(USE_GCONF)
>+   // Either read the gconf database and register for updates (on GNOME), or use
>+   // the default value (anywhere else).
>+   Singleton<GConfTitlebarListener>()->SetTitlebarButtons(this);
>++#else
>++  BuildButtons(kDefaultButtonString);
>++#endif
>+ 
>+   // We use an alignment to control the titlebar height.
>+   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
>+@@ -363,7 +372,9 @@ void BrowserTitlebar::Init() {
>+ 
>+ BrowserTitlebar::~BrowserTitlebar() {
>+   ActiveWindowWatcherX::RemoveObserver(this);
>++#if defined(USE_GCONF)
>+   Singleton<GConfTitlebarListener>()->RemoveObserver(this);
>++#endif
>+ }
>+ 
>+ void BrowserTitlebar::BuildButtons(const std::string& button_string) {
>+diff --git a/chrome/browser/gtk/browser_titlebar.h b/chrome/browser/gtk/browser_titlebar.h
>+index c6da855..5cd30e6 100644
>+--- chrome/browser/gtk/browser_titlebar.h
>++++ chrome/browser/gtk/browser_titlebar.h
>+@@ -31,6 +31,10 @@ class BrowserTitlebar : public NotificationObserver,
>+                         public ActiveWindowWatcherX::Observer,
>+                         public menus::SimpleMenuModel::Delegate {
>+  public:
>++  // A default button order string for when we aren't asking gconf for the
>++  // metacity configuration.
>++  static const char kDefaultButtonString[];
>++
>+   BrowserTitlebar(BrowserWindowGtk* browser_window, GtkWindow* window);
>+   virtual ~BrowserTitlebar();
>+ 
>+diff --git a/chrome/browser/gtk/gconf_titlebar_listener.cc b/chrome/browser/gtk/gconf_titlebar_listener.cc
>+index 81b5ef0..237332f 100644
>+--- chrome/browser/gtk/gconf_titlebar_listener.cc
>++++ chrome/browser/gtk/gconf_titlebar_listener.cc
>+@@ -13,10 +13,6 @@
>+ 
>+ namespace {
>+ 
>+-// A default button order string for when we aren't asking gconf for the
>+-// metacity configuration.
>+-const char* kDefaultButtonPlacement = ":minimize,maximize,close";
>+-
>+ // The GConf key we read for the button placement string. Even through the key
>+ // has "metacity" in it, it's shared between metacity and compiz.
>+ const char* kButtonLayoutKey = "/apps/metacity/general/button_layout";
>+@@ -34,7 +30,7 @@ void GConfTitlebarListener::SetTitlebarButtons(BrowserTitlebar* titlebar) {
>+     titlebar->BuildButtons(current_value_);
>+     titlebars_.insert(titlebar);
>+   } else {
>+-    titlebar->BuildButtons(kDefaultButtonPlacement);
>++    titlebar->BuildButtons(BrowserTitlebar::kDefaultButtonString);
>+   }
>+ }
>+ 
>+@@ -113,8 +109,8 @@ bool GConfTitlebarListener::HandleGError(GError* error, const char* key) {
>+ void GConfTitlebarListener::ParseAndStoreValue(GConfValue* gconf_value) {
>+   if (gconf_value) {
>+     const char* value = gconf_value_get_string(gconf_value);
>+-    current_value_ = value ? value : kDefaultButtonPlacement;
>++    current_value_ = value ? value : BrowserTitlebar::kDefaultButtonString;
>+   } else {
>+-    current_value_ = kDefaultButtonPlacement;
>++    current_value_ = BrowserTitlebar::kDefaultButtonString;
>+   }
>+ }
> diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
> index 5c38d97..29a73d7 100644
> --- chrome/browser/memory_details.cc
>@@ -2668,7 +2791,18 @@
> index 05a38da..b64be85 100644
> --- chrome/chrome_browser.gypi
> +++ chrome/chrome_browser.gypi
>-@@ -2862,7 +2862,7 @@
>+@@ -2883,12 +2883,18 @@
>+             ],
>+           },
>+         }],
>++        ['use_gconf==0', {
>++          'sources!': [
>++            'browser/gtk/gconf_titlebar_listener.cc',
>++            'browser/gtk/gconf_titlebar_listener.h',
>++          ],
>++        }],
>+         ['touchui==0', {
>+           'sources!': [
>              # Nothing yet.
>            ],
>          }],

Actions: View | Diff

Attachments on bug 152816: 111534