Updated Debian build scripts to 47.0.2526.80-2

build_templates/debian/.pc/.quilt_patches

@@ -0,0 +1 @@
+patches

build_templates/debian/.pc/.quilt_series

@@ -0,0 +1 @@
+series

build_templates/debian/.pc/.version

@@ -0,0 +1 @@
+2

build_templates/debian/changelog

@@ -1,3 +1,10 @@
+chromium-browser (47.0.2526.80-2) stretch; urgency=low
+
+  * New upstream version
+    - Based off of Debian's 47.0.2526.80-2
+
+ -- Eloston <eloston@mail.com>  Mon, 14 Dec 2015 00:00:00 +0000
+
 chromium-browser (47.0.2526.80-1) stretch; urgency=low
 
   * New upstream version

build_templates/debian/chromium.desktop

@@ -136,5 +136,5 @@ Type=Application
 Icon=chromium.png
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml_xml;application/x-mimearchive;x-scheme-handler/http;x-scheme-handler/https;
-StartupWMClass=Chromium
+StartupWMClass=chromium-browser
 StartupNotify=true

build_templates/debian/chromium.install

@@ -4,8 +4,6 @@ out/Release/*.bin usr/lib/chromium
 out/Release/*.pak usr/lib/chromium
 out/Release/icudtl.dat usr/lib/chromium
 
-out/Release/resources/*.pak usr/lib/chromium/locales
-
 debian/presubj usr/share/bug/chromium
 
 debian/master_preferences usr/share/chromium

build_templates/debian/default-flags

@@ -2,3 +2,7 @@
 
 # Do not hide any extensions in the about:extensions dialog
 export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disk-cache-dir=/dev/null --disk-cache-size=1 --media-cache-size=1 --show-component-extension-options --disable-component-update"
+
+# Don't use the GPU blacklist (bug #802933)
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist"
+

build_templates/debian/rules

@@ -11,7 +11,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 #export LDFLAGS+=-Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--hash-size=7919
 
 # more verbose linker output
-export LDFLAGS+=-Wl,--trace -Wl,--stats
+export LDFLAGS+=-Wl,--trace -Wl,--print-memory-usage
 
 # treat all warnings as errors
 defines=werror=
@@ -128,14 +128,16 @@ override_dh_auto_configure:
 	for file in $(flotpaths); do ln -sf $$file third_party/flot; done
 	GYP_DEFINES="$(defines)" ./build/gyp_chromium $(options)
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	ninja $(njobs) -C out/Release chrome chrome_sandbox chromedriver
 	mv out/Release/chrome out/Release/chromium || true
 	mv out/Release/chrome.1 out/Release/chromium.1 || true
-	mv out/Release/locales/en-US.pak out/Release/resources || true
 	mv out/Release/chrome_sandbox out/Release/chrome-sandbox || true
 	chmod 4755 out/Release/chrome-sandbox # suid sandbox
 
+override_dh_auto_build-indep:
+	ninja $(njobs) -C out/Release packed_resources
+
 override_dh_auto_install-arch:
 	dh_auto_install
 	echo "Any files placed in this directory will be sourced prior to executing chromium." \

build_templates/debian/scripts/chromium

@@ -51,6 +51,9 @@ if test -z "$CHROME_WRAPPER"; then
     export CHROME_WRAPPER="/usr/bin/$APPNAME"
 fi
 
+# Set the correct file name for the desktop file
+export CHROME_DESKTOP="chromium.desktop"
+
 # Set CHROME_VERSION_EXTRA text, which is displayed in the About dialog
 DIST=`cat /etc/debian_version`
 export CHROME_VERSION_EXTRA="Built on Debian $BUILD_DIST, running on Debian $DIST"

patches/debian/fullscreen-ui.patch

@@ -0,0 +1,11 @@
+--- a/chrome/browser/ui/views/frame/browser_view.cc
++++ b/chrome/browser/ui/views/frame/browser_view.cc
+@@ -1009,6 +1009,8 @@ void BrowserView::UpdateExclusiveAccessE
+ }
+ 
+ bool BrowserView::ShouldHideUIForFullscreen() const {
++  return false;
++
+   // Immersive mode needs UI for the slide-down top panel.
+   if (immersive_mode_controller_->IsEnabled())
+     return false;

patches/patch_order

@@ -55,6 +55,7 @@ debian/disable/promo.patch
 debian/disable/google-api-warning.patch
 debian/disable/default-browser-warning.patch
 debian/ps-print.patch
+debian/fullscreen-ui.patch
 debian/gpu-timeout.patch
 debian/webui.patch