[chromium-libs-media-freeworld: 26/259] Improve the chromium-latest.py script
by Nicolas Chauvet
commit b36884aebdb5c98e6ad3c515020919bbccbcda53
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Thu Oct 19 14:08:03 2017 +0200
Improve the chromium-latest.py script
- Download the policy templates per release channel
- Only run the nacl_versions when not running on python 2.6 as the
toolchain_build modules are not python 2.6 compatible
chromium-latest.py | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 242e8d8..2efe44b 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -165,6 +165,10 @@ def download_version(version):
download_file_and_compare_hashes ('chromium-%s-testdata.tar.xz' % version)
def nacl_versions(version):
+
+ if sys.version_info[0] == 2 and sys.version_info[1] == 6:
+ return
+
myvars = {}
chrome_dir = './chromium-%s' % version
with open(chrome_dir + "/native_client/tools/REVISIONS") as myfile:
@@ -205,10 +209,16 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
-def remove_and_download_latest_policy_templates():
+def remove_and_download_latest_policy_templates(version_string):
policy_file = 'policy_templates.zip'
- path = 'https://dl.google.com/dl/edgedl/chrome/policy/%s' % policy_file
+ if version_string != 'stable':
+ if version_string == 'unstable':
+ policy_file = "dev_" + policy_file
+ else:
+ policy_file = version_string + "_" + policy_file
+
+ path = 'https://dl.google.com/chrome/policy/%s' % policy_file
remove_file_if_exists(policy_file)
# Let's make sure we haven't already downloaded it.
@@ -312,7 +322,7 @@ if __name__ == '__main__':
download_version(chromium_version)
# Always download the newest policy templates
- remove_and_download_latest_policy_templates()
+ remove_and_download_latest_policy_templates(version_string)
# Lets make sure we haven't unpacked it already
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
5 years
[chromium-libs-media-freeworld: 25/259] Update the chromium-lastest.py to always download the policy templates
by Nicolas Chauvet
commit 18ab5a523a50798d420829681bb6157d530c3bc4
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Wed Oct 18 13:28:53 2017 +0200
Update the chromium-lastest.py to always download the policy templates
They are changing across the releases - always download the latest one.
chromium-latest.py | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 88703db..242e8d8 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -42,7 +42,7 @@ chromium_root_dir = "."
version_string = "stable"
name = 'Chromium Latest'
-script_version = 0.8
+script_version = 0.9
my_description = '{0} {1}'.format(name, script_version)
@@ -205,6 +205,26 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
+def remove_and_download_latest_policy_templates():
+
+ policy_file = 'policy_templates.zip'
+ path = 'https://dl.google.com/dl/edgedl/chrome/policy/%s' % policy_file
+ remove_file_if_exists(policy_file)
+
+ # Let's make sure we haven't already downloaded it.
+ if os.path.isfile("./%s" % policy_file):
+ print "%s already exists!" % policy_file
+ else:
+ print "Downloading %s" % path
+ # Perhaps look at using python-progressbar at some point?
+ info=urllib.urlretrieve(path, policy_file, reporthook=dlProgress)[1]
+ urllib.urlcleanup()
+ print ""
+ if (info["Content-Type"] != "application/octet-stream"):
+ print 'Policy templates are not on servers.' % version_string
+ remove_file_if_exists (policy_file)
+ sys.exit(1)
+
# This is where the magic happens
if __name__ == '__main__':
@@ -291,6 +311,9 @@ if __name__ == '__main__':
download_version(chromium_version)
+ # Always download the newest policy templates
+ remove_and_download_latest_policy_templates()
+
# Lets make sure we haven't unpacked it already
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
if (args.clean and os.path.isdir(latest_dir)):
5 years
[chromium-libs-media-freeworld: 24/259] Update the chromium-lastest.py to always download the policy templates
by Nicolas Chauvet
commit 9d223e0ab1fea6a6573805f7bde1ea0c6e538cb6
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Wed Oct 18 13:28:53 2017 +0200
Update the chromium-lastest.py to always download the policy templates
They are changing across the releases - always download the latest one.
chromium-latest.py | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 88703db..242e8d8 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -42,7 +42,7 @@ chromium_root_dir = "."
version_string = "stable"
name = 'Chromium Latest'
-script_version = 0.8
+script_version = 0.9
my_description = '{0} {1}'.format(name, script_version)
@@ -205,6 +205,26 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
+def remove_and_download_latest_policy_templates():
+
+ policy_file = 'policy_templates.zip'
+ path = 'https://dl.google.com/dl/edgedl/chrome/policy/%s' % policy_file
+ remove_file_if_exists(policy_file)
+
+ # Let's make sure we haven't already downloaded it.
+ if os.path.isfile("./%s" % policy_file):
+ print "%s already exists!" % policy_file
+ else:
+ print "Downloading %s" % path
+ # Perhaps look at using python-progressbar at some point?
+ info=urllib.urlretrieve(path, policy_file, reporthook=dlProgress)[1]
+ urllib.urlcleanup()
+ print ""
+ if (info["Content-Type"] != "application/octet-stream"):
+ print 'Policy templates are not on servers.' % version_string
+ remove_file_if_exists (policy_file)
+ sys.exit(1)
+
# This is where the magic happens
if __name__ == '__main__':
@@ -291,6 +311,9 @@ if __name__ == '__main__':
download_version(chromium_version)
+ # Always download the newest policy templates
+ remove_and_download_latest_policy_templates()
+
# Lets make sure we haven't unpacked it already
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
if (args.clean and os.path.isdir(latest_dir)):
5 years
[chromium-libs-media-freeworld: 23/259] Update the chromium-lastest.py to always download the policy templates
by Nicolas Chauvet
commit faa28427517424d3700cdd82fa9b86abb273e483
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Wed Oct 18 13:28:53 2017 +0200
Update the chromium-lastest.py to always download the policy templates
They are changing across the releases - always download the latest one.
chromium-latest.py | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/chromium-latest.py b/chromium-latest.py
index 88703db..242e8d8 100755
--- a/chromium-latest.py
+++ b/chromium-latest.py
@@ -42,7 +42,7 @@ chromium_root_dir = "."
version_string = "stable"
name = 'Chromium Latest'
-script_version = 0.8
+script_version = 0.9
my_description = '{0} {1}'.format(name, script_version)
@@ -205,6 +205,26 @@ def download_chrome_latest_rpm(arch):
remove_file_if_exists (chrome_rpm)
sys.exit(1)
+def remove_and_download_latest_policy_templates():
+
+ policy_file = 'policy_templates.zip'
+ path = 'https://dl.google.com/dl/edgedl/chrome/policy/%s' % policy_file
+ remove_file_if_exists(policy_file)
+
+ # Let's make sure we haven't already downloaded it.
+ if os.path.isfile("./%s" % policy_file):
+ print "%s already exists!" % policy_file
+ else:
+ print "Downloading %s" % path
+ # Perhaps look at using python-progressbar at some point?
+ info=urllib.urlretrieve(path, policy_file, reporthook=dlProgress)[1]
+ urllib.urlcleanup()
+ print ""
+ if (info["Content-Type"] != "application/octet-stream"):
+ print 'Policy templates are not on servers.' % version_string
+ remove_file_if_exists (policy_file)
+ sys.exit(1)
+
# This is where the magic happens
if __name__ == '__main__':
@@ -291,6 +311,9 @@ if __name__ == '__main__':
download_version(chromium_version)
+ # Always download the newest policy templates
+ remove_and_download_latest_policy_templates()
+
# Lets make sure we haven't unpacked it already
latest_dir = "%s/chromium-%s" % (chromium_root_dir, chromium_version)
if (args.clean and os.path.isdir(latest_dir)):
5 years
[chromium-libs-media-freeworld: 22/259] uploaded sources this time
by Nicolas Chauvet
commit fac5adaa62ed571066fcf5283734d5ae0235c861
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Sep 22 18:48:11 2017 -0400
uploaded sources this time
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index b3e1d00..33c625a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
/chromium-60.0.3112.113-clean.tar.xz
/chromium-60.0.3112.113.tar.xz
/chromium-61.0.3163.79-clean.tar.xz
+/chromium-61.0.3163.100-clean.tar.xz
diff --git a/sources b/sources
index fadaf7c..ae3c95c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-61.0.3163.79-clean.tar.xz) = 9d3bfb24a71af6332e30cb5a5d40581eab166bf550c48019b6ac6ed37ead52eac4a09af41e056207f5ded91f4c420560ebd886ae3ae23e05602c755e334dbe02
SHA512 (policy_templates.zip) = 39e9ccbeda8499acb81e5455e34ece44e72f065d139e718b38803c907b4ecca9f179f2eb84b10953a307087ed9586a5de30bbfb933eb9f6b77a682ea82164be7
+SHA512 (chromium-61.0.3163.100-clean.tar.xz) = 985a2d86f43e59252343fa3a5ee56b0462259ef67afd4c43fd9ee3abd9eec34292b7437d416513cccc29a9de9a10879d91ccb5328e7702a1888b5880eb27c809
5 years
[chromium-libs-media-freeworld: 21/259] 61.0.3163.100 and lots of epel7 fixes
by Nicolas Chauvet
commit 79d8235f4c89bb21221dba613de4eb62efdfe8d8
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Sep 22 18:36:45 2017 -0400
61.0.3163.100 and lots of epel7 fixes
chromium-61.0.3163.79-rvalue-fix.patch | 36 ++++++++++++++++++++++++++++++++++
chromium.spec | 24 +++++++++++++++++++++--
2 files changed, 58 insertions(+), 2 deletions(-)
---
diff --git a/chromium-61.0.3163.79-rvalue-fix.patch b/chromium-61.0.3163.79-rvalue-fix.patch
new file mode 100644
index 0000000..41138f6
--- /dev/null
+++ b/chromium-61.0.3163.79-rvalue-fix.patch
@@ -0,0 +1,36 @@
+diff -up chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc
+--- chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix 2017-09-22 17:50:14.247727636 -0400
++++ chromium-61.0.3163.100/chrome/browser/ui/webui/settings/on_startup_handler.cc 2017-09-22 17:50:25.626492965 -0400
+@@ -77,7 +77,7 @@ std::unique_ptr<base::Value> OnStartupHa
+ !extensions::ExtensionSystem::Get(profile_)
+ ->management_policy()
+ ->MustRemainEnabled(ntp_extension, nullptr));
+- return dict;
++ return std::move(dict);
+ }
+
+ void OnStartupHandler::HandleGetNtpExtension(const base::ListValue* args) {
+diff -up chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc.another-rvalue-fix chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc
+--- chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc.another-rvalue-fix 2017-09-21 18:05:24.000000000 -0400
++++ chromium-61.0.3163.100/ui/message_center/views/notification_header_view.cc 2017-09-22 10:14:15.680987910 -0400
+@@ -321,7 +321,7 @@ std::unique_ptr<views::InkDrop> Notifica
+ ink_drop->SetAutoHighlightMode(
+ views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
+ ink_drop->SetShowHighlightOnHover(false);
+- return ink_drop;
++ return std::move(ink_drop);
+ }
+
+ std::unique_ptr<views::InkDropRipple>
+diff -up chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc.another-rvalue-fix chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc
+--- chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc.another-rvalue-fix 2017-09-22 14:46:36.109955800 -0400
++++ chromium-61.0.3163.100/ui/views/controls/button/checkbox.cc 2017-09-22 14:46:48.736698401 -0400
+@@ -195,7 +195,7 @@ std::unique_ptr<InkDrop> Checkbox::Creat
+ std::unique_ptr<InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
+ ink_drop->SetShowHighlightOnHover(false);
+ ink_drop->SetAutoHighlightMode(InkDropImpl::AutoHighlightMode::NONE);
+- return ink_drop;
++ return std::move(ink_drop);
+ }
+
+ std::unique_ptr<InkDropRipple> Checkbox::CreateInkDropRipple() const {
diff --git a/chromium.spec b/chromium.spec
index 3ab9372..e970c15 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -84,11 +84,13 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibusbx 1
%global bundleharfbuzz 1
%global bundlelibwebp 1
+%global bundlelibpng 1
%else
%global bundleharfbuzz 0
%global bundleopus 1
%global bundlelibusbx 0
%global bundlelibwebp 0
+%global bundlelibpng 0
%endif
# Needs at least harfbuzz 1.4.2 now.
@@ -115,7 +117,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3163.79
+Version: %{majorversion}.0.3163.100
Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
@@ -221,6 +223,8 @@ Patch58: chromium-61.0.3163.79-dde535-gcc-fix.patch
Patch59: chromium-61.0.3163.79-gcc-nc.patch
# Epel compiler really does not like assigning nullptr to a StructPtr
Patch60: chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
+# Another gcc 4.8 goods..
+Patch61: chromium-61.0.3163.79-rvalue-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -341,7 +345,12 @@ BuildRequires: libffi-devel
BuildRequires: libicu-devel = 54.1
%endif
BuildRequires: libjpeg-devel
+%if 0%{?bundlelibpng}
+# If this is true, we're using the bundled libpng
+# which we need to do because the RHEL 7 libpng doesn't work right anymore
+%else
BuildRequires: libpng-devel
+%endif
%if 0
# see https://code.google.com/p/chromium/issues/detail?id=501318
BuildRequires: libsrtp-devel >= 1.4.4
@@ -473,7 +482,9 @@ Provides: bundled(libevent) = 1.4.15
Provides: bundled(libjingle) = 9564
# Provides: bundled(libjpeg-turbo) = 1.4.90
Provides: bundled(libphonenumber) = a4da30df63a097d67e3c429ead6790ad91d36cf4
-# Provides: bundled(libpng) = 1.6.22
+%if 0%{?bundlelibpng}
+Provides: bundled(libpng) = 1.6.22
+%endif
Provides: bundled(libsrtp) = 2cbd85085037dc7bf2eda48d4cf62e2829056e2d
%if %{bundlelibusbx}
Provides: bundled(libusbx) = 1.0.17
@@ -664,6 +675,7 @@ udev.
%patch58 -p1 -b .dde5e35
%patch59 -p1 -b .gcc-nc
%patch60 -p1 -b .nonullptr
+%patch61 -p1 -b .another-rvalue-fix
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix
@@ -1025,7 +1037,10 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
%endif
libdrm \
libjpeg \
+%if %{bundlelibpng}
+%else
libpng \
+%endif
%if %{bundlelibusbx}
%else
libusb \
@@ -1898,6 +1913,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Fri Sep 22 2017 Tom Callaway <spot(a)fedoraproject.org> 61.0.3163.100-1
+- update to 61.0.3163.100
+- lots of epel7 specific fixes
+- use bundled libpng on epel7
+
* Wed Sep 6 2017 Tom Callaway <spot(a)fedoraproject.org> 61.0.3163.79-1
- update to 61.0.3163.79
5 years
[chromium-libs-media-freeworld: 20/259] i think this will build
by Nicolas Chauvet
commit 1144ae5d3cd031b0e14095ce787f1574109b33b2
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Sep 19 10:07:30 2017 -0400
i think this will build
....0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch | 12 ++++++++++++
chromium.spec | 6 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch b/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
new file mode 100644
index 0000000..0ba375b
--- /dev/null
+++ b/chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
@@ -0,0 +1,12 @@
+diff -up chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp
+--- chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr 2017-09-18 11:28:33.541339036 -0400
++++ chromium-61.0.3163.79/third_party/WebKit/Source/platform/blob/BlobData.cpp 2017-09-18 11:27:35.757799400 -0400
+@@ -287,7 +287,7 @@ BlobDataHandle::BlobDataHandle(std::uniq
+
+ size_t current_memory_population = 0;
+ Vector<DataElementPtr> elements;
+- const DataElementPtr null_element = nullptr;
++ const DataElementPtr null_element;
+ BlobBytesProvider* last_bytes_provider = nullptr;
+
+ // TODO(mek): When the mojo code path is the default BlobData should
diff --git a/chromium.spec b/chromium.spec
index 1f24993..3ab9372 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -219,8 +219,8 @@ Patch57: chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch
# More gcc fixes for epel
Patch58: chromium-61.0.3163.79-dde535-gcc-fix.patch
Patch59: chromium-61.0.3163.79-gcc-nc.patch
-# This is really ugly.
-Patch60: chromium-61.0.3163.79-uglyhack.patch
+# Epel compiler really does not like assigning nullptr to a StructPtr
+Patch60: chromium-61.0.3163.79-epel7-no-nullptr-assignment-on-StructPtr.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -663,7 +663,7 @@ udev.
%patch47 -p1 -b .c99
%patch58 -p1 -b .dde5e35
%patch59 -p1 -b .gcc-nc
-%patch60 -p1 -b .uglyhack
+%patch60 -p1 -b .nonullptr
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix
5 years
[chromium-libs-media-freeworld: 19/259] ugly hack to make epel7 build. maybe
by Nicolas Chauvet
commit a0a687b685d749b71830e3cd1151ab9783777796
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 14 14:19:52 2017 -0400
ugly hack to make epel7 build. maybe
chromium-61.0.3163.79-uglyhack.patch | 12 ++++++++++++
chromium.spec | 3 +++
2 files changed, 15 insertions(+)
---
diff --git a/chromium-61.0.3163.79-uglyhack.patch b/chromium-61.0.3163.79-uglyhack.patch
new file mode 100644
index 0000000..b76fcd7
--- /dev/null
+++ b/chromium-61.0.3163.79-uglyhack.patch
@@ -0,0 +1,12 @@
+diff -up chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h.uglyhack chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h
+--- chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h.uglyhack 2017-09-14 14:01:32.168409717 -0400
++++ chromium-61.0.3163.79/mojo/public/cpp/bindings/struct_ptr.h 2017-09-14 14:01:40.478219060 -0400
+@@ -107,7 +107,7 @@ class StructPtr {
+
+ std::unique_ptr<Struct> ptr_;
+
+- DISALLOW_COPY_AND_ASSIGN(StructPtr);
++ // DISALLOW_COPY_AND_ASSIGN(StructPtr);
+ };
+
+ template <typename T>
diff --git a/chromium.spec b/chromium.spec
index fa699ff..1f24993 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -219,6 +219,8 @@ Patch57: chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch
# More gcc fixes for epel
Patch58: chromium-61.0.3163.79-dde535-gcc-fix.patch
Patch59: chromium-61.0.3163.79-gcc-nc.patch
+# This is really ugly.
+Patch60: chromium-61.0.3163.79-uglyhack.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -661,6 +663,7 @@ udev.
%patch47 -p1 -b .c99
%patch58 -p1 -b .dde5e35
%patch59 -p1 -b .gcc-nc
+%patch60 -p1 -b .uglyhack
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix
5 years
[chromium-libs-media-freeworld: 18/259] will it never stop?
by Nicolas Chauvet
commit 5ff888b012dceeb722f051db5de026f9e295b188
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 14 11:17:31 2017 -0400
will it never stop?
chromium-61.0.3163.79-gcc-nc.patch | 12 ++++++++++++
chromium.spec | 2 ++
2 files changed, 14 insertions(+)
---
diff --git a/chromium-61.0.3163.79-gcc-nc.patch b/chromium-61.0.3163.79-gcc-nc.patch
new file mode 100644
index 0000000..652e4bd
--- /dev/null
+++ b/chromium-61.0.3163.79-gcc-nc.patch
@@ -0,0 +1,12 @@
+diff -up chromium-61.0.3163.79/content/network/network_service_impl.cc.gcc-nc chromium-61.0.3163.79/content/network/network_service_impl.cc
+--- chromium-61.0.3163.79/content/network/network_service_impl.cc.gcc-nc 2017-09-14 11:15:35.138981701 -0400
++++ chromium-61.0.3163.79/content/network/network_service_impl.cc 2017-09-14 11:16:15.874070310 -0400
+@@ -90,7 +90,7 @@ NetworkServiceImpl::CreateNetworkContext
+ base::MakeUnique<NetworkContext>(std::move(request), std::move(params),
+ std::move(builder));
+ *url_request_context = network_context->url_request_context();
+- return network_context;
++ return std::unique_ptr<content::NetworkContext>(network_context.release());
+ }
+
+ std::unique_ptr<NetworkService> NetworkServiceImpl::CreateForTesting() {
diff --git a/chromium.spec b/chromium.spec
index a264003..fa699ff 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -218,6 +218,7 @@ Patch56: chromium-61.0.3163.79-fix-atk-compile.patch
Patch57: chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch
# More gcc fixes for epel
Patch58: chromium-61.0.3163.79-dde535-gcc-fix.patch
+Patch59: chromium-61.0.3163.79-gcc-nc.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -659,6 +660,7 @@ udev.
%patch46 -p1 -b .kmaxskip
%patch47 -p1 -b .c99
%patch58 -p1 -b .dde5e35
+%patch59 -p1 -b .gcc-nc
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix
5 years
[chromium-libs-media-freeworld: 17/259] more epel gcc fixes
by Nicolas Chauvet
commit c00dedb7b53a73dd779a1653c81d5dc887265f45
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Sep 14 10:24:23 2017 -0400
more epel gcc fixes
chromium-61.0.3163.79-dde535-gcc-fix.patch | 14 ++++++++++++++
chromium.spec | 3 +++
2 files changed, 17 insertions(+)
---
diff --git a/chromium-61.0.3163.79-dde535-gcc-fix.patch b/chromium-61.0.3163.79-dde535-gcc-fix.patch
new file mode 100644
index 0000000..f9c3572
--- /dev/null
+++ b/chromium-61.0.3163.79-dde535-gcc-fix.patch
@@ -0,0 +1,14 @@
+diff -up chromium-61.0.3163.79/content/renderer/service_worker/web_service_worker_installed_scripts_manager_impl.cc.dde5e35 chromium-61.0.3163.79/content/renderer/service_worker/web_service_worker_installed_scripts_manager_impl.cc
+diff -up chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc.dde5e35 chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc
+--- chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc.dde5e35 2017-09-14 10:20:59.750146036 -0400
++++ chromium-61.0.3163.79/services/resource_coordinator/resource_coordinator_service.cc 2017-09-14 10:21:35.498261516 -0400
+@@ -17,7 +17,8 @@ std::unique_ptr<service_manager::Service
+ auto resource_coordinator_service =
+ base::MakeUnique<ResourceCoordinatorService>();
+
+- return resource_coordinator_service;
++ return std::unique_ptr<service_manager::Service>(
++ resource_coordinator_service.release());
+ }
+
+ ResourceCoordinatorService::ResourceCoordinatorService()
diff --git a/chromium.spec b/chromium.spec
index 2c10707..a264003 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -216,6 +216,8 @@ Patch55: chromium-61.0.3163.79-gtk2fix.patch
Patch56: chromium-61.0.3163.79-fix-atk-compile.patch
# Only needed when glibc 2.26.90 or later is used
Patch57: chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch
+# More gcc fixes for epel
+Patch58: chromium-61.0.3163.79-dde535-gcc-fix.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -656,6 +658,7 @@ udev.
%if 0%{?rhel} == 7
%patch46 -p1 -b .kmaxskip
%patch47 -p1 -b .c99
+%patch58 -p1 -b .dde5e35
%endif
%patch48 -p1 -b .camfix
%patch50 -p1 -b .pathfix
5 years