Added patch to prevent excessive logging to stderr

Fix build machine info detection
Updated README.md with Ubuntu instructions
This commit is contained in:
Eloston
2016-01-08 22:57:45 -08:00
parent 56da9e6cc9
commit 24ff958c25
6 changed files with 79 additions and 3 deletions

View File

@@ -44,10 +44,10 @@ Here's some information on what's in the `patches` directory:
## Building
Right now, only Debian build scripts are provided.
Right now, only Debian and Ubuntu build scripts are provided.
### Debian and derivatives
**NOTE:** Tested on Debian Stretch 64-bit
**NOTE:** Tested on Debian Stretch 64-bit and Ubuntu Wily 64-bit
git clone https://github.com/Eloston/ungoogled-chromium.git
cd ungoogled-chromium

View File

@@ -1,3 +1,9 @@
chromium-browser (47.0.2526.106-3) stretch; urgency=low
* Do not output URLRequest URLs to stderr
-- Eloston <eloston@mail.com> Fri, 08 Jan 2016 00:00:00 +0000
chromium-browser (47.0.2526.106-2) stretch; urgency=low
* Updated Debian build scripts to 47.0.2526.80-3

View File

@@ -145,7 +145,7 @@ override_dh_auto_install-arch:
echo "Any files placed in this directory will be sourced prior to executing chromium." \
> debian/chromium/etc/chromium.d/README
# update launcher script with build information
sed 's|@BUILD_DIST@|$(shell printf "%s %s/%s" $(lsb_release -si) $(lsb_release -sc) $(lsb_release -sr))|' \
sed 's|@BUILD_DIST@|$(shell printf "%s %s/%s" $(shell lsb_release -si) $(shell lsb_release -sc) $(shell lsb_release -sr))|' \
< debian/scripts/chromium > debian/chromium/usr/bin/chromium
# move icons into /usr/share
for file in $(shell find chrome/app/theme/chromium -name product_logo_[0-9]* -a ! -name *mono*); do \

View File

@@ -1,3 +1,9 @@
chromium-browser (47.0.2526.106-3) wily; urgency=low
* Do not output URLRequest URLs to stderr
-- Eloston <eloston@mail.com> Fri, 08 Jan 2016 00:00:00 +0000
chromium-browser (47.0.2526.106-2) wily; urgency=low
* Initial build for Ubuntu Wily

View File

@@ -74,4 +74,5 @@ ungoogled-chromium/disable-ipv6-pinging.patch
ungoogled-chromium/disable-profile-avatar-downloading.patch
ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
ungoogled-chromium/fix-building-without-safebrowsing.patch
ungoogled-chromium/disable-logging-urls-to-stderr.patch

View File

@@ -0,0 +1,63 @@
description: Disable log_url_request, which logs URLs to stderr
--- a/iridium/trknotify.cpp
+++ b/iridium/trknotify.cpp
@@ -4,10 +4,6 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include <cstdio>
-#ifdef __linux__
-# include <unistd.h>
-#endif
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -19,27 +15,6 @@
namespace iridium {
-void log_url_request(const std::string &caller, const GURL &url)
-{
-#ifdef __linux__
- bool tty = isatty(fileno(stderr));
-#else
- bool tty = false;
-#endif
- const char *xred = tty ? "\033[1;37;41m" : ""; // ]
- const char *xfruit = tty ? "\033[33m" : ""; // ]
- const char *xdark = tty ? "\033[1;30m" : ""; // ]
- const char *xreset = tty ? "\033[0m" : ""; // ]
-
- if (url.scheme() == url::kTraceScheme)
- fprintf(stderr, "%s*** %s(%s)%s\n", xred, caller.c_str(),
- url.possibly_invalid_spec().c_str(), xreset);
- else
- fprintf(stderr, "%s***%s %s(%s)%s\n", xfruit, xdark,
- caller.c_str(), url.possibly_invalid_spec().c_str(),
- xreset);
-}
-
static void __trace_url_request(const std::string &caller, const GURL &url)
{
auto browser = chrome::FindLastActiveWithHostDesktopType(chrome::GetActiveDesktop());
--- a/iridium/trknotify.h
+++ b/iridium/trknotify.h
@@ -12,7 +12,6 @@
namespace iridium {
-extern void log_url_request(const std::string &, const GURL &);
extern void trace_url_request(const std::string &, const GURL &);
}; /* namespace iridium */
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -32,7 +32,6 @@ int ChromeMain(int argc, const char** argv);
#if !defined(CHROME_MULTIPLE_DLL_CHILD)
static void trace_url_request(const std::string &caller, const GURL &url)
{
- iridium::log_url_request(caller, url);
if (url.scheme() != url::kTraceScheme)
/* Do not show infobar for non-trk URLs */
return;