This RC bug has been fixed in a non-maintainer upload.  The patch is
attached; please apply it and acknowledge it in your next maintainer
upload.


Regards,
Roger


diff -urN dict-gcide-0.48.original/debian/changelog 
dict-gcide-0.48/debian/changelog
--- dict-gcide-0.48.original/debian/changelog   2005-07-19 20:35:08.000000000 
+0100
+++ dict-gcide-0.48/debian/changelog    2005-07-19 20:43:28.767882848 +0100
@@ -1,3 +1,12 @@
+dict-gcide (0.48-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Andreas Jochens to allow building with
+    GCC 3.4 and 4.0, replacing the non-standard preprocessor
+    macro __FUNCTION__ with the C99 __func__ (Closes: #263337).
+
+ -- Roger Leigh <[EMAIL PROTECTED]>  Tue, 19 Jul 2005 20:39:38 +0100
+
 dict-gcide (0.48-4) unstable; urgency=low
 
   * Corrected format of Build-Depends-Indep: Closes: #218709
diff -urN dict-gcide-0.48.original/libmaa/parse.c dict-gcide-0.48/libmaa/parse.c
--- dict-gcide-0.48.original/libmaa/parse.c     1998-02-22 19:32:36.000000000 
+0000
+++ dict-gcide-0.48/libmaa/parse.c      2005-07-19 20:38:19.674872128 +0100
@@ -75,7 +75,7 @@
 
    if (!cpp) {
       if ((cpp = getenv( "KHEPERA_CPP" ))) {
-         PRINTF(MAA_PARSE,(__FUNCTION__ ": Using KHEPERA_CPP from %s\n",cpp));
+         PRINTF(MAA_PARSE,("%s: Using KHEPERA_CPP from %s\n",__func__,cpp));
       }
       
                                 /* Always look for gcc's cpp first, since
@@ -86,7 +86,7 @@
          
          if (fread( buf, 1, 1023, tmp ) > 0) {
             if ((t = strchr( buf, '\n' ))) *t = '\0';
-            PRINTF(MAA_PARSE,(__FUNCTION__ ": Using GNU cpp from %s\n",buf));
+            PRINTF(MAA_PARSE,("%s: Using GNU cpp from %s\n",__func__,buf));
             cpp = str_find( buf );
             extra_options = "-nostdinc -nostdinc++";
          }
@@ -103,7 +103,7 @@
          for (pt = cpps; **pt; pt++) {
             if (!access( *pt, X_OK )) {
                PRINTF(MAA_PARSE,
-                      (__FUNCTION__ ": Using system cpp from %s\n",*pt));
+                      ("%s: Using system cpp from %s\n",__func__,*pt));
                cpp = *pt;
                break;
             }
@@ -111,8 +111,8 @@
       }
       
       if (!cpp)
-        err_fatal( __FUNCTION__,
-                   "Cannot locate cpp -- set KHEPERA_CPP to cpp's path\n" );
+        err_fatal("%s:Cannot locate cpp -- set KHEPERA_CPP to cpp's path\n",
+                  __func__ );
    }
 
    buffer = alloca( strlen( cpp )
@@ -123,10 +123,9 @@
    sprintf( buffer, "%s -I. %s %s 2>/dev/null", cpp,
            _prs_cpp_options ? _prs_cpp_options : "", filename );
 
-   PRINTF(MAA_PARSE,(__FUNCTION__ ": %s\n",buffer));
+   PRINTF(MAA_PARSE,("%s: %s\n",__func__,buffer));
    if (!(yyin = popen( buffer, "r" )))
-      err_fatal_errno( __FUNCTION__,
-                      "Cannot open \"%s\" for read\n", filename );
+      err_fatal_errno("%s Cannot open \"%s\" for read\n", __func__, filename );
 
    src_new_file( filename );
    yydebug = _prs_debug_flag;
@@ -144,11 +143,10 @@
 void prs_file_nocpp( const char *filename )
 {
    if (!filename)
-      err_fatal( __FUNCTION__, "No filename specified\n" );
+      err_fatal( "%s No filename specified\n", __func__ );
 
    if (!(yyin = fopen( filename, "r" )))
-      err_fatal_errno( __FUNCTION__,
-                      "Cannot open \"%s\" for read\n", filename );
+      err_fatal_errno( "%s Cannot open \"%s\" for read\n", __func__, filename 
);
 
    src_new_file( filename );
    yydebug = _prs_debug_flag;

-- 
Roger Leigh
                Printing on GNU/Linux?  http://gimp-print.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to