From: František Dvořák Date: Mon, 20 Jul 2015 21:35:40 +0000 (+0200) Subject: Patch not actual. X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=refs%2Fheads%2Fdebian8;p=debian-protobuf.git Patch not actual. --- diff --git a/debian/patches/fix-ftbfs-gcc4.7-kfreebsd.patch b/debian/patches/fix-ftbfs-gcc4.7-kfreebsd.patch deleted file mode 100644 index 6097c35..0000000 --- a/debian/patches/fix-ftbfs-gcc4.7-kfreebsd.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: fix GCC 4.7 build on 'other' platforms like GNU/kFreeBSD - Assume that all platforms in the 'other' category will have unistd.h; - as of GCC 4.7 they are going to have to include it. -Author: Steven Chamberlain - -Index: protobuf/gtest/include/gtest/internal/gtest-port.h -=================================================================== ---- protobuf.orig/gtest/include/gtest/internal/gtest-port.h 2013-08-13 17:03:10.932794167 -0400 -+++ protobuf/gtest/include/gtest/internal/gtest-port.h 2013-08-13 17:03:10.932794167 -0400 -@@ -325,6 +325,9 @@ - - #else - -+// Assume other platforms have unistd.h -+#include // NOLINT -+ - // may not be available on this platform. Use our own - // simple regex implementation instead. - # define GTEST_USES_SIMPLE_RE 1 diff --git a/debian/patches/series b/debian/patches/series index 04556ab..f0d4f77 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ disable-setuptools-download.diff arm_optimization.diff revert_upstream_issue_388_about_rpath.diff -fix-ftbfs-gcc4.7-kfreebsd.patch fix-ftbfs-upstream-issue-488.patch