summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/fim/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/fim/files')
-rw-r--r--media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch13
-rw-r--r--media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch10
-rw-r--r--media-gfx/fim/files/fim-0.4_pre-nosvn.patch11
-rw-r--r--media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch19
-rw-r--r--media-gfx/fim/files/fim-0.4_rc1-nosvn.patch11
-rw-r--r--media-gfx/fim/files/fim-0.4_rc3-poppler031.patch12
6 files changed, 76 insertions, 0 deletions
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
new file mode 100644
index 000000000000..7629fd1ad566
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch
@@ -0,0 +1,13 @@
+--- fim-0.3/configure.ac
++++ fim-0.3/configure.ac
+@@ -86,10 +86,6 @@
+ AC_MSG_RESULT($fim_cv_prefix)
+
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+-if test "x$U" != "x"; then
+- AC_MSG_ERROR(Compiler not ANSI compliant)
+-fi
+ #AC_PROG_CPP
+ AC_PROG_MAKE_SET
+
diff --git a/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch b/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
new file mode 100644
index 000000000000..952e800f149b
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
@@ -0,0 +1,10 @@
+--- fim-0.4-trunk/configure.ac
++++ fim-0.4-trunk/configure.ac
+@@ -123,6 +123,7 @@
+ FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS FbiStuffMagick.o";
+ LIBS="$LIBS `GraphicsMagick-config --cppflags --ldflags --libs|tr '\n' ' '` ";
+ CXXFLAGS="$CXXFLAGS `GraphicsMagick-config --cppflags |tr '\n' ' '` ";
++ CXXFLAGS="$CXXFLAGS -I`GraphicsMagick-config --prefix |tr -d '\n'`/include/GraphicsMagick ";
+ AC_DEFINE([HAVE_LIBGRAPHICSMAGICK],[1],[We have libGraphicsMagick])
+ fi
+ ], [])
diff --git a/media-gfx/fim/files/fim-0.4_pre-nosvn.patch b/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
new file mode 100644
index 000000000000..ba414aab7d00
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
@@ -0,0 +1,11 @@
+--- fim-0.4-trunk/configure.ac
++++ fim-0.4-trunk/configure.ac
+@@ -10,7 +10,7 @@
+ #AC_PROG_CC(cc gcc)
+ #AC_PROG_CXX(CC g++ gcc c++ cxx)
+
+-define([svnversion],esyscmd([sh -c "svnversion | tr -c '[0-9]' ' ' | sed 's/ *//g;s/^$/-1/g' "]))dnl
++define([svnversion],esyscmd([sh -c "echo -n '-1'"]))dnl
+ # WARNING : here 0.0 denotes the package version, which will be corrected some lines after this.
+ AC_INIT([fim],[0.4],[dezperado_FOobAr_autistici_Baz_org, by replacing _FOobAr_ with a @ and _Baz_ with a .])
+
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
new file mode 100644
index 000000000000..2e5da2aabaa7
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch
@@ -0,0 +1,19 @@
+--- fim-0.4-rc1/src/FbiStuffGif.cpp.orig 2014-05-27 13:06:10.521394320 +0200
++++ fim-0.4-rc1/src/FbiStuffGif.cpp 2014-05-27 13:13:48.754866607 +0200
+@@ -58,14 +58,14 @@
+ #if FIM_GIFLIB_RETIRED_PrintGifError
+ void
+ FimPrintGifError(struct gif_state * gs) {
+- int ErrorCode = gs->gif->Error;
++ int ErrorCode = GifError();
+ /* On the basis of giflib-5.0.5/util/qprintf.c suggestion, after retirement of PrintGifError */
+ char *Err = NULL;
+
+ if(ErrorCode == 0)
+ return;
+
+- Err = GifErrorString(ErrorCode);
++ Err = GifErrorString();
+
+ if (Err != NULL)
+ fprintf(stderr, "GIF-LIB error: %s.\n", Err);
diff --git a/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch b/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
new file mode 100644
index 000000000000..ec7a7e69a83d
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
@@ -0,0 +1,11 @@
+--- fim-0.4-rc1/configure.ac
++++ fim-0.4-rc1/configure.ac
+@@ -10,7 +10,7 @@
+ #AC_PROG_CC(cc gcc)
+ #AC_PROG_CXX(CC g++ gcc c++ cxx)
+
+-define([svnversion],esyscmd([sh -c "svnversion | tr -c '[0-9]' ' ' | sed 's/ *//g;s/^$/-1/g' "]))dnl
++define([svnversion],esyscmd([sh -c "echo -n -1"]))dnl
+ AC_INIT([fim],[0.4-rc1],[dezperado_FOobAr_autistici_Baz_org, by replacing _FOobAr_ with a @ and _Baz_ with a .])
+ AC_CONFIG_SRCDIR([src/fim.cpp])
+
diff --git a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch b/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch
new file mode 100644
index 000000000000..74ba50aa5155
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch
@@ -0,0 +1,12 @@
+diff -ruN fim-0.4-rc3.orig/src/FbiStuffPdf.cpp fim-0.4-rc3/src/FbiStuffPdf.cpp
+--- fim-0.4-rc3.orig/src/FbiStuffPdf.cpp 2014-12-22 23:54:29.000000000 +0100
++++ fim-0.4-rc3/src/FbiStuffPdf.cpp 2015-05-18 21:13:07.058115455 +0200
+@@ -199,7 +199,7 @@
+ if (!ds->od)
+ {
+ GBool bitmapTopDown = gTrue;
+- ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown,gFalse/*antialias*/);
++ ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown);
+ if (ds->od)
+ #ifdef POPPLER_VERSION /* as of 0.20.2, from poppler/poppler-config.h */
+ /* FIXME: this is an incomplete fix (triggered on 20120719's email on fim-devel);