From ebc65b360483b27111d2f727bb4aea66aa778eba Mon Sep 17 00:00:00 2001
From: Piotr Karbowski <slashbeast@gentoo.org>
Date: Sun, 14 Mar 2021 16:33:33 +0100
Subject: dev-libs/libdispatch: 5.3.3: Drop -Werror; block on libobjc2.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=775692
Closes: https://bugs.gentoo.org/show_bug.cgi?id=775623
Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>
---
 dev-libs/libdispatch/files/remove-Werror.patch   | 25 +++++++++++++
 dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild | 46 ++++++++++++++++++++++++
 dev-libs/libdispatch/libdispatch-5.3.3.ebuild    | 45 -----------------------
 3 files changed, 71 insertions(+), 45 deletions(-)
 create mode 100644 dev-libs/libdispatch/files/remove-Werror.patch
 create mode 100644 dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
 delete mode 100644 dev-libs/libdispatch/libdispatch-5.3.3.ebuild

diff --git a/dev-libs/libdispatch/files/remove-Werror.patch b/dev-libs/libdispatch/files/remove-Werror.patch
new file mode 100644
index 000000000000..bdc3edf2d483
--- /dev/null
+++ b/dev-libs/libdispatch/files/remove-Werror.patch
@@ -0,0 +1,25 @@
+diff --git a/cmake/modules/DispatchCompilerWarnings.cmake b/cmake/modules/DispatchCompilerWarnings.cmake
+index 35b80f3..cc554ed 100644
+--- a/cmake/modules/DispatchCompilerWarnings.cmake
++++ b/cmake/modules/DispatchCompilerWarnings.cmake
+@@ -2,7 +2,6 @@
+ if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
+   # TODO: someone needs to provide the msvc equivalent warning flags
+ else()
+-  add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
+   add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index adc989d..2841aa2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -127,7 +127,7 @@ endif()
+ # FIXME(compnerd) add check for -fblocks?
+ target_compile_options(dispatch PRIVATE -fblocks)
+ 
+-check_c_compiler_flag("-momit-leaf-frame-pointer -Werror -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
++check_c_compiler_flag("-momit-leaf-frame-pointer -Wall -O3" C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
+ if (C_SUPPORTS_OMIT_LEAF_FRAME_POINTER)
+   target_compile_options(dispatch PRIVATE -momit-leaf-frame-pointer)
+ endif()
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
new file mode 100644
index 000000000000..d02b56e15ca3
--- /dev/null
+++ b/dev-libs/libdispatch/libdispatch-5.3.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="swift-corelibs-${PN}"
+MY_PV="swift-${PV}-RELEASE"
+
+DESCRIPTION="A library for concurrent code execution on multicore hardware"
+HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
+SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!gnustep-base/libobjc2"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/clang
+	sys-devel/llvm
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/remove-Werror.patch" )
+
+src_configure () {
+	if ! tc-is-clang ; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild b/dev-libs/libdispatch/libdispatch-5.3.3.ebuild
deleted file mode 100644
index d469c43530f2..000000000000
--- a/dev-libs/libdispatch/libdispatch-5.3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_PN="swift-corelibs-${PN}"
-MY_PV="swift-${PV}-RELEASE"
-
-DESCRIPTION="A library for concurrent code execution on multicore hardware"
-HOMEPAGE="https://github.com/apple/swift-corelibs-libdispatch"
-SRC_URI="https://github.com/apple/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/clang
-	sys-devel/llvm
-"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_configure () {
-	if ! tc-is-clang ; then
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	cmake_src_configure
-}
-- 
cgit v1.2.3-65-gdbad