carlwgeorge pushed to xpanes (rawhide). "Latest upstream 4.1.3"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 20:27:17 UTC
From 6450258e3b6b90e1d78a133d598921e1021627db Mon Sep 17 00:00:00 2001
From: Carl George <carl(a)george.computer>
Date: May 31 2021 20:26:47 +0000
Subject: Latest upstream 4.1.3
---
diff --git a/sources b/sources
index b21fa6f..ed09907 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tmux-xpanes-4.1.2.tar.gz) = b18445940052a6af848286b901bfd81abfbdf83356cd1b39ac592e1509c9d63b81440978a8c2632672bfb7a2429a7fcc57b7c55c91a00d751b43aa9f368a5c57
+SHA512 (tmux-xpanes-4.1.3.tar.gz) = 6545ec75a522b05eb8079c93830c81ac3c6a9ac338a3cc51c491f69a4602bef5b9f19c9f18b2975d0470c4af0a83ebf2357a4461024508ff0f6ac61d1099b22e
diff --git a/xpanes.spec b/xpanes.spec
index 208cf29..2b646ae 100644
--- a/xpanes.spec
+++ b/xpanes.spec
@@ -1,6 +1,6 @@
Name: xpanes
-Version: 4.1.2
-Release: 2%{?dist}
+Version: 4.1.3
+Release: 1%{?dist}
Summary: Awesome tmux-based terminal divider
License: MIT
URL: https://github.com/greymd/tmux-xpanes
@@ -53,6 +53,9 @@ ln -s _xpanes %{buildroot}%{_datadir}/zsh/site-functions/_tmux-xpanes
%changelog
+* Mon May 31 2021 Carl George <carl(a)george.computer> - 4.1.3-1
+- Latest upstream
+
* Thu Jan 28 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
https://src.fedoraproject.org/rpms/xpanes/c/6450258e3b6b90e1d78a133d59892...
2Â years, 10Â months
than pushed to qt5-qtwebkit (rawhide). "fix macro definitions TRUE,
FALSE"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 20:08:17 UTC
From c519c3594476c1316f95aa5a02b1aa6bda2ab3a3 Mon Sep 17 00:00:00 2001
From: Than Ngo <than(a)redhat.com>
Date: May 31 2021 20:07:27 +0000
Subject: fix macro definitions TRUE,FALSE
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index a63bb98..8470dbe 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -28,6 +28,7 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch
Patch3: qtwebkit-5.212.0-json.patch
Patch4: qtwebkit-bison37.patch
Patch5: qt5-qtwebkit-glib-2.68.patch
+Patch6: qtwebkit-icu68.patch
BuildRequires: make
BuildRequires: bison
@@ -246,6 +247,7 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
%changelog
* Mon May 31 2021 Than Ngo <than(a)redhat.com> - 5.212.0-0.59.alpha4
- fix FTBFS against glib >= 2.68
+- fix macro definitions TRUE,FALSE
* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 5.212.0-0.58.alpha4
- Rebuild for ICU 69
diff --git a/qtwebkit-icu68.patch b/qtwebkit-icu68.patch
new file mode 100644
index 0000000..fc68d1b
--- /dev/null
+++ b/qtwebkit-icu68.patch
@@ -0,0 +1,124 @@
+diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProvider.h
+--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h 2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProvider.h 2021-05-31 22:02:56.974163189 +0200
+@@ -80,12 +80,12 @@
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2021-05-31 22:02:56.974163189 +0200
+@@ -100,23 +100,23 @@
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 2021-05-31 22:02:56.974163189 +0200
+@@ -125,7 +125,7 @@
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/TextCodecICU.cpp
+--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp 2020-03-04 18:16:37.000000000 +0100
++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/TextCodecICU.cpp 2021-05-31 22:02:56.974163189 +0200
+@@ -308,7 +308,7 @@
+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+ ASSERT(U_SUCCESS(err));
+ if (m_converterICU)
+- ucnv_setFallback(m_converterICU, TRUE);
++ ucnv_setFallback(m_converterICU, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
https://src.fedoraproject.org/rpms/qt5-qtwebkit/c/c519c3594476c1316f95aa5...
2Â years, 10Â months
sbergmann pushed to libreoffice (rawhide). "Resolves: rhbz#1965975
FTBFS"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:51:41 UTC
From 71a4281675c2ce631083448149f00969deae55d4 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman(a)redhat.com>
Date: May 31 2021 19:51:21 +0000
Subject: Resolves: rhbz#1965975 FTBFS
---
diff --git a/0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch b/0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch
new file mode 100644
index 0000000..ca24834
--- /dev/null
+++ b/0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch
@@ -0,0 +1,26 @@
+From 2382a2f6b4e84e3dc6c3b724b92dae8f991a76be Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman(a)redhat.com>
+Date: Mon, 31 May 2021 13:30:37 +0200
+Subject: [PATCH] Adapt to hamcrest-2.2-3.fc35.noarch.rpm
+
+Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 43fb8d877515..07954b2c3262 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13427,6 +13427,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no" -a "$cross_compiling" != "
+ HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
+ elif test -e /usr/share/java/hamcrest/core.jar; then
+ HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
++ elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
++ HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
+ else
+ HAMCREST_JAR=/usr/share/java/hamcrest.jar
+ fi
+--
+2.31.1
+
diff --git a/0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch b/0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch
new file mode 100644
index 0000000..ad3346d
--- /dev/null
+++ b/0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch
@@ -0,0 +1,80 @@
+From 4f85b6ec5964e2d9747f6743f9adc6ef1f951e4a Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman(a)redhat.com>
+Date: Wed, 5 May 2021 08:20:18 +0200
+Subject: [PATCH] Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"
+
+<https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=aa475c4ac80733f85ba47b109fc...>
+towards GCC 12, so that now "the return type is the original rvalue stream type
+not its base class." (And which would thus have caused issues like
+
+> sfx2/source/control/bindings.cxx:1323:19: error: dynamic_cast from rvalue to reference type '::std::ostringstream &' (aka 'basic_ostringstream<char> &')
+> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : ""));
+> ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+> include/sal/log.hxx:198:6: note: expanded from macro 'SAL_STREAM'
+> (dynamic_cast< ::std::ostringstream & >(::std::ostringstream() << stream).str())
+> ^
+> include/sal/log.hxx:341:20: note: expanded from macro 'SAL_INFO'
+> SAL_WHERE, stream)
+> ~~~~~~~~~~~^~~~~~~
+> include/sal/log.hxx:155:68: note: expanded from macro 'SAL_DETAIL_LOG_STREAM'
+> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \
+> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
+> include/sal/log.hxx:133:45: note: expanded from macro 'SAL_DETAIL_LOG_STREAM_PRIVATE_'
+> ::sal::detail::StreamStart() << stream) == 1) \
+> ^~~~~~
+
+now. While the issue with old libstdc++ that originally prompted the
+dynamic_cast was
+
+> sfx2/source/control/bindings.cxx:1323:19: error: no member named 'str' in 'std::basic_ostream<char>'
+> ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : ""));
+> ~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+> include/sal/log.hxx:194:40: note: expanded from macro 'SAL_STREAM'
+> (::std::ostringstream() << stream).str()
+> ^
+> include/sal/log.hxx:336:20: note: expanded from macro 'SAL_INFO'
+> SAL_WHERE, stream)
+> ~~~~~~~~~~~^~~~~~~
+> include/sal/log.hxx:155:68: note: expanded from macro 'SAL_DETAIL_LOG_STREAM'
+> SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \
+> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
+> include/sal/log.hxx:133:45: note: expanded from macro 'SAL_DETAIL_LOG_STREAM_PRIVATE_'
+> ::sal::detail::StreamStart() << stream) == 1) \
+> ^~~~~~
+
+.)
+
+The libstdc++ macro _GLIBCXX_RELEASE is reportedly available since GCC 7.1.
+
+Change-Id: I1ee6eabb66355c1f28b9d305cbd85bac50d6b0e1
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115121
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <sbergman(a)redhat.com>
+
+(cherry picked from commit 1f3dddd6f21d91c429190ae314dadeec409f35f4, plus
+follow-up 95e26d3dce4f5a3b2d010d5ca47b4e450905a100 "tdf#142326: Adapt to
+'libstdc++: Implement LWG 1203 for rvalue iostreams'")
+Change-Id: I7c8fef25e15fcfa9b83924467dc86dc2957fbd7d
+---
+ include/sal/log.hxx | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/include/sal/log.hxx b/include/sal/log.hxx
+index 6bb0d1b43d3d..a0fa902dbce6 100644
+--- a/include/sal/log.hxx
++++ b/include/sal/log.hxx
+@@ -186,7 +186,10 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const &) {
+
+ @since LibreOffice 3.5
+ */
+-#if defined _LIBCPP_VERSION || (defined _MSC_VER && _MSC_VER >= 1915)
++#if defined _LIBCPP_VERSION \
++ || (defined _GLIBCXX_RELEASE \
++ && (_GLIBCXX_RELEASE >= 12 || (_GLIBCXX_RELEASE == 11 && __GLIBCXX__ > 20210428))) \
++ || (defined _MSC_VER && _MSC_VER >= 1915)
+ #define SAL_STREAM(stream) \
+ (::std::ostringstream() << stream).str()
+ #else
+--
+2.31.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 13983f4..84a21e0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -50,7 +50,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
URL: http://www.libreoffice.org/
@@ -252,6 +252,8 @@ Patch4: 0001-rhbz-1918152-fix-FTBFS.patch
Patch5: 0001-Get-rid-of-apache-commons-logging.patch
Patch6: 0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch
Patch7: 0001-Related-tdf-138888-fix-assertion-on-avmedia-MediaCon.patch
+Patch8: 0001-Adapt-to-libstdc-Implement-LWG-1203-for-rvalue-iostr.patch
+Patch9: 0001-Adapt-to-hamcrest-2.2-3.fc35.noarch.rpm.patch
# not upstreamed
Patch500: 0001-disable-libe-book-support.patch
@@ -2237,6 +2239,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || :
%{_includedir}/LibreOfficeKit
%changelog
+* Mon May 31 2021 Stephan Bergmann <sbergman(a)redhat.com> - 1:7.1.3.2-3
+- Resolves: rhbz#1965975 Adapt to "libstdc++: Implement LWG 1203 for rvalue iostreams"
+- Resolves: rhbz#1965975 Adapt to hamcrest-2.2-3.fc35.noarch.rpm
+
* Thu May 20 2021 Pete Walter <pwalter(a)fedoraproject.org> - 1:7.1.3.2-2
- Rebuild for ICU 69
https://src.fedoraproject.org/rpms/libreoffice/c/71a4281675c2ce6310834481...
2Â years, 10Â months
packagerbot pushed to dummy-test-package-rubino (rawhide). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:37:08 UTC
From 28c6c5519f15a9d4f6e638af0cb049abfa6b6aed Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: May 31 2021 19:37:03 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-rubino.spec b/dummy-test-package-rubino.spec
index 86516ac..2caf1d9 100644
--- a/dummy-test-package-rubino.spec
+++ b/dummy-test-package-rubino.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-rubino
Version: 0
-Release: 3587
+Release: 3588
Summary: Dummy Test Package called Rubino
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -34,6 +34,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Mon May 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-3588
+- rebuilt
+
* Mon May 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-3587
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-rubino/c/28c6c5519f...
2Â years, 10Â months
packagerbot pushed to dummy-test-package-crested (rawhide). "Bump
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:36:59 UTC
From 33330a69ad70e6ff48e30383a862a48d72cf7173 Mon Sep 17 00:00:00 2001
From: packagerbot <admin(a)fedoraproject.org>
Date: May 31 2021 19:36:54 +0000
Subject: Bump release
Signed-off-by: packagerbot <admin(a)fedoraproject.org>
---
diff --git a/dummy-test-package-crested.spec b/dummy-test-package-crested.spec
index 2800eb1..e2ac765 100644
--- a/dummy-test-package-crested.spec
+++ b/dummy-test-package-crested.spec
@@ -3,7 +3,7 @@
Name: dummy-test-package-crested
Version: 0
-Release: 3587
+Release: 3588
Summary: Dummy Test Package called Crested
License: CC0
URL: http://fedoraproject.org/wiki/DummyTestPackages
@@ -32,6 +32,9 @@ cp -p uuid %{buildroot}%{_datadir}/%{name}
%{_datadir}/%{name}
%changelog
+* Mon May 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-3588
+- rebuilt
+
* Mon May 31 2021 packagerbot <admin(a)fedoraproject.org> - 0-3587
- rebuilt
https://src.fedoraproject.org/rpms/dummy-test-package-crested/c/33330a69a...
2Â years, 10Â months
aalvarez pushed to elements-alexandria (rawhide). "Release 2.19"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:36:27 UTC
From 079c51cf7ec3550b39d8f6b990683f638903350c Mon Sep 17 00:00:00 2001
From: Alejandro Alvarez Ayllon <a.alvarezayllon(a)gmail.com>
Date: May 31 2021 19:36:17 +0000
Subject: Release 2.19
---
diff --git a/elements-alexandria.spec b/elements-alexandria.spec
index 4b7f75f..3848855 100644
--- a/elements-alexandria.spec
+++ b/elements-alexandria.spec
@@ -1,7 +1,7 @@
Summary: A lightweight C++ utility library
Name: elements-alexandria
-Version: 2.18
-Release: 3%{?dist}
+Version: 2.19
+Release: 1%{?dist}
License: LGPLv3+
URL: https://github.com/astrorama/Alexandria
Source0: https://github.com/astrorama/Alexandria/archive/%{version}/%{name}-%{vers...
@@ -9,11 +9,6 @@ Source0: https://github.com/astrorama/Alexandria/archive/%{version}/%{nam
# It is downloaded from:
# https://upload.cppreference.com/w/File:cppreference-doxygen-web.tag.xml
Source1: cppreference-doxygen-web.tag.xml
-# Test assumes little endian
-# Fixed on next version
-Patch0: elements-alexandria_bigendian_test.patch
-# Fix an padding issue that causes a bad alignment signal on armv7
-Patch1: elements-alexandria_ndarray_align.patch
%global elements_version 5.12
@@ -182,6 +177,9 @@ make test -C "%{_vpath_builddir}"
%{docdir}
%changelog
+* Mon May 31 2021 Alejandro Alvarez Ayllon <aalvarez(a)fedoraproject.org> - 2.19-1
+- Release 2.19
+
* Mon May 10 2021 Alejandro Alvarez Ayllon <aalvarez(a)fedoraproject.org> - 2.18-3
- Rebuild for gcc11.1
diff --git a/elements-alexandria_bigendian_test.patch b/elements-alexandria_bigendian_test.patch
deleted file mode 100644
index d152049..0000000
--- a/elements-alexandria_bigendian_test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/NdArray/NdArray/io/_impl/NpyCommon.h b/NdArray/NdArray/io/_impl/NpyCommon.h
-index 84efd49..8c95078 100644
---- a/NdArray/NdArray/io/_impl/NpyCommon.h
-+++ b/NdArray/NdArray/io/_impl/NpyCommon.h
-@@ -236,7 +236,7 @@ inline void readNpyHeader(std::istream& input, std::string& dtype, std::vector<s
- if (fortran_order)
- throw Elements::Exception() << "Fortran order not supported";
-
-- if (big_endian && (BYTE_ORDER != BIG_ENDIAN))
-+ if ((big_endian && (BYTE_ORDER != BIG_ENDIAN)) || (!big_endian && (BYTE_ORDER != LITTLE_ENDIAN)))
- throw Elements::Exception() << "Only native endianness supported for reading";
- }
-
-diff --git a/NdArray/tests/src/Npy_test.cpp b/NdArray/tests/src/Npy_test.cpp
-index 7839032..b8a9f9d 100644
---- a/NdArray/tests/src/Npy_test.cpp
-+++ b/NdArray/tests/src/Npy_test.cpp
-@@ -160,11 +160,19 @@ BOOST_AUTO_TEST_CASE(Npy_badtype_test) {
- BOOST_AUTO_TEST_CASE(Npy_badendian_test) {
- Elements::TempFile file(std::string("npy_testpy_endian_%%.npy"));
-
-+#if BYTE_ORDER == LITTLE_ENDIAN
- constexpr const char* PYCODE = R"EDOCYP(
- import sys
- import numpy as np
- np.save(sys.argv[1], np.arange(100, 400, dtype='>i8'))
- )EDOCYP";
-+#else
-+ constexpr const char* PYCODE = R"EDOCYP(
-+import sys
-+import numpy as np
-+np.save(sys.argv[1], np.arange(100, 400, dtype='<i8'))
-+)EDOCYP";
-+#endif
-
- runPython(PYCODE, file.path());
-
diff --git a/elements-alexandria_ndarray_align.patch b/elements-alexandria_ndarray_align.patch
deleted file mode 100644
index 37f014d..0000000
--- a/elements-alexandria_ndarray_align.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-commit c467d22132935c9c385a591d48eeb6bc68196fa1
-Author: Alejandro Alvarez Ayllon <a.alvarezayllon(a)gmail.com>
-Date: Mon Feb 8 15:02:43 2021 +0100
-
- Fix alignment when creating mmapped ndarrays
-
- * Detected on armv7hl, where aligmnment requirements are harder
-
-diff --git a/NdArray/NdArray/io/_impl/NpyCommon.h b/NdArray/NdArray/io/_impl/NpyCommon.h
-index 8c95078..43f176d 100644
---- a/NdArray/NdArray/io/_impl/NpyCommon.h
-+++ b/NdArray/NdArray/io/_impl/NpyCommon.h
-@@ -294,13 +294,14 @@ void writeNpyHeader(std::ostream& out, std::vector<size_t> shape, const std::vec
- little_uint32_t header_len = header_str.size();
-
- // Pad header with spaces so the header block is 64 bytes aligned
-- size_t total_length = sizeof(NPY_MAGIC) + sizeof(NPY_VERSION) + sizeof(header_len) + header_len - 1; // Keep 1 for \n
-+ size_t total_length = sizeof(NPY_MAGIC) + sizeof(NPY_VERSION) + sizeof(header_len) + header_len + 1; // Keep 1 for \n
- size_t padding = 64 - total_length % 64;
- if (padding) {
-- header << std::string(padding, '\x20') << '\n';
-- header_str = header.str();
-- header_len = header_str.size();
-+ header << std::string(padding, '\x20');
- }
-+ header << '\n';
-+ header_str = header.str();
-+ header_len = header_str.size();
-
- // Magic and version
- out.write(NPY_MAGIC, sizeof(NPY_MAGIC));
-diff --git a/NdArray/NdArray/io/_impl/NpyMmap.icpp b/NdArray/NdArray/io/_impl/NpyMmap.icpp
-index 5cdd603..c7b34dc 100644
---- a/NdArray/NdArray/io/_impl/NpyMmap.icpp
-+++ b/NdArray/NdArray/io/_impl/NpyMmap.icpp
-@@ -67,6 +67,8 @@ NdArray<T> createMmapNpy(const boost::filesystem::path& path, const std::vector<
- auto header_str = header.str();
- auto header_size = header_str.size();
-
-+ assert(header_size % 64 == 0);
-+
- // Compute file expected size
- size_t n_elements = std::accumulate(shape.begin(), shape.end(), 1, std::multiplies<size_t>());
- if (!attrs.empty())
diff --git a/sources b/sources
index 8380884..05c5f13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (elements-alexandria-2.18.tar.gz) = 01d037b1b209dabd465e325ca21b1989a659e9b757fbefc3cc3aa5d6bea6aa020c44c5328307652dfb99a25e31a1da05753fef454294108f606b3606d6c17d3d
+SHA512 (elements-alexandria-2.19.tar.gz) = 23cc4876d97bcf993a667c08a39161ddf5ad59803c8f6a2e2d0f53f84ae0766af71b4b74eaa3f66bb0d289ecc2a91891aec348894d0000128ef4f8278254d4b1
https://src.fedoraproject.org/rpms/elements-alexandria/c/079c51cf7ec3550b...
2Â years, 10Â months
eclipseo pushed to jpegxl (f33). "Update to 0.3.7 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:34:07 UTC
From 29de62a00652d93b644c53b3727d92a12c612845 Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: May 31 2021 16:34:17 +0000
Subject: Update to 0.3.7
Close: rhbz#1922638
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0920551
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/jpeg-xl-0.3.7.tar.bz2
+/third_party-0.3.7.tar.gz
diff --git a/jpegxl.spec b/jpegxl.spec
new file mode 100644
index 0000000..14030c1
--- /dev/null
+++ b/jpegxl.spec
@@ -0,0 +1,189 @@
+%global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir)
+
+%global name_dash jpeg-xl
+
+%global common_description %{expand:
+This package contains a reference implementation of JPEG XL (encoder and
+decoder). As previously announced, it is available under a royalty-free and open
+source license (Apache 2).}
+
+Name: jpegxl
+Version: 0.3.7
+%global commit 9e9bce86164dc4d01c39eeeb3404d6aed85137b2
+Release: 1%{?dist}
+Summary: JPEG XL image format reference implementation
+
+# Main library: ASL 2.0
+# lodepng: zlib
+# sjpeg: ASL 2.0
+# skcms: BSD
+License: ASL 2.0 and zlib and BSD
+URL: https://jpeg.org/jpegxl/
+VCS: https://gitlab.com/wg1/jpeg-xl
+Source0: %vcs/-/archive/v%{version}/%{name_dash}-%{version}.tar.bz2
+
+# git clone https://gitlab.com/wg1/jpeg-xl.git
+# cd jpeg-xl/
+# git checkout v%%{version}
+# git submodule init ; git submodule update
+# rm -r third_party/brotli/ third_party/difftest_ng/ third_party/googletest/
+# rm -r third_party/HEVCSoftware/ third_party/highway/
+# rm -r third_party/IQA-optimization/ third_party/lcms/
+# rm -r third_party/skcms/profiles/ third_party/vmaf/ third_party/testdata/
+# tar -zcvf third_party-%%{version}.tar.gz third_party/
+Source1: third_party-%{version}.tar.gz
+
+BuildRequires: asciidoc
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: extra-cmake-modules
+BuildRequires: gcc
+BuildRequires: giflib-devel
+BuildRequires: gperftools-devel
+BuildRequires: ninja-build
+BuildRequires: pkgconfig(gimp-2.0)
+BuildRequires: (pkgconfig(glut) or pkgconfig(freeglut))
+BuildRequires: pkgconfig(gtest)
+BuildRequires: pkgconfig(libhwy)
+BuildRequires: pkgconfig(libbrotlicommon)
+BuildRequires: pkgconfig(libjpeg)
+BuildRequires: pkgconfig(libpng)
+BuildRequires: pkgconfig(libwebp)
+BuildRequires: pkgconfig(OpenEXR)
+BuildRequires: pkgconfig(Qt5)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(zlib)
+
+# Header-only library to be directly included in the project's source tree
+Provides: bundled(lodepng) = 0-0.1.20210522git48e5364
+# No official release
+Provides: bundled(sjpeg) = 0-0.1.20210522git868ab55
+# Build system is Bazel, which is not packaged by Fedora
+Provides: bundled(skcms) = 0-0.1.20210522git6437475
+
+%description
+%common_description
+
+%package utils
+Summary: JPEG XL image format reference implementation
+Recommends: jxl-pixbuf-loader = %{version}-%{release}
+Recommends: gimp-jxl-plugin = %{version}-%{release}
+
+%description utils
+%{common_description}
+
+%package doc
+Summary: Documentation for JPEG-XL
+BuildArch: noarch
+
+%description doc
+%{common_description}
+
+Documentation for JPEG-XL.
+
+%package libs
+Summary: Library files for JPEG-XL
+Requires: shared-mime-info
+Recommends: jxl-pixbuf-loader = %{version}-%{release}
+Recommends: gimp-jxl-plugin = %{version}-%{release}
+
+%description libs
+%{common_description}
+
+Library files for JPEG-XL.
+
+%package devel
+Summary: Development files for JPEG-XL
+Requires: jpegxl-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+%{common_description}
+
+Development files for JPEG-XL.
+
+%package -n jxl-pixbuf-loader
+Summary: JPEG-XL image loader for GTK+ applications
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+Requires: gdk-pixbuf2
+
+%description -n jxl-pixbuf-loader
+Jxl-pixbuf-loader contains a plugin to load JPEG-XL images in GTK+ applications.
+
+%package -n gimp-jxl-plugin
+Summary: A plugin for loading and saving JPEG-XL images
+Requires: gimp
+
+%description -n gimp-jxl-plugin
+This is a GIMP plugin for loading and saving JPEG-XL images.
+
+%prep
+%autosetup -p1 -n %{name_dash}-v%{version}-%{commit}
+rm -rf third_party/
+%setup -q -T -D -a 1 -n %{name_dash}-v%{version}-%{commit}
+
+%build
+%cmake -DENABLE_CCACHE=1 \
+ -DBUILD_TESTING=OFF \
+ -DINSTALL_GTEST:BOOL=OFF \
+ -DJPEGXL_ENABLE_BENCHMARK:BOOL=OFF \
+ -DJPEGXL_ENABLE_PLUGINS:BOOL=ON \
+ -DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL=ON \
+ -DJPEGXL_FORCE_SYSTEM_GTEST:BOOL=ON \
+ -DJPEGXL_FORCE_SYSTEM_HWY:BOOL=ON \
+ -DJPEGXL_WARNINGS_AS_ERRORS:BOOL=OFF \
+ -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake_build -- all doc
+
+%install
+%cmake_install
+rm -v %{buildroot}%{_libdir}/*.a
+
+%files utils
+%doc CONTRIBUTING.md CONTRIBUTORS README.md
+%{_bindir}/cjxl
+%{_bindir}/djxl
+%{_mandir}/man1/cjxl.1*
+%{_mandir}/man1/djxl.1*
+
+%files doc
+%doc doc/*.md
+%doc %{_vpath_builddir}/html
+%license LICENSE
+
+%files libs
+%license LICENSE
+%{_libdir}/libjxl.so.0*
+%{_libdir}/libjxl_threads.so.0*
+%dir %{_datadir}/thumbnailers
+%{_datadir}/thumbnailers/jxl.thumbnailer
+%{_datadir}/mime/packages/image-jxl.xml
+
+%files devel
+%doc CONTRIBUTING.md
+%{_includedir}/jxl/
+%{_libdir}/libjxl.so
+%{_libdir}/libjxl_threads.so
+%{_libdir}/pkgconfig/libjxl.pc
+%{_libdir}/pkgconfig/libjxl_threads.pc
+
+%files -n jxl-pixbuf-loader
+%license LICENSE
+%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-jxl.so
+
+%files -n gimp-jxl-plugin
+%license LICENSE
+%{_libdir}/gimp/2.0/plug-ins/file-jxl/
+
+%changelog
+* Mon May 17 20:49:39 CEST 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3.7-1
+- Update to 0.3.7
+- Close: rhbz#1922638
+
+* Sat Jan 30 17:10:24 CET 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3-1
+- Update to 0.3
+
+* Sat Dec 12 03:45:24 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.1.1-1
+- Update to 0.1.1
+
+* Wed Jul 15 17:00:49 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.0.1-0.1.20200715git0a46d01c
+- Initial RPM
diff --git a/sources b/sources
new file mode 100644
index 0000000..223fdb9
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+SHA512 (jpeg-xl-0.3.7.tar.bz2) = 6de35fb940f4fdc41a194635e01b474a6be90abd6945f34853234355de51c0812ca4c1891bdd90ec39068e829b16da6997009cb3ba5d9cdcdcd3af1f37139835
+SHA512 (third_party-0.3.7.tar.gz) = b342a5db08b92f7ec4a095f78c50ce8d7fa088a5fcbc56935db218b9107c8b7fd366d36aeab3f1e5081a8eccf02b16b95687ecbc5b7ba90a8ac6ba6786a6c76c
https://src.fedoraproject.org/rpms/jpegxl/c/29de62a00652d93b644c53b3727d9...
2Â years, 10Â months
eclipseo pushed to jpegxl (f33). "Use Clang instead of GCC due to
vector conversion strictness of GCC (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:34:07 UTC
From cc1c02250c3ce4dc9cc498c86d63605a2fb86f8c Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: May 31 2021 19:19:44 +0000
Subject: Use Clang instead of GCC due to vector conversion strictness of GCC
Disable LTO on arm due to Clang 12.0.0 bug
Close: rhbz#1922638
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
---
diff --git a/jpegxl.spec b/jpegxl.spec
index 14030c1..52caffb 100644
--- a/jpegxl.spec
+++ b/jpegxl.spec
@@ -2,6 +2,15 @@
%global name_dash jpeg-xl
+# https://github.com/libjxl/libjxl/issues/63
+# https://github.com/libjxl/libjxl/issues/64
+%global toolchain clang
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1918924
+%ifarch %arm32
+%global _lto_cflags %{nil}
+%endif
+
%global common_description %{expand:
This package contains a reference implementation of JPEG XL (encoder and
decoder). As previously announced, it is available under a royalty-free and open
@@ -10,7 +19,7 @@ source license (Apache 2).}
Name: jpegxl
Version: 0.3.7
%global commit 9e9bce86164dc4d01c39eeeb3404d6aed85137b2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JPEG XL image format reference implementation
# Main library: ASL 2.0
@@ -37,7 +46,7 @@ BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: extra-cmake-modules
-BuildRequires: gcc
+BuildRequires: clang
BuildRequires: giflib-devel
BuildRequires: gperftools-devel
BuildRequires: ninja-build
@@ -175,9 +184,13 @@ rm -v %{buildroot}%{_libdir}/*.a
%{_libdir}/gimp/2.0/plug-ins/file-jxl/
%changelog
+* Mon May 31 21:07:22 CEST 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3.7-2
+- Use Clang instead of GCC due to vector conversion strictness of GCC
+- Disable LTO on arm due to Clang 12.0.0 bug
+- Close: rhbz#1922638
+
* Mon May 17 20:49:39 CEST 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3.7-1
- Update to 0.3.7
-- Close: rhbz#1922638
* Sat Jan 30 17:10:24 CET 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3-1
- Update to 0.3
https://src.fedoraproject.org/rpms/jpegxl/c/cc1c02250c3ce4dc9cc498c86d636...
2Â years, 10Â months
eclipseo pushed to jpegxl (f34). "Use Clang instead of GCC due to
vector conversion strictness of GCC (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2021-05-31 19:33:35 UTC
From cc1c02250c3ce4dc9cc498c86d63605a2fb86f8c Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: May 31 2021 19:19:44 +0000
Subject: Use Clang instead of GCC due to vector conversion strictness of GCC
Disable LTO on arm due to Clang 12.0.0 bug
Close: rhbz#1922638
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
---
diff --git a/jpegxl.spec b/jpegxl.spec
index 14030c1..52caffb 100644
--- a/jpegxl.spec
+++ b/jpegxl.spec
@@ -2,6 +2,15 @@
%global name_dash jpeg-xl
+# https://github.com/libjxl/libjxl/issues/63
+# https://github.com/libjxl/libjxl/issues/64
+%global toolchain clang
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1918924
+%ifarch %arm32
+%global _lto_cflags %{nil}
+%endif
+
%global common_description %{expand:
This package contains a reference implementation of JPEG XL (encoder and
decoder). As previously announced, it is available under a royalty-free and open
@@ -10,7 +19,7 @@ source license (Apache 2).}
Name: jpegxl
Version: 0.3.7
%global commit 9e9bce86164dc4d01c39eeeb3404d6aed85137b2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: JPEG XL image format reference implementation
# Main library: ASL 2.0
@@ -37,7 +46,7 @@ BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: extra-cmake-modules
-BuildRequires: gcc
+BuildRequires: clang
BuildRequires: giflib-devel
BuildRequires: gperftools-devel
BuildRequires: ninja-build
@@ -175,9 +184,13 @@ rm -v %{buildroot}%{_libdir}/*.a
%{_libdir}/gimp/2.0/plug-ins/file-jxl/
%changelog
+* Mon May 31 21:07:22 CEST 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3.7-2
+- Use Clang instead of GCC due to vector conversion strictness of GCC
+- Disable LTO on arm due to Clang 12.0.0 bug
+- Close: rhbz#1922638
+
* Mon May 17 20:49:39 CEST 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3.7-1
- Update to 0.3.7
-- Close: rhbz#1922638
* Sat Jan 30 17:10:24 CET 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 0.3-1
- Update to 0.3
https://src.fedoraproject.org/rpms/jpegxl/c/cc1c02250c3ce4dc9cc498c86d636...
2Â years, 10Â months