summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libvisio/files')
-rw-r--r--media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch12
-rw-r--r--media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch41
-rw-r--r--media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch46
3 files changed, 0 insertions, 99 deletions
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch b/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
deleted file mode 100644
index 78eb9fe66bc9..000000000000
--- a/media-libs/libvisio/files/libvisio-0.1.3-tests-without-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac 2015-07-25 09:29:53.000000000 +0200
-+++ b/configure.ac 2016-02-07 00:19:30.534383076 +0100
-@@ -317,6 +317,9 @@
- )
- AS_IF([test "x$enable_tests" = "xyes"], [
- PKG_CHECK_MODULES([CPPUNIT], [cppunit])
-+ PKG_CHECK_MODULES([REVENGE_STREAM],[
-+ librevenge-stream-0.0
-+ ])
- ], [])
- AC_SUBST([CPPUNIT_CFLAGS])
- AC_SUBST([CPPUNIT_LIBS])
diff --git a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch b/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch
deleted file mode 100644
index 801421a689c0..000000000000
--- a/media-libs/libvisio/files/libvisio-0.1.5-fix-test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a97d30ad693374deab404ec31fe00665882cc949 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 18 Jan 2016 13:53:19 +0100
-Subject: [PATCH] tdf#92396 test must be run in specific time zone
-
-Change-Id: Idc9d85ae8c5c1a6eccca7e830baa05a867ac4402
-Change-Id: I03b40e2746ad90f2c7cf09560c218aab2a18090d
----
- src/test/Makefile.am | 3 +++
- src/test/importtest.cpp | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-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=UTC; export TZ;
-+
- TESTS = test
-diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
-index e05b3c1..32fb185 100644
---- a/src/test/importtest.cpp
-+++ b/src/test/importtest.cpp
-@@ -242,8 +242,8 @@ void ImportTest::testVsdMetadataTitleUtf8()
- // Test the case when the string is UTF-8 encoded already in the file.
- assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1\xC5\x91\xC5\xB1");
- // Test <dcterms:created> and <dcterms:modified>.
-- assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T09:24:56Z");
-- assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T09:24:56Z");
-+ assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T08:24:56Z");
-+ assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T08:24:56Z");
- }
-
- void ImportTest::testVsdUserDefinedMetadata()
---
-2.1.4
diff --git a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch b/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch
deleted file mode 100644
index c119ce619da5..000000000000
--- a/media-libs/libvisio/files/libvisio-0.1.5-no-zlib.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8bfb5e3c19ab4e8aea09132881963facb76cfcda Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Thu, 23 Feb 2017 14:30:15 +0100
-Subject: [PATCH] zlib is not needed since the move to librevenge
-
-Change-Id: Ib83663e9cc7a808db966cd8dfb3fbcd1ee195da6
----
- configure.ac | 12 ------------
- libvisio.pc.in | 2 +-
- 2 files changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a11115b..2aa8ece 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,18 +76,6 @@ PKG_CHECK_MODULES([ICU],[icu-i18n],[
- AC_SUBST(ICU_CFLAGS)
- AC_SUBST(ICU_LIBS)
-
--# =========
--# Find zlib
--# =========
--PKG_CHECK_MODULES([ZLIB],[zlib],[],[
-- AC_CHECK_HEADER(zlib.h, [ZLIB_CFLAGS=],
-- [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-- AC_CHECK_LIB(z, inflate, [ ZLIB_LIBS=-lz ],
-- [AC_MSG_ERROR(zlib not found or functional)], [])
--])
--AC_SUBST(ZLIB_CFLAGS)
--AC_SUBST(ZLIB_LIBS)
--
- # ===========================
- # Find required boost headers
- # ===========================
-diff --git a/libvisio.pc.in b/libvisio.pc.in
-index ce68e6f..638930b 100644
---- a/libvisio.pc.in
-+++ b/libvisio.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0
- Libs: -L${libdir} -lvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
- Cflags: -I${includedir}/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@
-
--Requires.private: icu-i18n libxml-2.0 zlib
-+Requires.private: icu-i18n libxml-2.0
---
-2.1.4