[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: 7f3889a0db7e504d8c7694185da9082709452f06 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 21 07:43:10 2022 + Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 21 07:58:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3889a0 net-irc/hexchat: Removed old Signed-off-by: Lars Wendler gentoo.org> net-irc/hexchat/Manifest | 3 - .../hexchat/files/hexchat-2.14.3-python38.patch| 28 - net-irc/hexchat/hexchat-2.14.3-r101.ebuild | 139 - 3 files changed, 170 deletions(-) diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest index f634ca07b754..5620bb3a2a09 100644 --- a/net-irc/hexchat/Manifest +++ b/net-irc/hexchat/Manifest @@ -1,5 +1,2 @@ -DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5 DIST hexchat-2.16.0.tar.xz 1348320 BLAKE2B d5c6da74152e7ca08b629ee86cc45acb8232fbdad3d508cf56aba0c09d558b77644b704b5489e5f08a70133813f37c12e45b1529162e41b62acc9f61bca0b108 SHA512 4802f6efe0883f48d3d56ee949be1fc224b76a3c76956dcba3f913679e91424ba53c5c0d68bb4e0e790b16a08689111098958ead4c83c35cddf39855fe07c207 DIST hexchat-2.16.1.tar.xz 1349536 BLAKE2B 6e1d9f7c36affc94356e0124ea445f019d8f00b643896ec004af17059befadfcd8fc1b75ef9fba277542dcf8593e8e4683a709a4c4cbaaaf4f3122d8488dc6ce SHA512 9e6baa30ec8c3ce4fb56e2c82625da63295040eaf93a542aec8a4a18a6a3c95d69d1d4ffabc952bcdcd7b754afef234b348f296143991fafd0550342db95ce0e -DIST hexchat-add-libera-chat.patch 696 BLAKE2B cd5f0736abd7895d017e835335a6ff9a0f6301cba7e7b8c2a4e9da7047885aac2f8b7b25b0723966bd103118c99d833d3e99481865bf20d202b0f95c0a9131bb SHA512 e3cc7df3f114a2374c1653c4ab7262dad87191f74ca759c41beecd731472478e8bdc929b0a13475a1248ed045ee1faf93cd80a225b6ed670f449d4495d4ab2ae -DIST hexchat-default-network.patch 1423 BLAKE2B b11982d50abb4fb7d8aab4758195cbfea1691cd7c6487ca56f995e449ff0445e2427a68064c0d8ee4b4b4e7764e438bfd68bb5402a266624cb6cfb93fbfdb30b SHA512 2691786d360278b4334e9129912ca0abde7b98f0d72f5e530b34e109eaf624d8e7280e137490dab218bacfb5bed952b2d7827640777ad73da5585517de308f42 diff --git a/net-irc/hexchat/files/hexchat-2.14.3-python38.patch b/net-irc/hexchat/files/hexchat-2.14.3-python38.patch deleted file mode 100644 index fdfc74f94344.. --- a/net-irc/hexchat/files/hexchat-2.14.3-python38.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5deb69591992d4fede9090b60d3dc847612a4d60 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Wed, 11 Mar 2020 11:07:56 -0700 -Subject: [PATCH] build: Better support building against python 3.8+ - -Closes #2441 - plugins/python/meson.build | 8 +++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/plugins/python/meson.build b/plugins/python/meson.build -index 2ad5128e5..eb762134a 100644 a/plugins/python/meson.build -+++ b/plugins/python/meson.build -@@ -1,6 +1,12 @@ - python_opt = get_option('with-python') - if python_opt.startswith('python3') -- python_dep = dependency(python_opt, version: '>= 3.3') -+ # Python 3.8 introduced a new -embed variant -+ if not python_opt.endswith('-embed') -+python_dep = dependency(python_opt + '-embed', version: '>= 3.3', required: false) -+ endif -+ if not python_dep.found() -+python_dep = dependency(python_opt, version: '>= 3.3') -+ endif - else - python_dep = dependency(python_opt, version: '>= 2.7') - endif diff --git a/net-irc/hexchat/hexchat-2.14.3-r101.ebuild b/net-irc/hexchat/hexchat-2.14.3-r101.ebuild deleted file mode 100644 index 1cd245462e32.. --- a/net-irc/hexchat/hexchat-2.14.3-r101.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{7..9} ) - -inherit lua-single meson mono-env python-single-r1 xdg - -DESCRIPTION="Graphical IRC client based on XChat" -HOMEPAGE="https://hexchat.github.io/"; - -if [[ "${PV}" == "" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; -else - SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz - https://github.com/hexchat/hexchat/commit/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch -> ${PN}-add-libera-chat.patch - https://github.com/hexchat/hexchat/commit/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch -> ${PN}-default-network.patch" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux" -fi - -LICENSE="GPL-2 plugin-fishlim? ( MIT )" -SLOT="0" -IUSE="dbus debug +gtk libcanberra libnotify libproxy lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager" -REQUIRED_USE="lua? (
[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: 84a391d6e374314b5497e0027d87a5af62415989 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 25 13:16:33 2020 + Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 25 13:16:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a391d6 net-irc/hexchat: Fixed python plugins with python-3.8 Closes: https://bugs.gentoo.org/758758 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> .../hexchat/files/hexchat-2.14.3-python38.patch| 28 ++ net-irc/hexchat/hexchat-2.14.3-r100.ebuild | 6 - 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/net-irc/hexchat/files/hexchat-2.14.3-python38.patch b/net-irc/hexchat/files/hexchat-2.14.3-python38.patch new file mode 100644 index 000..fdfc74f9434 --- /dev/null +++ b/net-irc/hexchat/files/hexchat-2.14.3-python38.patch @@ -0,0 +1,28 @@ +From 5deb69591992d4fede9090b60d3dc847612a4d60 Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Wed, 11 Mar 2020 11:07:56 -0700 +Subject: [PATCH] build: Better support building against python 3.8+ + +Closes #2441 +--- + plugins/python/meson.build | 8 +++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/plugins/python/meson.build b/plugins/python/meson.build +index 2ad5128e5..eb762134a 100644 +--- a/plugins/python/meson.build b/plugins/python/meson.build +@@ -1,6 +1,12 @@ + python_opt = get_option('with-python') + if python_opt.startswith('python3') +- python_dep = dependency(python_opt, version: '>= 3.3') ++ # Python 3.8 introduced a new -embed variant ++ if not python_opt.endswith('-embed') ++python_dep = dependency(python_opt + '-embed', version: '>= 3.3', required: false) ++ endif ++ if not python_dep.found() ++python_dep = dependency(python_opt, version: '>= 3.3') ++ endif + else + python_dep = dependency(python_opt, version: '>= 2.7') + endif diff --git a/net-irc/hexchat/hexchat-2.14.3-r100.ebuild b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild index 77c0bc72368..27f07d1deda 100644 --- a/net-irc/hexchat/hexchat-2.14.3-r100.ebuild +++ b/net-irc/hexchat/hexchat-2.14.3-r100.ebuild @@ -4,7 +4,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit lua-single meson mono-env python-single-r1 xdg @@ -62,6 +62,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${P}-python38.patch" #758758 +) + pkg_setup() { use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: 9fb1874f5ac33882ae1cad2c991bceb0e9620b1c Author: Lars Wendler gentoo org> AuthorDate: Wed Apr 8 08:39:02 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Apr 8 08:39:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb1874f net-irc/hexchat: Security cleanup Bug: https://bugs.gentoo.org/71 Package-Manager: Portage-2.3.97, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> net-irc/hexchat/Manifest | 3 - .../files/hexchat-2.12.4-configure.ac.patch| 319 - .../hexchat/files/hexchat-2.12.4-libressl.patch| 29 -- net-irc/hexchat/hexchat-2.12.4-r2.ebuild | 132 - net-irc/hexchat/hexchat-2.14.1.ebuild | 135 - net-irc/hexchat/hexchat-2.14.2.ebuild | 137 - 6 files changed, 755 deletions(-) diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest index ac320c313dc..a09b66c24a7 100644 --- a/net-irc/hexchat/Manifest +++ b/net-irc/hexchat/Manifest @@ -1,4 +1 @@ -DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40 -DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd -DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5 diff --git a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch deleted file mode 100644 index c4288d2761d..000 --- a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch +++ /dev/null @@ -1,319 +0,0 @@ hexchat-2.12.4/data/pkgconfig/Makefile.am -+++ hexchat-2.12.4/data/pkgconfig/Makefile.am -@@ -1,4 +1,7 @@ -+AM_CFLAGS = @hexchat_def_CFLAGS@ -+AM_LDFLAGS = @hexchat_def_LDFLAGS@ -+ - pkgcfgdir = $(pkgconfigdir) - pkgcfg_DATA = hexchat-plugin.pc - - EXTRA_DIST = hexchat-plugin.pc.in hexchat-2.12.4/data/Makefile.am -+++ hexchat-2.12.4/data/Makefile.am -@@ -1,5 +1,8 @@ -+AM_CFLAGS = @hexchat_def_CFLAGS@ -+AM_LDFLAGS = @hexchat_def_LDFLAGS@ -+ - SUBDIRS = - - if DO_PLUGIN - SUBDIRS += pkgconfig - endif hexchat-2.12.4/data/misc/Makefile.am -+++ hexchat-2.12.4/data/misc/Makefile.am -@@ -1,5 +1,7 @@ -+AM_CFLAGS = @hexchat_def_CFLAGS@ -+AM_LDFLAGS = @hexchat_def_LDFLAGS@ - - appdatadir = $(datadir)/appdata - appdata_in_files = - - if DO_GTK hexchat-2.12.4/data/icons/Makefile.am -+++ hexchat-2.12.4/data/icons/Makefile.am -@@ -1,5 +1,8 @@ -+AM_CFLAGS = @hexchat_def_CFLAGS@ -+AM_LDFLAGS = @hexchat_def_LDFLAGS@ -+ - icon_DATA = hexchat.png - icondir = $(datadir)/icons/hicolor/48x48/apps - - hicolor_DATA = hexchat.svg - hicolordir = $(datadir)/icons/hicolor/scalable/apps hexchat-2.12.4/data/man/Makefile.am -+++ hexchat-2.12.4/data/man/Makefile.am -@@ -1,3 +1,6 @@ -+AM_CFLAGS = @hexchat_def_CFLAGS@ -+AM_LDFLAGS = @hexchat_def_LDFLAGS@ -+ - man_MANS = hexchat.1 - - EXTRA_DIST = hexchat.1.in hexchat-2.12.4/Makefile.am -+++ hexchat-2.12.4/Makefile.am -@@ -1,6 +1,8 @@ - ## Process this file with automake to produce Makefile.in -+AM_CFLAGS = @hexchat_def_CFLAGS@ -+AM_LDFLAGS = @hexchat_def_LDFLAGS@ - - ACLOCAL_AMFLAGS = -I m4 - - SUBDIRS = po src plugins data - hexchat-2.12.4/configure.ac -+++ hexchat-2.12.4/configure.ac -@@ -621,23 +621,23 @@ AX_APPEND_COMPILE_FLAGS([\ - -Werror=declaration-after-statement \ - -Werror=missing-include-dirs \ - -Werror=date-time \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ --]) -+], hexchat_def_CFLAGS) - - AS_IF([test "$stack_protector" = "yes"], [ - AX_APPEND_COMPILE_FLAGS([ \ - -fstack-protector-strong \ -- ]) -+ ], [hexchat_def_CFLAGS]) - ]) - - AX_APPEND_LINK_FLAGS([ \ - -pie \ - -Wl,-z,relro \ - -Wl,-z,now \ --]) -+], [hexchat_def_LDFLAGS]) - - dnl * - dnl ** FUNCTIONS/LIBS/CFLAGS
[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: e1c0c1e605017b8714fdac338d14d9c3186a6e77 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 26 17:17:29 2018 + Commit: Michał Górny gentoo org> CommitDate: Sun Aug 26 17:17:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c0c1e6 net-irc/hexchat: Clean old up ...hexchat-2.12.2-configure.ac-remove-werror.patch | 25 net-irc/hexchat/hexchat-2.12.4-r1.ebuild | 147 - 2 files changed, 172 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 deleted file mode 100644 index 7798d81c740..000 --- a/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.old2016-10-15 13:40:30.585210113 -0700 -+++ hexchat-2.12.2/configure.ac2016-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-2.12.4-r1.ebuild b/net-irc/hexchat/hexchat-2.12.4-r1.ebuild deleted file mode 100644 index cf092fcf354..000 --- a/net-irc/hexchat/hexchat-2.12.4-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit autotools fdo-mime gnome2-utils mono-env python-single-r1 - -DESCRIPTION="Graphical IRC client based on XChat" -HOMEPAGE="https://hexchat.github.io/"; - -if [[ "${PV}" == "" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; -else - SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux" -fi - -LICENSE="GPL-2 plugin-fishlim? ( MIT )" -SLOT="0" -IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -COMMON_DEPEND="dev-libs/glib:2 - dbus? ( sys-apps/dbus ) - gtk? ( x11-libs/gtk+:2 ) - libcanberra? ( media-libs/libcanberra ) - libproxy? ( net-libs/libproxy ) - libnotify? ( x11-libs/libnotify ) - lua? ( dev-lang/lua:= ) - nls? ( virtual/libintl ) - perl? ( dev-lang/perl ) - plugin-sysinfo? ( sys-apps/pciutils ) - python? ( ${PYTHON_DEPS} ) - spell? ( app-text/iso-codes ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - theme-manager? ( - || ( - ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) - dev-lang/mono[-minimal] - ) - )" - -RDEPEND="${COMMON_DEPEND} - spell? ( app-text/enchant )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - virtual/pkgconfig - dev-util/intltool - sys-devel/autoconf-archive - theme-manager? ( dev-util/monodevelop )" - -PATCHES=( - "${FILESDIR}/hexchat-2.12.2-configure.ac-remove-werror.patch" - "${FILESDIR}/hexchat-2.12.4-libressl.patch" -) - -src_prepare() { - default - eautoreconf -} - -pkg_setup() { - use python && python-single-r1_pkg_setup - if use theme-manager ; then - mono-env_pkg_setup - export XDG_CACHE_HOME="${T}/.cache" - fi -} - -src_configure() { - econf \ - --enable-plugin \ - $(use_enable nls) \ - $(use_enable ssl openssl) \ - $(use_enable gtk gtkfe) \ - $(use_enable !gtk textfe) \ - $(use_enable python python "${EPYTHON}") \ - $(use_enable perl) \ - $(use_enable plugin-checksum checksum) \ - $(use_enable plugin-fishlim fishlim) \ - $(use_enable plugin-sysinfo sysinfo) \ - $(use_enable dbus) \ - $(use_enable lua) \ - $(use_enable libnotify) \ - $(use_enable libcanberra) \ -
[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: d88256e2f8a6cc6f808fdd665f615a91d213e959 Author: Nicholas Vinson gmail com> AuthorDate: Sat Jan 21 14:39:54 2017 + Commit: Lars Wendler gentoo org> CommitDate: Sun Jan 22 04:15:53 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88256e2 net-irc/hexchat: Remove theme-manager support; favor am_* vars in configure Gentoo-bug: 606522 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3588 .../files/hexchat-2.12.4-configure.ac.patch| 319 + net-irc/hexchat/hexchat-2.12.4-r2.ebuild | 133 + 2 files changed, 452 insertions(+) diff --git a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch new file mode 100644 index ..c4288d2 --- /dev/null +++ b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch @@ -0,0 +1,319 @@ +--- hexchat-2.12.4/data/pkgconfig/Makefile.am hexchat-2.12.4/data/pkgconfig/Makefile.am +@@ -1,4 +1,7 @@ ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ ++ + pkgcfgdir = $(pkgconfigdir) + pkgcfg_DATA = hexchat-plugin.pc + + EXTRA_DIST = hexchat-plugin.pc.in +--- hexchat-2.12.4/data/Makefile.am hexchat-2.12.4/data/Makefile.am +@@ -1,5 +1,8 @@ ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ ++ + SUBDIRS = + + if DO_PLUGIN + SUBDIRS += pkgconfig + endif +--- hexchat-2.12.4/data/misc/Makefile.am hexchat-2.12.4/data/misc/Makefile.am +@@ -1,5 +1,7 @@ ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ + + appdatadir = $(datadir)/appdata + appdata_in_files = + + if DO_GTK +--- hexchat-2.12.4/data/icons/Makefile.am hexchat-2.12.4/data/icons/Makefile.am +@@ -1,5 +1,8 @@ ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ ++ + icon_DATA = hexchat.png + icondir = $(datadir)/icons/hicolor/48x48/apps + + hicolor_DATA = hexchat.svg + hicolordir = $(datadir)/icons/hicolor/scalable/apps +--- hexchat-2.12.4/data/man/Makefile.am hexchat-2.12.4/data/man/Makefile.am +@@ -1,3 +1,6 @@ ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ ++ + man_MANS = hexchat.1 + + EXTRA_DIST = hexchat.1.in +--- hexchat-2.12.4/Makefile.am hexchat-2.12.4/Makefile.am +@@ -1,6 +1,8 @@ + ## Process this file with automake to produce Makefile.in ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ + + ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = po src plugins data + +--- hexchat-2.12.4/configure.ac hexchat-2.12.4/configure.ac +@@ -621,23 +621,23 @@ AX_APPEND_COMPILE_FLAGS([\ + -Werror=declaration-after-statement \ + -Werror=missing-include-dirs \ + -Werror=date-time \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ +-]) ++], hexchat_def_CFLAGS) + + AS_IF([test "$stack_protector" = "yes"], [ + AX_APPEND_COMPILE_FLAGS([ \ + -fstack-protector-strong \ +- ]) ++ ], [hexchat_def_CFLAGS]) + ]) + + AX_APPEND_LINK_FLAGS([ \ + -pie \ + -Wl,-z,relro \ + -Wl,-z,now \ +-]) ++], [hexchat_def_LDFLAGS]) + + dnl * + dnl ** FUNCTIONS/LIBS/CFLAGS + dnl * + +@@ -687,10 +687,12 @@ dnl freebsd needs this + LIBS="$LIBS $INTLLIBS" + + GUI_LIBS="$GUI_LIBS $COMMON_LIBS" + + dnl make these visible to all Makefiles ++AC_SUBST(hexchat_def_CFLAGS) ++AC_SUBST(hexchat_def_LDFLAGS) + AC_SUBST(GUI_LIBS) + AC_SUBST(GUI_CFLAGS) + AC_SUBST(COMMON_LIBS) + AC_SUBST(COMMON_CFLAGS) + AC_SUBST(PERL_CFLAGS) +--- hexchat-2.12.4/src/common/Makefile.am hexchat-2.12.4/src/common/Makefile.am +@@ -1,6 +1,8 @@ + ## Process this file with automake to produce Makefile.in ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ + + include $(top_srcdir)/m4/clang-analyze.am + + noinst_LIBRARIES = libhexchatcommon.a + +@@ -62,11 +64,11 @@ noinst_PROGRAMS = make-te + + libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \ + history.c ignore.c inbound.c marshal.c modes.c network.c notify.c \ + outbound.c plugin.c plugin-identd.c plugin-timer.c proto-irc.c server.c servlist.c \ + $(ssl_c) text.c tree.c url.c userlist.c util.c +-libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) ++libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) $(hexchat_def_CFLAGS) + + textenums.h: textevents.h + + textevents.h: $(srcdir)/textevents.in make-te + $(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h +--- hexchat-2.12.4/src/common/dbus/Makefile.am hexchat-2.12.4/src/common/dbus/Makefile.am +@@ -1,5 +1,8 @@ ++AM_CFLAGS = @hexchat_def_CFLAGS@ ++AM_LDFLAGS = @hexchat_def_LDFLAGS@ ++ + noinst_LIBRARIES = libhexchatdbus.a + libhexchatdbus_a_SOURCES =\ + dbus-plugin.c
[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: d663a68c1b428f18fe13677b57944b9868f23806 Author: Nicholas Vinson gmail com> AuthorDate: Tue Dec 13 07:45:55 2016 + Commit: Lars Wendler gentoo org> CommitDate: Tue Dec 13 14:55:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d663a68c net-irc/hexchat: Fix libreSSL and missing dep. Adds preprocessor libreSSL check to Fix libreSSL compile-time. Adds autconf-archive as a bdep. Gentoo-bug: 602372 Gentoo-bug: 602438 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3109 .../hexchat/files/hexchat-2.12.4-libressl.patch| 29 net-irc/hexchat/hexchat-2.12.4-r1.ebuild | 148 + 2 files changed, 177 insertions(+) diff --git a/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch b/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch new file mode 100644 index ..3b3adc0 --- /dev/null +++ b/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch @@ -0,0 +1,29 @@ +# diff -pU5 hexchat-2.12.4/src/common/ssl.c.old hexchat-2.12.4/src/common/ssl.c +--- hexchat-2.12.4/src/common/ssl.c hexchat-2.12.4/src/common/ssl.c +@@ -174,11 +174,11 @@ _SSL_get_cert_info (struct cert_info *ce + key = X509_get_X509_PUBKEY(peer_cert); + if (!X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key)) + return 1; + + alg = OBJ_obj2nid (algor->algorithm); +-#if OPENSSL_VERSION_NUMBER < 0x1010L ++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined LIBRESSL_VERSION_NUMBER + sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm); + #else + sign_alg = X509_get_signature_nid (peer_cert); + #endif + ASN1_TIME_snprintf (notBefore, sizeof (notBefore), +@@ -304,11 +304,11 @@ _SSL_socket (SSL_CTX *ctx, int sd) + /* FATAL */ + __SSL_critical_error ("SSL_new"); + + SSL_set_fd (ssl, sd); + +-#if OPENSSL_VERSION_NUMBER < 0x1010L ++#if OPENSSL_VERSION_NUMBER < 0x1010L || defined LIBRESSL_VERSION_NUMBER + method = ctx->method; + #else + method = SSL_CTX_get_ssl_method (ctx); + #endif + if (method == SSLv23_client_method()) diff --git a/net-irc/hexchat/hexchat-2.12.4-r1.ebuild b/net-irc/hexchat/hexchat-2.12.4-r1.ebuild new file mode 100644 index ..ddcfa91 --- /dev/null +++ b/net-irc/hexchat/hexchat-2.12.4-r1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +inherit autotools fdo-mime gnome2-utils mono-env python-single-r1 + +DESCRIPTION="Graphical IRC client based on XChat" +HOMEPAGE="https://hexchat.github.io/"; + +if [[ "${PV}" == "" ]] ; then + inherit git-r3 + SRC_URI="" + EGIT_REPO_URI="git://github.com/hexchat/hexchat.git" +else + SRC_URI="https://dl.hexchat.net/hexchat/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" +fi + +LICENSE="GPL-2 plugin-fishlim? ( MIT )" +SLOT="0" +IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND="dev-libs/glib:2 + dbus? ( sys-apps/dbus ) + gtk? ( x11-libs/gtk+:2 ) + libcanberra? ( media-libs/libcanberra ) + libproxy? ( net-libs/libproxy ) + libnotify? ( x11-libs/libnotify ) + lua? ( dev-lang/lua:= ) + nls? ( virtual/libintl ) + perl? ( dev-lang/perl ) + plugin-sysinfo? ( sys-apps/pciutils ) + python? ( ${PYTHON_DEPS} ) + spell? ( app-text/iso-codes ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + theme-manager? ( + || ( + ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) + dev-lang/mono[-minimal] + ) + )" + +RDEPEND="${COMMON_DEPEND} + spell? ( app-text/enchant )" +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + virtual/pkgconfig + dev-util/intltool + sys-devel/autoconf-archive + theme-manager? ( dev-util/monodevelop )" + +PATCHES=( + "${FILESDIR}/hexchat-2.12.2-configure.ac-remove-werror.patch" + "${FILESDIR}/hexchat-2.12.4-libressl.patch" +) + +src_prepare() { + default + eautoreconf +} + +pkg_setup() { + use python && python-single-r1_pkg_setup + if use theme-manager ; then + mono-env_pkg_setup + export XDG_CACHE_HOME="${T}/.cache" + fi +} + +src_configure() { + econf \ + --enable-plugin \ + $(use_enable nls) \ + $(use_enable ssl openssl) \ + $(use_enable gtk gtkfe) \ + $(use_enable !gtk textfe) \ + $(use_enable python python "${EPYTHON}") \ +
[gentoo-commits] repo/gentoo:master commit in: net-irc/hexchat/, net-irc/hexchat/files/
commit: 9c77065a52897026dc3cd4c16e8eec9273befc5c Author: Nicholas Vinson gmail com> AuthorDate: Sat Oct 15 20:24:12 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Oct 16 17:24:04 2016 + 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 gentoo.org> ...hexchat-2.12.2-configure.ac-remove-werror.patch | 25 ++ ...exchat-.ebuild => hexchat-2.12.2-r1.ebuild} | 16 ++ net-irc/hexchat/hexchat-.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 ..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.old2016-10-15 13:40:30.585210113 -0700 hexchat-2.12.2/configure.ac2016-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-.ebuild b/net-irc/hexchat/hexchat-2.12.2-r1.ebuild similarity index 94% copy from net-irc/hexchat/hexchat-.ebuild copy to net-irc/hexchat/hexchat-2.12.2-r1.ebuild index 530b157..0b74edb 100644 --- a/net-irc/hexchat/hexchat-.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} == "" ]]; then - eautoreconf - fi default + eautoreconf } pkg_setup() { diff --git a/net-irc/hexchat/hexchat-.ebuild b/net-irc/hexchat/hexchat-.ebuild index 530b157..21b0714 100644 --- a/net-irc/hexchat/hexchat-.ebuild +++ b/net-irc/hexchat/hexchat-.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}