commit: 9c77065a52897026dc3cd4c16e8eec9273befc5c Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> AuthorDate: Sat Oct 15 20:24:12 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Oct 16 17:24:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c77065a
net-irc/hexchat: fix libgdiplus.so & Werror errors Fixes the System.DllNotFounException: libgdiplus.so error when the theme-manager USE flag is set. The problem is that only mono[minimal] is buildable right now, so mono[-minimal] does not work. However, mono[minimal] does not pull in libgdiplus.so. Therefore, the "fix" is to pull in libgdiplus as a dependency if the user is using mono[minimal]. Unfortunately, this doesn't fix the mono[-minimal] use case. Additionally, removes all Werror* flags from configure.ac. Gentoo-bug: 578290 Gentoo-bug: 597126 Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/2563 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...hexchat-2.12.2-configure.ac-remove-werror.patch | 25 ++++++++++++++++++++++ ...exchat-9999.ebuild => hexchat-2.12.2-r1.ebuild} | 16 ++++++++++---- net-irc/hexchat/hexchat-9999.ebuild | 8 ++++++- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch b/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch new file mode 100644 index 00000000..7798d81 --- /dev/null +++ b/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch @@ -0,0 +1,25 @@ +The option -Werror=missing-include-dirs causes the build to fail if +non-exsistent directories are added via -I. Removing the rest of the -Werror* +flags to ensure no new bugs get created because a -Werror flag stopped the +build. + +--- hexchat-2.12.2/configure.ac.old 2016-10-15 13:40:30.585210113 -0700 ++++ hexchat-2.12.2/configure.ac 2016-10-15 13:40:44.937008119 -0700 +@@ -634,17 +634,10 @@ AX_APPEND_COMPILE_FLAGS([\ + -Wno-unused-parameter \ + -Wno-sign-compare \ + -Wno-pointer-sign \ + -Wno-missing-field-initializers \ + -Wno-unused-result \ +- -Werror=format-security \ +- -Werror=init-self \ +- -Werror=declaration-after-statement \ +- -Werror=missing-include-dirs \ +- -Werror=date-time \ +- -Werror=implicit-function-declaration \ +- -Werror=pointer-arith \ + ]) + + AS_IF([test "$stack_protector" = "yes"], [ + AX_APPEND_COMPILE_FLAGS([ \ + -fstack-protector-strong \ diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-2.12.2-r1.ebuild similarity index 94% copy from net-irc/hexchat/hexchat-9999.ebuild copy to net-irc/hexchat/hexchat-2.12.2-r1.ebuild index 530b157..0b74edb 100644 --- a/net-irc/hexchat/hexchat-9999.ebuild +++ b/net-irc/hexchat/hexchat-2.12.2-r1.ebuild @@ -40,7 +40,13 @@ COMMON_DEPEND="dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - theme-manager? ( dev-lang/mono )" + theme-manager? ( + || ( + ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) + dev-lang/mono[-minimal] + ) + )" + RDEPEND="${COMMON_DEPEND} spell? ( app-text/enchant )" DEPEND="${COMMON_DEPEND} @@ -49,11 +55,13 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool theme-manager? ( dev-util/monodevelop )" +PATCHES=( + "${FILESDIR}/hexchat-2.12.2-configure.ac-remove-werror.patch" +) + src_prepare() { - if [[ ${PV} == "9999" ]]; then - eautoreconf - fi default + eautoreconf } pkg_setup() { diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild index 530b157..21b0714 100644 --- a/net-irc/hexchat/hexchat-9999.ebuild +++ b/net-irc/hexchat/hexchat-9999.ebuild @@ -40,7 +40,13 @@ COMMON_DEPEND="dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - theme-manager? ( dev-lang/mono )" + theme-manager? ( + || ( + ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) + dev-lang/mono[-minimal] + ) + )" + RDEPEND="${COMMON_DEPEND} spell? ( app-text/enchant )" DEPEND="${COMMON_DEPEND}
