From bc6e48406df6aa1646726f78d1e7975fe240770f Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Sat, 4 Nov 2006 21:36:46 +0000 Subject: update to SRC680_m191 --- editors/openoffice.org-2.0-devel/Makefile | 8 ++--- editors/openoffice.org-2.0-devel/distinfo | 6 ++-- .../openoffice.org-2.0-devel/files/patch-i71039 | 34 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 editors/openoffice.org-2.0-devel/files/patch-i71039 (limited to 'editors/openoffice.org-2.0-devel') diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile index acb0c2e4587c..73c35c3f9da3 100644 --- a/editors/openoffice.org-2.0-devel/Makefile +++ b/editors/openoffice.org-2.0-devel/Makefile @@ -72,10 +72,10 @@ IGNORE= install lang/perl5.8 then try again CODELINE= 680 RELEASE_NR= 2.0 -MILESTONE?= 186 +MILESTONE?= 191 OOOTAG?= SRC680_m${MILESTONE} -OOOSRC?= OOo_SRC680_m${MILESTONE}_source${EXTRACT_SUFX} -SNAPDATE= 20060928 +OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} +SNAPDATE= 20061101 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -149,7 +149,7 @@ LIB_DEPENDS+= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl .endif GNU_CONFIGURE= yes -WRKSRC?= ${WRKDIR}/SRC680_m${MILESTONE} +WRKSRC?= ${WRKDIR}/${OOOTAG} CONFIGURE_WRKSRC= ${WRKSRC}/config_office TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo index a8e0cf770a99..f8bcb1e7c861 100644 --- a/editors/openoffice.org-2.0-devel/distinfo +++ b/editors/openoffice.org-2.0-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m186_source.tar.bz2) = e6b8b8231c1fbf9afb7b1b5ed0b4c702 -SHA256 (openoffice.org2.0/OOo_SRC680_m186_source.tar.bz2) = 762d8701a03653a88368e72f0ba882850d95443c8a81cc4b1fd3bf27a9154907 -SIZE (openoffice.org2.0/OOo_SRC680_m186_source.tar.bz2) = 268046672 +MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13 +SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753 +SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2.0-devel/files/patch-i71039 b/editors/openoffice.org-2.0-devel/files/patch-i71039 new file mode 100644 index 000000000000..8f0897bc862b --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-i71039 @@ -0,0 +1,34 @@ +--- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006 ++++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006 +@@ -265,7 +265,7 @@ + {} + virtual ~SdrObjUserData(); + +- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; ++ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; + UINT32 GetInventor() const { return nInventor; } + UINT16 GetId() const { return nIdentifier; } + virtual void WriteData(SvStream& rOut); + +--- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006 ++++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006 +@@ -323,7 +323,7 @@ + {} + virtual ~SdrObjUserData(); + +- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; ++ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; + UINT32 GetInventor() const { return nInventor; } + UINT16 GetId() const { return nIdentifier; } + //BFS01virtual void WriteData(SvStream& rOut); +--- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005 ++++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006 +@@ -444,7 +444,7 @@ + + protected: + /** Derived classes create a new accessible object here. */ +- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; ++ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; + }; + + -- cgit v1.2.3