diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2012-01-31 06:17:38 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2012-01-31 06:17:38 +0000 |
| commit | 59c13ac8a29879f8ba96478458e838afd0d20847 (patch) | |
| tree | 394f3beaec47aca4d2dbc48217647c6d1bcb6989 /app-text/dos2unix/files | |
| parent | Version bump. Masked as it's an alpha. Also EAPI bumped. (diff) | |
| download | gentoo-2-59c13ac8a29879f8ba96478458e838afd0d20847.tar.gz gentoo-2-59c13ac8a29879f8ba96478458e838afd0d20847.tar.bz2 gentoo-2-59c13ac8a29879f8ba96478458e838afd0d20847.zip | |
Version bump. Removed old. Fixed debug build with patch from upstream (bug #400769)
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'app-text/dos2unix/files')
| -rw-r--r-- | app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch | 46 | ||||
| -rw-r--r-- | app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch | 54 |
2 files changed, 100 insertions, 0 deletions
diff --git a/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch b/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch new file mode 100644 index 000000000000..32e3caa66a24 --- /dev/null +++ b/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch @@ -0,0 +1,46 @@ +--- dos2unix-5.3.1/dos2unix.c ++++ dos2unix-5.3.1/dos2unix.c +@@ -60,8 +60,6 @@ + */ + + +-#define VER_AUTHOR "Erwin Waterlander" +- + /* #define DEBUG 1 */ + + #include "common.h" +--- dos2unix-5.3.1/Makefile ++++ dos2unix-5.3.1/Makefile +@@ -194,9 +194,14 @@ + + EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ + -DVER_DATE=\"$(DOS2UNIX_DATE)\" \ ++ -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \ + -DDEBUG=$(DEBUG) \ + $(CFLAGS_OS) + ++ifeq ($(DEBUG), 1) ++ EXTRA_CFLAGS += -g ++endif ++ + ifdef STATIC + EXTRA_CFLAGS += -static + endif +--- dos2unix-5.3.1/unix2dos.c ++++ dos2unix-5.3.1/unix2dos.c +@@ -50,8 +50,6 @@ + */ + + +-#define VER_AUTHOR "Erwin Waterlander" +- + /* #define DEBUG 1 */ + + #include "common.h" +--- dos2unix-5.3.1/version.mk ++++ dos2unix-5.3.1/version.mk +@@ -1,3 +1,4 @@ + DOS2UNIX_VERSION = 5.3.1 + DOS2UNIX_VERSION_SHORT = 531 + DOS2UNIX_DATE = 2011-08-09 ++DOS2UNIX_AUTHOR = 'Erwin Waterlander' diff --git a/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch b/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch new file mode 100644 index 000000000000..123bfcc62c2e --- /dev/null +++ b/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch @@ -0,0 +1,54 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 349) ++++ Makefile (working copy) +@@ -204,9 +204,14 @@ + + EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ + -DVER_DATE=\"$(DOS2UNIX_DATE)\" \ ++ -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \ + -DDEBUG=$(DEBUG) \ + $(CFLAGS_OS) + ++ifeq ($(DEBUG), 1) ++ EXTRA_CFLAGS += -g ++endif ++ + ifdef STATIC + EXTRA_CFLAGS += -static + endif +Index: dos2unix.c +=================================================================== +--- dos2unix.c (revision 347) ++++ dos2unix.c (working copy) +@@ -60,8 +60,6 @@ + */ + + +-#define VER_AUTHOR "Erwin Waterlander" +- + /* #define DEBUG 1 */ + + #include "common.h" +Index: unix2dos.c +=================================================================== +--- unix2dos.c (revision 347) ++++ unix2dos.c (working copy) +@@ -50,8 +50,6 @@ + */ + + +-#define VER_AUTHOR "Erwin Waterlander" +- + /* #define DEBUG 1 */ + + #include "common.h" +Index: version.mk +=================================================================== +--- version.mk (revision 347) ++++ version.mk (working copy) +@@ -1,3 +1,4 @@ + DOS2UNIX_VERSION = 5.3.2 + DOS2UNIX_VERSION_SHORT = 532 + DOS2UNIX_DATE = 2012-01-27 ++DOS2UNIX_AUTHOR = 'Erwin Waterlander' |