From b12e11d5ea2aac282eb86bc0b9dc08e7cd76f3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 18 Aug 2019 12:23:41 +0200 Subject: [PATCH] libabw: upgrade 0.1.2 -> 0.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../libabw/0001-Fix-build-with-gcc-9.patch | 32 ------------------- .../{libabw_0.1.2.bb => libabw_0.1.3.bb} | 9 ++---- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 recipes-filter/libabw/libabw/0001-Fix-build-with-gcc-9.patch rename recipes-filter/libabw/{libabw_0.1.2.bb => libabw_0.1.3.bb} (57%) diff --git a/recipes-filter/libabw/libabw/0001-Fix-build-with-gcc-9.patch b/recipes-filter/libabw/libabw/0001-Fix-build-with-gcc-9.patch deleted file mode 100644 index fc88698..0000000 --- a/recipes-filter/libabw/libabw/0001-Fix-build-with-gcc-9.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5590fc76c90ab29e9042f9402d99ce0a77df45f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 6 Jun 2019 21:58:57 +0200 -Subject: [PATCH] Fix build with gcc 9 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../../../libabw-0.1.2/src/lib/ABWStylesCollector.cpp:221:56: error: implicitly-declared 'libabw::ABWData& libabw::ABWData::operator=(const libabw::ABWData&)' is deprecated [-Werror=deprecated-copy] - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/lib/ABWCollector.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/ABWCollector.h b/src/lib/ABWCollector.h -index aa4f9ce..cfb4a50 100644 ---- a/src/lib/ABWCollector.h -+++ b/src/lib/ABWCollector.h -@@ -51,6 +51,7 @@ struct ABWData - ABWData(const librevenge::RVNGString &mimeType, const librevenge::RVNGBinaryData binaryData) - : m_mimeType(mimeType), m_binaryData(binaryData) {} - ~ABWData() {} -+ ABWData& operator=(const ABWData& other) = default; - - librevenge::RVNGString m_mimeType; - librevenge::RVNGBinaryData m_binaryData; --- -2.20.1 - diff --git a/recipes-filter/libabw/libabw_0.1.2.bb b/recipes-filter/libabw/libabw_0.1.3.bb similarity index 57% rename from recipes-filter/libabw/libabw_0.1.2.bb rename to recipes-filter/libabw/libabw_0.1.3.bb index 83fb5c2..a25ed76 100644 --- a/recipes-filter/libabw/libabw_0.1.2.bb +++ b/recipes-filter/libabw/libabw_0.1.3.bb @@ -5,12 +5,9 @@ LIC_FILES_CHKSUM = " \ file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \ " -SRC_URI = " \ - http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-Fix-build-with-gcc-9.patch \ -" -SRC_URI[md5sum] = "201f477df7ea90d362c389c145c0f352" -SRC_URI[sha256sum] = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485" +SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "0ec0331abbbf653f08eecceb1fb787a0" +SRC_URI[sha256sum] = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed" inherit autotools pkgconfig