rathann pushed to rpms/mozilla-ublock-origin (f37). "new bundled
dependency: js-beautify"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 21:00:10 UTC
From 07e5a216eb1209ca11b9ed98e598287f3dcaff27 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Aug 31 2023 20:57:40 +0000
Subject: new bundled dependency: js-beautify
---
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index 01845e3..021ba50 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -39,6 +39,8 @@ Provides: bundled(fontawesome-fonts) = 4.7.0
Provides: bundled(inter-fonts)
# css/fonts/Metropolis/Metropolis-*.woff2 https://github.com/chrismsimpson/Metropolis Unlicense
Provides: bundled(metropolis-fonts)
+# lib/js-beautify https://github.com/beautify-web/js-beautify MIT
+Provides: bundled(js-beautify) = 1.14.7
# lib/punycode.js https://mths.be/punycode MIT
Provides: bundled(js-punycode) = 1.3.2
# lib/diff https://github.com/Swatinem/diff LGPLv3
@@ -75,6 +77,7 @@ popd
rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm
mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt
mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt
+mv src/lib/js-beautify/LICENSE LICENSE.js-beautify.txt
mv src/lib/codemirror/LICENSE LICENSE.codemirror.txt
%build
@@ -100,6 +103,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%license LICENSE.txt
%license LICENSE.codemirror.txt
%license LICENSE.fontawesome.txt
+%license LICENSE.js-beautify.txt
%license LICENSE.Inter.txt
%license src/css/fonts/Metropolis/UNLICENSE
%{firefox_inst_dir}/%{ext_id}.xpi
@@ -108,6 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
* Thu Aug 31 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.51.0-1
- update to 1.51.0 (#2224682)
+- new bundled dependency: js-beautify
* Mon Jun 12 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.50.0-1
- update to 1.50.0 (#2213457)
https://src.fedoraproject.org/rpms/mozilla-ublock-origin/c/07e5a216eb1209...
8Â months, 3Â weeks
jjames pushed to rpms/musescore (rawhide). "Fix Gootville font
config file error"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 20:52:43 UTC
From 711ce1ea86e5c0f386321f9f269afaa55717fea3 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Aug 31 2023 20:52:03 +0000
Subject: Fix Gootville font config file error
---
diff --git a/musescore.spec b/musescore.spec
index 6b32bb2..2d31dfb 100644
--- a/musescore.spec
+++ b/musescore.spec
@@ -19,7 +19,7 @@
Name: musescore
Summary: Music Composition & Notation Software
Version: %{musescore_ver}
-Release: 1%{?dist}
+Release: 2%{?dist}
# The MuseScore project itself is GPL-3.0-only WITH Font-exception-2.0. Other
# licenses in play:
@@ -179,7 +179,7 @@ Provides: mscore-gootville-fonts = %{musescore_ver}-%{release}
%global fontlicense9 OFL-1.1
%global fonts9 fonts/gootville/GootvilleText.otf
%global fontdocs9 fonts/gootville/readme.txt
-%global fontconfs9 %{SOURCE10}
+%global fontconfs9 %{SOURCE9}
%global fontdescription9 %{expand:
The Gootville Text font is designed to complement the Gootville font.}
%global fontpkgheader9 %{expand:
@@ -546,6 +546,9 @@ hardlink %{buildroot}%{_datadir}/mscore-%{musescore_maj}
%fontfiles -z 9
%changelog
+* Thu Aug 31 2023 Jerry James <loganjerry(a)gmail.com> - 4.1.1-2
+- Fix Gootville font config file error
+
* Wed Aug 30 2023 Jerry James <loganjerry(a)gmail.com> - 4.1.1-1
- Version 4.1.1
- Rename from mscore to musescore
https://src.fedoraproject.org/rpms/musescore/c/711ce1ea86e5c0f386321f9f26...
8Â months, 3Â weeks
iucar pushed to rpms/jacktrip (f39). "Update to Update 2.0.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 20:52:25 UTC
From e43d5c083a608cee668c7ca74e6a510d428e21c8 Mon Sep 17 00:00:00 2001
From: Iñaki Úcar <iucar(a)fedoraproject.org>
Date: Aug 31 2023 20:51:38 +0000
Subject: Update to Update 2.0.1
---
diff --git a/.gitignore b/.gitignore
index 39831df..cd9688b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/jacktrip-Simple-FFT-06f2377.tar.gz
/jacktrip-1.10.1.tar.gz
/jacktrip-2.0.0.tar.gz
+/jacktrip-2.0.1.tar.gz
diff --git a/jacktrip.spec b/jacktrip.spec
index 199fe98..83b291c 100644
--- a/jacktrip.spec
+++ b/jacktrip.spec
@@ -1,5 +1,5 @@
Name: jacktrip
-Version: 2.0.0
+Version: 2.0.1
Release: %autorelease
Summary: A system for high-quality audio network performance over the Internet
diff --git a/sources b/sources
index b1cebf6..efbd058 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jacktrip-2.0.0.tar.gz) = 06f52fceeb01e42e8f79efaedd11627f568aa542fe9cefc8d48b26586ef9f3fef22df33d90ad3929766f92ea497e3f1b0fccdc48312d213c4252fdce9336e056
+SHA512 (jacktrip-2.0.1.tar.gz) = 630d76ea731506c2a0bb9e9a7c2729a8ee710fc2914228cdb3103a9a2175cd871da2881c1ced275f615548b394cf93e608394218edb4aa71e7bbb1aebff2f662
https://src.fedoraproject.org/rpms/jacktrip/c/e43d5c083a608cee668c7ca74e6...
8Â months, 3Â weeks
iucar pushed to rpms/jacktrip (rawhide). "Update to Update 2.0.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 20:52:42 UTC
From e43d5c083a608cee668c7ca74e6a510d428e21c8 Mon Sep 17 00:00:00 2001
From: Iñaki Úcar <iucar(a)fedoraproject.org>
Date: Aug 31 2023 20:51:38 +0000
Subject: Update to Update 2.0.1
---
diff --git a/.gitignore b/.gitignore
index 39831df..cd9688b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/jacktrip-Simple-FFT-06f2377.tar.gz
/jacktrip-1.10.1.tar.gz
/jacktrip-2.0.0.tar.gz
+/jacktrip-2.0.1.tar.gz
diff --git a/jacktrip.spec b/jacktrip.spec
index 199fe98..83b291c 100644
--- a/jacktrip.spec
+++ b/jacktrip.spec
@@ -1,5 +1,5 @@
Name: jacktrip
-Version: 2.0.0
+Version: 2.0.1
Release: %autorelease
Summary: A system for high-quality audio network performance over the Internet
diff --git a/sources b/sources
index b1cebf6..efbd058 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jacktrip-2.0.0.tar.gz) = 06f52fceeb01e42e8f79efaedd11627f568aa542fe9cefc8d48b26586ef9f3fef22df33d90ad3929766f92ea497e3f1b0fccdc48312d213c4252fdce9336e056
+SHA512 (jacktrip-2.0.1.tar.gz) = 630d76ea731506c2a0bb9e9a7c2729a8ee710fc2914228cdb3103a9a2175cd871da2881c1ced275f615548b394cf93e608394218edb4aa71e7bbb1aebff2f662
https://src.fedoraproject.org/rpms/jacktrip/c/e43d5c083a608cee668c7ca74e6...
8Â months, 3Â weeks
yonhan pushed to rpms/openosc (f37). "Update to release 1.0.6 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 20:44:12 UTC
From a4edb530aa9460372757946199aa1622f12cfc3b Mon Sep 17 00:00:00 2001
From: Yongkui Han <yonhan(a)cisco.com>
Date: Aug 31 2023 19:46:05 +0000
Subject: Update to release 1.0.6
Signed-off-by: Yongkui Han <yonhan(a)cisco.com>
---
diff --git a/.gitignore b/.gitignore
index d2af06b..5e1a678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openosc-1.0.2.tar.gz
+/openosc-1.0.6.tar.gz
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..9516a16
--- /dev/null
+++ b/changelog
@@ -0,0 +1,23 @@
+* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Nov 25 2018 Yongkui Han <yonhan(a)cisco.com> 1.0.2-1
+- Initial packaging.
diff --git a/openosc.spec b/openosc.spec
index 1c4261e..83c78c1 100644
--- a/openosc.spec
+++ b/openosc.spec
@@ -1,8 +1,8 @@
Name: openosc
-Version: 1.0.2
-Release: 8%{?dist}
+Version: 1.0.6
+Release: %autorelease
Summary: Open Object Size Check Library
-License: ASL 2.0
+License: Apache-2.0
%global forgeurl https://github.com/cisco/openosc
%forgemeta
@@ -49,7 +49,7 @@ OpenOSC static package, containing the static library.
%build
%configure
-make %{?_smp_mflags}
+%make_build
%install
@@ -72,26 +72,4 @@ make %{?_smp_mflags}
%changelog
-* Thu Jul 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun Nov 25 2018 Yongkui Han <yonhan(a)cisco.com> 1.0.2-1
-- Initial packaging.
+%autochangelog
diff --git a/sources b/sources
index 5bcb111..38ce9db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openosc-1.0.2.tar.gz) = 56b3d2a6f7f4b01937717c80a07b0bdcc874c8093c9ce69b5420846cbc18cb7d57cad42864e8e4526a9b7b48680fafc4873c44579987888abbaa2d774b668e5f
+SHA512 (openosc-1.0.6.tar.gz) = 02a59e2758cef6a2aceab6934dd13f23c08afa163275266aa4a26ff93662576a758f5612490feb45a76087b9722852a72078bda5f8d447898db3c28487dfd8f2
https://src.fedoraproject.org/rpms/openosc/c/a4edb530aa9460372757946199aa...
8Â months, 3Â weeks
packagerbot pushed to rpms/dummy-test-package-gloster (rawhide).
"Bump release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 20:42:20 UTC
From d2946dcb27eaee496f6c2b27d865fa06c238fd49 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: Aug 31 2023 20:42:12 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-gloster.spec b/dummy-test-package-gloster.spec
index 15dfdeb..cfc0568 100644
--- a/dummy-test-package-gloster.spec
+++ b/dummy-test-package-gloster.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-gloster
Version: 0
-Release: 10850%{?dist}
+Release: 10851%{?dist}
Summary: Dummy Test Package called Gloster
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Thu Aug 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-10851
+- rebuilt
+
* Thu Aug 31 2023 packagerbot <admin(a)fedoraproject.org> - 0-10850
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-gloster/c/d2946dcb2...
8Â months, 3Â weeks
limb pushed to rpms/libreoffice (rawhide). "7.6.1.1"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-08-31 20:35:30 UTC
From 36004e2be45df8c0442c6ea67bf676e37819dc23 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync(a)protonmail.com>
Date: Aug 31 2023 20:09:45 +0000
Subject: 7.6.1.1
---
diff --git a/.gitignore b/.gitignore
index 47a6d53..f5226fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,9 @@
/libreoffice-help-7.6.0.3.tar.xz.asc
/libreoffice-translations-7.6.0.3.tar.xz
/libreoffice-translations-7.6.0.3.tar.xz.asc
+/libreoffice-7.6.1.1.tar.xz
+/libreoffice-7.6.1.1.tar.xz.asc
+/libreoffice-help-7.6.1.1.tar.xz
+/libreoffice-help-7.6.1.1.tar.xz.asc
+/libreoffice-translations-7.6.1.1.tar.xz
+/libreoffice-translations-7.6.1.1.tar.xz.asc
diff --git a/0001-Adapt-test-code-to-cURL-8.2.0.patch b/0001-Adapt-test-code-to-cURL-8.2.0.patch
deleted file mode 100644
index bfe94fc..0000000
--- a/0001-Adapt-test-code-to-cURL-8.2.0.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 2a68dc02bd19a717d3c86873206fabed1098f228 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman(a)redhat.com>
-Date: Mon, 31 Jul 2023 17:09:32 +0200
-Subject: [PATCH] Adapt test code to cURL 8.2.0
-
-...for which CppunitTest_ucb_webdav_core would fail with
-
-> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:60:(anonymous namespace)::webdav_local_test::WebdavUriTest
-> equality assertion failed
-> - Expected: ?query#fragment
-> - Actual : /?query#fragment
-
-and
-
-> ucb/qa/cppunit/webdav/webdav_local_neon.cxx:89:(anonymous namespace)::webdav_local_test::WebdavUriTest2
-> equality assertion failed
-> - Expected: ?query
-> - Actual : /?query
-
-because of
-<https://github.com/bch/curl/commit/5752e71080cb3aafa8b24c3261419345b832bc92>
-"urlapi: have *set(PATH) prepend a slash if one is missing".
-
-All that test code had been added with b03e070420606d407df2ec5e9dfa7043ecc46177
-"ucb: webdav-curl: fix CurlUri::CloneWithRelativeRefPathAbsolute()", and it
-looks harmless for our use cases that cURL started to behave differently there
-now. So instead of accepting either of the outcomes depending on what cURL
-version is being used, just change the test code to not leave out the
-path-absolute in the calls to CloneWithRelativeRefPathAbsolute (which is
-documented in ucb/source/ucp/webdav-curl/CurlUri.hxx to take
-
-> /// @param matches: relative-ref = path-absolute [ "?" query ] [ "#" fragment ]
-
-and path-absolute cannot be empty as per RFC 3986 "Uniform Resource Identifier
-(URI): Generic Syntax").
-
-Change-Id: If07a28598dfa047ebe89d8bcda19e8fcaa36aed0
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155099
-Reviewed-by: Michael Stahl <michael.stahl(a)allotropia.de>
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- ucb/qa/cppunit/webdav/webdav_local_neon.cxx | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-index bde7652b9ffa..a457bc6d2b28 100644
---- a/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-+++ b/ucb/qa/cppunit/webdav/webdav_local_neon.cxx
-@@ -52,12 +52,12 @@ namespace
- CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/foo/bar"), uri2.GetURI() );
-
-- CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query#fragment"));
-+ CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query#fragment"));
- CPPUNIT_ASSERT_EQUAL( OUString("http"), uri3.GetScheme() );
- CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
- CPPUNIT_ASSERT_EQUAL( OUString("user%40anothername"), uri3.GetUser() );
- CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
-- CPPUNIT_ASSERT_EQUAL( OUString("?query#fragment"), uri3.GetRelativeReference() );
-+ CPPUNIT_ASSERT_EQUAL( OUString("/?query#fragment"), uri3.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("http://user%40anothername@server.biz:8040/?query#fragment"), uri3.GetURI() );
- }
-
-@@ -80,13 +80,13 @@ namespace
- CPPUNIT_ASSERT_EQUAL( OUString("/foo/bar"), uri2.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/foo/bar"), uri2.GetURI() );
-
-- CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"?query"));
-+ CurlUri uri3(aURI.CloneWithRelativeRefPathAbsolute(u"/?query"));
- CPPUNIT_ASSERT_EQUAL( OUString("https"), uri3.GetScheme() );
- CPPUNIT_ASSERT_EQUAL( OUString("server.biz"), uri3.GetHost() );
- CPPUNIT_ASSERT_EQUAL( OUString("foo"), uri3.GetUser() );
- CPPUNIT_ASSERT_EQUAL( OUString("bar"), uri3.GetPassword() );
- CPPUNIT_ASSERT_EQUAL( sal_uInt16(8040), uri3.GetPort() );
-- CPPUNIT_ASSERT_EQUAL( OUString("?query"), uri3.GetRelativeReference() );
-+ CPPUNIT_ASSERT_EQUAL( OUString("/?query"), uri3.GetRelativeReference() );
- CPPUNIT_ASSERT_EQUAL( OUString("https://foo:bar@server.biz:8040/?query"), uri3.GetURI() );
- }
-
---
-2.41.0
-
diff --git a/0002-Fix-heap-use-after-free.patch b/0002-Fix-heap-use-after-free.patch
deleted file mode 100644
index d79a629..0000000
--- a/0002-Fix-heap-use-after-free.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 694bacca057c9f1d93ab27d61199aec9d060b868 Mon Sep 17 00:00:00 2001
-From: Tibor Nagy <nagy.tibor2(a)nisz.hu>
-Date: Fri, 4 Aug 2023 00:39:24 +0200
-Subject: [PATCH] Fix heap-use-after-free
-
-The issue is caused by commit Ic87983fa6e3279a64841babc565fbe97710ff730
-(tdf#99808 sc: fix background of conditional formatting in merged cell)
-
-Change-Id: Ic72ba16c2649537dc3b486e07c12e2486cdf1957
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155328
-Tested-by: Jenkins
-Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
----
- sc/qa/unit/ucalc_condformat.cxx | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
-index 6b79a4318501..7a0abc7cf026 100644
---- a/sc/qa/unit/ucalc_condformat.cxx
-+++ b/sc/qa/unit/ucalc_condformat.cxx
-@@ -1394,21 +1394,19 @@ CPPUNIT_TEST_FIXTURE(TestCondformat, testConditionStyleInMergedCell)
- // Add a conditional format.
- auto pFormat = std::make_unique<ScConditionalFormat>(1, m_pDoc);
- pFormat->SetRange(ScRange(0, 0, 0, 0, 0, 0));
-- auto pFormatTmp = pFormat.get();
-- sal_uLong nKey = m_pDoc->AddCondFormat(std::move(pFormat), 0);
-
- // Add condition in which if the value equals 1, set the "Good" style.
- ScCondFormatEntry* pEntry = new ScCondFormatEntry(
- ScConditionMode::Equal, "=1", "", *m_pDoc, ScAddress(0, 0, 0), ScResId(STR_STYLENAME_GOOD));
-- pFormatTmp->AddEntry(pEntry);
-+ pFormat->AddEntry(pEntry);
-
- // Apply the format to the range.
-- m_pDoc->AddCondFormatData(pFormatTmp->GetRange(), 0, nKey);
-+ m_pDoc->AddCondFormatData(pFormat->GetRange(), 0, 1);
-
- ScDocFunc& rFunc = m_xDocShell->GetDocFunc();
-- sal_uInt32 nOldFormat = pFormatTmp->GetKey();
-- const ScRangeList& rRangeList = pFormatTmp->GetRange();
-- rFunc.ReplaceConditionalFormat(nOldFormat, pFormatTmp->Clone(), 0, rRangeList);
-+ sal_uInt32 nOldFormat = pFormat->GetKey();
-+ const ScRangeList& rRangeList = pFormat->GetRange();
-+ rFunc.ReplaceConditionalFormat(nOldFormat, std::move(pFormat), 0, rRangeList);
-
- CPPUNIT_ASSERT_EQUAL(true, aListener.mbPaintAllMergedCell);
-
---
-2.41.0
-
diff --git a/libreoffice.spec b/libreoffice.spec
index d53928b..f306ae1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
-%global libo_version 7.6.0
+%global libo_version 7.6.1
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@@ -57,8 +57,8 @@ ExcludeArch: %{ix86}
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
-Version: %{libo_version}.3
-Release: 4%{?libo_prerelease}%{?dist}
+Version: %{libo_version}.1
+Release: 1%{?libo_prerelease}%{?dist}
# default new files are: MPLv2
# older files are typically: MPLv2 incorporating work under ASLv2
# nlpsolver is: LGPLv3
@@ -243,6 +243,7 @@ BuildRequires: dejavu-sans-fonts
BuildRequires: dejavu-serif-fonts
BuildRequires: google-carlito-fonts
BuildRequires: google-rubik-fonts
+BuildRequires: google-crosextra-caladea-fonts
# Amiri used in vcl/qa/cppunit tests
BuildRequires: amiri-fonts
BuildRequires: amiri-quran-fonts
@@ -271,9 +272,7 @@ Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch
Patch4: 0001-default-to-sifr-for-gnome-light-mode.patch
# backported
-Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
-Patch9: 0001-Adapt-test-code-to-cURL-8.2.0.patch
-Patch10: 0002-Fix-heap-use-after-free.patch
+Patch5: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch
# not upstreamed
# fix FTB in ppc64le from sharkcz
Patch11: lo-7.6-ppc64le-tests.patch
@@ -2258,6 +2257,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Mon Aug 28 2023 Gwyn Ciesla <gwync(a)protonmail.com> - 1:7.6.1.1-1
+- 7.6.1.1
+
* Sun Aug 27 2023 Mattia Verga <mattia.verga(a)proton.me> - 1:7.6.0.3-4
- Remove test exclusions from aarch64
- Link aarch64 executable with standard -g level
diff --git a/sources b/sources
index b178851..690bfe9 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (libreoffice-7.6.0.3.tar.xz) = e8f3d4bede14427027cd69e3a9a21ebe6f8dcf3cd002f67b850fe3a1657ef06b312a34864780280d7a7c713ea906947130239708dcd0a45509b133710fd330be
-SHA512 (libreoffice-7.6.0.3.tar.xz.asc) = 511a0d3896def87f02e8c5aad161482249d39e2739643b0ddc8b905bc9ec9775bbc5cb18572d55320aabddb5e4cdf99f7d3cc77e3e01452fd6b3411b6de708c9
-SHA512 (libreoffice-help-7.6.0.3.tar.xz) = 5293158a51ee62f1df664ff5b49f12e7dee3d25e2e485a53a546db2bca16bb2699e795d21cf8aa8b3e87ba2f159e9cf03fb2f71c6f17307faa8ff60fa0948217
-SHA512 (libreoffice-help-7.6.0.3.tar.xz.asc) = a69db87e55b07985721cea7064268bccfc16fb48919d471063ce21ac3baccdd3b3958830c617b6df34b72ba5ddd2e256cf8a527ebf6a6e8cdc52f4de1aeb52f5
-SHA512 (libreoffice-translations-7.6.0.3.tar.xz) = 2bc9888f3cb7131397585aa8321c703b983e7003eed37b49113128c89b7a0e7350d5f02bd0c7ba3718016eec08a9c50e246391344f54b0137150b4b2b65de1f5
-SHA512 (libreoffice-translations-7.6.0.3.tar.xz.asc) = 841a690149fd9eab6a56c3461a6209ccd448e4de09087bc5cc32972827df56b744fdde40e60512f0f6ea74cf66a57c66375e2bfb18d9e65d56caf7751c4948dc
+SHA512 (libreoffice-7.6.1.1.tar.xz) = 3ef29b11abb40e3a2d6048b38648d677bbe9b9012dd2b262fd81dc1e97485a8f5a3c8a5fa2776171ce9344ea083c1874cc1da66164516ed1691796b34be44341
+SHA512 (libreoffice-7.6.1.1.tar.xz.asc) = 63357bd8220c0023acd0d38c20f9bae20741dae008412313803d9456a8db7c7018a56b97355c76456c37ae9b17d47cc4080b1007221bde8cda7e3527ccceeffd
+SHA512 (libreoffice-help-7.6.1.1.tar.xz) = 75a5c05b7fa0a51e6e33cef1fae742f623d6c92a8a453478474c603909ff0f8fad2a0ffeb5e1903d3be1e6285add67ae34b08a4d2e7135a7d3461695d4fd561e
+SHA512 (libreoffice-help-7.6.1.1.tar.xz.asc) = f2b3dc3fd959de41d62e3c674cb160e9ebb96a1a3de74c8ead99a214b8e4e26682fafb0b689bc843108470009c9c3d031273da488f64fe0abda4728ecd24fe7e
+SHA512 (libreoffice-translations-7.6.1.1.tar.xz) = ff48388aeb2388d7db0c464f5179fd968a021fa99216877cc21742e816d08b5387116c9f6c547ac50aaee427e692d05ffa41c496b177968f1bf856fc7041af22
+SHA512 (libreoffice-translations-7.6.1.1.tar.xz.asc) = 60ef64efafac73ea22bdba85f96e3689988cdf604d192c8c7898788f5d3b303eea9fc32a32d2840a0528e95f536828f3360fc14a53fdf79551ec40bc6f8b341a
SHA512 (17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
SHA512 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
https://src.fedoraproject.org/rpms/libreoffice/c/36004e2be45df8c0442c6ea6...
8Â months, 3Â weeks