[lpf-flash-plugin] update script
by Leigh Scott
commit df802b840554047706da7c1c9db989ad3b890f4c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Apr 9 08:15:06 2020 +0100
update script
check_new_version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/check_new_version.py b/check_new_version.py
index a2ada6f..7604e94 100755
--- a/check_new_version.py
+++ b/check_new_version.py
@@ -45,9 +45,9 @@ if new_version != old_version:
print('rfpkg ci -c && git show')
print('rfpkg push && rfpkg build --nowait')
+ print('git checkout f32 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f31 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master')
- print('git checkout f29 && git merge master && git push && rfpkg build --nowait; git checkout master')
else:
print("Already updated !")
4 years, 7 months
[lpf-flash-plugin] Update to 32.0.0.344
by Leigh Scott
commit c26f1c97f7488f4c100b08808d8a6afa2cfecb19
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Apr 9 08:12:07 2020 +0100
Update to 32.0.0.344
flash-plugin.spec.in | 5 ++++-
lpf-flash-plugin.spec | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/flash-plugin.spec.in b/flash-plugin.spec.in
index f4497f5..d389090 100644
--- a/flash-plugin.spec.in
+++ b/flash-plugin.spec.in
@@ -2,7 +2,7 @@
%global __strip /bin/true
Name: flash-plugin
-Version: 32.0.0.330
+Version: 32.0.0.344
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player
@@ -63,6 +63,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/flash-player-properti
%{_datadir}/icons/hicolor/*/apps/flash-player-properties.png
%changelog
+* Thu Apr 09 2020 leigh123linux <leigh123linux(a)googlemail.com> - 1:32.0.0.344-1
+- Update to 32.0.0.344
+
* Wed Feb 12 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 1:32.0.0.330-1
- Update to 32.0.0.330
diff --git a/lpf-flash-plugin.spec b/lpf-flash-plugin.spec
index 647768a..2ddd3d7 100644
--- a/lpf-flash-plugin.spec
+++ b/lpf-flash-plugin.spec
@@ -5,7 +5,7 @@
%define target_pkg %(t=%{name}; echo ${t#lpf-})
Name: lpf-flash-plugin
-Version: 32.0.0.330
+Version: 32.0.0.344
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player package bootstrap
@@ -67,6 +67,9 @@ fi
%changelog
+* Thu Apr 09 2020 leigh123linux <leigh123linux(a)googlemail.com> - 1:32.0.0.344-1
+- Update to 32.0.0.344
+
* Wed Feb 12 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 1:32.0.0.330-1
- Update to 32.0.0.330
4 years, 7 months
[rpmfusion-free-release/f30] Fix rpmfusion-free-fedora-32 key (rfbz#5591)
by Leigh Scott
commit 59eaabfe47c73da13c2773bc69d8413b386b0e80
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Apr 8 20:46:01 2020 +0100
Fix rpmfusion-free-fedora-32 key (rfbz#5591)
rpmfusion-free-release.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 2e8469a..24a3851 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 30
-Release: 1
+Release: 2
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE32}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Wed Apr 08 2020 Leigh Scott <leigh123linux(a)gmail.com> - 30-2
+- Fix rpmfusion-free-fedora-32 key (rfbz#5591)
+
* Mon Apr 08 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 30-1
- Release for f30
4 years, 7 months
[telegram-desktop/f32] Fixed FTBFS on Fedora 32+.
by Vitaly Zaitsev
commit 1e1f47c1704ef0a6713f4f627eed98764c126b9e
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Apr 8 12:37:52 2020 +0200
Fixed FTBFS on Fedora 32+.
lib_base-eedb8af.patch | 22 ++++++++++++++++++++++
telegram-desktop.spec | 9 +++++++--
2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/lib_base-eedb8af.patch b/lib_base-eedb8af.patch
new file mode 100644
index 0000000..f2f5811
--- /dev/null
+++ b/lib_base-eedb8af.patch
@@ -0,0 +1,22 @@
+From eedb8afcf5f1709f3e02db9b06b977bb57aca182 Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail(a)gmail.com>
+Date: Wed, 8 Apr 2020 13:56:26 +0400
+Subject: [PATCH] Fix thread_safe_wrap for Clang 10.
+
+---
+ base/thread_safe_wrap.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Telegram/lib_base/base/thread_safe_wrap.h b/Telegram/lib_base/base/thread_safe_wrap.h
+index 8c2f562..d5f4e4a 100644
+--- a/Telegram/lib_base/base/thread_safe_wrap.h
++++ b/Telegram/lib_base/base/thread_safe_wrap.h
+@@ -31,7 +31,7 @@ class thread_safe_wrap {
+
+ private:
+ T _value;
+- QMutex _mutex;
++ mutable QMutex _mutex;
+
+ };
+
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 00b5f83..5e2aca4 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,13 +1,15 @@
# Build conditionals (with - OFF, without - ON)...
-%bcond_with rlottie
%bcond_with gtk3
-%bcond_with clang
%bcond_without spellcheck
%bcond_without fonts
%bcond_without mindbg
%if 0%{?fedora} && 0%{?fedora} >= 32
%bcond_with ipo
+%bcond_without clang
+%bcond_without rlottie
%else
+%bcond_with clang
+%bcond_with rlottie
%ifarch x86_64
%bcond_without ipo
%else
@@ -50,6 +52,9 @@ ExclusiveArch: x86_64
# Source files...
Source0: %{url}/releases/download/v%{version}/%{appname}-%{version}%{tarsuffix}.tar.gz
+# https://github.com/desktop-app/lib_base/commit/eedb8afcf5f1709f3e02db9b06...
+Patch100: lib_base-eedb8af.patch
+
# Telegram Desktop require exact version of Qt due to Qt private API usage.
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Requires: qt5-qtimageformats%{?_isa}
4 years, 7 months
[ffmpeg] Update changelog
by Nicolas Chauvet
commit 239e5310db50c9edd5b1d425f355a71d5be3072f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 8 10:32:06 2020 +0200
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b38d376..75cf5e2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -89,7 +89,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3
-Release: 0.11.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.12.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -434,6 +434,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Wed Apr 08 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3-0.12.20200401git
+- Enable srt
+
* Wed Apr 01 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.11.20200401git
- Update snapshot, fixes rfbz#5537
4 years, 7 months
[ffmpeg] Enable srt
by Nicolas Chauvet
commit e6847b1ea7da8722b62152e3d60d57928050dbf1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 8 10:30:58 2020 +0200
Enable srt
ffmpeg.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ff88495..b38d376 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -171,6 +171,7 @@ BuildRequires: perl(Pod::Man)
%{?_with_snappy:BuildRequires: snappy-devel}
BuildRequires: soxr-devel
BuildRequires: speex-devel
+BuildRequires: pkgconfig(srt)
%{?_with_tesseract:BuildRequires: tesseract-devel}
#BuildRequires: texi2html
BuildRequires: texinfo
4 years, 7 months
[VirtualBox] rfbz #5598 2 patches: Fix VBox crash when started under Wayland, Fix keyboard-grab under Wayland
by Sérgio M. Basto
commit b3fda30729bf11e7bac00d4e058ccb3188e7b27f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 7 22:37:30 2020 +0100
rfbz #5598 2 patches: Fix VBox crash when started under Wayland, Fix
keyboard-grab under Wayland
VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch | 45 ++++++++++++++++++++++++
VirtualBox-6.1.4-wayland-crash.patch | 15 ++++++++
VirtualBox.spec | 9 ++++-
3 files changed, 68 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch b/VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch
new file mode 100644
index 0000000..1284b6b
--- /dev/null
+++ b/VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch
@@ -0,0 +1,45 @@
+diff -up VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp~ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp
+--- VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp~ 2020-02-18 18:19:59.000000000 +0100
++++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp 2020-04-06 13:30:21.274027340 +0200
+@@ -2203,6 +2204,17 @@ void UICommon::setWMClass(QWidget *pWidg
+ XSetClassHint(QX11Info::display(), pWidget->window()->winId(), &windowClass);
+ }
+
++/* static */
++void UICommon::setXwaylandMayGrabKeyboardFlag(QWidget *pWidget)
++{
++ /* Tell the WM we are well behaved wrt Xwayland keyboard-grabs. This will
++ * make the WM turn our grab into a Wayland shortcut inhibition request,
++ * so that e.g. alt+tab will get send to the VM instead of moving the
++ * focus away from the VM. */
++ XXSendClientMessage(QX11Info::display(), pWidget->window()->winId(),
++ "_XWAYLAND_MAY_GRAB_KEYBOARD", 1);
++}
++
+ #endif /* VBOX_WS_X11 */
+
+ /* static */
+diff -up VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h~ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h
+--- VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h~ 2020-02-18 18:19:59.000000000 +0100
++++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h 2020-04-06 13:30:20.345012390 +0200
+@@ -416,6 +416,8 @@ public:
+
+ /** Assigns WM_CLASS property for passed @a pWidget. */
+ static void setWMClass(QWidget *pWidget, const QString &strNameString, const QString &strClassString);
++ /** Tell the WM the passed @a pWidget window is well behaved wrt XWayland keyboard-grabs. */
++ static void setXwaylandMayGrabKeyboardFlag(QWidget *pWidget);
+ #endif /* VBOX_WS_X11 */
+
+ /** Assigns minimum @a pSpinBox to correspond to @a cCount digits. */
+diff -up VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp~ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
+--- VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp~ 2020-04-06 13:18:46.000000000 +0200
++++ VirtualBox-6.1.4/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp 2020-04-06 13:25:52.235673962 +0200
+@@ -135,6 +135,8 @@ void UIMachineWindow::prepare()
+ strWindowName = QString("VirtualBox Machine UUID: %1").arg(uiCommon().managedVMUuid().toString());
+ /* Assign WM_CLASS property: */
+ UICommon::setWMClass(this, strWindowName, strWindowClass);
++ /* Tell the WM we are well behaved wrt Xwayland keyboard-grabs: */
++ UICommon::setXwaylandMayGrabKeyboardFlag(this);
+ #endif
+ }
+
diff --git a/VirtualBox-6.1.4-wayland-crash.patch b/VirtualBox-6.1.4-wayland-crash.patch
new file mode 100644
index 0000000..48461b2
--- /dev/null
+++ b/VirtualBox-6.1.4-wayland-crash.patch
@@ -0,0 +1,15 @@
+diff -up VirtualBox-6.1.4/src/VBox/Installer/linux/VBox.sh~ VirtualBox-6.1.4/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-6.1.4/src/VBox/Installer/linux/VBox.sh~ 2020-04-02 18:29:07.000000000 +0200
++++ VirtualBox-6.1.4/src/VBox/Installer/linux/VBox.sh 2020-04-06 10:29:16.560823901 +0200
+@@ -88,6 +88,11 @@ if [ "$SHUTDOWN" = "true" ]; then
+ exit 0
+ fi
+
++# The VirtualBox code uses QX11Info::display() to make direct X11 calls in
++# various places, so it is not ready to run as native Wayland client yet
++# Without this "VirtualBox" crashes immediately at startup under Wayland
++export QT_QPA_PLATFORM=xcb
++
+ APP=`basename $0`
+ case "$APP" in
+ VirtualBox|virtualbox)
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 755c488..ba3d4f9 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -93,6 +93,8 @@ Patch80: VirtualBox-6.1.4-hacks.patch
Patch81: fixes_for_5.6.patch
Patch82: Clipboard.patch
Patch83: VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch
+Patch84: VirtualBox-6.1.4-wayland-crash.patch
+Patch85: VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -348,6 +350,8 @@ rm -r src/libs/zlib-1.2.*/
%endif
%patch82 -p1 -b .clipboard
%patch83 -p1 -b .vmsvga-x11-crash
+%patch84 -p1 -b .wayland
+%patch85 -p1 -b .wayland2
%build
@@ -886,7 +890,10 @@ getent passwd vboxadd >/dev/null || \
%changelog
* Sat Apr 04 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.4-4
- Fix rfbz#5581 USB devices are not available
-- VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch, just for epel7 guest-additions.
+- VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch, just for epel7
+ guest-additions.
+- rfbz #5598 2 patches: Fix VBox crash when started under Wayland, Fix
+ keyboard-grab under Wayland
* Thu Mar 19 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.4-3
- Fixes for kernel 5.6 from
4 years, 7 months
[VirtualBox] Delete unused VBoxOGLRun.sh, OGL was removed in version 6.1.0
by Sérgio M. Basto
commit d3d23a11de4af19009ec80ea82aadb9faf670778
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Apr 4 05:47:49 2020 +0100
Delete unused VBoxOGLRun.sh, OGL was removed in version 6.1.0
VBoxOGLRun.sh | 10 ----------
VirtualBox.spec | 6 ------
2 files changed, 16 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 2c1c901..755c488 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -66,7 +66,6 @@ Source5: VirtualBox-60-vboxguest.rules
Source6: VirtualBox-guest.modules
Source7: vboxservice.service
Source8: 96-vbox.preset
-Source9: VBoxOGLRun.sh
Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
@@ -592,9 +591,6 @@ install -m 0755 -t %{buildroot}%{_bindir} \
# Guest libraries
install -m 0755 -t %{buildroot}%{_libdir}/security \
obj/bin/additions/pam_vbox.so
-#install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \
-# obj/bin/additions/VBoxOGL*.so
-#ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1
# init/vboxadd-x11 code near call the function install_x11_startup_app
install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
@@ -609,7 +605,6 @@ desktop-file-validate \
install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_unitdir}/vboxservice.service
install -p -m 0644 -D %{SOURCE8} %{buildroot}%{_presetdir}/96-vbox.preset
install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
-install -p -m 0755 -D %{SOURCE9} %{buildroot}%{_bindir}/VBoxOGLRun
install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
%if 0%{?fedora}
#sed -i s/vboxvideo/d %{buildroot}%{_prefix}/lib/modules-load.d/%{name}-guest.conf
@@ -870,7 +865,6 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
%{_bindir}/VBoxClient-all
-%{_bindir}/VBoxOGLRun
%{_sbindir}/VBoxService
%{_sbindir}/mount.vboxsf
%{_libdir}/security/pam_vbox.so
4 years, 7 months
