[pithos] Add missing gettext dep
by Patrick Griffis
commit fb1cf6058d339486e36ade041a20386d39a2bfa8
Author: Patrick Griffis <tingping(a)tingping.se>
Date: Mon Oct 16 02:38:22 2017 -0400
Add missing gettext dep
pithos.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/pithos.spec b/pithos.spec
index 64a41e3..0782dfb 100644
--- a/pithos.spec
+++ b/pithos.spec
@@ -16,7 +16,7 @@ Source0: https://github.com/pithos/pithos/releases/download/%{version}/pi
BuildArch: noarch
BuildRequires: python3-devel >= 3.4
BuildRequires: meson >= 0.40.0
-BuildRequires: glib2-devel gdk-pixbuf2-devel libappstream-glib
+BuildRequires: glib2-devel gdk-pixbuf2-devel libappstream-glib gettext
Requires: gtk3 libsecret
Requires: python3-gobject python3-cairo
6 years, 7 months
[pithos] Bump version to 1.4.0
by Patrick Griffis
commit 5037394c28e3dd590026bc9b9056dc628efbe622
Author: Patrick Griffis <tingping(a)tingping.se>
Date: Mon Oct 16 02:21:39 2017 -0400
Bump version to 1.4.0
.gitignore | 1 +
pithos.spec | 47 ++++++++++++++++++++++++++++-------------------
sources | 2 +-
3 files changed, 30 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f8f7a3..87cd713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pithos-1.1.2.tar.gz
/pithos-1.2.1.tar.xz
/pithos-1.3.0.tar.xz
/pithos-1.3.1.tar.xz
+/pithos-1.4.0.tar.xz
diff --git a/pithos.spec b/pithos.spec
index 9424331..64a41e3 100644
--- a/pithos.spec
+++ b/pithos.spec
@@ -1,8 +1,10 @@
+# brp-python-bytecompile is ran with python2 by default
+%global __python %{__python3}
%global appid io.github.Pithos
Name: pithos
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
Summary: A Pandora client for the GNOME Desktop
Group: Applications/Multimedia
@@ -13,8 +15,8 @@ Source0: https://github.com/pithos/pithos/releases/download/%{version}/pi
BuildArch: noarch
BuildRequires: python3-devel >= 3.4
-BuildRequires: intltool libappstream-glib
-BuildRequires: glib2-devel gdk-pixbuf2-devel
+BuildRequires: meson >= 0.40.0
+BuildRequires: glib2-devel gdk-pixbuf2-devel libappstream-glib
Requires: gtk3 libsecret
Requires: python3-gobject python3-cairo
@@ -27,8 +29,6 @@ Requires: ((gstreamer1-plugins-ugly and gstreamer1-plugins-bad-freeworld)
Recommends: python3-pylast
# Keybinder plugin on DEs other than Gnome/Mate
Recommends: keybinder3
-# Notify plugin
-Recommends: libnotify
# Notification Icon plugin on some DEs
Suggests: libappindicator-gtk
@@ -41,9 +41,13 @@ things like media key support and song notifications.
%prep
%autosetup -p1
+# brp-python-bytecompile always runs (probably because we install to datadir)
+# so lets just not do it twice...
+/usr/bin/sed -e 's/^compile_dir.*$//' -i meson_post_install.py
+
%install
-%configure
-%make_install
+%meson
+%meson_install
# Remove Unity specific icons
rm -rf %{buildroot}%{_datadir}/icons/ubuntu*
@@ -52,28 +56,34 @@ rm -rf %{buildroot}%{_datadir}/icons/ubuntu*
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
%post
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc README.md
%license license
%{_bindir}/%{name}
-%{python3_sitelib}/%{name}/
-%{_datadir}/%{name}/%{name}.gresource
+%{_datadir}/%{name}/
%{_datadir}/applications/%{appid}.desktop
%{_datadir}/appdata/%{appid}.appdata.xml
%{_datadir}/glib-2.0/schemas/%{appid}.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/hicolor/scalable/apps/*.svg
-%{_datadir}/icons/hicolor/symbolic/apps/*.svg
-%{_mandir}/man1/*.gz
+%{_datadir}/icons/hicolor/*/apps/%{appid}*.png
+%{_datadir}/icons/hicolor/scalable/apps/%{appid}*.svg
+%{_datadir}/icons/hicolor/symbolic/apps/%{appid}*.svg
+%{_mandir}/man1/%{name}.1.gz
%changelog
+* Sun Oct 15 2017 Patrick Griffis <tingping(a)tingping.se> - 1.4.0-1
+- Bump version to 1.4.0
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
@@ -122,4 +132,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
* Thu Mar 27 2014 TingPing <tingping(a)tingping.se> - 0.3.18-1
- Initial package
-
diff --git a/sources b/sources
index 4f804ed..46f0380 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b4212d360a32649577c319cd058c3a0 pithos-1.3.1.tar.xz
+2324a9ed104682fb2417f662a82cc8bb pithos-1.4.0.tar.xz
6 years, 7 months
[ffmpeg] Updated to 3.4
by Leigh Scott
commit c91907d05e6e433fe1e380f8f7e33b30e36a51d7
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Oct 16 00:11:50 2017 +0100
Updated to 3.4
LibOpenJPEG-2.2.patch | 95 ---------------------------------------------------
LibOpenJPEG-2.3.patch | 95 ---------------------------------------------------
ffmpeg.spec | 16 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 201 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d5772c8..ca8ad0c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -70,8 +70,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 3.3.4
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 3.4
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -79,10 +79,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/078322f33ced4b2db6ac3e5002...
-Patch0: LibOpenJPEG-2.2.patch
-# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/41d6d627024393c142cf7cd93e...
-Patch1: LibOpenJPEG-2.3.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0 cuda-npp-dev-8-0}
@@ -145,7 +141,6 @@ BuildRequires: opus-devel
%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: perl(Pod::Man)
%{?_with_rubberband:BuildRequires: rubberband-devel}
-BuildRequires: schroedinger-devel
%{!?_without_tools:BuildRequires: SDL2-devel}
%{?_with_snappy:BuildRequires: snappy-devel}
BuildRequires: soxr-devel
@@ -257,7 +252,6 @@ This package contains development files for %{name}
%{!?_without_pulse:--enable-libpulse} \\\
%{?_with_rtmp:--enable-librtmp} \\\
%{?_with_rubberband:--enable-librubberband} \\\
- --enable-libschroedinger \\\
%{?_with_smb:--enable-libsmbclient} \\\
%{?_with_snappy:--enable-libsnappy} \\\
--enable-libsoxr \\\
@@ -293,8 +287,6 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1
-%patch1 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -396,6 +388,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Oct 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4-1
+- Updated to 3.4
+- Remove build requires schroedinger-devel (wrapper was removed)
+
* Thu Oct 12 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.3.4-2
- add support for OpenJPEG v2.3
diff --git a/sources b/sources
index cf56903..ee7e29f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e14a0200c78ce5c918427e57cd406a0d ffmpeg-3.3.4.tar.xz
+c64ba7247bb91e516f6a5789348fd5b5 ffmpeg-3.4.tar.xz
6 years, 7 months
[DVDAuthorWizard] Fix calls to unsupported (EOL) options of transcode and sox (#4673) spec clean up, urls and license
by Sérgio M. Basto
commit 684be212aa72467f0fd07dc121746dec6d5cbde7
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Oct 15 13:09:00 2017 +0100
Fix calls to unsupported (EOL) options of transcode and sox (#4673)
spec clean up, urls and license fixes .
DVDAuthorWizard-Builder.sh.patch | 42 ++++++++++++++++++++++++++++++++++++++++
DVDAuthorWizard.spec | 23 +++++++++++-----------
2 files changed, 54 insertions(+), 11 deletions(-)
---
diff --git a/DVDAuthorWizard-Builder.sh.patch b/DVDAuthorWizard-Builder.sh.patch
new file mode 100644
index 0000000..601487b
--- /dev/null
+++ b/DVDAuthorWizard-Builder.sh.patch
@@ -0,0 +1,42 @@
+--- ./bin/DVDAuthorWizard-Builder.sh.orig 2017-03-18 22:18:16.000000000 +0100
++++ ./bin/DVDAuthorWizard-Builder.sh 2017-10-02 09:22:00.955789419 +0200
+@@ -327,13 +327,13 @@
+ # -x autodetect video, ignore audio
+ # -I 5 Deinterlace with linear blend (lb)
+ # -Z Convert frame size
+- # --keep_asr Fit input image in target framesize without changing aspect
++ # EOL --keep_asr Fit input image in target framesize without changing aspect
+ # -y im,null Export video to ImageMagick, ignore audio
+
+ DiskSpaceWarning "$(pwd)" 100
+
+ transcode -i "$1" -x auto,null -I 5 $TranscodeEffectString -Z $2 \
+- --keep_asr -y im,null -F png -c $3-$4 -o frame%d.png 2>&1
++ -y im,null -F png -c $3-$4 -o frame%d.png 2>&1
+
+ DiskSpaceError "$(pwd)"
+
+@@ -1069,7 +1069,7 @@
+
+ pushd "$WorkingDir"
+
+- dd if=/dev/zero bs=2 count=$NumAudioFrames | sox -r 48000 -t .sw - -t .wav -w /dev/stdout \
++ dd if=/dev/zero bs=2 count=$NumAudioFrames | sox -r 48000 -t .sw - -t .wav /dev/stdout \
+ | mp2enc -b 128 -r 48000 -o soundtrack.mp2 < /dev/stdin
+
+ popd
+@@ -1093,12 +1093,12 @@
+
+ if [ "$DetectedSampleRate" == 48000 ]; then
+
+- sox "$SoundtrackFile" -t .wav -w "$WorkingDir/soundtrack.wav" \
++ sox "$SoundtrackFile" -t .wav "$WorkingDir/soundtrack.wav" \
+ fade t 0 $Length $FadeoutLength trim 0 $Length
+
+ else
+
+- sox "$SoundtrackFile" -t .wav -w -r 48000 "$WorkingDir/soundtrack.wav" \
++ sox "$SoundtrackFile" -t .wav -r 48000 "$WorkingDir/soundtrack.wav" \
+ fade t 0 $Length $FadeoutLength trim 0 $Length resample -qs
+
+ fi
diff --git a/DVDAuthorWizard.spec b/DVDAuthorWizard.spec
index 69471fb..0aa2063 100644
--- a/DVDAuthorWizard.spec
+++ b/DVDAuthorWizard.spec
@@ -1,21 +1,22 @@
Name: DVDAuthorWizard
Version: 1.4.6
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Create a video DVD from MPEG-2 files
Group: Applications/Multimedia
-License: GPL
-URL: http://dvdauthorwizard.sourceforge.net
-Source0: http://dl.sf.net/dvdauthorwizard/%{name}-%{version}.tar.bz2
+License: GPLv2
+URL: https://sourceforge.net/projects/dvdauthorwizard/
+Source0: http://download.sf.net/dvdauthorwizard/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: DVDAuthorWizard-Builder.sh.patch
BuildArch: noarch
BuildRequires: desktop-file-utils
-Requires: kdebase3, bc, k3b, sox, mjpegtools, transcode, xine
+Requires: kdebase3 bc sox mjpegtools transcode
Requires: dvdauthor >= 0.6.11
Requires: ImageMagick >= 6.2.0
Requires: kdewebdev >= 3.3.0
+Recommends: k3b xine-ui
%description
@@ -27,6 +28,7 @@ follow.
%prep
%setup -q
+%patch0 -p1 -b .options
sed -i 's/\/\.\.\/share\/apps\/dvdauthorwizard//g' bin/DVDAuthorWizard.kmdr
sed -i 's/..\/share\/apps\/dvdauthorwizard/\/usr\/share\/apps\/DVDAuthorWizard/g' \
bin/DVDAuthorWizard-Builder.sh
@@ -45,7 +47,6 @@ EOF
%install
-rm -rf %{buildroot}
mkdir -p %{buildroot}%{_datadir}/apps/%{name}
mkdir -p %{buildroot}%{_bindir}
@@ -59,10 +60,6 @@ desktop-file-install --vendor "" \
%{SOURCE1}
-%clean
-rm -rf %{buildroot}
-
-
%files
%defattr(-,root,root,-)
%doc Changelog Creating?Chapters.txt
@@ -72,6 +69,10 @@ rm -rf %{buildroot}
%changelog
+* Sun Oct 15 2017 Sérgio Basto <sergio(a)serjux.com> - 1.4.6-11
+- Fix calls to unsupported (EOL) options of transcode and sox (#4673)
+- spec clean up, urls and license fixes .
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.4.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 7 months
[qt5-qtwebengine-freeworld] Update to 5.9.2
by Kevin Kofler
commit ccf84842267edf879896dc8555bddde4fb95280c
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sun Oct 15 01:35:12 2017 +0200
Update to 5.9.2
* Sat Oct 14 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.9.2-1
- Update to 5.9.2
- Add BuildRequires: qt5-qtquickcontrols2-devel for the examples
- Rebase linux-pri patch
- Drop qt57 and qtbug-61521 patches, fixed upstream
- arm-fpu-fix patch: Drop the host tools hunk added in 5.9.0-2, fixed upstream
- linux-pri patch: Do not call the Chromium unbundling script on re2,
QtWebEngine now auto-detects and uses the system re2 out of the box
- Drop system-re2 patch (patching the no longer used unbundle/re2.gn), the
QtWebEngine re2/BUILD.gn is already correct
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 33 +++--
qtwebengine-opensource-src-5.8.0-qt57.patch | 12 --
qtwebengine-opensource-src-5.9.0-system-re2.patch | 24 ----
qtwebengine-opensource-src-5.9.1-qtbug-61521.patch | 160 ---------------------
...ebengine-opensource-src-5.9.2-arm-fpu-fix.patch | 9 --
...twebengine-opensource-src-5.9.2-linux-pri.patch | 15 +-
sources | 2 +-
8 files changed, 26 insertions(+), 230 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91fbc7c..44dadbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/qtwebengine-opensource-src-5.9.0.tar.xz
/qtwebengine-opensource-src-5.9.1.tar.xz
/qtwebengine-opensource-src-5.6.3-ee719ad313e564d4e6f06d74b313ae179169466f.tar.xz
+/qtwebengine-opensource-src-5.9.2.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 151f136..0c9a74c 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -43,8 +43,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.9.1
-Release: 3%{?dist}
+Version: 5.9.2
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -55,8 +55,8 @@ Release: 3%{?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: http://download.qt.io/official_releases/qt/%{major_minor}/%{version}/subm...
-# some tweaks to linux.pri (system libs, link libpci, run unbundling script)
-Patch0: qtwebengine-opensource-src-5.9.0-linux-pri.patch
+# some tweaks to linux.pri (system yasm, link libpci, run unbundling script)
+Patch0: qtwebengine-opensource-src-5.9.2-linux-pri.patch
# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
# resulting warnings - not upstreamable as is because it removes the fallback
# mechanism for the ICU data directory (which is not used in our builds because
@@ -84,7 +84,7 @@ Patch5: qtwebengine-opensource-src-5.9.0-system-icu-utf.patch
# also build V8 shared and twice on i686 (once for x87, once for SSE2)
Patch6: qtwebengine-opensource-src-5.9.1-no-sse2.patch
# fix missing ARM -mfpu setting
-Patch9: qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch
+Patch9: qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch
# remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
# restore NEON runtime detection in Skia: revert upstream review 1952953004,
@@ -93,15 +93,8 @@ Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
Patch11: qtwebengine-opensource-src-5.9.0-skia-neon.patch
# webrtc: enable the CPU feature detection for ARM Linux also for Chromium
Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch
-# FTBFS using qt < 5.8
-Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch
# Force verbose output from the GN bootstrap process
Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch
-# Fix src/3rdparty/chromium/build/linux/unbundle/re2.gn
-Patch22: qtwebengine-opensource-src-5.9.0-system-re2.patch
-# Fix broken binary compatibility for C memory management functions (incomplete
-# upstream fix for QTBUG-60565) (QTBUG-61521)
-Patch23: qtwebengine-opensource-src-5.9.1-qtbug-61521.patch
%if 0%{?fedora} && 0%{?fedora} < 25
# work around missing qt5_qtwebengine_arches macro on F24
@@ -121,6 +114,8 @@ BuildRequires: qt5-qtlocation-devel
BuildRequires: qt5-qtsensors-devel
BuildRequires: qt5-qtwebchannel-devel
BuildRequires: qt5-qttools-static
+# for examples?
+BuildRequires: qt5-qtquickcontrols2-devel
BuildRequires: ninja-build
BuildRequires: cmake
BuildRequires: bison
@@ -323,10 +318,7 @@ This version is compiled with support for patent-encumbered codecs enabled.
%patch10 -p1 -b .openmax-dl-neon
%patch11 -p1 -b .skia-neon
%patch12 -p1 -b .webrtc-neon-detect
-%patch20 -p1 -b .qt57
%patch21 -p1 -b .gn-bootstrap-verbose
-%patch22 -p1 -b .system-re2
-%patch23 -p1 -b .qtbug-61521
# fix // in #include in content/renderer/gpu to avoid debugedit failure
sed -i -e 's!gpu//!gpu/!g' \
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
@@ -405,6 +397,17 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Sat Oct 14 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.9.2-1
+- Update to 5.9.2
+- Add BuildRequires: qt5-qtquickcontrols2-devel for the examples
+- Rebase linux-pri patch
+- Drop qt57 and qtbug-61521 patches, fixed upstream
+- arm-fpu-fix patch: Drop the host tools hunk added in 5.9.0-2, fixed upstream
+- linux-pri patch: Do not call the Chromium unbundling script on re2,
+ QtWebEngine now auto-detects and uses the system re2 out of the box
+- Drop system-re2 patch (patching the no longer used unbundle/re2.gn), the
+ QtWebEngine re2/BUILD.gn is already correct
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 5.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch b/qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch
similarity index 63%
rename from qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch
rename to qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch
index ca308d4..a475199 100644
--- a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch
+++ b/qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch
@@ -1,15 +1,6 @@
diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-arm-fpu-fix/src/core/config/linux.pri
--- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200
+++ qtwebengine-opensource-src-5.9.0-arm-fpu-fix/src/core/config/linux.pri 2017-06-13 14:51:26.986633933 +0200
-@@ -41,7 +41,7 @@
- !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\"
- }
-
--contains(QT_ARCH, "arm"):!host_build {
-+contains(QT_ARCH, "arm") {
- # Extract ARM specific compiler options that we have to pass to gn,
- # but let gn figure out a default if an option is not present.
- MTUNE = $$extractCFlag("-mtune=.*")
@@ -64,6 +64,7 @@
gn_args += arm_use_neon=true
} else {
diff --git a/qtwebengine-opensource-src-5.9.0-linux-pri.patch b/qtwebengine-opensource-src-5.9.2-linux-pri.patch
similarity index 57%
rename from qtwebengine-opensource-src-5.9.0-linux-pri.patch
rename to qtwebengine-opensource-src-5.9.2-linux-pri.patch
index c671f6b..ac7b583 100644
--- a/qtwebengine-opensource-src-5.9.0-linux-pri.patch
+++ b/qtwebengine-opensource-src-5.9.2-linux-pri.patch
@@ -1,14 +1,11 @@
-diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri
---- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200
-+++ qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri 2017-06-08 00:20:53.688419747 +0200
-@@ -148,3 +148,22 @@
- use?(system_ffmpeg): gn_args += use_system_ffmpeg=true
+diff -up qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri
+--- qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri 2017-10-09 15:08:43.206663093 -0500
++++ qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri 2017-10-09 15:09:52.248208321 -0500
+@@ -153,3 +153,19 @@ host_build {
+ use?(system_re2): gn_args += use_system_re2=true
#use?(system_protobuf): gn_args += use_system_protobuf=true
}
+
-+# some more system packages, that are not checked for for some reason
-+gn_args += use_system_re2=true
-+
+# yasm is only used on x86, and passing use_system_yasm makes the build fail on
+# other architectures (e.g., ARM), so make it conditional on the architecture
+contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") {
@@ -21,6 +18,6 @@ diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-
+# run the unbundling script Chromium provides
+CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
+R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py"
-+R_G_F_PY_ARGS = "--system-libraries re2 yasm"
++R_G_F_PY_ARGS = "--system-libraries yasm"
+log("Running python $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
+!system("python $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
diff --git a/sources b/sources
index a5cd74f..2cccd0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4ad2f5df86c8483c06b3fe14c30136a qtwebengine-opensource-src-5.9.1.tar.xz
+366bb699788c79c92787b38c60cbf5db qtwebengine-opensource-src-5.9.2.tar.xz
6 years, 7 months