From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-emulation/fuse/Manifest | 5 +- app-emulation/fuse/files/multiple-definition.patch | 13 ++++ app-emulation/fuse/fuse-1.5.6.ebuild | 79 ---------------------- app-emulation/fuse/fuse-1.5.7.ebuild | 6 +- 4 files changed, 19 insertions(+), 84 deletions(-) create mode 100644 app-emulation/fuse/files/multiple-definition.patch delete mode 100644 app-emulation/fuse/fuse-1.5.6.ebuild (limited to 'app-emulation/fuse') diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest index 19e75902d6f8..ec8eea92f7e3 100644 --- a/app-emulation/fuse/Manifest +++ b/app-emulation/fuse/Manifest @@ -1,6 +1,5 @@ +AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3 -DIST fuse-1.5.6.tar.gz 1634711 BLAKE2B a581c106c668f0342b4a3b4ebbc0e92e750806e59d067798e23da02284cbb9a17cf580c5b6369144863fbf64b12326ea2982e4d83e87354d62ff51926e3293de SHA512 84312e4f83883b36d06f2b96ded1bfc71675cba71a0848f4cbb5a233a1d1c06466013d2655d759397f32d6d67d6ba26b2b6a5041796cb9143cd0b354a88fd589 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d -EBUILD fuse-1.5.6.ebuild 1823 BLAKE2B 9b00e74118e6e8070dd6893accd12cb68ed63c0abb7e7a1c263d28122f791926ed757222a7aba6cdd6904a931936ce27f44d524348cca6eb72efffb47f15cef7 SHA512 a49b5e820de1a3a67b05b1f9385a0e12a3cbd150f83f637adfc0b1555d7083210b17aaa08e7954053a4f241edf711efaa299982e52dc9075852341043a571c65 -EBUILD fuse-1.5.7.ebuild 1823 BLAKE2B 9b00e74118e6e8070dd6893accd12cb68ed63c0abb7e7a1c263d28122f791926ed757222a7aba6cdd6904a931936ce27f44d524348cca6eb72efffb47f15cef7 SHA512 a49b5e820de1a3a67b05b1f9385a0e12a3cbd150f83f637adfc0b1555d7083210b17aaa08e7954053a4f241edf711efaa299982e52dc9075852341043a571c65 +EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b MISC metadata.xml 801 BLAKE2B 0a1504d02b423a72ad2d087489f9a0808dd2fb60643dc5c4a90625ce888cb6e9469195c919a3f9827bc0731afdf3ba739c2649692070c9d468a391e77eb9117a SHA512 dcb8d6a43cea89804e932e07dedf7d0fa3cabaf31aaa697f062e6e22a24c3c49e12a918e0cfd353d814ce1973c643b08f27710f95e696736bba2f174fbda76d5 diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch new file mode 100644 index 000000000000..8a8e9d7d1758 --- /dev/null +++ b/app-emulation/fuse/files/multiple-definition.patch @@ -0,0 +1,13 @@ +diff -Naur fuse-1.5.7/ui/widget/widget.c fuse-1.5.7-patched/ui/widget/widget.c +--- fuse-1.5.7/ui/widget/widget.c 2018-08-06 15:36:04.000000000 +0200 ++++ fuse-1.5.7-patched/ui/widget/widget.c 2020-09-20 15:27:42.045382588 +0200 +@@ -90,9 +90,6 @@ + + static widget_recurse_t widget_return[10]; /* The stack to recurse on */ + +-/* The settings used whilst playing with an options dialog box */ +-settings_info widget_options_settings; +- + static int widget_read_font( const char *filename ) + { + utils_file file; diff --git a/app-emulation/fuse/fuse-1.5.6.ebuild b/app-emulation/fuse/fuse-1.5.6.ebuild deleted file mode 100644 index ffc3cfaeb973..000000000000 --- a/app-emulation/fuse/fuse-1.5.6.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall" -HOMEPAGE="http://fuse-emulator.sourceforge.net" -SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alsa ao backend-fbcon backend-sdl backend-svga backend-X gpm joystick memlimit png xml" - -# Only one UI back-end can be enabled at a time -REQUIRED_USE="?? ( backend-fbcon backend-sdl backend-svga backend-X )" - -RDEPEND=" - >=app-emulation/libspectrum-1.4.4 - dev-libs/glib:2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - backend-sdl? ( media-libs/libsdl ) - backend-svga? ( media-libs/svgalib ) - backend-X? ( x11-libs/libX11 x11-libs/libXext ) - !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) - gpm? ( sys-libs/gpm ) - joystick? ( media-libs/libjsw ) - png? ( media-libs/libpng:0= sys-libs/zlib ) - xml? ( dev-libs/libxml2:2 )" -DEPEND="${RDEPEND} - backend-fbcon? ( virtual/linux-sources ) - dev-lang/perl - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog README THANKS ) - -PATCHES=( - "${FILESDIR}"/remove-local-prefix.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --without-win32 - $(use_with alsa) - $(use_with ao libao) - $(use_with gpm) - $(use_with joystick) - $(use_enable joystick ui-joystick) - $(use_enable memlimit smallmem) - $(use_with png) - $(use_with xml libxml2) - ) - - if use backend-sdl; then - myconf+=("--with-sdl") - elif use backend-X; then - myconf+=("--without-gtk") - elif use backend-svga; then - myconf+=("--with-svgalib") - elif use backend-fbcon; then - myconf+=("--with-fb") - else - myconf+=("--with-gtk") - fi - - econf "${myconf[@]}" -} - -src_test() { - emake test -} diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild index ffc3cfaeb973..063ecf27471a 100644 --- a/app-emulation/fuse/fuse-1.5.7.ebuild +++ b/app-emulation/fuse/fuse-1.5.7.ebuild @@ -27,7 +27,7 @@ RDEPEND=" backend-X? ( x11-libs/libX11 x11-libs/libXext ) !backend-fbcon? ( !backend-sdl? ( !backend-svga? ( !backend-X? ( x11-libs/gtk+:3 ) ) ) ) gpm? ( sys-libs/gpm ) - joystick? ( media-libs/libjsw ) + joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= sys-libs/zlib ) xml? ( dev-libs/libxml2:2 )" DEPEND="${RDEPEND} @@ -38,6 +38,7 @@ DEPEND="${RDEPEND} DOCS=( AUTHORS ChangeLog README THANKS ) PATCHES=( + "${FILESDIR}"/multiple-definition.patch "${FILESDIR}"/remove-local-prefix.patch ) @@ -53,7 +54,6 @@ src_configure() { $(use_with ao libao) $(use_with gpm) $(use_with joystick) - $(use_enable joystick ui-joystick) $(use_enable memlimit smallmem) $(use_with png) $(use_with xml libxml2) @@ -71,6 +71,8 @@ src_configure() { myconf+=("--with-gtk") fi + use joystick && myconf+=( $(use_enable backend-sdl ui-joystick) ) + econf "${myconf[@]}" } -- cgit v1.2.3