diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/icoutils/files | |
download | gentoo-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/icoutils/files')
-rw-r--r-- | media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch | 13 | ||||
-rw-r--r-- | media-gfx/icoutils/files/icoutils-0.29.1-locale.patch | 39 |
2 files changed, 52 insertions, 0 deletions
diff --git a/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch new file mode 100644 index 000000000000..4aa4c44cc3ce --- /dev/null +++ b/media-gfx/icoutils/files/icoutils-0.29.1-gettext.patch @@ -0,0 +1,13 @@ +Index: icoutils-0.29.1/configure.ac +=================================================================== +--- icoutils-0.29.1.orig/configure.ac ++++ icoutils-0.29.1/configure.ac +@@ -26,7 +26,7 @@ gl_INIT + + # Gettext + AM_GNU_GETTEXT([external]) +-# AM_GNU_GETTEXT_VERSION(0.14.1) ++AM_GNU_GETTEXT_VERSION(0.14.1) + + # Checks for header files. + AC_HEADER_STDC diff --git a/media-gfx/icoutils/files/icoutils-0.29.1-locale.patch b/media-gfx/icoutils/files/icoutils-0.29.1-locale.patch new file mode 100644 index 000000000000..d73ae119ea5e --- /dev/null +++ b/media-gfx/icoutils/files/icoutils-0.29.1-locale.patch @@ -0,0 +1,39 @@ +Fix compiling with -O0 (see <https://bugs.gentoo.org/show_bug.cgi?id=319559>) + + +--- a/wrestool/main.c ++++ b/wrestool/main.c +@@ -32,6 +32,10 @@ + #include "common/string-utils.h" + #include "wrestool.h" + ++#ifdef HAVE_LOCALE_H ++#include <locale.h> ++#endif ++ + #define PROGRAM "wrestool" + + +--- a/icotool/main.c ++++ b/icotool/main.c +@@ -37,6 +37,10 @@ + #include "common/io-utils.h" + #include "icotool.h" + ++#ifdef HAVE_LOCALE_H ++#include <locale.h> ++#endif ++ + #define PROGRAM "icotool" + + static int32_t image_index = -1; +--- a/configure.ac ++++ b/configure.ac +@@ -34,6 +34,7 @@ + AC_HEADER_SYS_WAIT + AC_HEADER_TIME + #AC_CHECK_HEADERS([byteswap.h errno.h fcntl.h getopt.h limits.h sys/stat.h sys/time.h sys/types.h unistd.h]) ++AC_CHECK_HEADERS([locale.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE |