* [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/, app-emulation/fuse/files/
@ 2017-08-01 10:54 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2017-08-01 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 881e38df97a8ae4bf238260e30f47c4519e20e0d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 1 10:27:08 2017 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Aug 1 10:53:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=881e38df
app-emulation/fuse: Remove broken old version
app-emulation/fuse/Manifest | 1 -
app-emulation/fuse/files/fuse-1.0.0-libpng15.patch | 10 ---
.../fuse/files/fuse-1.1.1-gold-link-lm.patch | 10 ---
app-emulation/fuse/fuse-1.1.1.ebuild | 95 ----------------------
4 files changed, 116 deletions(-)
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 3cf548c66c7..b6a7d1e5d2e 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,2 +1 @@
-DIST fuse-1.1.1.tar.gz 1881332 SHA256 a857d4bd62e01d18429897467508af15624cbaf343caed8b9ba1ab3a8879444e SHA512 67d12c56057a13121d8a5c073002dd2168268894669bdb50f3aba977cb1f53afa48774bfcb438a627a5afdbd2288248d4449e57d744e17b9e3eba00970685a14 WHIRLPOOL b64dd50037a4cba617bd0e10794c01e1a63bc2e68cd990636c1daa88e9a515032216b34e72ca6876f432a72d214d1220b808d2aae2ba849ee66f3d3784f14b73
DIST fuse-1.3.7.tar.gz 1644585 SHA256 ba57f4b4c1a7ed398b8d85b7da14b85bd346023bed17d8d7b6ed3e0452e7b4b0 SHA512 68a251de93a71a6ca8c107a9bd4258e6b4f5643af5dd76c0855ebfcfcaba768b932e6d0d0ab7b521ecaef50d975b86b4bfb7094e9a72ec6bf7d94911823d0886 WHIRLPOOL aab8ffdfd40ebbac9f88736dff98891f0eb51e43548ceb0c4d1ccba241009304c431651ed0c034797290eb79e6ffdd97f45591dd6efb426a60f0e511f642cf0f
diff --git a/app-emulation/fuse/files/fuse-1.0.0-libpng15.patch b/app-emulation/fuse/files/fuse-1.0.0-libpng15.patch
deleted file mode 100644
index 3da2d672c47..00000000000
--- a/app-emulation/fuse/files/fuse-1.0.0-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- screenshot.c
-+++ screenshot.c
-@@ -48,6 +48,7 @@
-
- #ifdef USE_LIBPNG
-
-+#include <zlib.h>
- #include <png.h>
-
- static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride,
diff --git a/app-emulation/fuse/files/fuse-1.1.1-gold-link-lm.patch b/app-emulation/fuse/files/fuse-1.1.1-gold-link-lm.patch
deleted file mode 100644
index 97e18a540ae..00000000000
--- a/app-emulation/fuse/files/fuse-1.1.1-gold-link-lm.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -uNr fuse-1.1.1.orig/sound/Makefile.am fuse-1.1.1/sound/Makefile.am
---- fuse-1.1.1.orig/sound/Makefile.am 2014-06-04 17:32:46.540000001 -0400
-+++ fuse-1.1.1/sound/Makefile.am 2014-06-04 19:04:23.190000001 -0400
-@@ -46,5 +46,6 @@
-
- libsound_a_LIBADD = $(SOUND_LIBADD)
- libsound_a_DEPENDENCIES = $(SOUND_LIBADD)
-+libsound_a_LDFLAGS = -lm
-
- noinst_HEADERS = sfifo.h blipbuffer.h
diff --git a/app-emulation/fuse/fuse-1.1.1.ebuild b/app-emulation/fuse/fuse-1.1.1.ebuild
deleted file mode 100644
index 08ce497fcc9..00000000000
--- a/app-emulation/fuse/fuse-1.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils
-
-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 fbcon gpm gtk joystick memlimit png sdl svga X xml"
-
-# This build is heavily use dependent. Fuse user interface use flags are, in
-# order of precedence: gtk, sdl, X, svga and fbcon. X version of fuse will
-# be built if no valid user interface flag is chosen.
-RDEPEND="~app-emulation/libspectrum-1.1.1
- gtk? ( x11-libs/gtk+:2
- alsa? ( media-libs/alsa-lib )
- !alsa? ( ao? ( media-libs/libao ) )
- joystick? ( media-libs/libjsw ) )
- !gtk? (
- sdl? ( >=media-libs/libsdl-1.2.4 )
- !sdl? (
- X? ( x11-libs/libX11
- x11-libs/libXext
- alsa? ( media-libs/alsa-lib )
- !alsa? ( ao? ( media-libs/libao ) )
- joystick? ( media-libs/libjsw ) )
- !X? (
- svga? ( media-libs/svgalib
- alsa? ( media-libs/alsa-lib )
- !alsa? ( ao? ( media-libs/libao ) ) )
- !svga? (
- fbcon? (
- gpm? ( sys-libs/gpm )
- alsa? ( media-libs/alsa-lib )
- !alsa? ( ao? ( media-libs/libao ) )
- joystick? ( media-libs/libjsw ) )
- !fbcon? ( x11-libs/libX11
- x11-libs/libXext
- alsa? ( media-libs/alsa-lib )
- !alsa? ( ao? ( media-libs/libao ) )
- joystick? ( media-libs/libjsw ) ) ) ) ) )
- dev-libs/glib:2
- png? ( media-libs/libpng:0= sys-libs/zlib )
- xml? ( dev-libs/libxml2:2 )"
-DEPEND="${RDEPEND}
- fbcon? ( virtual/linux-sources )
- dev-lang/perl
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README THANKS )
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-gold-link-lm.patch"
- eautoreconf
-}
-
-src_configure() {
- local guiflag
-
- if use gtk; then
- guiflag=""
- elif use sdl; then
- guiflag="--with-sdl"
- elif use X; then
- guiflag="--without-gtk"
- elif use svga; then
- guiflag="--with-svgalib"
- elif use fbcon; then
- guiflag="--with-fb"
- else # We default to X user interface
- guiflag="--without-gtk"
- fi
-
- econf \
- --without-win32 \
- ${guiflag} \
- $(use_with gpm) \
- $(use_with alsa) \
- $(use_with ao libao) \
- $(use_with joystick) \
- $(use_enable joystick ui-joystick) \
- $(use_with xml libxml2) \
- $(use_with png ) \
- $(use_enable memlimit smallmem)
-}
-
-src_install() {
- default
- doman man/fuse.1
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/, app-emulation/fuse/files/
@ 2020-08-16 8:01 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-08-16 8:01 UTC (permalink / raw
To: gentoo-commits
commit: c36a73546fb51cf33dcdd1fab2444d4da239665f
Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com>
AuthorDate: Tue Jul 28 15:32:04 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 08:00:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36a7354
app-emulation/fuse: avoid /usr/lib in the link command line
Closes: https://bugs.gentoo.org/734182
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/fuse/files/remove-local-prefix.patch | 18 ++++++++++++++++++
app-emulation/fuse/fuse-1.5.6.ebuild | 13 ++++++++++++-
app-emulation/fuse/fuse-1.5.7.ebuild | 13 ++++++++++++-
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/app-emulation/fuse/files/remove-local-prefix.patch b/app-emulation/fuse/files/remove-local-prefix.patch
new file mode 100644
index 00000000000..61bf33a1adc
--- /dev/null
+++ b/app-emulation/fuse/files/remove-local-prefix.patch
@@ -0,0 +1,18 @@
+diff -Naur fuse-1.5.7/configure.ac fuse-1.5.7-patched/configure.ac
+--- fuse-1.5.7/configure.ac 2018-12-09 13:06:11.000000000 +0100
++++ fuse-1.5.7-patched/configure.ac 2020-07-28 17:02:33.678546857 +0200
+@@ -110,14 +110,6 @@
+ AX_STRINGS_STRCASECMP
+ fi
+
+-dnl Allow the user to say that various libraries are in one place
+-AC_ARG_WITH(local-prefix,
+-[ --with-local-prefix=PFX local libraries installed in PFX (optional)],
+-CPPFLAGS="$CPPFLAGS -I$withval/include"; LDFLAGS="$LDFLAGS -L$withval/lib",
+-if test "$prefix" != "NONE"; then
+- CPPFLAGS="$CPPFLAGS -I$prefix/include"; LDFLAGS="$LDFLAGS -L$prefix/lib"
+-fi)
+-
+ dnl Check that libspectrum is available and that it is new enough
+ PKG_CHECK_MODULES([LIBSPECTRUM], [libspectrum >= 1.4.0])
+
diff --git a/app-emulation/fuse/fuse-1.5.6.ebuild b/app-emulation/fuse/fuse-1.5.6.ebuild
index 0e1754ea079..ffc3cfaeb97 100644
--- a/app-emulation/fuse/fuse-1.5.6.ebuild
+++ b/app-emulation/fuse/fuse-1.5.6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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"
@@ -35,6 +37,15 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README THANKS )
+PATCHES=(
+ "${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myconf=(
--without-win32
diff --git a/app-emulation/fuse/fuse-1.5.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild
index 0e1754ea079..ffc3cfaeb97 100644
--- a/app-emulation/fuse/fuse-1.5.7.ebuild
+++ b/app-emulation/fuse/fuse-1.5.7.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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"
@@ -35,6 +37,15 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README THANKS )
+PATCHES=(
+ "${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myconf=(
--without-win32
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/, app-emulation/fuse/files/
@ 2020-10-10 7:22 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-10-10 7:22 UTC (permalink / raw
To: gentoo-commits
commit: 6ca492771eb090c1856ce41c499be90d4e89d3f6
Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com>
AuthorDate: Sun Sep 20 13:48:48 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 07:22:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca49277
app-emulation/fuse: fix building with GCC 10
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-emulation/fuse/files/multiple-definition.patch | 13 +++++++++++++
app-emulation/fuse/fuse-1.5.7.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/app-emulation/fuse/files/multiple-definition.patch b/app-emulation/fuse/files/multiple-definition.patch
new file mode 100644
index 00000000000..8a8e9d7d175
--- /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.7.ebuild b/app-emulation/fuse/fuse-1.5.7.ebuild
index ffc3cfaeb97..b75ae1134c5 100644
--- a/app-emulation/fuse/fuse-1.5.7.ebuild
+++ b/app-emulation/fuse/fuse-1.5.7.ebuild
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README THANKS )
PATCHES=(
+ "${FILESDIR}"/multiple-definition.patch
"${FILESDIR}"/remove-local-prefix.patch
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-10 7:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-10 7:22 [gentoo-commits] repo/gentoo:master commit in: app-emulation/fuse/, app-emulation/fuse/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-08-16 8:01 Joonas Niilola
2017-08-01 10:54 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox