[chromium-freeworld: 5/8] rhel 7 might need libc++ bundled
by Miro Hrončok
commit 6113fdf4e85fc48c6c8d812f4e955b31cb380da1
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 20 12:44:57 2018 -0400
rhel 7 might need libc++ bundled
chromium.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 53b4163..fcf87dd 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -731,8 +731,11 @@ export CXX="g++"
export AR="ar"
export RANLIB="ranlib"
-# NUKE FROM ORBIT
+%if 0%{?rhel} == 7
+# eh. rhel 7 might need this
+%else
rm -rf buildtools/third_party/libc++/BUILD.gn
+%endif
%if 0%{?nacl}
# prep the nacl tree
6 years, 8 months
[chromium-freeworld/f28] (20 commits) ...Merge Fedora, chromium-65.0.3325.181-1
by Miro Hrončok
Summary of changes:
c558cc1... 64.0.3282.186 (*)
e36a0c8... 65.0.3325.146 (*)
7c1ea9e... Merge Fedora, chromium-64.0.3282.186-1 (*)
c5342c3... this gets past prep... (*)
4e6c6ef... 65.0.3325.162 (*)
8ca12f1... clean sources (*)
fe5b552... version conditionalize gnome-keyring-devel (*)
3534f5e... use bundled libjpeg on epel7 (*)
8cfa28d... fix bool issue triggered by newer gcc (*)
61203bf... use normal bool cast (*)
9e38b7c... fix skia build issue on aarch64 (*)
bdba7c7... disable StartupNotify in chromium-browser.desktop (not in g (*)
6d9e418... use bundled freetype on epel7 (*)
f7e3b54... use bundled libdrm on epel7 (*)
e9b3537... Merge Fedora, chromium-65.0.3325.162-1 (*)
f525a51... try use_custom_libcxx=true on epel7 (*)
6113fdf... rhel 7 might need libc++ bundled (*)
0d818fb... force lstdc++ on epel7 (*)
c747d58... 65.0.3325.181 (*)
963e034... Merge Fedora, chromium-65.0.3325.181-1 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[chromium-freeworld: 4/8] try use_custom_libcxx=true on epel7
by Miro Hrončok
commit f525a513b3edf0be7034a92fa1ae96dcd50705d5
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Tue Mar 20 10:54:37 2018 -0400
try use_custom_libcxx=true on epel7
chromium.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 9dd3058..53b4163 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -842,7 +842,12 @@ CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="ChromeOS" proprietary_codecs=true'
%else
CHROMIUM_CORE_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false'
%endif
-CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_binutils=false use_custom_libcxx=false'
+CHROMIUM_CORE_GN_DEFINES+=' treat_warnings_as_errors=false linux_use_bundled_binutils=false'
+%if 0%{?rhel} == 7
+CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=true'
+%else
+CHROMIUM_CORE_GN_DEFINES+=' use_custom_libcxx=false'
+%endif
%ifarch aarch64
CHROMIUM_CORE_GN_DEFINES+=' target_cpu="arm64"'
%endif
6 years, 8 months
[chromium-freeworld: 3/8] use bundled libdrm on epel7
by Miro Hrončok
commit f7e3b54d1f3e091f04765ffc37f4d53179f87d69
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Mar 19 14:18:55 2018 -0400
use bundled libdrm on epel7
chromium.spec | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/chromium.spec b/chromium.spec
index 047063c..9dd3058 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -86,6 +86,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibpng 1
%global bundlelibjpeg 1
%global bundlefreetype 1
+%global bundlelibdrm 1
%else
%global bundleharfbuzz 0
%global bundleopus 1
@@ -94,6 +95,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibpng 0
%global bundlelibjpeg 0
%global bundlefreetype 0
+%global bundlelibdrm 0
%endif
# Needs at least harfbuzz 1.7.3 now.
@@ -121,7 +123,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3325.162
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -292,7 +294,11 @@ BuildRequires: glibc-devel
BuildRequires: gperf
BuildRequires: libatomic
BuildRequires: libcap-devel
+%if 0%{?bundlelibdrm}
+#nothing
+%else
BuildRequires: libdrm-devel
+%endif
BuildRequires: libgcrypt-devel
BuildRequires: libudev-devel
BuildRequires: libusb-devel
@@ -499,7 +505,9 @@ Provides: bundled(icu) = 58.1
Provides: bundled(kitchensink) = 1
Provides: bundled(leveldb) = 1.20
Provides: bundled(libaddressinput) = 0
-Provides: bundled(libdrm) = 2.4.70
+%if 0%{?bundlelibdrm}
+Provides: bundled(libdrm) = 2.4.85
+%endif
Provides: bundled(libevent) = 1.4.15
Provides: bundled(libjingle) = 9564
%if 0%{?bundlelibjpeg}
@@ -1064,7 +1072,10 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
%else
icu \
%endif
+%if %{bundlelibdrm}
+%else
libdrm \
+%endif
%if %{bundlelibjpeg}
%else
libjpeg \
@@ -1581,6 +1592,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Mar 19 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-3
+- use bundled libdrm on epel7
+
* Fri Mar 16 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-2
- disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file)
(bz1545241)
6 years, 8 months
[chromium-freeworld: 2/8] use bundled freetype on epel7
by Miro Hrončok
commit 6d9e4187928d6252b77fb1ed8d64b4c64d6b81f8
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Mar 19 10:30:17 2018 -0400
use bundled freetype on epel7
chromium.spec | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/chromium.spec b/chromium.spec
index 4f5e076..047063c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -85,6 +85,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibwebp 1
%global bundlelibpng 1
%global bundlelibjpeg 1
+%global bundlefreetype 1
%else
%global bundleharfbuzz 0
%global bundleopus 1
@@ -92,6 +93,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibwebp 0
%global bundlelibpng 0
%global bundlelibjpeg 0
+%global bundlefreetype 0
%endif
# Needs at least harfbuzz 1.7.3 now.
@@ -119,7 +121,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3325.162
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -332,7 +334,11 @@ BuildRequires: bzip2-devel
BuildRequires: dbus-glib-devel
BuildRequires: elfutils-libelf-devel
BuildRequires: flac-devel
+%if 0%{?bundlefreetype}
+# nothing
+%else
BuildRequires: freetype-devel
+%endif
BuildRequires: hwdata
BuildRequires: kernel-headers
BuildRequires: libevent-devel
@@ -478,6 +484,9 @@ Provides: bundled(fdmlibm) = 5.3
Provides: bundled(ffmpeg) = 3.2git
Provides: bundled(fips181) = 2.2.3
Provides: bundled(fontconfig) = 2.11.0
+%if 0%{?bundlefreetype}
+Provides: bundled(freetype) = 2.9.3
+%endif
Provides: bundled(gperftools) = svn144
%if 0%{?bundleharfbuzz}
Provides: bundled(harfbuzz) = 1.4.2
@@ -1043,7 +1052,10 @@ export PATH=$PATH:%{_builddir}/depot_tools
build/linux/unbundle/replace_gn_files.py --system-libraries \
flac \
+%if 0%{?bundlefreetype}
+%else
freetype \
+%endif
%if 0%{?bundleharfbuzz}
%else
harfbuzz-ng \
@@ -1572,6 +1584,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
* Fri Mar 16 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-2
- disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file)
(bz1545241)
+- use bundled freetype on epel7
* Wed Mar 14 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-1
- update to 65.0.3325.162
6 years, 8 months
[chromium-freeworld: 1/8] disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file) (bz1545241)
by Miro Hrončok
commit bdba7c7bdaa147447e8c6c2230cb670686ca7c0c
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Fri Mar 16 14:32:58 2018 -0400
disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file) (bz1545241)
chromium-browser.desktop | 1 -
chromium.spec | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/chromium-browser.desktop b/chromium-browser.desktop
index fda8567..962decb 100644
--- a/chromium-browser.desktop
+++ b/chromium-browser.desktop
@@ -136,7 +136,6 @@ Icon=chromium-browser
Categories=Network;WebBrowser;
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
StartupWMClass=Chromium-browser
-StartupNotify=true
Keywords=web;browser;internet;
Actions=new-window;new-private-window;
diff --git a/chromium.spec b/chromium.spec
index 307e0d4..4f5e076 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -1569,6 +1569,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Fri Mar 16 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-2
+- disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file)
+ (bz1545241)
+
* Wed Mar 14 2018 Tom Callaway <spot(a)fedoraproject.org> 65.0.3325.162-1
- update to 65.0.3325.162
6 years, 8 months
[chromium-freeworld] (8 commits) ...Merge Fedora, chromium-65.0.3325.181-1
by Miro Hrončok
Summary of changes:
bdba7c7... disable StartupNotify in chromium-browser.desktop (not in g
6d9e418... use bundled freetype on epel7
f7e3b54... use bundled libdrm on epel7
f525a51... try use_custom_libcxx=true on epel7
6113fdf... rhel 7 might need libc++ bundled
0d818fb... force lstdc++ on epel7
c747d58... 65.0.3325.181
963e034... Merge Fedora, chromium-65.0.3325.181-1
6 years, 8 months
