[gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.1.1.diff

[Andreas Proschofsky (suka)]

suka        09/09/03 15:29:16

  Modified:             gentoo-3.1.1.diff
  Log:
  Fix qt4-detection, see bug #280344
  (Portage version: 2.2_rc40/cvs/Linux i686)

Revision  Changes    Path
1.2                  app-office/openoffice/files/gentoo-3.1.1.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff?r1=1.1&r2=1.2

Index: gentoo-3.1.1.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.1.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gentoo-3.1.1.diff	2 Sep 2009 19:07:24 -0000	1.1
+++ gentoo-3.1.1.diff	3 Sep 2009 15:29:16 -0000	1.2
@@ -11,4 +11,15 @@
  
  [ LinuxOnly ]
  # fix that allows OOo to work with a standard (unpatched) libjpeg,
+--- patches/dev300kde4-configure.diff 
++++ patches/dev300/kde4-configure.diff 
+@@ -104,7 +104,7 @@
+ +MOC4="moc"
+ +if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+ +   qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+-+   qt_libdirs="$QTLIB /usr/lib $x_libraries"
+++   qt_libdirs="$QTLIB /usr/lib /usr/lib/qt4 $x_libraries"
+ +   
+ +   kde_incdirs="/usr/include $x_includes"
+ +   kde_libdirs="/usr/lib $x_libraries"