[kde-freebsd] kdebase3 - bad patch

[John E Hein]

Building kdebase3, I got this:

main.cpp: In function `int kdemain(int, char**)':
main.cpp:310: error: redeclaration of `KApplication*a'
main.cpp:255: error: `KApplication*a' previously declared here

This shows up if configured to not use libXcomposite.  This is not
standard, so I doubt many people will run into the problem, but the
following patch to the patch fixes it for both cases (with or without
libXcomposite).

Index: files/patch-konsole-konsole-main.cpp
===================================================================
RCS file: /base/FreeBSD-CVS/ports/x11/kdebase3/files/patch-konsole-konsole-main.cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-konsole-konsole-main.cpp
--- files/patch-konsole-konsole-main.cpp	11 Jul 2007 20:53:41 -0000	1.3
+++ files/patch-konsole-konsole-main.cpp	28 Sep 2007 18:57:14 -0000
@@ -24,8 +24,8 @@
    if( qtargs->isSet("font") )
        kdWarning() << "The Qt option -fn, --font has no effect." << endl;
  
-+  KApplication* a = NULL;
  #ifdef COMPOSITE
++  KApplication* a = NULL;
 -  char *display = 0;
 -  if ( qtargs->isSet("display"))
 -    display = qtargs->getOption( "display" ).data();