commit: 64705de9c3daa4d43d89a75f25dd226f3b5541ee Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat Mar 12 15:42:21 2016 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Mar 19 21:39:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64705de9
media-libs/libvisio: Drop obsolete 0.1.3 patches Package-Manager: portage-2.2.27 .../libvisio/files/libvisio-0.1.3-boost-1.59.patch | 22 ---------- .../files/libvisio-0.1.3-fix-importtest.patch | 25 ----------- .../libvisio/files/libvisio-0.1.3-fix-tests.patch | 49 ---------------------- 3 files changed, 96 deletions(-) diff --git a/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch deleted file mode 100644 index a0102e8..0000000 --- a/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: David Tardon <[email protected]> -Date: Sun, 30 Aug 2015 11:59:23 +0000 (+0200) -Subject: fix build with boost 1.59 -X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff_plain;h=2968c3dff8572b4734cb42c7bd5b00222f7fb288;hp=4b03893826bcc5f859b0ac3bea6a98269499d99f - -fix build with boost 1.59 - -Change-Id: I21eebdfa99d379e57949bfe4bf7eb83aec16f916 ---- - -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index dc0f8fd..6946b0a 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -22,6 +22,7 @@ generated_files = \ - $(top_builddir)/src/lib/tokens.h \ - $(top_builddir)/src/lib/tokenhash.h - -+libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED - libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = $(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@ - libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES = @LIBVISIO_WIN32_RESOURCE@ - libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch deleted file mode 100644 index f7e7035..0000000 --- a/media-libs/libvisio/files/libvisio-0.1.3-fix-importtest.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -Date: Mon, 18 Jan 2016 13:53:19 +0100 -Subject: [PATCH] tdf#92396 test must be run in specific time zone - -Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402 ---- - src/test/Makefile.am | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/test/Makefile.am b/src/test/Makefile.am -index 59d3419..23049b5 100644 ---- a/src/test/Makefile.am -+++ b/src/test/Makefile.am -@@ -29,4 +29,7 @@ EXTRA_DIST = \ - data/dwg.vsdx \ - $(test_SOURCES) - -+# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string -+AM_TESTS_ENVIRONMENT = TZ=CET; export TZ; -+ - TESTS = test --- -1.7.9.5 - diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch deleted file mode 100644 index 19104a1..0000000 --- a/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -Date: Sat, 25 Jul 2015 15:11:19 +0200 -Subject: [PATCH] fix test - -The previous version only worked with libxml2 < 2.9.2, because of a bug -in handling nested elements of the same name. - -Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f ---- - configure.ac | 4 ++++ - src/test/importtest.cpp | 6 +++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1611dcb..a075e73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,6 +128,10 @@ AS_IF([test "x$enable_tools" = "xyes"], [ - PKG_CHECK_MODULES([REVENGE_STREAM],[ - librevenge-stream-0.0 - ]) -+ PKG_CHECK_EXISTS([libxml-2.0 >= 2.9.2], -+ [], -+ [AC_MSG_ERROR([libxml2 >= 2.9.2 is needed to run tests])] -+ ) - ]) - AC_SUBST([REVENGE_GENERATORS_CFLAGS]) - AC_SUBST([REVENGE_GENERATORS_LIBS]) -diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp -index 8554309..0296380 100644 ---- a/src/test/importtest.cpp -+++ b/src/test/importtest.cpp -@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme() - void ImportTest::testVsdxCharBgColor() - { - m_doc = parse("bgcolor.vsdx", m_buffer); -- assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color"); -- assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); -- assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); -+ assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color"); -+ assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61"); -+ assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61"); - } - - CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest); --- -1.7.9.5 -
