From 50a754a82a96f8ef9f70a339d8498d884c48c4fc Mon Sep 17 00:00:00 2001 From: Ze Zhang Date: Thu, 5 Sep 2024 18:05:08 +0800 Subject: [PATCH 1/3] Remove not used macors --- clean_ffmpeg.sh | 364 -------------------------------- clean_qtwebengine.sh | 70 ------ get_free_ffmpeg_source_files.py | 82 ------- qt5-qtwebengine.spec | 16 +- qtwebengine-release.sh | 15 -- sources | 4 - 6 files changed, 5 insertions(+), 546 deletions(-) delete mode 100755 clean_ffmpeg.sh delete mode 100755 clean_qtwebengine.sh delete mode 100755 get_free_ffmpeg_source_files.py delete mode 100755 qtwebengine-release.sh diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh deleted file mode 100755 index 360f330..0000000 --- a/clean_ffmpeg.sh +++ /dev/null @@ -1,364 +0,0 @@ -#!/bin/bash -# Copyright 2013 Tomas Popela -# Copyright 2016-2017 Kevin Kofler -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -where=`pwd` - -generated_files=`./get_free_ffmpeg_source_files.py $1 0` -generated_files_headers="${generated_files//.c/.h}" -generated_files_headers="${generated_files_headers//.S/.h}" -generated_files_headers="${generated_files_headers//.asm/.h}" - -cd $1/third_party/ffmpeg - -header_files=" libavutil/x86/asm.h \ - libavutil/x86/bswap.h \ - libavutil/x86/cpu.h \ - libavutil/x86/emms.h \ - libavutil/x86/intmath.h \ - libavutil/x86/intreadwrite.h \ - libavutil/x86/timer.h \ - libavutil/aarch64/asm.S \ - libavutil/aarch64/bswap.h \ - libavutil/aarch64/cpu.h \ - libavutil/aarch64/timer.h \ - libavutil/arm/asm.S \ - libavutil/arm/bswap.h \ - libavutil/arm/cpu.h \ - libavutil/arm/float_dsp_arm.h \ - libavutil/arm/intmath.h \ - libavutil/arm/intreadwrite.h \ - libavutil/arm/timer.h \ - libavutil/ppc/cpu.h \ - libavutil/ppc/float_dsp_altivec.h \ - libavutil/ppc/float_dsp_vsx.h \ - libavutil/ppc/intreadwrite.h \ - libavutil/ppc/timer.h \ - libavutil/ppc/util_altivec.h \ - libavutil/aes_internal.h \ - libavutil/atomic.h \ - libavutil/atomic_gcc.h \ - libavutil/attributes.h \ - libavutil/audio_fifo.h \ - libavutil/avassert.h \ - libavutil/avutil.h \ - libavutil/bswap.h \ - libavutil/buffer_internal.h \ - libavcodec/bsf_internal.h \ - libavcodec/codec.h \ - libavcodec/codec_desc.h \ - libavcodec/codec_id.h \ - libavcodec/codec_par.h \ - libavcodec/decode.h \ - libavcodec/hwconfig.h \ - libavcodec/internal.h \ - libavcodec/packet.h \ - libavcodec/packet_internal.h \ - libavutil/common.h \ - libavutil/colorspace.h \ - libavutil/cpu_internal.h \ - libavutil/cpu.h \ - libavutil/dynarray.h \ - libavutil/ffmath.h \ - libavutil/fixed_dsp.h \ - libavutil/float_dsp.h \ - libavutil/hwcontext_internal.h \ - libavutil/imgutils.h \ - libavutil/imgutils_internal.h \ - libavutil/internal.h \ - libavutil/intfloat.h \ - libavutil/intreadwrite.h \ - libavutil/libm.h \ - libavutil/lls.h \ - libavutil/lzo.h \ - libavutil/macros.h \ - libavutil/mem_internal.h \ - libavcodec/mlp_parse.h \ - libavutil/old_pix_fmts.h \ - libavutil/pixfmt.h \ - libavutil/qsort.h \ - libavutil/replaygain.h \ - libavutil/softfloat_tables.h \ - libavutil/thread.h \ - libavutil/timer.h \ - libavutil/timestamp.h \ - libavutil/time_internal.h \ - libavutil/tx_priv.h \ - libavutil/tx_template.c \ - libavutil/version.h \ - libavutil/x86_cpu.h - libavcodec/aarch64/neon.S \ - libavcodec/aarch64/vp8dsp.h \ - libavcodec/x86/constants.h \ - libavcodec/x86/dsputil_x86.h \ - libavcodec/x86/fft.h \ - libavcodec/x86/fpel.h \ - libavcodec/x86/hpeldsp.h \ - libavcodec/x86/inline_asm.h \ - libavcodec/x86/mathops.h \ - libavcodec/x86/vp56_arith.h \ - libavcodec/arm/mathops.h \ - libavcodec/arm/neon.S \ - libavcodec/arm/videodsp_arm.h \ - libavcodec/arm/vp56_arith.h \ - libavcodec/arm/vp8.h \ - libavcodec/arm/vp8dsp.h \ - libavcodec/ppc/fft_vsx.h \ - libavcodec/ppc/hpeldsp_altivec.h \ - libavcodec/ppc/mathops.h \ - libavcodec/aac_ac3_parser.h \ - libavcodec/ac3_parser_internal.h \ - libavcodec/ac3.h \ - libavcodec/adts_header.h \ - libavcodec/avcodec.h \ - libavcodec/blockdsp.h \ - libavcodec/bytestream.h \ - libavcodec/dct.h \ - libavcodec/dct32.h \ - libavcodec/dsputil.h \ - libavcodec/dv_profile_internal.h \ - libavcodec/error_resilience.h \ - libavcodec/fdctdsp.h \ - libavcodec/flac.h \ - libavcodec/flacdsp.h \ - libavcodec/fft.h \ - libavcodec/fft-internal.h \ - libavcodec/fft_table.h \ - libavcodec/frame_thread_encoder.h \ - libavcodec/get_bits.h \ - libavcodec/h263dsp.h \ - libavcodec/h264chroma.h \ - libavcodec/h264pred.h \ - libavcodec/hpeldsp.h \ - libavcodec/hwaccel.h \ - libavcodec/hwaccels.h \ - libavcodec/idctdsp.h \ - libavcodec/internal.h \ - libavcodec/mathops.h \ - libavcodec/mdct15.h \ - libavcodec/me_cmp.h \ - libavcodec/motion_est.h \ - libavcodec/mpegaudio_tablegen.h \ - libavcodec/mpegaudiodectab.h \ - libavcodec/mpegaudiodsp.h \ - libavcodec/mpeg12.h \ - libavcodec/mpeg12data.h \ - libavcodec/mpeg12vlc.h \ - libavcodec/mpegpicture.h \ - libavcodec/mpegutils.h \ - libavcodec/mpegvideo.h \ - libavcodec/mpegvideodata.h \ - libavcodec/mpegvideodsp.h \ - libavcodec/mpegvideoencdsp.h \ - libavcodec/old_codec_ids.h \ - libavcodec/options_table.h \ - libavcodec/opus_celt.h \ - libavcodec/opusdsp.h \ - libavcodec/opus_pvq.h \ - libavcodec/opus_rc.h \ - libavcodec/pcm_tablegen.h \ - libavcodec/pel_template.c \ - libavcodec/pixblockdsp.h \ - libavcodec/pixels.h \ - libavcodec/png.h \ - libavcodec/pthread_internal.h \ - libavcodec/put_bits.h \ - libavcodec/qpeldsp.h \ - libavcodec/ratecontrol.h \ - libavcodec/rectangle.h \ - libavcodec/rl.h \ - libavcodec/rnd_avg.h \ - libavcodec/thread.h \ - libavcodec/tpel_template.c \ - libavcodec/unary.h \ - libavcodec/version.h \ - libavcodec/videodsp.h \ - libavcodec/vlc.h \ - libavcodec/vorbis_parser_internal.h \ - libavcodec/vorbisdsp.h \ - libavcodec/vp3data.h \ - libavcodec/vp3dsp.h \ - libavcodec/vp4data.h \ - libavcodec/vp56.h \ - libavcodec/vp56dsp.h \ - libavcodec/vp8data.h \ - libavcodec/vp8.h \ - libavcodec/vp8dsp.h \ - libavformat/audiointerleave.h \ - libavformat/avio_internal.h \ - libavformat/avformat.h \ - libavformat/dv.h \ - libavformat/internal.h \ - libavformat/pcm.h \ - libavformat/rdt.h \ - libavformat/rtp.h \ - libavformat/rtpdec.h \ - libavformat/spdif.h \ - libavformat/srtp.h \ - libavformat/options_table.h \ - libavformat/version.h \ - libavformat/w64.h \ - libswresample/swresample.h \ - libswresample/version.h \ - compat/va_copy.h " - -manual_files=" libavutil/x86/x86inc.asm \ - libavutil/x86/x86util.asm \ - libavcodec/x86/hpeldsp_rnd_template.c \ - libavcodec/x86/rnd_template.c \ - libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c \ - libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c \ - libavcodec/x86/constants.c \ - libavcodec/x86/fft_init.c \ - libavcodec/x86/h264_intrapred_init.c \ - libavcodec/x86/hpeldsp_init.c \ - libavcodec/x86/videodsp_init.c \ - libavcodec/x86/vorbisdsp_init.c \ - libavcodec/x86/vp3dsp_init.c \ - libavcodec/x86/vp8dsp_init.c \ - libavutil/x86/autorename_libavutil_x86_cpu.c \ - libavutil/x86/autorename_libavutil_x86_float_dsp_init.c \ - libavutil/x86/cpu.c \ - libavutil/x86/float_dsp_init.c \ - libavutil/x86/lls_init.c \ - libavcodec/x86/deinterlace.asm \ - libavcodec/x86/fft.asm \ - libavcodec/x86/fpel.asm \ - libavcodec/x86/h264_intrapred.asm \ - libavcodec/x86/h264_intrapred_10bit.asm \ - libavcodec/x86/hpeldsp.asm \ - libavcodec/x86/videodsp.asm \ - libavcodec/x86/vorbisdsp.asm \ - libavcodec/x86/vp3dsp.asm \ - libavcodec/x86/vp8dsp.asm \ - libavcodec/x86/vp8dsp_loopfilter.asm \ - libavutil/x86/cpuid.asm \ - libavutil/x86/float_dsp.asm \ - libavutil/x86/lls.asm \ - libavcodec/bit_depth_template.c \ - libavcodec/dct32_template.c \ - libavcodec/fft_template.c \ - libavcodec/h264pred_template.c \ - libavcodec/hpel_template.c \ - libavcodec/hpeldsp_template.c \ - libavcodec/mdct_template.c \ - libavcodec/mpegaudiodec_template.c \ - libavcodec/mpegaudiodsp_template.c - libavcodec/mpegaudiodsp.c \ - libavcodec/videodsp_template.c \ - libavcodec/flacdec.c \ - libavcodec/flacdsp.c \ - libavcodec/flacdsp_template.c \ - libavcodec/flacdsp_lpc_template.c \ - libavcodec/h264pred.c \ - libavcodec/hpeldsp.c \ - libavcodec/videodsp.c \ - libavcodec/vorbisdsp.c \ - libavcodec/vp3.c \ - libavcodec/vp3_parser.c \ - libavcodec/vp3dsp.c \ - libavcodec/vp56rac.c \ - libavcodec/vp8.c \ - libavcodec/vp8_parser.c \ - libavcodec/vp8dsp.c \ - libavutil/cpu.c \ - libavutil/fixed_dsp.c \ - libavutil/float_dsp.c \ - libavutil/imgutils.c \ - libavutil/aarch64/cpu.c \ - libavutil/aarch64/float_dsp_neon.S \ - libavutil/arm/cpu.c \ - libavutil/arm/float_dsp_neon.S \ - libavformat/options.c \ - libavformat/pcm.c \ - libavformat/utils.c \ - libavcodec/utils.c \ - libavcodec/aarch64/fft_neon.S \ - libavcodec/aarch64/hpeldsp_neon.S \ - libavcodec/aarch64/h264pred_neon.S \ - libavcodec/aarch64/mdct_neon.S \ - libavcodec/aarch64/vorbisdsp_neon.S \ - libavcodec/aarch64/vp8dsp_neon.S \ - libavcodec/arm/vorbisdsp_neon.S \ - libavcodec/arm/mdct_neon.S \ - libavcodec/arm/fft_neon.S \ - libavcodec/arm/vp8dsp_neon.S \ - libavutil/ppc/cpu.c \ - libavutil/ppc/float_dsp_altivec.c \ - libavutil/ppc/float_dsp_init.c \ - libavutil/ppc/float_dsp_vsx.c \ - libavcodec/ppc/fft_altivec.S \ - libavcodec/ppc/fft_init.c \ - libavcodec/ppc/fft_vsx.c \ - libavcodec/ppc/hpeldsp_altivec.c \ - libavcodec/ppc/mpegaudiodsp_altivec.c \ - libavcodec/ppc/videodsp.c \ - libavcodec/ppc/vorbisdsp_altivec.c \ - libavcodec/ppc/vp3dsp_altivec.c \ - libavcodec/ppc/vp8dsp_altivec.c \ - chromium/ffmpeg_stub_headers.fragment \ - chromium/ffmpegsumo.sigs" - -other_files=" BUILD.gn \ - Changelog \ - COPYING.GPLv2 \ - COPYING.GPLv3 \ - COPYING.LGPLv2.1 \ - COPYING.LGPLv3 \ - CREDITS \ - CREDITS.chromium \ - ffmpeg.gyp \ - ffmpeg_generated.gypi \ - ffmpeg_generated.gni \ - ffmpeg_options.gni \ - ffmpegsumo.ver \ - INSTALL \ - LICENSE \ - MAINTAINERS \ - OWNERS \ - README \ - README.chromium \ - RELEASE \ - xcode_hack.c " - -files=$generated_files$manual_files$other_files$generated_files_headers$header_files - -for f in $files -do - dir_name=`dirname $f`/ - if [[ $dir_name == ./ ]]; then - dir_name= - else - mkdir -p ../tmp_ffmpeg/$dir_name - fi - - cp -p $f ../tmp_ffmpeg/$dir_name 2>/dev/null -done - -# whole directory -mkdir -p ../tmp_ffmpeg/chromium -cp -pr chromium/config ../tmp_ffmpeg/chromium/ - -cd .. -rm -rf ffmpeg -mv tmp_ffmpeg ffmpeg - -cd $where diff --git a/clean_qtwebengine.sh b/clean_qtwebengine.sh deleted file mode 100755 index 628fe44..0000000 --- a/clean_qtwebengine.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# Copyright 2015-2017 Kevin Kofler -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if [ -z "$1" ] ; then - echo "usage: ./clean_qtwebengine.sh VERSION" - echo "e.g.: ./clean_qtwebengine.sh 5.15.16" - exit 1 -fi - -DIRNAME="qtwebengine-everywhere-src-$1" - -echo "removing $DIRNAME" -rm -rf "$DIRNAME" || exit $? - -if [ -f "$DIRNAME.tar.xz" ] ; then - echo "unpacking $DIRNAME.tar.xz" - XZ_OPT="-T 4" tar xJf "$DIRNAME.tar.xz" || exit $? -elif [ -f "$DIRNAME.tar.bz2" ] ; then - echo "unpacking $DIRNAME.tar.bz2" - tar xjf "$DIRNAME.tar.bz2" || exit $? -elif [ -f "$DIRNAME.tar.gz" ] ; then - echo "unpacking $DIRNAME.tar.gz" - tar xzf "$DIRNAME.tar.gz" || exit $? -elif [ -f "$DIRNAME.7z" ] ; then - echo "unpacking $DIRNAME.7z" - if type 7za >/dev/null 2>/dev/null ; then - 7za x "$DIRNAME.7z" || exit $? - elif type 7z >/dev/null 2>/dev/null ; then - 7z x "$DIRNAME.7z" || exit $? - else - echo "error: p7zip required" - exit 1 - fi -else - echo "error: no archive for $DIRNAME found" - exit 1 -fi - -echo "running clean_ffmpeg.sh" -./clean_ffmpeg.sh "$DIRNAME/src/3rdparty/chromium" || exit $? - -echo "ripping out openh264 sources" -rm -rf "$DIRNAME/src/3rdparty/chromium/third_party/openh264/src" || exit $? - -echo "repacking as $DIRNAME-clean.tar.xz" -XZ_OPT="-8 -T 2" tar cJf "$DIRNAME-clean.tar.xz" "$DIRNAME" || exit $? - -echo "removing $DIRNAME" -rm -rf "$DIRNAME" || exit $? - -echo "done" -exit 0 diff --git a/get_free_ffmpeg_source_files.py b/get_free_ffmpeg_source_files.py deleted file mode 100755 index 390ee3f..0000000 --- a/get_free_ffmpeg_source_files.py +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/python3 -# Copyright 2015 Tomas Popela -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import sys -import re - -def append_sources (input_sources, output_sources): - - # Get the source files. - source_files = re.findall(r"\"(.*?)\"", input_sources) - output_sources += source_files - - -def parse_sources(input_sources, output_sources, arch_not_arm): - - # Get the type of sources in one group and sources itself in the other one. - blocks = re.findall(r"(ffmpeg[^\s]*).*?\[(.*?)]", input_sources, re.DOTALL) - for block in blocks: - if (arch_not_arm): - if not 'ffmpeg_gas_sources' in block[0]: - append_sources (block[1], output_sources) - else: - append_sources (block[1], output_sources) - - -def parse_ffmpeg_gyni_file(gyni_path, arch_not_arm): - - with open(gyni_path, "r") as input_file: - content = input_file.read().replace('\n', '') - - output_sources = [] - # Get all the sections. - sections = re.findall(r"if (.*?})", content, re.DOTALL) - for section in sections: - # Get all the conditions (first group) and sources (second group) for the - # current section. - blocks = re.findall(r"(\(.*?\))\s\{(.*?)\}", section, re.DOTALL) - for block in blocks: - conditions = re.findall(r"\(?\((.*?)\)", block[0]) - inserted = False - for condition in conditions: - if inserted: - break - limitations = ['ffmpeg_branding == "Chrome"', 'ffmpeg_branding == "ChromeOS"'] - if ('use_linux_config' in condition) and not any(limitation in condition for limitation in limitations): - if (arch_not_arm): - if ('x64' in condition) or ('x86' in condition): - parse_sources (block[1], output_sources, arch_not_arm) - inserted = True - else: - parse_sources (block[1], output_sources, arch_not_arm) - inserted = True - - if len(output_sources) == 0: - sys.stderr.write("Something went wrong, no sources parsed!\n") - sys.exit(1) - - print(' '.join(output_sources)) - - -if __name__ == "__main__": - - path = "%s/third_party/ffmpeg/ffmpeg_generated.gni" % sys.argv[1] - parse_ffmpeg_gyni_file (path, False if sys.argv[2] == "0" else True) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 8ddf22a..39c9da2 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -29,23 +29,13 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.16 -Release: 1%{?dist} +Release: 2%{?dist} License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: http://www.qt.io Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz -Source1: qtwebengine-release.sh -Source2: clean_qtwebengine.sh -Source3: clean_ffmpeg.sh -Source4: get_free_ffmpeg_source_files.py Source10: macros.qt5-qtwebengine -Source20: pulseaudio-12.2-headers.tar.gz - -Source100: python2.7-2.7.18-19.el9.1.src.rpm -Source101: python2.7-2.7.18-19.el9.1.aarch64.rpm -Source102: python2.7-2.7.18-19.el9.1.x86_64.rpm - Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch Patch4: qtwebengine-SIOCGSTAMP.patch @@ -444,5 +434,9 @@ done %{_qt5_examplesdir}/ %changelog +* Tue Sep 5 2024 Ze Zhang - 5.15.16-2 +- [Type] other +- [DESC] Remove not used macors + * Wed Aug 28 2024 OpenCloudOS Release Engineering - 5.15.16-1 - initial build diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh deleted file mode 100755 index ccec359..0000000 --- a/qtwebengine-release.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -x -VERSION=5.15.16 -CHROMIUMHASH=`wget https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q --content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object name: \([0-9a-f]\{40\}\).*$/\1/g'` -rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION -wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O qtwebengine-$VERSION.tar.gz || exit $? -tar xzf qtwebengine-$VERSION.tar.gz || exit $? -wget https://github.com/qt/qtwebengine-chromium/archive/$CHROMIUMHASH.tar.gz -O qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? -tar xzf qtwebengine-chromium-$CHROMIUMHASH.tar.gz || exit $? -mv qtwebengine-$VERSION qtwebengine-everywhere-src-$VERSION || exit $? -(cd qtwebengine-everywhere-src-$VERSION ; syncqt.pl -version $VERSION ) || exit $? -rmdir qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $? -mv qtwebengine-chromium-$CHROMIUMHASH qtwebengine-everywhere-src-$VERSION/src/3rdparty || exit $? -XZ_OPT="-9 -T2" tar cJf qtwebengine-everywhere-src-$VERSION.tar.xz qtwebengine-everywhere-src-$VERSION || exit $? -rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz qtwebengine-everywhere-src-$VERSION diff --git a/sources b/sources index db33f34..eba9b00 100644 --- a/sources +++ b/sources @@ -1,5 +1 @@ -SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be -SHA512 (python2.7-2.7.18-19.el9.1.aarch64.rpm) = 66c8487a3323bb854ff79242287ae5d290315609b4f79fb985626e52d96286d6dfd2da9a8257e23be036b72adabbbec08d53db339935d5d6e8b6018417bbc769 -SHA512 (python2.7-2.7.18-19.el9.1.src.rpm) = 5833fc6d9e8a6e208fc1b753b03b6db7a817ba554501cd6b1d6ccd3c9ce56fec6a9e97b9faa83746e3e21e6b4e27313f1a569f662772a17167d21e23c1e1e689 -SHA512 (python2.7-2.7.18-19.el9.1.x86_64.rpm) = 55f03b17f649a2da9edae67c1ca7c84738a023fc3ab2e7d6060db8a2b8ddf20099147533f3d50ce3dfafec5ca988f75ff229e67d331bcb669c879802ab6555a9 SHA512 (qtwebengine-everywhere-src-5.15.16-clean.tar.xz) = 40572289b542a55d6e87d045fc9f9d841e5434df55bcdd4da3818df492b0cdcaaa2cc14f0827a2e9af65d08372a69de980732bf7f83b0103732c9ea4f0881bf1 -- Gitee From 842091be5e925d11b48b60d2241f2d1bc586af70 Mon Sep 17 00:00:00 2001 From: Ze Zhang Date: Thu, 5 Sep 2024 19:48:38 +0800 Subject: [PATCH 2/3] fix changelog --- qt5-qtwebengine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 39c9da2..f3edc73 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -434,7 +434,7 @@ done %{_qt5_examplesdir}/ %changelog -* Tue Sep 5 2024 Ze Zhang - 5.15.16-2 +* Thu Sep 5 2024 Ze Zhang - 5.15.16-2 - [Type] other - [DESC] Remove not used macors -- Gitee From 670fa9c02fa661833bb53a0ad2311f812dc1ae50 Mon Sep 17 00:00:00 2001 From: Ze Zhang Date: Mon, 9 Sep 2024 11:19:44 +0800 Subject: [PATCH 3/3] fix --- qt5-qtwebengine.spec | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index f3edc73..a02b686 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -35,6 +35,7 @@ License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ a URL: http://www.qt.io Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz Source10: macros.qt5-qtwebengine +Source20: pulseaudio-12.2-headers.tar.gz Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch diff --git a/sources b/sources index eba9b00..7e01f71 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be SHA512 (qtwebengine-everywhere-src-5.15.16-clean.tar.xz) = 40572289b542a55d6e87d045fc9f9d841e5434df55bcdd4da3818df492b0cdcaaa2cc14f0827a2e9af65d08372a69de980732bf7f83b0103732c9ea4f0881bf1 -- Gitee