From 3ae5f333159aa13f7b0e826b1a57b9b059a3f6b7 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Fri, 3 Aug 2007 08:57:51 +0000 Subject: Update to SRC680_m224. --- editors/openoffice-3-devel/Makefile | 4 ++-- editors/openoffice-3-devel/distinfo | 6 +++--- editors/openoffice-3-devel/files/patch-i80295 | 20 ++++++++++++++++++++ editors/openoffice.org-2-devel/Makefile | 4 ++-- editors/openoffice.org-2-devel/distinfo | 6 +++--- editors/openoffice.org-2-devel/files/patch-i80295 | 20 ++++++++++++++++++++ editors/openoffice.org-3-devel/Makefile | 4 ++-- editors/openoffice.org-3-devel/distinfo | 6 +++--- editors/openoffice.org-3-devel/files/patch-i80295 | 20 ++++++++++++++++++++ editors/openoffice.org-vcltesttool/Makefile | 4 ++-- editors/openoffice.org-vcltesttool/distinfo | 6 +++--- .../openoffice.org-vcltesttool/files/patch-i80295 | 20 ++++++++++++++++++++ 12 files changed, 100 insertions(+), 20 deletions(-) create mode 100644 editors/openoffice-3-devel/files/patch-i80295 create mode 100644 editors/openoffice.org-2-devel/files/patch-i80295 create mode 100644 editors/openoffice.org-3-devel/files/patch-i80295 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i80295 diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 167368e39364..f7b785b6c0ce 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 223 +MILESTONE?= 224 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070801 +SNAPDATE= 20070803 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index 16ba919c6306..aa791749a7f6 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = db9d069581e7cae601f5f28a366bc5eb -SHA256 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 46556d00dfc56d96072c0d8f7750ca3c6f56d8feea092c2c9bda428e6d8a00e3 -SIZE (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 286282114 +MD5 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 39bd44b5520af4f31f9948fbbb026245 +SHA256 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 17e8503dabc019b6cfd73f23277f79b8cd7e652fb19e71caaa407b7a60d86fb1 +SIZE (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 285975007 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/patch-i80295 b/editors/openoffice-3-devel/files/patch-i80295 new file mode 100644 index 000000000000..d66798903a3c --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i80295 @@ -0,0 +1,20 @@ +Index: svx/source/dialog/cuifmsearch.hxx +=================================================================== +RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v +retrieving revision 1.6 +diff -u -r1.6 cuifmsearch.hxx +--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6 ++++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000 +@@ -93,10 +93,10 @@ + + struct FmSearchProgress; + ++class FmSearchEngine; ++ + class FmSearchDialog : public ModalDialog + { +- friend class FmSearchEngine; +- + // meine ganzen Controls + FixedLine m_flSearchFor; + RadioButton m_rbSearchForText; diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 167368e39364..f7b785b6c0ce 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 223 +MILESTONE?= 224 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070801 +SNAPDATE= 20070803 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index 16ba919c6306..aa791749a7f6 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = db9d069581e7cae601f5f28a366bc5eb -SHA256 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 46556d00dfc56d96072c0d8f7750ca3c6f56d8feea092c2c9bda428e6d8a00e3 -SIZE (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 286282114 +MD5 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 39bd44b5520af4f31f9948fbbb026245 +SHA256 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 17e8503dabc019b6cfd73f23277f79b8cd7e652fb19e71caaa407b7a60d86fb1 +SIZE (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 285975007 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2-devel/files/patch-i80295 b/editors/openoffice.org-2-devel/files/patch-i80295 new file mode 100644 index 000000000000..d66798903a3c --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i80295 @@ -0,0 +1,20 @@ +Index: svx/source/dialog/cuifmsearch.hxx +=================================================================== +RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v +retrieving revision 1.6 +diff -u -r1.6 cuifmsearch.hxx +--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6 ++++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000 +@@ -93,10 +93,10 @@ + + struct FmSearchProgress; + ++class FmSearchEngine; ++ + class FmSearchDialog : public ModalDialog + { +- friend class FmSearchEngine; +- + // meine ganzen Controls + FixedLine m_flSearchFor; + RadioButton m_rbSearchForText; diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 167368e39364..f7b785b6c0ce 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 223 +MILESTONE?= 224 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070801 +SNAPDATE= 20070803 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index 16ba919c6306..aa791749a7f6 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = db9d069581e7cae601f5f28a366bc5eb -SHA256 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 46556d00dfc56d96072c0d8f7750ca3c6f56d8feea092c2c9bda428e6d8a00e3 -SIZE (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 286282114 +MD5 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 39bd44b5520af4f31f9948fbbb026245 +SHA256 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 17e8503dabc019b6cfd73f23277f79b8cd7e652fb19e71caaa407b7a60d86fb1 +SIZE (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 285975007 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-devel/files/patch-i80295 b/editors/openoffice.org-3-devel/files/patch-i80295 new file mode 100644 index 000000000000..d66798903a3c --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i80295 @@ -0,0 +1,20 @@ +Index: svx/source/dialog/cuifmsearch.hxx +=================================================================== +RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v +retrieving revision 1.6 +diff -u -r1.6 cuifmsearch.hxx +--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6 ++++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000 +@@ -93,10 +93,10 @@ + + struct FmSearchProgress; + ++class FmSearchEngine; ++ + class FmSearchDialog : public ModalDialog + { +- friend class FmSearchEngine; +- + // meine ganzen Controls + FixedLine m_flSearchFor; + RadioButton m_rbSearchForText; diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 167368e39364..f7b785b6c0ce 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -66,10 +66,10 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif CODELINE= 680 -MILESTONE?= 223 +MILESTONE?= 224 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20070801 +SNAPDATE= 20070803 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} .if defined(WITH_CWS) diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index 16ba919c6306..aa791749a7f6 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = db9d069581e7cae601f5f28a366bc5eb -SHA256 (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 46556d00dfc56d96072c0d8f7750ca3c6f56d8feea092c2c9bda428e6d8a00e3 -SIZE (openoffice.org2/OOo_SRC680_m223_source.tar.bz2) = 286282114 +MD5 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 39bd44b5520af4f31f9948fbbb026245 +SHA256 (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 17e8503dabc019b6cfd73f23277f79b8cd7e652fb19e71caaa407b7a60d86fb1 +SIZE (openoffice.org2/OOo_SRC680_m224_source.tar.bz2) = 285975007 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-vcltesttool/files/patch-i80295 b/editors/openoffice.org-vcltesttool/files/patch-i80295 new file mode 100644 index 000000000000..d66798903a3c --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i80295 @@ -0,0 +1,20 @@ +Index: svx/source/dialog/cuifmsearch.hxx +=================================================================== +RCS file: /cvs/graphics/svx/source/dialog/cuifmsearch.hxx,v +retrieving revision 1.6 +diff -u -r1.6 cuifmsearch.hxx +--- svx/source/dialog/cuifmsearch.hxx 31 Jul 2007 13:56:33 -0000 1.6 ++++ svx/source/dialog/cuifmsearch.hxx 3 Aug 2007 05:35:05 -0000 +@@ -93,10 +93,10 @@ + + struct FmSearchProgress; + ++class FmSearchEngine; ++ + class FmSearchDialog : public ModalDialog + { +- friend class FmSearchEngine; +- + // meine ganzen Controls + FixedLine m_flSearchFor; + RadioButton m_rbSearchForText; -- cgit v1.2.3