diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-18 11:26:13 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-18 11:26:13 +0000 |
| commit | 449a928eea07416fb2c4e7ce5f02faae8c31155d (patch) | |
| tree | 32461f0eea9317c27ab59afa60d1e17c3884eefe /x11-toolkits/gal2 | |
| parent | Add a patch to fix a bug where iconv() did not return -1 properly on (diff) | |
Iconv cleanup, stage 2a: remove patches that only replacing <iconv.h> with
<giconv.h> or -liconv with -lgiconv.
Notes
Notes:
svn path=/head/; revision=56293
Diffstat (limited to 'x11-toolkits/gal2')
| -rw-r--r-- | x11-toolkits/gal2/files/patch-aa | 45 | ||||
| -rw-r--r-- | x11-toolkits/gal2/files/patch-gal::util::e-iconv.h | 14 |
2 files changed, 0 insertions, 59 deletions
diff --git a/x11-toolkits/gal2/files/patch-aa b/x11-toolkits/gal2/files/patch-aa deleted file mode 100644 index 6051ab181d24..000000000000 --- a/x11-toolkits/gal2/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Sun Jan 13 17:23:41 2002 -+++ configure Sun Jan 13 17:24:34 2002 -@@ -4890,9 +4890,9 @@ - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS $ICONV_CFLAGS" --LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv" --echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 --echo "configure:4896: checking for iconv in -liconv" >&5 -+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv" -+echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6 -+echo "configure:4896: checking for iconv in -lgiconv" >&5 - if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4900,7 +4900,7 @@ - #line 4901 "configure" - #include "confdefs.h" - --#include <iconv.h> -+#include <giconv.h> - - int main() { - -@@ -4923,7 +4923,7 @@ - - echo "$ac_t""$ac_cv_libiconv" 1>&6 - if test $ac_cv_libiconv = yes; then -- ICONV_LIBS="$ICONV_LIBS -liconv" -+ ICONV_LIBS="$ICONV_LIBS -lgiconv" - have_iconv=yes - else - CFLAGS="$save_CFLAGS" -@@ -5049,7 +5049,7 @@ - #line 5050 "configure" - #include "confdefs.h" - --#include <iconv.h> -+#include <giconv.h> - #include <stdlib.h> - #include <string.h> - #ifdef HAVE_GNU_GET_LIBC_VERSION diff --git a/x11-toolkits/gal2/files/patch-gal::util::e-iconv.h b/x11-toolkits/gal2/files/patch-gal::util::e-iconv.h deleted file mode 100644 index 47a19c3586c8..000000000000 --- a/x11-toolkits/gal2/files/patch-gal::util::e-iconv.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- gal/util/e-iconv.h 2001/11/07 14:06:41 1.1 -+++ gal/util/e-iconv.h 2001/11/07 14:06:52 -@@ -24,7 +24,7 @@ - #ifndef _E_ICONV_H_ - #define _E_ICONV_H_ - --#include <iconv.h> -+#include <giconv.h> - - #ifdef __cplusplus - extern "C" { |