commit: d85e3753726db7bda68c178af66b0e4f8d35593b
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Aug 10 17:45:24 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sun Aug 13 11:29:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d85e3753
x11-misc/fireflies: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5383
.../files/fireflies-2.07-build_system.patch| 85 --
.../fireflies/files/fireflies-2.07-gcc43.patch | 11 ---
.../fireflies/files/fireflies-2.07-gcc44.patch | 12 ---
.../files/fireflies-2.07-libgfx-libpng15.patch | 20 -
.../files/fireflies-2.07-libgfx-libpng16.patch | 15
5 files changed, 143 deletions(-)
diff --git a/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
deleted file mode 100644
index 2097b881b74..000
--- a/x11-misc/fireflies/files/fireflies-2.07-build_system.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Multiple QA issues:
-* Respect CXXFLAGS,LDFLAGS
-* fix parallel build
-* configure recursively
-* don't strip binaries
-* don't unpack libgfx during make
-
-http://bugs.gentoo.org/show_bug.cgi?id=336814
-
configure.ac
-+++ configure.ac
-@@ -2,6 +2,7 @@
- AC_INIT(fireflies, 2.07, g...@somewhere.fscked.org)
- AC_CONFIG_SRCDIR([src/arrow.cc])
- AC_CONFIG_HEADER([config.h])
-+AC_CONFIG_SUBDIRS([libgfx])
-
- sys=`uname`
-
Makefile
-+++ Makefile
-@@ -21,18 +21,17 @@
- win32/
-
- all: libgfx/src/libgfx.a
-- cd src && make
-+ $(MAKE) -C src
-
- libgfx/src/libgfx.a:
-- gunzip -c libgfx-1.0.1.tar.gz | tar x
-- cd libgfx && ./configure && cd src && make
-+ $(MAKE) -C libgfx/src
-
- install: all
- sh ./installit $(DESTDIR)
-
- clean:
-- make -C src clean
-- make -C win32 clean
-+ $(MAKE) -C src clean
-+ $(MAKE) -C win32 clean
-
- dist:
- rm -rf fireflies-$(VERSION)
-@@ -42,7 +41,7 @@
-
- # need Make.include temporarily to run make
- cp Make.include fireflies-$(VERSION)
-- make -C fireflies-$(VERSION) clean
-+ $(MAKE) -C fireflies-$(VERSION) clean
- rm -f fireflies-$(VERSION)/Make.include
-
- # don't want to include debian's buildroot
src/Makefile
-+++ src/Makefile
-@@ -8,8 +8,7 @@
- all: $(PROGRAM)
-
- $(PROGRAM): $(OBJECTS)
-- $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS)
-- strip $(PROGRAM)
-+ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS)
-
- $(OBJECTS): $(HEADERS)
-
-@@ -17,7 +16,7 @@
- .SUFFIXES: .cc .rc .o
-
- .cc.o:
-- $(CXX) -c $(CFLAGS) -o $@ $<
-+ $(CXX) -c $(CXXFLAGS) -o $@ $<
-
- #$(HEADERS_GCH): %.h.gch: %.h
- # $(CXX) -c -x c++-header $(CFLAGS) -o $@ $<
Make.include.in
-+++ Make.include.in
-@@ -5,7 +5,7 @@
- GL_LIBS = @GL_LIBS@
- OPT_LIBS = @OPT_LIBS@
-
--CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
-+CXXFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CXXFLAGS@
- LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
-
- OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
b/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
deleted file mode 100644
index d6bad4d9dda..000
--- a/x11-misc/fireflies/files/fireflies-2.07-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
fireflies-2.07/libgfx/src/raster.cxx.old 2008-07-29 17:53:35.0
-0500
-+++ fireflies-2.07/libgfx/src/raster.cxx 2008-07-29 17:53:51.0
-0500
-@@ -9,7 +9,7 @@
- #include
- #include
-
--#include
-+#include
- #include
-
- ByteRaster::ByteRaster(const ByteRaster )
diff --git a/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
b/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
deleted file mode 100644
index 612a25ec280..000
--- a/x11-misc/fireflies/files/fireflies-2.07-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur fireflies-2.07.orig/src/vroot.h fireflies-2.07/src/vroot.h
fireflies-2.07.orig/src/vroot.h2005-12-09 05:07:30.0 +0200
-+++ fireflies-2.07/src/vroot.h 2009-08-09 21:18:40.0 +0300
-@@ -78,6 +78,8 @@
- "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolcke Exp stolcke #";
- #endif
-
-+#include
-+
- #include
- #include
- #include
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
deleted file mode 100644
index 23d471b8fd1..000
--- a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
libgfx/src/raster-png.cxx
-+++ libgfx/src/raster-png.cxx
-@@ -39,7 +39,7 @@
-// Because we didn't set up any error handlers, we need to be
-// prepared to handle longjmps out of the library on error
-// conditions.
-- if( setjmp(png_ptr->jmpbuf) )
-+ if( setjmp(png_jmpbuf(png_ptr)) )
-{
-
