[chromium-freeworld/el7] conditionalize minizip-compat change
by Akarshan Biswas
commit 391e86a1ec928ae6f77832086fc07665ca0c82f8
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Sep 5 13:40:21 2018 -0400
conditionalize minizip-compat change
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
chromium-freeworld.spec | 8 ++++++++
1 file changed, 8 insertions(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index ba12ebd..a71e052 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -346,7 +346,11 @@ BuildRequires: libusb-devel
BuildRequires: libXdamage-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXtst-devel
+%if 0%{?fedora} >= 30
BuildRequires: minizip-compat-devel
+%else
+BuildRequires: minizip-devel
+%endif
BuildRequires: nodejs
BuildRequires: nss-devel >= 3.26
BuildRequires: pciutils-devel
@@ -651,7 +655,11 @@ Chromium is an open-source web browser, powered by WebKit (Blink).
Summary: Files needed for both the headless_shell and full Chromium
# Chromium needs an explicit Requires: minizip-compat
# We put it here to cover headless too.
+%if 0%{?fedora} >= 30
Requires: minizip-compat%{_isa}
+%else
+Requires: minizip%{_isa}
+%endif
%description common
%{summary}.
5 years, 10 months
[chromium-freeworld/el7] Update dependency to minizip-compat(-devel)
by Akarshan Biswas
commit 1229ecf2f8227acfaedfc058fe7e1689a2691d8f
Author: Patrik Novotný <panovotn(a)redhat.com>
Date: Tue Aug 28 11:22:04 2018 +0200
Update dependency to minizip-compat(-devel)
Related: rhbz#1609830, rhbz#1615381
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
chromium-freeworld.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 4f0c630..ba12ebd 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -140,7 +140,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3440.106
-Release: 3%{?dist}
+Release: 4%{?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)
@@ -346,7 +346,7 @@ BuildRequires: libusb-devel
BuildRequires: libXdamage-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXtst-devel
-BuildRequires: minizip-devel
+BuildRequires: minizip-compat-devel
BuildRequires: nodejs
BuildRequires: nss-devel >= 3.26
BuildRequires: pciutils-devel
@@ -649,9 +649,9 @@ Chromium is an open-source web browser, powered by WebKit (Blink).
%package common
Summary: Files needed for both the headless_shell and full Chromium
-# Chromium needs an explicit Requires: minizip
+# Chromium needs an explicit Requires: minizip-compat
# We put it here to cover headless too.
-Requires: minizip%{_isa}
+Requires: minizip-compat%{_isa}
%description common
%{summary}.
@@ -1753,6 +1753,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Tue Aug 28 2018 Patrik Novotný <panovotn(a)redhat.com> - 68.0.3440.106-4
+- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
+
* Sun Aug 19 2018 Tom Callaway <spot(a)fedoraproject.org> - 68.0.3440.106-3
- fix library filters
5 years, 10 months
[chromium-freeworld/el7] Upload New freeworld sources:70.0.3538.110
by Akarshan Biswas
commit c4d4c19931ea13bbe22ca7dfb8988887c569ce10
Author: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
Date: Thu Nov 29 01:55:17 2018 +0530
Upload New freeworld sources:70.0.3538.110
.gitignore | 1 +
sources | 18 ++----------------
2 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f8acf8..2b0e5b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
/chromium-67.0.3396.99.tar.xz
/Ahem.ttf
/chromium-68.0.3440.106.tar.xz
+/chromium-70.0.3538.110.tar.xz
diff --git a/sources b/sources
index d1fe7b1..4a8291a 100644
--- a/sources
+++ b/sources
@@ -1,19 +1,5 @@
-49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz
+f45eadcee2101b1e3f57c98765616d14 chromium-70.0.3538.110.tar.xz
+0cb65c7d84e7125e1925bccc96e1e0a2 depot_tools.git-master.tar.gz
4d610887ff4d445cbc639aae7828d139 gelasio.zip
314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
-9af8a0b80e85db34b1c34928d81cc423 NotoSansCJKjp-hinted.zip
-85d8bf52bda23c1cd422be54dee113a6 lohit-gurmukhi-ttf-2.91.2.tar.gz
-08fb930e5cf38bab811efa91f368b248 Arimo-BoldItalic.ttf
-927b7dca5b947f69cb8e835f7f743d15 Arimo-Bold.ttf
-fa87472a877e70c5bce22e42be5c25a9 Arimo-Italic.ttf
-7ac02a544211773d9636e056e9da6c35 Arimo-Regular.ttf
-97415fecbce8ffd540f9f9af681cd398 Cousine-BoldItalic.ttf
-86fed5639322e2f033ad817ee406c2fe Cousine-Bold.ttf
-cef49e5506d6f09ea3064f7bd3191417 Cousine-Italic.ttf
-00d46771d6344fd0c8e3d05bfd092887 Cousine-Regular.ttf
-042b1967a334625c34b3ab6255242127 Tinos-BoldItalic.ttf
-b68a7149509c5f1f69153d2dc3d8dd17 Tinos-Bold.ttf
-0da96c8a7d54f8b8f6f7713c8524f2fc Tinos-Italic.ttf
-b25c0f936b23cccc0b92e85017e02bee Tinos-Regular.ttf
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
-45f1c943546c008051ec39df51aa20c0 chromium-68.0.3440.106.tar.xz
5 years, 10 months
[chromium-freeworld/f28] remove sysroot options
by Akarshan Biswas
commit b19f48b95184bb2cafafa8ccce12df4687f47dd2
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Nov 26 13:43:04 2018 -0500
remove sysroot options
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
...mium-70.0.3538.110-remove-sysroot-options.patch | 23 ++++++++++++++++++++++
chromium-freeworld.spec | 3 +++
2 files changed, 26 insertions(+)
---
diff --git a/chromium-70.0.3538.110-remove-sysroot-options.patch b/chromium-70.0.3538.110-remove-sysroot-options.patch
new file mode 100644
index 0000000..9eb99d1
--- /dev/null
+++ b/chromium-70.0.3538.110-remove-sysroot-options.patch
@@ -0,0 +1,23 @@
+diff -up chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py
+--- chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix 2018-11-26 13:40:19.324713204 -0500
++++ chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py 2018-11-26 13:40:43.199180888 -0500
+@@ -46,10 +46,6 @@ def main(argv):
+ '--build-path',
+ help='The directory in which to build gn, '
+ 'relative to the src directory. (eg. out/Release)')
+- parser.add_option(
+- '--with-sysroot',
+- action='store_true',
+- help='Download and build with the Debian sysroot.')
+ parser.add_option('-v', '--verbose', help='ignored')
+ options, args = parser.parse_args(argv)
+ if args:
+@@ -71,8 +67,6 @@ def main(argv):
+ '--no-last-commit-position',
+ '--out-path=' + gn_build_dir,
+ ]
+- if not options.with_sysroot:
+- cmd.append('--no-sysroot')
+ if options.debug:
+ cmd.append('--debug')
+ subprocess.check_call(cmd)
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 56020fc..d696294 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -291,6 +291,8 @@ Patch117: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
Patch118: chromium-70.0.3538.77-harfbuzz2-fix.patch
# Fix aarch64 build against latest linux kernel headers
Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
+# https://chromium.googlesource.com/chromium/src/tools/gn/+/6630c2e334d7bc1...
+Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -837,6 +839,7 @@ udev.
%patch118 -p1 -b .harfbuzz2
%endif
%patch119 -p1 -b .aarch64-new-stat
+%patch120 -p1 -b .sysrootfix
# Change shebang in all relevant files in this directory and all subdirectories
5 years, 10 months
[chromium-freeworld/f28] .110
by Akarshan Biswas
commit 37587872823ceb42cb161410f25d4830cfde9ad6
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Nov 26 13:11:42 2018 -0500
.110
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
chromium-freeworld.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 2c31eb3..56020fc 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -149,8 +149,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3538.77
-Release: 4%{?dist}
+Version: %{majorversion}.0.3538.110
+Release: 1%{?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)
@@ -1804,6 +1804,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Nov 26 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.110-1
+- update to .110
+
* Wed Nov 7 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-4
- fix library requires filtering
5 years, 10 months
[chromium-freeworld/f28] Upload new sources:70.0.3538.110
by Akarshan Biswas
commit bce6765b25224b41ee9de441b7e6930bd61ccbba
Author: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
Date: Thu Nov 29 01:55:08 2018 +0530
Upload new sources:70.0.3538.110
.gitignore | 1 +
sources | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eec70ea..c747230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@
/chromium-69.0.3497.92.tar.xz
/chromium-69.0.3497.100.tar.xz
/chromium-70.0.3538.77.tar.xz
+/chromium-70.0.3538.110.tar.xz
diff --git a/sources b/sources
index 93ea90c..4a8291a 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-a246a9c95308d8918db963731e553e70 chromium-70.0.3538.77.tar.xz
-5f394788d9403dfe8512c751755c7b04 depot_tools.git-master.tar.gz
+f45eadcee2101b1e3f57c98765616d14 chromium-70.0.3538.110.tar.xz
+0cb65c7d84e7125e1925bccc96e1e0a2 depot_tools.git-master.tar.gz
4d610887ff4d445cbc639aae7828d139 gelasio.zip
314394b29c1d15a73c3f00316003810a MuktiNarrow-0.94.tar.bz2
da72b7ad3a595d0140ceba60e867b9b7 Ahem.ttf
5 years, 10 months
[chromium-freeworld/f29] remove sysroot options
by Akarshan Biswas
commit 6b03a2668aa7e3811491726d9476790781f8b7cf
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Nov 26 13:43:04 2018 -0500
remove sysroot options
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
...mium-70.0.3538.110-remove-sysroot-options.patch | 23 ++++++++++++++++++++++
chromium-freeworld.spec | 3 +++
2 files changed, 26 insertions(+)
---
diff --git a/chromium-70.0.3538.110-remove-sysroot-options.patch b/chromium-70.0.3538.110-remove-sysroot-options.patch
new file mode 100644
index 0000000..9eb99d1
--- /dev/null
+++ b/chromium-70.0.3538.110-remove-sysroot-options.patch
@@ -0,0 +1,23 @@
+diff -up chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py
+--- chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix 2018-11-26 13:40:19.324713204 -0500
++++ chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py 2018-11-26 13:40:43.199180888 -0500
+@@ -46,10 +46,6 @@ def main(argv):
+ '--build-path',
+ help='The directory in which to build gn, '
+ 'relative to the src directory. (eg. out/Release)')
+- parser.add_option(
+- '--with-sysroot',
+- action='store_true',
+- help='Download and build with the Debian sysroot.')
+ parser.add_option('-v', '--verbose', help='ignored')
+ options, args = parser.parse_args(argv)
+ if args:
+@@ -71,8 +67,6 @@ def main(argv):
+ '--no-last-commit-position',
+ '--out-path=' + gn_build_dir,
+ ]
+- if not options.with_sysroot:
+- cmd.append('--no-sysroot')
+ if options.debug:
+ cmd.append('--debug')
+ subprocess.check_call(cmd)
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 56020fc..d696294 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -291,6 +291,8 @@ Patch117: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
Patch118: chromium-70.0.3538.77-harfbuzz2-fix.patch
# Fix aarch64 build against latest linux kernel headers
Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch
+# https://chromium.googlesource.com/chromium/src/tools/gn/+/6630c2e334d7bc1...
+Patch120: chromium-70.0.3538.110-remove-sysroot-options.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -837,6 +839,7 @@ udev.
%patch118 -p1 -b .harfbuzz2
%endif
%patch119 -p1 -b .aarch64-new-stat
+%patch120 -p1 -b .sysrootfix
# Change shebang in all relevant files in this directory and all subdirectories
5 years, 10 months
[chromium-freeworld/f29] .110
by Akarshan Biswas
commit 0988abc4c77be4faf9ea6fd20d9d763d8867cb59
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Nov 26 13:11:42 2018 -0500
.110
Signed-off-by: Akarshan Biswas <akarshan.biswas(a)protonmail.com>
chromium-freeworld.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 2c31eb3..56020fc 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -149,8 +149,8 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
%else
Name: chromium%{chromium_channel}
%endif
-Version: %{majorversion}.0.3538.77
-Release: 4%{?dist}
+Version: %{majorversion}.0.3538.110
+Release: 1%{?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)
@@ -1804,6 +1804,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
+* Mon Nov 26 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.110-1
+- update to .110
+
* Wed Nov 7 2018 Tom Callaway <spot(a)fedoraproject.org> - 70.0.3538.77-4
- fix library requires filtering
5 years, 10 months