diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-03-20 01:18:17 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@novell.com> | 2007-03-20 01:18:17 +0000 |
| commit | 74607924735b89c5e14dc91d3b3256da1281bc7b (patch) | |
| tree | 7cc94bbefe1e225d4584b2a9ea2303a4fe9ad1c7 | |
| parent | f7b107d95dd9a97fb40ea3e70bbed18ccc32d9f2 (diff) | |
Clean up patch chunks that applied with fuzz 2.
* patches/src680/novell-win32-agfa-monotype-fonts.diff
* patches/src680/win32-activex-disable.diff: Clean up patch
chunks that applied with fuzz 2.
| -rw-r--r-- | patches/src680/novell-win32-agfa-monotype-fonts.diff | 6 | ||||
| -rw-r--r-- | patches/src680/win32-activex-disable.diff | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/patches/src680/novell-win32-agfa-monotype-fonts.diff b/patches/src680/novell-win32-agfa-monotype-fonts.diff index 7f7aa7b1f..5e1d30d1a 100644 --- a/patches/src680/novell-win32-agfa-monotype-fonts.diff +++ b/patches/src680/novell-win32-agfa-monotype-fonts.diff @@ -28,9 +28,9 @@ +fi +AC_SUBST(WITH_AGFA_MONOTYPE_FONTS) + - AC_SUBST(SCPDEFS) - - AC_MSG_CHECKING([whether to include PPDs]) + dnl =================================================================== + dnl Test whether to include ppds + dnl =================================================================== --- agfa_monotype_fonts/makefile.mk.OLD 1970-01-01 02:00:00.000000000 +0200 +++ agfa_monotype_fonts/makefile.mk 2005-11-23 05:07:41.015625000 +0200 @@ -0,0 +1,78 @@ diff --git a/patches/src680/win32-activex-disable.diff b/patches/src680/win32-activex-disable.diff index 8db5594fa..b6f5e479c 100644 --- a/patches/src680/win32-activex-disable.diff +++ b/patches/src680/win32-activex-disable.diff @@ -9,10 +9,9 @@ +],,enable_activex=yes) AC_ARG_ENABLE(epm, [ --disable-epm OO.o includes self-packaging code, that requires -@@ -4268,6 +4272,19 @@ - fi - AC_SUBST(WITH_AGFA_MONOTYPE_FONTS) -- +@@ -4268,6 +4272,20 @@ + + AC_SUBST(SCPDEFS) + +if test "$_os" = "WINNT"; then @@ -29,7 +28,8 @@ + AC_SUBST(SCPDEFS) +fi - AC_MSG_CHECKING([whether to include PPDs]) + AC_MSG_CHECKING([whether and how to use Xinerama]) + if test "$_os" = "Darwin"; then --- scp2/source/activex/file_activex.scp Thu Oct 27 17:08:13 2005 +++ /mnt/pippi/src/2.0.2/build/OOO_2_0_2/scp2/source/activex/file_activex.scp Wed May 3 14:24:12 2006 @@ -36,4 +36,6 @@ |