scm-commits August 2020

scm-commits@lists.fedoraproject.org

1 participants
30498 discussions

tdawson pushed to qtkeychain (epel8). "Fix for CMake macro changes (..more)"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:11:34 UTC From 4bc961c7caa8588d73174aeb136525c638f08bfc Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim <michel(a)michel-slm.name> Date: Aug 31 2020 19:50:41 +0000 Subject: Fix for CMake macro changes Add ability to disable Qt4 build (makes it easier to maintain EPEL8 branch) Signed-off-by: Michel Alexandre Salim <michel(a)michel-slm.name> --- diff --git a/qtkeychain.spec b/qtkeychain.spec index 1f4b82b..33a3d29 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,6 +1,12 @@ +%if 0%{?fedora} +%bcond_without qt4 +%else +%bcond_with qt4 +%endif + Name: qtkeychain Version: 0.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A password store library License: BSD @@ -9,8 +15,10 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: cmake +%if %{with qt4} BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtDBus) +%endif BuildRequires: pkgconfig(libsecret-1) %description @@ -47,33 +55,39 @@ This package contains development files for qt5keychain. %prep %autosetup -p1 +%if %{with qt4} mkdir %{_target_platform}-qt4 -mkdir %{_target_platform}-qt5 +%endif %build -pushd %{_target_platform}-qt4 - %cmake .. \ - -DBUILD_WITH_QT4:BOOL=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -popd -pushd %{_target_platform}-qt5 - %cmake .. \ - -DBUILD_WITH_QT4:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -popd +%if %{with qt4} +%cmake -B %{_target_platform}-qt4 \ + -DBUILD_WITH_QT4:BOOL=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo %make_build -C %{_target_platform}-qt4 -%make_build -C %{_target_platform}-qt5 +%endif + +%cmake \ + -DBUILD_WITH_QT4:BOOL=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + +%cmake_build %install +%if %{with qt4} %make_install -C %{_target_platform}-qt4 -%make_install -C %{_target_platform}-qt5 +%endif +%cmake_install %find_lang %{name} --with-qt +%if %{with qt4} grep %{_qt4_translationdir} %{name}.lang > %{name}-qt4.lang +%endif grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang +%if %{with qt4} %files -f %{name}-qt4.lang %doc ReadMe.txt %license COPYING @@ -85,6 +99,7 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang %{_libdir}/cmake/QtKeychain/ %{_libdir}/libqtkeychain.so %{_libdir}/qt5/mkspecs/modules/qt_QtKeychain.pri +%endif %files qt5 -f %{name}-qt5.lang %doc ReadMe.txt @@ -99,6 +114,10 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang %{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri %changelog +* Mon Aug 31 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.10.0-4 +- Fix for CMake macro changes +- Add ability to disable Qt4 build (makes it easier to maintain EPEL8 branch) + * Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://src.fedoraproject.org/rpms/qtkeychain/c/4bc961c7caa8588d73174aeb136…

1 0

tdawson pushed to qtkeychain (epel8). "Update to 0.10.0 (..more)"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:11:34 UTC From 12e96088753ce8230a11adec50f9cf56d2c3713c Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan <nonamedotc(a)gmail.com> Date: Jun 19 2020 01:55:01 +0000 Subject: Update to 0.10.0 Drop upstreamed patches --- diff --git a/.gitignore b/.gitignore index b03eff1..e0c60b6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qtkeychain-0.6.2.tar.gz /qtkeychain-0.7.0.tar.gz /qtkeychain-0.9.1.tar.gz +/qtkeychain-0.10.0.tar.gz diff --git a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch b/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch deleted file mode 100644 index 02cb7ee..0000000 --- a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 89db0fc72d2aad5e88d7da035b27b882453a8d05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com> -Date: Sun, 28 Apr 2019 21:46:14 +0200 -Subject: [PATCH] Convert QStringLiteral to QLatin1String to keep compatibility - with Qt4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> ---- - keychain_unix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keychain_unix.cpp b/keychain_unix.cpp -index 958927a..b9a8e9d 100644 ---- a/keychain_unix.cpp -+++ b/keychain_unix.cpp -@@ -93,7 +93,7 @@ static bool isKwallet5Available() - // a wallet can be opened. - - iface.setTimeout(500); -- QDBusMessage reply = iface.call(QStringLiteral("networkWallet")); -+ QDBusMessage reply = iface.call(QLatin1String("networkWallet")); - return reply.type() == QDBusMessage::ReplyMessage; - } - --- -2.21.0 - diff --git a/qtkeychain.spec b/qtkeychain.spec index 4f86a20..280531b 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,13 +1,11 @@ Name: qtkeychain -Version: 0.9.1 -Release: 4%{?dist} +Version: 0.10.0 +Release: 1%{?dist} Summary: A password store library License: BSD Url: https://github.com/frankosterfeld/qtkeychain Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://github.com/frankosterfeld/qtkeychain/pull/144 -Patch0: 0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -101,6 +99,10 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang %{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri %changelog +* Thu Jun 18 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 0.10.0-1 +- Update to 0.10.0 +- Drop upstreamed patches + * Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0995b0d..fb2ceee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtkeychain-0.9.1.tar.gz) = c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a +SHA512 (qtkeychain-0.10.0.tar.gz) = de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6 https://src.fedoraproject.org/rpms/qtkeychain/c/12e96088753ce8230a11adec50f…

1 0

tdawson pushed to qtkeychain (epel8). "- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild (..more)"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:11:34 UTC From 7684c06658e119a1c928acd30493352b6c48bc08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Aug 01 2020 07:38:25 +0000 Subject: - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> --- diff --git a/qtkeychain.spec b/qtkeychain.spec index c23ec29..1f4b82b 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,6 +1,6 @@ Name: qtkeychain Version: 0.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A password store library License: BSD @@ -99,6 +99,10 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang %{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri %changelog +* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://src.fedoraproject.org/rpms/qtkeychain/c/7684c06658e119a1c928acd3049…

1 0

tdawson pushed to qtkeychain (epel8). "- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild (..more)"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:11:34 UTC From 42c1df7ad960f1c7598599731ab0650c9784e2e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Jul 29 2020 05:17:14 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> --- diff --git a/qtkeychain.spec b/qtkeychain.spec index 280531b..c23ec29 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,6 +1,6 @@ Name: qtkeychain Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A password store library License: BSD @@ -99,6 +99,9 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang %{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri %changelog +* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 18 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 0.10.0-1 - Update to 0.10.0 - Drop upstreamed patches https://src.fedoraproject.org/rpms/qtkeychain/c/42c1df7ad960f1c7598599731ab…

1 0

tdawson pushed to qtkeychain (epel8). "Merge branch 'master' into epel8"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:11:34 UTC From 1ea0b161dfb339ebed9b1b4749ca7633bda18d55 Mon Sep 17 00:00:00 2001 From: Troy Dawson <tdawson(a)redhat.com> Date: Aug 31 2020 20:11:14 +0000 Subject: Merge branch 'master' into epel8 --- diff --git a/.gitignore b/.gitignore index b03eff1..e0c60b6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qtkeychain-0.6.2.tar.gz /qtkeychain-0.7.0.tar.gz /qtkeychain-0.9.1.tar.gz +/qtkeychain-0.10.0.tar.gz diff --git a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch b/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch deleted file mode 100644 index 02cb7ee..0000000 --- a/0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 89db0fc72d2aad5e88d7da035b27b882453a8d05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com> -Date: Sun, 28 Apr 2019 21:46:14 +0200 -Subject: [PATCH] Convert QStringLiteral to QLatin1String to keep compatibility - with Qt4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com> ---- - keychain_unix.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/keychain_unix.cpp b/keychain_unix.cpp -index 958927a..b9a8e9d 100644 ---- a/keychain_unix.cpp -+++ b/keychain_unix.cpp -@@ -93,7 +93,7 @@ static bool isKwallet5Available() - // a wallet can be opened. - - iface.setTimeout(500); -- QDBusMessage reply = iface.call(QStringLiteral("networkWallet")); -+ QDBusMessage reply = iface.call(QLatin1String("networkWallet")); - return reply.type() == QDBusMessage::ReplyMessage; - } - --- -2.21.0 - diff --git a/qtkeychain.spec b/qtkeychain.spec index 42c73a8..f7d843d 100644 --- a/qtkeychain.spec +++ b/qtkeychain.spec @@ -1,21 +1,21 @@ %if 0%{?fedora} -%global qt4 1 +%bcond_without qt4 +%else +%bcond_with qt4 %endif Name: qtkeychain -Version: 0.9.1 -Release: 4%{?dist}.1 +Version: 0.10.0 +Release: 4%{?dist} Summary: A password store library License: BSD Url: https://github.com/frankosterfeld/qtkeychain Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# https://github.com/frankosterfeld/qtkeychain/pull/144 -Patch0: 0001-Convert-QStringLiteral-to-QLatin1String-to-keep-comp.patch BuildRequires: gcc-c++ BuildRequires: cmake -%if 0%{?qt4} +%if %{with qt4} BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtDBus) %endif @@ -55,44 +55,39 @@ This package contains development files for qt5keychain. %prep %autosetup -p1 -%if 0%{?qt4} +%if %{with qt4} mkdir %{_target_platform}-qt4 %endif -mkdir %{_target_platform}-qt5 %build -%if 0%{?qt4} -pushd %{_target_platform}-qt4 - %cmake .. \ - -DBUILD_WITH_QT4:BOOL=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -popd -%endif -pushd %{_target_platform}-qt5 - %cmake .. \ - -DBUILD_WITH_QT4:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -popd +%if %{with qt4} +%cmake -B %{_target_platform}-qt4 \ + -DBUILD_WITH_QT4:BOOL=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo -%if 0%{?qt4} %make_build -C %{_target_platform}-qt4 %endif -%make_build -C %{_target_platform}-qt5 + +%cmake \ + -DBUILD_WITH_QT4:BOOL=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo + +%cmake_build %install -%if 0%{?qt4} +%if %{with qt4} %make_install -C %{_target_platform}-qt4 %endif -%make_install -C %{_target_platform}-qt5 +%cmake_install %find_lang %{name} --with-qt -%if 0%{?qt4} +%if %{with qt4} grep %{_qt4_translationdir} %{name}.lang > %{name}-qt4.lang %endif grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang -%if 0%{?qt4} +%if %{with qt4} %files -f %{name}-qt4.lang %doc ReadMe.txt %license COPYING @@ -119,6 +114,21 @@ grep %{_qt5_translationdir} %{name}.lang > %{name}-qt5.lang %{_libdir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri %changelog +* Mon Aug 31 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.10.0-4 +- Fix for CMake macro changes +- Add ability to disable Qt4 build (makes it easier to maintain EPEL8 branch) + +* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 18 2020 Mukundan Ragavan <nonamedotc(a)fedoraproject.org> - 0.10.0-1 +- Update to 0.10.0 +- Drop upstreamed patches + * Fri May 29 2020 Troy Dawson <tdawson(a)redhat.com> - 0.9.1-4.1 - Make qt4 optional - Only build qt4 in Fedora diff --git a/sources b/sources index 0995b0d..fb2ceee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtkeychain-0.9.1.tar.gz) = c80bd25a5b72c175d0d4a985b952924c807bf67be33eeb89e2b83757727e642c10d8d737cea9744d2faad74c50c1b55d82b306135559c35c91a088c3b198b33a +SHA512 (qtkeychain-0.10.0.tar.gz) = de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6 https://src.fedoraproject.org/rpms/qtkeychain/c/1ea0b161dfb339ebed9b1b4749c…

1 0

sagitter pushed to qcad (f32). "Release 3.25.1.0"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:11:26 UTC From 7de6029c7d95a2cd0efdf4389ccb1a5b4999dba5 Mon Sep 17 00:00:00 2001 From: sagitter <sagitter(a)fedoraproject.org> Date: Aug 31 2020 19:46:03 +0000 Subject: Release 3.25.1.0 --- diff --git a/.gitignore b/.gitignore index 93d8b75..a359d7e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /qcad-3.24.2.6.tar.gz /qcad-3.24.3.0.tar.gz /qcad-3.25.0.0.tar.gz +/qcad-3.25.1.0.tar.gz diff --git a/qcad.spec b/qcad.spec index bd540dc..689ccc7 100644 --- a/qcad.spec +++ b/qcad.spec @@ -2,7 +2,7 @@ %global _QT_PLUGINS %{_qt5_plugindir} Name: qcad -Version: 3.25.0.0 +Version: 3.25.1.0 Release: 1%{?dist} Summary: Powerful 2D CAD system @@ -222,6 +222,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %{_mandir}/man1/* %changelog +* Mon Aug 31 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.25.1.0-1 +- Release 3.25.1.0 + * Thu Aug 20 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.25.0.0-1 - Release 3.25.0.0 diff --git a/sources b/sources index 2eadc7b..00832e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qcad-3.25.0.0.tar.gz) = 0dcbafcff4abdca348cef4d680356cc35f134dc560312107165dd410e2203b65d1550ecef6ccc5c930514fc77efe1a5d8316fcf73e1e3841864af3fbb5295ce7 +SHA512 (qcad-3.25.1.0.tar.gz) = f63eed6a00aab94b5ea1ecc2fdd05a876ff470a5aea25d7d5e1685c36e1193872ddfe2f4bd903179f035ad0a96205c9f25330f397c46ee3d8bee9e5863ab5439 https://src.fedoraproject.org/rpms/qcad/c/7de6029c7d95a2cd0efdf4389ccb1a5b4…

1 0

sagitter pushed to qcad (f33). "Release 3.25.1.0"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:10:43 UTC From 7de6029c7d95a2cd0efdf4389ccb1a5b4999dba5 Mon Sep 17 00:00:00 2001 From: sagitter <sagitter(a)fedoraproject.org> Date: Aug 31 2020 19:46:03 +0000 Subject: Release 3.25.1.0 --- diff --git a/.gitignore b/.gitignore index 93d8b75..a359d7e 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /qcad-3.24.2.6.tar.gz /qcad-3.24.3.0.tar.gz /qcad-3.25.0.0.tar.gz +/qcad-3.25.1.0.tar.gz diff --git a/qcad.spec b/qcad.spec index bd540dc..689ccc7 100644 --- a/qcad.spec +++ b/qcad.spec @@ -2,7 +2,7 @@ %global _QT_PLUGINS %{_qt5_plugindir} Name: qcad -Version: 3.25.0.0 +Version: 3.25.1.0 Release: 1%{?dist} Summary: Powerful 2D CAD system @@ -222,6 +222,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %{_mandir}/man1/* %changelog +* Mon Aug 31 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.25.1.0-1 +- Release 3.25.1.0 + * Thu Aug 20 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.25.0.0-1 - Release 3.25.0.0 diff --git a/sources b/sources index 2eadc7b..00832e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qcad-3.25.0.0.tar.gz) = 0dcbafcff4abdca348cef4d680356cc35f134dc560312107165dd410e2203b65d1550ecef6ccc5c930514fc77efe1a5d8316fcf73e1e3841864af3fbb5295ce7 +SHA512 (qcad-3.25.1.0.tar.gz) = f63eed6a00aab94b5ea1ecc2fdd05a876ff470a5aea25d7d5e1685c36e1193872ddfe2f4bd903179f035ad0a96205c9f25330f397c46ee3d8bee9e5863ab5439 https://src.fedoraproject.org/rpms/qcad/c/7de6029c7d95a2cd0efdf4389ccb1a5b4…

1 0

atim pushed to vokoscreenNG (f31). "Update to 3.0.6"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:07:22 UTC From d14c87e99a1d9ec424a2b881c6617b0641eaf791 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk <ego.cordatus(a)gmail.com> Date: Aug 31 2020 19:42:24 +0000 Subject: Update to 3.0.6 --- diff --git a/.gitignore b/.gitignore index aa46121..de075fa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /vokoscreenNG-3.0.3.tar.gz /vokoscreenNG-3.0.4.tar.gz /vokoscreenNG-3.0.5.tar.gz +/vokoscreenNG-3.0.6.tar.gz diff --git a/sources b/sources index af4afc6..d426733 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vokoscreenNG-3.0.5.tar.gz) = c7d62e1764f0dd5db6a0de1fc447cb9c06292e2f4f9885795605473e31086f49ceff2d4492ff55edb4f5f9fe36964085d078e7fe41215c3c403f61153e6a614e +SHA512 (vokoscreenNG-3.0.6.tar.gz) = ee0c2985aa7baf42c31e0e05210419a7f3c24e1f249b8023b994142c8e9f824a9adad2afe72a96341c7e4ace18d7b8a1aff2d6c795f5999f4d3ff678b226e9bb diff --git a/vokoscreenNG.spec b/vokoscreenNG.spec index 6a2b0d4..cf80ede 100644 --- a/vokoscreenNG.spec +++ b/vokoscreenNG.spec @@ -1,7 +1,7 @@ # TODO: write AppData manifest Name: vokoscreenNG -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: User friendly Open Source screencaster @@ -65,6 +65,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Mon Aug 31 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.0.6-1 +- Update to 3.0.6 + * Fri Jul 31 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.0.5-1 - Update to 3.0.5 https://src.fedoraproject.org/rpms/vokoscreenNG/c/d14c87e99a1d9ec424a2b881c…

1 0

jkang pushed to jmc (jmc7). "Add temporary patch for startup flags"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:07:19 UTC From 697a4f65642f5a078f562980b2e15594029cf725 Mon Sep 17 00:00:00 2001 From: Jie Kang <jkang(a)redhat.com> Date: Aug 31 2020 20:07:12 +0000 Subject: Add temporary patch for startup flags --- diff --git a/11-update-flags.patch b/11-update-flags.patch new file mode 100644 index 0000000..ad4202c --- /dev/null +++ b/11-update-flags.patch @@ -0,0 +1,15 @@ +# HG changeset patch +# Parent 58eadb7c7ac8a81f6df4a70ecd5ecd69a8b42b0a + +diff -r 58eadb7c7ac8 -r 8992119f0f37 application/org.openjdk.jmc.rcp.product/jmc.product +--- a/application/org.openjdk.jmc.rcp.product/jmc.product Mon Aug 31 16:04:24 2020 -0400 ++++ b/application/org.openjdk.jmc.rcp.product/jmc.product Mon Aug 31 16:05:21 2020 -0400 +@@ -56,7 +56,7 @@ + </programArgsMac> + <programArgsWin> + </programArgsWin> +- <vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=128 -XX:+FlightRecorder -XX:StartFlightRecording=name=JMC_Default,maxsize=100m -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED ++ <vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED + </vmArgs> + <vmArgsLin>--add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED + </vmArgsLin> diff --git a/jmc.spec b/jmc.spec index 73689b9..4ec616e 100644 --- a/jmc.spec +++ b/jmc.spec @@ -80,6 +80,8 @@ Patch8: 8-remove-arch.patch Patch9: 9-remove-jacoco-dep.patch # Revert downloading of flameview assets from the web Patch10: 10-revert-flameview.patch +# Drop JFR flags (temporary) +Patch11: 11-update-flags.patch # JMC depends on Eclipse which no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -129,6 +131,7 @@ applications running locally or deployed in production environments. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %pom_disable_module releng %pom_disable_module l10n application @@ -222,6 +225,7 @@ sed -i "/.SH FILES/a .I %{_sysconfdir}/%{name}.ini" %{buildroot}%{_mandir}/man1/ * Fri Aug 28 2020 Jie Kang <jkang(a)redhat.com> - 7.1.1-6 - Update to latest upstream - Drop javax dependencies + * Fri Aug 07 2020 Alex Macdonald <almacdon(a)redhat.com> - 7.1.1-5 - Update symlink to match javamail version in rpms/javamail - Version 1.6.5 is compatible with 1.6.3 according to the upstream compatibility notes https://src.fedoraproject.org/rpms/jmc/c/697a4f65642f5a078f562980b2e1559402…

1 0

than pushed to qtwebkit (master). "fix FTBFS with bison-3.7"
by notifications＠fedoraproject.org 31 Aug '20

31 Aug '20

Notification time stamped 2020-08-31 20:04:19 UTC From 0ffa48d7bc7190de34157a3ee709ae06ae5b7f94 Mon Sep 17 00:00:00 2001 From: Than Ngo <than(a)redhat.com> Date: Aug 31 2020 20:04:10 +0000 Subject: fix FTBFS with bison-3.7 --- diff --git a/qtwebkit-bison-3.7.patch b/qtwebkit-bison-3.7.patch new file mode 100644 index 0000000..f11779f --- /dev/null +++ b/qtwebkit-bison-3.7.patch @@ -0,0 +1,43 @@ +diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.gyp/scripts/rule_bison.py.bison37 webkit-qtwebkit-23/Source/WebCore/WebCore.gyp/scripts/rule_bison.py +diff -up webkit-qtwebkit-23/Source/WebCore/css/makegrammar.pl.bison37 webkit-qtwebkit-23/Source/WebCore/css/makegrammar.pl +--- webkit-qtwebkit-23/Source/WebCore/css/makegrammar.pl.bison37 2014-09-24 13:42:05.000000000 +0200 ++++ webkit-qtwebkit-23/Source/WebCore/css/makegrammar.pl 2020-08-31 20:06:27.333379631 +0200 +@@ -73,23 +73,6 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-system("$bison -d -p $symbolsPrefix $grammarFilePath -o $fileBase.cpp"); +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while (<HPP>) { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. ++system(@bisonCommand) == 0 or die; +diff -up webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri.me webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri +--- webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri.me 2020-08-31 21:01:11.524849986 +0200 ++++ webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri 2020-08-31 21:03:55.555919630 +0200 +@@ -957,7 +957,7 @@ GENERATORS += stylesheets + # GENERATOR 10: XPATH grammar + xpathbison.output = ${QMAKE_FILE_BASE}.cpp + xpathbison.input = XPATHBISON +-xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && $(MOVE) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h ++xpathbison.commands = bison -d -p xpathyy ${QMAKE_FILE_NAME} -o ${QMAKE_FUNC_FILE_OUT_PATH}/${QMAKE_FILE_BASE}.tab.c && cp ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.c ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.cpp && cp ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.tab.h ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}${QMAKE_FILE_BASE}.h + xpathbison.depends = ${QMAKE_FILE_NAME} + GENERATORS += xpathbison + diff --git a/qtwebkit.spec b/qtwebkit.spec index a0328bb..d3805e9 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -44,6 +44,8 @@ Patch14: webkit-qtwebkit-23-no_rpath.patch Patch100: webkit-qtwebkit-23-gcc5.patch # backport from qt5-qtwebkit: URLs visited during private browsing show up in WebpageIcons.db Patch101: webkit-qtwebkit-23-private_browsing.patch +# fix FTBFS with bison-3.7 +Patch102: qtwebkit-bison-3.7.patch BuildRequires: bison BuildRequires: flex @@ -131,6 +133,9 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release} %patch100 -p1 -b .gcc5 %patch101 -p1 -b .private_browsing +%if 0%{?fedora} > 33 || 0%{?rhel} > 8 +%patch102 -p1 -b .bison37 +%endif install -m755 -D %{SOURCE1} bin/qmake https://src.fedoraproject.org/rpms/qtwebkit/c/0ffa48d7bc7190de34157a3ee709a…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
3050
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits August 2020