Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/files/
Date: Thu, 22 Dec 2016 15:12:59
Message-Id: 1482419553.99aae06b15b9d835d665f7fe38dc29b220a703bd.kensington@gentoo
1 commit: 99aae06b15b9d835d665f7fe38dc29b220a703bd
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 19 19:49:34 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 22 15:12:33 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aae06b
7
8 media-gfx/fim: remove unused patches
9
10 media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch | 13 -------------
11 media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch | 10 ----------
12 media-gfx/fim/files/fim-0.4_pre-nosvn.patch | 11 -----------
13 media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch | 19 -------------------
14 media-gfx/fim/files/fim-0.4_rc1-nosvn.patch | 11 -----------
15 5 files changed, 64 deletions(-)
16
17 diff --git a/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch b/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch
18 deleted file mode 100644
19 index 7629fd1..00000000
20 --- a/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch
21 +++ /dev/null
22 @@ -1,13 +0,0 @@
23 ---- fim-0.3/configure.ac
24 -+++ fim-0.3/configure.ac
25 -@@ -86,10 +86,6 @@
26 - AC_MSG_RESULT($fim_cv_prefix)
27 -
28 - AC_ISC_POSIX
29 --AM_C_PROTOTYPES
30 --if test "x$U" != "x"; then
31 -- AC_MSG_ERROR(Compiler not ANSI compliant)
32 --fi
33 - #AC_PROG_CPP
34 - AC_PROG_MAKE_SET
35 -
36
37 diff --git a/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch b/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
38 deleted file mode 100644
39 index 952e800..00000000
40 --- a/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
41 +++ /dev/null
42 @@ -1,10 +0,0 @@
43 ---- fim-0.4-trunk/configure.ac
44 -+++ fim-0.4-trunk/configure.ac
45 -@@ -123,6 +123,7 @@
46 - FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS FbiStuffMagick.o";
47 - LIBS="$LIBS `GraphicsMagick-config --cppflags --ldflags --libs|tr '\n' ' '` ";
48 - CXXFLAGS="$CXXFLAGS `GraphicsMagick-config --cppflags |tr '\n' ' '` ";
49 -+ CXXFLAGS="$CXXFLAGS -I`GraphicsMagick-config --prefix |tr -d '\n'`/include/GraphicsMagick ";
50 - AC_DEFINE([HAVE_LIBGRAPHICSMAGICK],[1],[We have libGraphicsMagick])
51 - fi
52 - ], [])
53
54 diff --git a/media-gfx/fim/files/fim-0.4_pre-nosvn.patch b/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
55 deleted file mode 100644
56 index ba414aa..00000000
57 --- a/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
58 +++ /dev/null
59 @@ -1,11 +0,0 @@
60 ---- fim-0.4-trunk/configure.ac
61 -+++ fim-0.4-trunk/configure.ac
62 -@@ -10,7 +10,7 @@
63 - #AC_PROG_CC(cc gcc)
64 - #AC_PROG_CXX(CC g++ gcc c++ cxx)
65 -
66 --define([svnversion],esyscmd([sh -c "svnversion | tr -c '[0-9]' ' ' | sed 's/ *//g;s/^$/-1/g' "]))dnl
67 -+define([svnversion],esyscmd([sh -c "echo -n '-1'"]))dnl
68 - # WARNING : here 0.0 denotes the package version, which will be corrected some lines after this.
69 - AC_INIT([fim],[0.4],[dezperado_FOobAr_autistici_Baz_org, by replacing _FOobAr_ with a @ and _Baz_ with a .])
70 -
71
72 diff --git a/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch b/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch
73 deleted file mode 100644
74 index 2e5da2a..00000000
75 --- a/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch
76 +++ /dev/null
77 @@ -1,19 +0,0 @@
78 ---- fim-0.4-rc1/src/FbiStuffGif.cpp.orig 2014-05-27 13:06:10.521394320 +0200
79 -+++ fim-0.4-rc1/src/FbiStuffGif.cpp 2014-05-27 13:13:48.754866607 +0200
80 -@@ -58,14 +58,14 @@
81 - #if FIM_GIFLIB_RETIRED_PrintGifError
82 - void
83 - FimPrintGifError(struct gif_state * gs) {
84 -- int ErrorCode = gs->gif->Error;
85 -+ int ErrorCode = GifError();
86 - /* On the basis of giflib-5.0.5/util/qprintf.c suggestion, after retirement of PrintGifError */
87 - char *Err = NULL;
88 -
89 - if(ErrorCode == 0)
90 - return;
91 -
92 -- Err = GifErrorString(ErrorCode);
93 -+ Err = GifErrorString();
94 -
95 - if (Err != NULL)
96 - fprintf(stderr, "GIF-LIB error: %s.\n", Err);
97
98 diff --git a/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch b/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
99 deleted file mode 100644
100 index ec7a7e6..00000000
101 --- a/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
102 +++ /dev/null
103 @@ -1,11 +0,0 @@
104 ---- fim-0.4-rc1/configure.ac
105 -+++ fim-0.4-rc1/configure.ac
106 -@@ -10,7 +10,7 @@
107 - #AC_PROG_CC(cc gcc)
108 - #AC_PROG_CXX(CC g++ gcc c++ cxx)
109 -
110 --define([svnversion],esyscmd([sh -c "svnversion | tr -c '[0-9]' ' ' | sed 's/ *//g;s/^$/-1/g' "]))dnl
111 -+define([svnversion],esyscmd([sh -c "echo -n -1"]))dnl
112 - AC_INIT([fim],[0.4-rc1],[dezperado_FOobAr_autistici_Baz_org, by replacing _FOobAr_ with a @ and _Baz_ with a .])
113 - AC_CONFIG_SRCDIR([src/fim.cpp])
114 -