diff -urN ooo-build.old/patches/dev300/apply ooo-build/patches/dev300/apply --- ooo-build.old/patches/dev300/apply 2009-04-16 11:19:06.000000000 +0200 +++ ooo-build/patches/dev300/apply 2009-04-16 22:33:56.605578884 +0200 @@ -1283,6 +1284,9 @@ [PLDOnly] SectionOwner => arekm +# fixes build with kde4-kde3support +pld-kde3support.diff + [ BuildBits ] # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392 svx-customshapes-NOOPTFILES.diff, martink diff -urN ooo-build.old/patches/dev300/pld-kde3support.diff ooo-build/patches/dev300/pld-kde3support.diff --- ooo-build.old/patches/dev300/pld-kde3support.diff 1970-01-01 01:00:00.000000000 +0100 +++ ooo-build/patches/dev300/pld-kde3support.diff 2009-04-16 22:32:52.114374550 +0200 @@ -0,0 +1,18 @@ +--- config_office/configure.in 2009-04-16 21:40:12.597985126 +0200 ++++ config_office/configure.in.new 2009-04-16 22:18:40.771086785 +0200 +@@ -5831,11 +5831,11 @@ + fi + fi + if test "$build_cpu" != "x86_64" ; then +- 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" +- 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" ++ 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" ++ 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" + else +- 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" +- 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" ++ 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" ++ 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" + fi + if test -n "$KDEDIR" ; then + kde_incdirs="$KDEDIR/include $kde_incdirs"