[Pkg-chromium-commit] [pkg-chromium] 01/02: release 47.0.2526.80-2

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository pkg-chromium.

commit 3900d44d305440c6869a1991c0ec8d30332d57d5
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Wed Dec 16 02:26:41 2015 +0000

    release 47.0.2526.80-2
---
 debian/changelog                   | 10 ++++++++++
 debian/chromium.desktop            |  2 +-
 debian/chromium.install            |  2 --
 debian/default-flags               |  3 +++
 debian/patches/fullscreen-ui.patch | 11 +++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  8 +++++---
 debian/scripts/chromium            |  3 +++
 8 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b849fc..e0a295f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+chromium-browser (47.0.2526.80-2) unstable; urgency=medium
+
+  * Greatly simplify the arch:all build.
+  * Don't hide the UI in fullscreen mode.
+  * Ignore the GPU blacklist (closes: #802933).
+  * Fix WMClass in the desktop launcher (closes: #803989).
+  * Set the correct file name for the desktop launcher (closes: #806402).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 13 Dec 2015 06:16:19 +0000
+
 chromium-browser (47.0.2526.80-1) unstable; urgency=medium
 
   * New upstream stable release:
diff --git a/debian/chromium.desktop b/debian/chromium.desktop
index 7be7058..4f9c5e4 100644
--- a/debian/chromium.desktop
+++ b/debian/chromium.desktop
@@ -135,5 +135,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
diff --git a/debian/chromium.install b/debian/chromium.install
index ccb5e1c..64dea6b 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -5,8 +5,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
diff --git a/debian/default-flags b/debian/default-flags
index 99ed32d..f14cbd3 100644
--- a/debian/default-flags
+++ b/debian/default-flags
@@ -2,3 +2,6 @@
 
 # Do not hide any extensions in the about:extensions dialog
 export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --show-component-extension-options"
+
+# Don't use the GPU blacklist (bug #802933)
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist"
diff --git a/debian/patches/fullscreen-ui.patch b/debian/patches/fullscreen-ui.patch
new file mode 100644
index 0000000..98fa363
--- /dev/null
+++ b/debian/patches/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;
diff --git a/debian/patches/series b/debian/patches/series
index a4ffd17..f68e839 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ disable/default-browser-warning.patch
 
 ps-print.patch
 gpu-timeout.patch
+fullscreen-ui.patch
 master-preferences.patch
 chromedriver-revision.patch
 
diff --git a/debian/rules b/debian/rules
index cb86461..81a7666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,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=
@@ -107,14 +107,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." \
diff --git a/debian/scripts/chromium b/debian/scripts/chromium
index 28f2854..1219b90 100644
--- a/debian/scripts/chromium
+++ b/debian/scripts/chromium
@@ -46,6 +46,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"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git