OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 25-Jul-2003 10:11:48
Branch: HEAD Handle: 2003072509114602
Added files:
openpkg-src/gd gd.patch
Modified files:
openpkg-src/gd gd.spec
openpkg-web news.txt
Log:
avoid defining public symbols for internal faked iconv functions
Summary:
Revision Changes Path
1.1 +72 -0 openpkg-src/gd/gd.patch
1.54 +3 -1 openpkg-src/gd/gd.spec
1.5800 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.patch
============================================================================
$ cvs diff -u -r0 -r1.1 gd.patch
--- /dev/null 2003-07-25 10:11:48.000000000 +0200
+++ gd.patch 2003-07-25 10:11:48.000000000 +0200
@@ -0,0 +1,72 @@
+--- gdkanji.c.dist 2003-07-25 10:05:16.000000000 +0200
++++ gdkanji.c 2003-07-25 10:07:43.000000000 +0200
+@@ -27,29 +27,32 @@
+
+ #ifndef HAVE_ICONV
+ #define ICONV_CONST /**/
+- iconv_t iconv_open (const char *, const char *);
+-size_t iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
+-int iconv_close (iconv_t);
++static iconv_t my_iconv_open (const char *, const char *);
++static size_t my_iconv (iconv_t, ICONV_CONST char **, size_t *, char **, size_t *);
++static int my_iconv_close (iconv_t);
+
+-iconv_t
+-iconv_open (const char *tocode, const char *fromcode)
++static iconv_t
++my_iconv_open (const char *tocode, const char *fromcode)
+ {
+ return (iconv_t) (-1);
+ }
+
+-size_t
+-iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
++static size_t
++my_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t * inbytesleft,
+ char **outbuf, size_t * outbytesleft)
+ {
+ return 0;
+ }
+
+-int
+-iconv_close (iconv_t cd)
++static int
++my_iconv_close (iconv_t cd)
+ {
+ return 0;
+ }
+-
++#else
++#define my_iconv_open iconv_open
++#define my_iconv iconv
++#define my_iconv_close iconv_close
+ #endif /* !HAVE_ICONV */
+
+ #define LIBNAME "any2eucjp()"
+@@ -377,7 +380,7 @@
+ iconv_t cd;
+ size_t from_len, to_len;
+
+- if ((cd = iconv_open (EUCSTR, code)) == (iconv_t) - 1)
++ if ((cd = my_iconv_open (EUCSTR, code)) == (iconv_t) - 1)
+ {
+ error ("iconv_open() error");
+ #ifdef HAVE_ERRNO_H
+@@ -391,7 +394,7 @@
+ from_len = strlen ((const char *) from) + 1;
+ to_len = BUFSIZ;
+
+- if ((int) (iconv (cd, (char **) &from, &from_len, (char **) &to, &to_len))
++ if ((int) (my_iconv (cd, (char **) &from, &from_len, (char **) &to, &to_len))
+ == -1)
+ {
+ #ifdef HAVE_ERRNO_H
+@@ -408,7 +411,7 @@
+ return;
+ }
+
+- if (iconv_close (cd) != 0)
++ if (my_iconv_close (cd) != 0)
+ {
+ error ("iconv_close() error");
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gd/gd.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 gd.spec
--- openpkg-src/gd/gd.spec 9 Jul 2003 08:23:38 -0000 1.53
+++ openpkg-src/gd/gd.spec 25 Jul 2003 08:11:48 -0000 1.54
@@ -33,10 +33,11 @@
Group: Graphics
License: GPL
Version: 2.0.15
-Release: 20030709
+Release: 20030725
# list of sources
Source0: http://www.boutell.com/gd/http/gd-%{version}.tar.gz
+Patch0: gd.patch
# build information
Prefix: %{l_prefix}
@@ -56,6 +57,7 @@
%prep
%setup -q
+ %patch -p0
%build
( echo "ac_cv_header_iconv_h=no"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5799 -r1.5800 news.txt
--- openpkg-web/news.txt 25 Jul 2003 07:11:02 -0000 1.5799
+++ openpkg-web/news.txt 25 Jul 2003 08:11:46 -0000 1.5800
@@ -1,3 +1,4 @@
+25-Jul-2003: Upgraded package: P<gd-2.0.15-20030725>
25-Jul-2003: Upgraded package: P<vim-6.2.31-20030725>
25-Jul-2003: Upgraded package: P<delegate-8.5.8-20030725>
25-Jul-2003: Upgraded package: P<php-4.3.2-20030725>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
