2 changed files with 7 additions and 38 deletions
@ -1,33 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../wdiff/hotfix.patch
|
||||
# Copyright (C) 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Hmm, I think this is simply screwed ifdef logic (first of all,
|
||||
getdelim is never tested, so HAVE_GETDELIM is never defined, second
|
||||
the gnu clib has both, getdelim and getline, defined already).
|
||||
--jsaw
|
||||
|
||||
--- wdiff-0.5g/lib/getline.c.orig 2006-06-16 15:34:31.000000000 +0200
|
||||
+++ wdiff-0.5g/lib/getline.c 2006-06-16 15:36:28.000000000 +0200
|
||||
@@ -31,7 +31,8 @@
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
-#if defined __GNU_LIBRARY__ && HAVE_GETDELIM
|
||||
+#if defined __GNU_LIBRARY__
|
||||
+#elif defined HAVE_GETDELIM
|
||||
|
||||
int
|
||||
getline (lineptr, n, stream)
|
@ -3,7 +3,7 @@
|
||||
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
[COPY] |
||||
[COPY] Filename: package/.../wdiff/wdiff.desc |
||||
[COPY] Copyright (C) 2006 The OpenSDE Project |
||||
[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project |
||||
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project |
||||
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf |
||||
[COPY] |
||||
@ -24,16 +24,18 @@
|
||||
[T] useful when two texts differ only by a few words and paragraphs have |
||||
[T] been refilled. |
||||
|
||||
[U] http://wdiff.progiciels-bpi.ca/ |
||||
[U] http://www.gnu.org/software/wdiff/ |
||||
|
||||
[A] Franc,ois Pinard <[email protected]> |
||||
[A] Martin von Gagern (current maintainer) |
||||
[A] Denver Gingerich (current maintainer) |
||||
[A] Francois Pinard <[email protected]> (original author) |
||||
[M] The OpenSDE Community <[email protected]> |
||||
|
||||
[C] base/tool |
||||
|
||||
[L] GPL |
||||
[S] Stable |
||||
[V] 0.5g |
||||
[V] 0.6.3 |
||||
[P] X -----5---9 110.200 |
||||
|
||||
[D] 1206591606 wdiff-0.5g.tar.gz http://wdiff.progiciels-bpi.ca/archives/ |
||||
[D] 2331977679 wdiff-0.6.3.tar.gz ftp://ftp.gnu.org/gnu/wdiff/ |
||||
|
Loading…
Reference in new issue