From f0abddbde577b36aeb03b126577c713403360702 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sun, 28 Oct 2018 04:13:44 +0300 Subject: [PATCH] Cleaned-up. Renamed patches. --- ...ut.patch => DEBIAN-Fixes-gpu-timeout.patch | 0 ...um-ps-print.patch => DEBIAN-ps-print.patch | 0 ...N-third-party-cookies-off-by-default.patch | 0 ...ebp-r1.patch => GENTOO-ffmpeg-ebp-r1.patch | 0 ...icu-r0.patch => GENTOO-system-icu-r0.patch | 0 ...evine-r2.patch => GENTOO-widevine-r2.patch | 0 ...ra-media.patch => MAGEIA-extra-media.patch | 0 ...-wmvflvmpg.patch => MAGEIA-wmvflvmpg.patch | 0 ...-user-agent.patch => ROSA-user-agent.patch | 0 chromium-browser-stable.spec | 47 +++++++++---------- ....patch => openSUSE-master-prefs-path.patch | 5 ++ 11 files changed, 28 insertions(+), 24 deletions(-) rename Debian-Fixes-gpu-timeout.patch => DEBIAN-Fixes-gpu-timeout.patch (100%) rename chromium-ps-print.patch => DEBIAN-ps-print.patch (100%) rename chromium-third-party-cookies-off-by-default.patch => DEBIAN-third-party-cookies-off-by-default.patch (100%) rename chromium-ffmpeg-ebp-r1.patch => GENTOO-ffmpeg-ebp-r1.patch (100%) rename chromium-system-icu-r0.patch => GENTOO-system-icu-r0.patch (100%) rename chromium-widevine-r2.patch => GENTOO-widevine-r2.patch (100%) rename Mageia-extra-media.patch => MAGEIA-extra-media.patch (100%) rename Mageia-wmvflvmpg.patch => MAGEIA-wmvflvmpg.patch (100%) rename chromium-68.0.3440.106-rosa-user-agent.patch => ROSA-user-agent.patch (100%) rename chromium-30.0.1599.66-master-prefs-path.patch => openSUSE-master-prefs-path.patch (76%) diff --git a/Debian-Fixes-gpu-timeout.patch b/DEBIAN-Fixes-gpu-timeout.patch similarity index 100% rename from Debian-Fixes-gpu-timeout.patch rename to DEBIAN-Fixes-gpu-timeout.patch diff --git a/chromium-ps-print.patch b/DEBIAN-ps-print.patch similarity index 100% rename from chromium-ps-print.patch rename to DEBIAN-ps-print.patch diff --git a/chromium-third-party-cookies-off-by-default.patch b/DEBIAN-third-party-cookies-off-by-default.patch similarity index 100% rename from chromium-third-party-cookies-off-by-default.patch rename to DEBIAN-third-party-cookies-off-by-default.patch diff --git a/chromium-ffmpeg-ebp-r1.patch b/GENTOO-ffmpeg-ebp-r1.patch similarity index 100% rename from chromium-ffmpeg-ebp-r1.patch rename to GENTOO-ffmpeg-ebp-r1.patch diff --git a/chromium-system-icu-r0.patch b/GENTOO-system-icu-r0.patch similarity index 100% rename from chromium-system-icu-r0.patch rename to GENTOO-system-icu-r0.patch diff --git a/chromium-widevine-r2.patch b/GENTOO-widevine-r2.patch similarity index 100% rename from chromium-widevine-r2.patch rename to GENTOO-widevine-r2.patch diff --git a/Mageia-extra-media.patch b/MAGEIA-extra-media.patch similarity index 100% rename from Mageia-extra-media.patch rename to MAGEIA-extra-media.patch diff --git a/Mageia-wmvflvmpg.patch b/MAGEIA-wmvflvmpg.patch similarity index 100% rename from Mageia-wmvflvmpg.patch rename to MAGEIA-wmvflvmpg.patch diff --git a/chromium-68.0.3440.106-rosa-user-agent.patch b/ROSA-user-agent.patch similarity index 100% rename from chromium-68.0.3440.106-rosa-user-agent.patch rename to ROSA-user-agent.patch diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index 17c49a7..0485d0f 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -9,6 +9,7 @@ # [8] https://build.opensuse.org/package/show/network:chromium/chromium # [9] https://packages.ubuntu.com/search?keywords=chromium-browser # [10] http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/ +# [11] https://salsa.debian.org/chromium-team/chromium/tree/master/debian/ # The script ./patches.sh helps to sync patches in spec and real files @@ -55,37 +56,32 @@ Source32: chromium.default Source100: icons.tar.bz2 Source997: depot_tools.tar.xz Source999: new-system-icons.tar.xz -Patch4: chromium-30.0.1599.66-master-prefs-path.patch +Patch4: openSUSE-master-prefs-path.patch Patch22: chromium-54-proprietary-codecs-assert.patch # (cjw) Recognize mimetypes for matroska (.mkv) and AVI (.avi) formats (video/x-matroska and audio/x-matroska, video/x-msvideo) + handle A52 "AC3" and DTS compressed audio. -Patch32: Mageia-extra-media.patch -Patch33: Mageia-wmvflvmpg.patch +Patch32: MAGEIA-extra-media.patch +Patch33: MAGEIA-wmvflvmpg.patch # (cjw) fix build with current glib... Patch36: chromium-58-glib.patch -# New from Debian -Patch500: chromium-third-party-cookies-off-by-default.patch -Patch501: chromium-ps-print.patch +Patch500: DEBIAN-third-party-cookies-off-by-default.patch +Patch501: DEBIAN-ps-print.patch # Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55. Patch502: chromium-45.0.2454.101-system-icu-54-does-not-have-detectHostTimeZone.patch # fix build with icu other than 54 -Patch504: chromium-system-icu-r0.patch +Patch504: GENTOO-system-icu-r0.patch # https://aur.archlinux.org/packages/chromium-vaapi/ # https://github.com/saiarcot895/chromium-ubuntu-build # openSUSE-libva1.patch must be applied after chromium-vaapi-r*.patch Patch508: chromium-vaapi-r21.patch Patch509: openSUSE-libva1.patch -Patch510: chromium-widevine-r2.patch -# Patch to fix build +Patch510: GENTOO-widevine-r2.patch Patch601: chromium-62-include-cstdlib.patch # Equal to Ubuntu's patches/fix-ffmpeg-ia32-build.patch -Patch605: chromium-ffmpeg-ebp-r1.patch +Patch605: GENTOO-ffmpeg-ebp-r1.patch # Add "ROSA" to the user agent string -Patch627: chromium-68.0.3440.106-rosa-user-agent.patch - -# From https://salsa.debian.org/chromium-team/chromium/tree/master/debian/patches -Patch710: Debian-Fixes-gpu-timeout.patch -# https://packages.altlinux.org/ru/Sisyphus/srpms/chromium/patches +Patch627: ROSA-user-agent.patch +Patch710: DEBIAN-Fixes-gpu-timeout.patch Patch730: ALT-allow-to-override-clang-through-env-variables.patch Patch732: FEDORA-Fix-memcpy.patch Patch733: FEDORA-Fix-issue-where-timespec-is-not-defined-when-.patch @@ -106,6 +102,7 @@ Provides: %{crname} = %{EVRD} Conflicts: chromium-browser-unstable Conflicts: chromium-browser-beta Obsoletes: chromium-browser < 1:9.0.597.94 + BuildRequires: bison %if 0%{?clang} BuildRequires: clang @@ -135,13 +132,11 @@ BuildRequires: jpeg-devel BuildRequires: jsoncpp-devel %endif BuildRequires: pam-devel -#BuildRequires: snappy-devel BuildRequires: speech-dispatcher-devel BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(expat) -#BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gconf-2.0) @@ -150,9 +145,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) -#BuildRequires: pkgconfig(harfbuzz) %if 0%{icu} BuildRequires: pkgconfig(icu-i18n) %endif @@ -162,12 +155,9 @@ BuildRequires: pkgconfig(libgpsd) BuildRequires: pkgconfig(libmtp) BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpci) -BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libxml-2.0) -#BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(minizip) BuildRequires: pkgconfig(nspr) @@ -178,12 +168,21 @@ BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(zlib) -#BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pythonegg(beautifulsoup4) BuildRequires: pythonegg(html5lib) +# These libraries can be either system or bundled. +# Commented out those which were switched from system to bundled. +#BuildRequires: pkgconfig(flac) +#BuildRequires: pkgconfig(zlib) +#BuildRequires: pkgconfig(vpx) +#BuildRequires: pkgconfig(libpng) +#BuildRequires: pkgconfig(libxslt) +#BuildRequires: pkgconfig(libtiff-4) +#BuildRequires: pkgconfig(harfbuzz) +#BuildRequires: snappy-devel + Suggests: chromium-browser-pepper-flash Conflicts: chromium-widevinecdm-plugin < 54 Obsoletes: chromium-widevinecdm-plugin < 54 diff --git a/chromium-30.0.1599.66-master-prefs-path.patch b/openSUSE-master-prefs-path.patch similarity index 76% rename from chromium-30.0.1599.66-master-prefs-path.patch rename to openSUSE-master-prefs-path.patch index 4649288..a519719 100644 --- a/chromium-30.0.1599.66-master-prefs-path.patch +++ b/openSUSE-master-prefs-path.patch @@ -1,3 +1,8 @@ +This patch probably originates from openSUSE +(https://build.opensuse.org/package/view_file/network:chromium/chromium/chromium-master-prefs-path.patch?expand=1) + +NOTE: we use /etc/chromium-browser in ROSA, but it is /etc/chromium in openSUSE! + diff -urN chromium-30.0.1599.66.orig/chrome/browser/first_run/first_run_internal_linux.cc chromium-30.0.1599.66/chrome/browser/first_run/first_run_internal_linux.cc --- chromium-30.0.1599.66.orig/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-04 13:51:55.589208095 +0400 +++ chromium-30.0.1599.66/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-04 13:52:49.035210352 +0400