[gentoo-commits] repo/gentoo:master commit in: app-text/catdoc/files/

[gentoo-commits] repo/gentoo:master commit in: app-text/catdoc/files/

[Alexis Ballier]

commit:     025693c51efadf809323f700eda208a97661d0ba
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 18:48:59 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 07:04:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025693c5

app-text/catdoc: remove unused patches

 .../catdoc/files/catdoc-0.94.2+autoconf-2.63.patch | 12 --------
 app-text/catdoc/files/catdoc-0.94.2-flags.patch    | 35 ----------------------
 app-text/catdoc/files/catdoc-0.94.4-desktop.patch  | 11 -------
 app-text/catdoc/files/catdoc-0.94.4-destdir.patch  | 17 -----------
 4 files changed, 75 deletions(-)

diff --git a/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch b/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch
deleted file mode 100644
index 7fc70d33fd9..00000000000
--- a/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: catdoc-0.94.2/configure.in
-===================================================================
---- catdoc-0.94.2.orig/configure.in
-+++ catdoc-0.94.2/configure.in
-@@ -119,6 +119,6 @@ AC_SUBST(charsetcheck)
- AC_SUBST(installroot)
- AC_SUBST(catdoc_version)
- AC_SUBST(CFLAGS)
--AC_SUBST(WORDS_BIGENDIAN DEFS)
-+AC_SUBST(DEFS)
- AC_CONFIG_HEADER(src/config.h)
- AC_OUTPUT(doc/Makefile charsets/Makefile src/Makefile Makefile doc/catdoc.1 doc/xls2csv.1 doc/wordview.1 doc/catppt.1)

diff --git a/app-text/catdoc/files/catdoc-0.94.2-flags.patch b/app-text/catdoc/files/catdoc-0.94.2-flags.patch
deleted file mode 100644
index eb4e7e469e9..00000000000
--- a/app-text/catdoc/files/catdoc-0.94.2-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: catdoc-0.94.2/configure.in
-===================================================================
---- catdoc-0.94.2.orig/configure.in
-+++ catdoc-0.94.2/configure.in
-@@ -100,10 +100,6 @@ AC_C_CONST
- dnl Checks for library functions.
- AC_FUNC_SETVBUF_REVERSED
- 
--if test "$GCC" = "yes"; then
--	CFLAGS="-g -O2 -Wall"
--fi
--
- AC_DEFINE_UNQUOTED([SOURCE_CHARSET],"$sourcecharset",[Character encoding used by default for 8-bit source files])
- AC_DEFINE_UNQUOTED([TARGET_CHARSET],"$targetcharset",[Output character encoding used by default, if impossible to determine encoding from locale])
- AC_DEFINE_UNQUOTED([SPEC_EXT],"$specsuffix",[Suffix for files with special symbols map (ones to be replaced regardless of availability in target encoding)])
-Index: catdoc-0.94.2/src/Makefile.in
-===================================================================
---- catdoc-0.94.2.orig/src/Makefile.in
-+++ catdoc-0.94.2/src/Makefile.in
-@@ -74,12 +74,12 @@ OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
- #	$(CC) -c $(CFLAGS) $*
- all: @buildtargets@
- catdoc: $(OBJ)
--	$(CC)  -o catdoc  $(OBJ)
-+	$(CC)  $(LDFLAGS) -o catdoc  $(OBJ)
- xls2csv: $(OBJXLS)
--	$(CC) -o xls2csv $(OBJXLS) -lm
-+	$(CC) $(LDFLAGS) -o xls2csv $(OBJXLS) -lm
- 
- catppt: $(OBJPPT)
--	$(CC) -o catppt $(OBJPPT) -lm
-+	$(CC) $(LDFLAGS) -o catppt $(OBJPPT) -lm
- 
- install: @installtargets@
- install-catdoc:catdoc xls2csv catppt 

diff --git a/app-text/catdoc/files/catdoc-0.94.4-desktop.patch b/app-text/catdoc/files/catdoc-0.94.4-desktop.patch
deleted file mode 100644
index f92792293ce..00000000000
--- a/app-text/catdoc/files/catdoc-0.94.4-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- catdoc-0.94.4/desktop/wordview.desktop
-+++ catdoc-0.94.4/desktop/wordview.desktop
-@@ -2,7 +2,7 @@
- Name=Wordview Microsoft doc Viewer
- Comment=Microsoft doc document file viewer
- Exec=wordview
--Icon=wordview.xpm
-+Icon=wordview
- Terminal=false
- Categories=Office;GNOME;
- Type=Application

diff --git a/app-text/catdoc/files/catdoc-0.94.4-destdir.patch b/app-text/catdoc/files/catdoc-0.94.4-destdir.patch
deleted file mode 100644
index 9e6ac0986b2..00000000000
--- a/app-text/catdoc/files/catdoc-0.94.4-destdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- catdoc-0.94.4/desktop/Makefile.in
-+++ catdoc-0.94.4/desktop/Makefile.in
-@@ -20,10 +20,10 @@
- clean:
- 
- install: all
--	../mkinstalldirs $(prefix)$(desktopdir)
--	../mkinstalldirs $(prefix)$(iconsdir)
--	$(INSTALL) -m 644 wordview.desktop $(prefix)$(desktopdir)/wordview.desktop
--	$(INSTALL) -m 644 wordview.xpm $(prefix)$(iconsdir)/wordview.xpm
-+	../mkinstalldirs $(installroot)$(prefix)$(desktopdir)
-+	../mkinstalldirs $(installroot)$(prefix)$(iconsdir)
-+	$(INSTALL) -m 644 wordview.desktop $(installroot)$(prefix)$(desktopdir)/wordview.desktop
-+	$(INSTALL) -m 644 wordview.xpm $(installroot)$(prefix)$(iconsdir)/wordview.xpm
- 
- distclean: clean
- 	rm Makefile