From 338d156047b8011dd8b3a5d7cf3238e02fd565b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 9 Jun 2021 12:42:47 +0100 Subject: [PATCH] remove upstream applied patches --- ...88-fix-assertion-on-avmedia-MediaCon.patch | 42 ---- ...t-xml-files-and-shouldn-t-have-xml-h.patch | 201 ++++++++++++++++++ ...sh-on-switch-from-active-comment-to-.patch | 42 ---- ...e-prefix-menu-on-menuseparator-is-no.patch | 40 ++++ 4 files changed, 241 insertions(+), 84 deletions(-) delete mode 100644 0001-Related-tdf-138888-fix-assertion-on-avmedia-MediaCon.patch create mode 100644 0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch delete mode 100644 0001-rhbz-1956977-crash-on-switch-from-active-comment-to-.patch create mode 100644 0002-xmllint-Namespace-prefix-menu-on-menuseparator-is-no.patch diff --git a/0001-Related-tdf-138888-fix-assertion-on-avmedia-MediaCon.patch b/0001-Related-tdf-138888-fix-assertion-on-avmedia-MediaCon.patch deleted file mode 100644 index 372e523..0000000 --- a/0001-Related-tdf-138888-fix-assertion-on-avmedia-MediaCon.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f4e496af66bc6a779f600158cc42b986d654f143 Mon Sep 17 00:00:00 2001 -From: Julien Nabet -Date: Mon, 14 Dec 2020 19:45:22 +0100 -Subject: [PATCH] Related tdf#138888: fix assertion on avmedia/MediaControlBase - -Assertion when trying to insert a video in Impress, see bt: -https://bugs.documentfoundation.org/attachment.cgi?id=168161 - -According to https://en.cppreference.com/w/cpp/algorithm/clamp -"behavior is undefined if the value of lo is greater than hi" - -Regression from: -commit 36b3b357fe2a882db6a5f5a006239e16200fb847 -Author: Noel -Date: Thu Nov 12 16:10:56 2020 +0200 - - replace std::min(std::max()) with std::clamp - -Change-Id: Idf33eb6c662b60174678f990f98aefc72edec2a6 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107722 -Tested-by: Jenkins -Reviewed-by: Noel Grandin ---- - avmedia/source/framework/MediaControlBase.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx -index ef92cce8a736..890bb04d805b 100644 ---- a/avmedia/source/framework/MediaControlBase.cxx -+++ b/avmedia/source/framework/MediaControlBase.cxx -@@ -64,7 +64,7 @@ void MediaControlBase::UpdateVolumeSlider( MediaItem const & aMediaItem ) - { - mxVolumeSlider->set_sensitive(true); - const sal_Int32 nVolumeDB = aMediaItem.getVolumeDB(); -- mxVolumeSlider->set_value( std::clamp( nVolumeDB, sal_Int32(0), AVMEDIA_DB_RANGE ) ); -+ mxVolumeSlider->set_value( std::clamp( nVolumeDB, AVMEDIA_DB_RANGE, sal_Int32(0)) ); - } - } - --- -2.31.1 - diff --git a/0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch b/0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch new file mode 100644 index 0000000..d43dd9d --- /dev/null +++ b/0001-dtd-files-are-not-xml-files-and-shouldn-t-have-xml-h.patch @@ -0,0 +1,201 @@ +From 3a19d8b8309070f8c14f3a3b4dc4b098ad64190f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 9 Jun 2021 10:20:57 +0100 +Subject: [PATCH 1/2] dtd files are not xml files and shouldn't have xml + headers + +so rpminspect is correct in complaining that they are not valid xml +on inspecting files claiming to be xml + +Change-Id: I70379989326c2ea63e6a54b3658ebea4684fa5df +--- + framework/dtd/accelerator.dtd | 1 - + framework/dtd/event.dtd | 1 - + framework/dtd/groupuinames.dtd | 1 - + framework/dtd/image.dtd | 1 - + framework/dtd/menubar.dtd | 1 - + framework/dtd/statusbar.dtd | 1 - + framework/dtd/toolbar.dtd | 1 - + i18npool/source/localedata/data/locale.dtd | 1 - + officecfg/registry/component-schema.dtd | 1 - + officecfg/registry/component-update.dtd | 1 - + package/dtd/Manifest.dtd | 1 - + xmerge/source/xmerge/converter.dtd | 1 - + xmloff/dtd/office.dtd | 1 - + xmlscript/dtd/dialog.dtd | 1 - + xmlscript/dtd/libraries.dtd | 2 -- + xmlscript/dtd/library.dtd | 2 -- + xmlscript/dtd/module.dtd | 2 -- + 17 files changed, 20 deletions(-) + +diff --git a/framework/dtd/accelerator.dtd b/framework/dtd/accelerator.dtd +index f4dcac65242d..912b652d3cf5 100644 +--- a/framework/dtd/accelerator.dtd ++++ b/framework/dtd/accelerator.dtd +@@ -1,4 +1,3 @@ +- +