openoffice.org-kde3support.patch

   1 diff -urN ooo-build.old/patches/dev300/apply ooo-build/patches/dev300/apply
   2 --- ooo-build.old/patches/dev300/apply  2009-04-16 11:19:06.000000000 +0200
   3 +++ ooo-build/patches/dev300/apply      2009-04-16 22:33:56.605578884 +0200
   4 @@ -1283,6 +1284,9 @@
   5  [PLDOnly]
   6  SectionOwner => arekm
   7
   8 +# fixes build with kde4-kde3support
   9 +pld-kde3support.diff
  10 +
  11  [ BuildBits ]
  12  # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
  13  svx-customshapes-NOOPTFILES.diff, martink
  14 diff -urN ooo-build.old/patches/dev300/pld-kde3support.diff ooo-build/patches/dev300/pld-kde3support.diff
  15 --- ooo-build.old/patches/dev300/pld-kde3support.diff   1970-01-01 01:00:00.000000000 +0100
  16 +++ ooo-build/patches/dev300/pld-kde3support.diff       2009-04-16 22:32:52.114374550 +0200
  17 @@ -0,0 +1,18 @@
  18 +--- config_office/configure.in 2009-04-16 21:40:12.597985126 +0200
  19 ++++ config_office/configure.in.new     2009-04-16 22:18:40.771086785 +0200
  20 +@@ -5831,11 +5831,11 @@
  21 +         fi
  22 +     fi
  23 +     if test "$build_cpu" != "x86_64" ; then
  24 +-        kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
  25 +-        kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
  26 ++        kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde3 /opt/kde3/include /opt/kde/include $x_includes"
  27 ++        kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3dev /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
  28 +     else
  29 +-        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
  30 +-        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
  31 ++        kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde3 /opt/kde3/include /opt/kde/include $x_includes"
  32 ++        kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3dev /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
  33 +     fi
  34 +     if test -n "$KDEDIR" ; then
  35 +         kde_incdirs="$KDEDIR/include $kde_incdirs"