ooo-build r12048 - in trunk: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Sat Mar 29 04:56:11 2008
New Revision: 12048
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12048&view=rev

Log:
2008-03-29  Chris Cheney <ccheney ubuntu com>

        * patches/src680/apply: add ubuntu-mstopdf to UbuntuHardyOnly
        * patches/src680/ubuntu-mstopdf.diff: Add ConvertMSToPDF
        * patches/src680/xulrunner-1.9.diff: Corrected to use sdkdir
        as in official xulrunner libxul.pc instead of libdir.
        Distributions which modify libxul.pc should add special cased
        code to support whatever they happened to rename sdkdir to.



Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/xulrunner-1.9.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sat Mar 29 04:56:11 2008
@@ -1725,6 +1725,7 @@
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
+ubuntu-mstopdf.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff

Modified: trunk/patches/src680/xulrunner-1.9.diff
==============================================================================
--- trunk/patches/src680/xulrunner-1.9.diff	(original)
+++ trunk/patches/src680/xulrunner-1.9.diff	Sat Mar 29 04:56:11 2008
@@ -62,7 +62,7 @@
 +    if $PKG_CONFIG --exists libxul ; then
 +      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
 +      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
-+      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
++      MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
      else
 -        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
 -        AC_SUBST(NSS_LIB)