dev-libs/libmspack: remove unused patches
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Sun, 7 Apr 2019 14:48:26 +0000 (16:48 +0200)
committerAaron Bauman <bman@gentoo.org>
Sat, 20 Apr 2019 01:28:35 +0000 (21:28 -0400)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11627
Signed-off-by: Aaron Bauman <bman@gentoo.org>
dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch [deleted file]
dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch [deleted file]

diff --git a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
deleted file mode 100644 (file)
index 22b0461..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libmspack/test/cabd_test.c b/libmspack/test/cabd_test.c
-index 5e8851c..abed65c 100644
---- a/test/cabd_test.c
-+++ b/test/cabd_test.c
-@@ -186,7 +186,8 @@ void cabd_open_test_05() {
-   for (i = 0; i < (sizeof(str_files)/sizeof(char *)); i++) {
-     cab = cabd->open(cabd, str_files[i]);
-     TEST(cab == NULL);
--    TEST(cabd->last_error(cabd) == MSPACK_ERR_DATAFORMAT);
-+    TEST(cabd->last_error(cabd) == MSPACK_ERR_DATAFORMAT ||
-+         cabd->last_error(cabd) == MSPACK_ERR_READ);
-   }
-   /* lack of data blocks should NOT be a problem for merely reading */
diff --git a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
deleted file mode 100644 (file)
index 38935a8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-From 43099fb1bba26792fe98b4157c950db9c333134d Mon Sep 17 00:00:00 2001
-From: Stuart Caie <kyzer@cabextract.org.uk>
-Date: Tue, 16 Oct 2018 11:25:24 +0100
-Subject: [PATCH] Fix parallel builds by adding adding libmschmd.la explicitly
- to test_chmd_test_DEPENDENCIES
-
----
-diff --git a/libmspack/Makefile.am b/libmspack/Makefile.am
-index ba19535..6130bc2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -89,7 +89,7 @@ test_chmd_order_SOURCES =    test/chmd_order.c test/md5.c test/md5.h \
- test_chmd_order_LDADD =               libmschmd.la
- test_chmd_test_SOURCES =      test/chmd_test.c libmschmd.la
- test_chmd_test_LDADD =                libmschmd.la
--test_chmd_test_DEPENDENCIES =         test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
-+test_chmd_test_DEPENDENCIES =         libmschmd.la test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
- test_chminfo_SOURCES =                test/chminfo.c libmschmd.la
- test_chminfo_LDADD =          libmschmd.la
- test_kwajd_test_SOURCES =     test/kwajd_test.c libmspack.la