diff options
Diffstat (limited to 'editors')
28 files changed, 388 insertions, 268 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 5e6f08aa9b0..f011aca5a37 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -18,10 +18,10 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg .if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc +DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) -DISTFILES+= ${ANT_DISTFILE}:antbin +DISTFILES+= ${ANT_DISTFILE}:antbin .endif EXTRACT_ONLY= ${OOOSRC} @@ -38,7 +38,7 @@ USE_GNOME+= libidl .endif .if defined(WITH_KDE) -USE_KDELIBS_VER= 3 +USE_KDELIBS_VER= 3 .endif USE_XLIB= yes USE_GMAKE= yes @@ -71,10 +71,10 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -MILESTONE?= 194 +MILESTONE?= 195 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061123 +SNAPDATE= 20061124 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -88,12 +88,14 @@ PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) .if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- +PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} +PKGNAMESUFFIX= -${LANG_SUFFIX} .endif +RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt @@ -103,11 +105,11 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj .else .if ${ARCH} == amd64 GCCVER=41 -BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 +BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 RUN_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 .else GCCVER=34 -BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo +BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif .endif @@ -118,12 +120,12 @@ CCACHE_PREFIX= ccache CCACHE_PREFIX= .endif .if (${GCCVER} == 41) -CC= gcc41 -CXX= g++41 +CC= gcc41 +CXX= g++41 .endif .if (${GCCVER} == 34) -CC= gcc-ooo -CXX= g++-ooo +CC= gcc-ooo +CXX= g++-ooo .endif CC:= ${CCACHE_PREFIX} ${CC} CXX:= ${CCACHE_PREFIX} ${CXX} @@ -138,7 +140,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ .if defined(WITH_GNUGCJ) LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 +ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 ANT_VERSION= 1.6.5 .else BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant @@ -154,17 +156,20 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 .if defined(WITH_GNUGCJ) -CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" +CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" .endif -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ + --with-gnu-patch=${LOCALBASE}/bin/gpatch \ + --enable-crashdump=yes \ + --enable-symbols=SMALL .if ${ARCH} == amd64 || ${GCCVER} == 41 WITHOUT_MOZILLA= yes .endif .if (${GCCVER} == 41) -LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost -CONFIGURE_ARGS+= --with-system-boost=yes #i58343# +LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost +CONFIGURE_ARGS+= --with-system-boost=yes #i58343# .endif .if (${OSVERSION} <= 492000) EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch @@ -250,29 +255,30 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "" > ${TMPPLIST} -.if defined(WITH_MENU) + @${ECHO_CMD} "" > ${TMPPLIST} @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak + @${RM} -f ${PREFIX}/share/applications/${EXECBASE} + @${MKDIR} ${PREFIX}/share/applications @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} - @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} + @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ done ; \ done -.endif @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index b398a100e9a..d0e6e346207 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 618601ecd29e21974c6f401c69f12ce7 -SHA256 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = da2c3eb111511a439886f25421eed4294e306a46f80c7bdfa3ca28ea3fcb806b -SIZE (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 263478405 +MD5 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 1ba55cdc451442df436e57d4cc367e3c +SHA256 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = b134076f201ab55a0aaafda55d338801e6571d5c0ec2bb615e4948ca0622265c +SIZE (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 263554482 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-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 33fa59095e1..95662f9f5d0 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -133,11 +133,6 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if !defined(WITH_MENU) - @${ECHO} - @${ECHO} "You can install OOo with menu items by" - @${ECHO} "make -DWITH_MENU" -.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice-3-devel/files/patch-i65514 b/editors/openoffice-3-devel/files/patch-i65514 index 8589161a029..d0cf3aafbd1 100644 --- a/editors/openoffice-3-devel/files/patch-i65514 +++ b/editors/openoffice-3-devel/files/patch-i65514 @@ -1,14 +1,15 @@ Index: berkeleydb/db-4.2.52.patch =================================================================== RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.13 -diff -u -r1.13 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jul 2006 10:23:22 -0000 1.13 -+++ berkeleydb/db-4.2.52.patch 29 Jul 2006 11:01:12 -0000 -@@ -518,6 +518,20 @@ - emode= 555 - fmode= 444 - +retrieving revision 1.15 +diff -u -r1.15 db-4.2.52.patch +--- berkeleydb/db-4.2.52.patch 22 Nov 2006 10:35:13 -0000 1.15 ++++ berkeleydb/db-4.2.52.patch 6 Dec 2006 00:28:05 -0000 +@@ -205,6 +205,21 @@ + ! $(SLO)$/dbreg_util.obj + ! + ! .INCLUDE : target.mk ++ +*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003 +--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006 +*************** @@ -23,13 +24,13 @@ diff -u -r1.13 db-4.2.52.patch + /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/configure Wed Dec 3 22:10:02 2003 - --- misc/build/db-4.2.52.NC/dist/configure Tue Jul 25 09:05:20 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2006-05-02 17:06:13.000000000 +0200 *************** -@@ -554,6 +568,76 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -273,6 +288,77 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -100,10 +101,11 @@ diff -u -r1.13 db-4.2.52.patch + _ACEOF + + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2006-05-02 16:55:53.000000000 +0200 *************** -@@ -1010,3 +1094,39 @@ +@@ -975,3 +1061,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice-3-devel/files/patch-i66666 b/editors/openoffice-3-devel/files/patch-i66666 deleted file mode 100644 index 11b05eaf081..00000000000 --- a/editors/openoffice-3-devel/files/patch-i66666 +++ /dev/null @@ -1,18 +0,0 @@ -Index: tools/inc/solar.h -=================================================================== -RCS file: /cvs/util/tools/inc/solar.h,v -retrieving revision 1.44 -diff -u -r1.44 solar.h ---- tools/inc/solar.h 26 Apr 2006 20:42:59 -0000 1.44 -+++ tools/inc/solar.h 23 Jun 2006 13:32:04 -0000 -@@ -55,9 +55,6 @@ - #define FALSE 0 - #endif - --#undef NULL --#define NULL 0 -- - #ifdef _SOLAR__PRIVATE - #undef _SOLAR__PRIVATE - #endif - diff --git a/editors/openoffice-3-devel/files/patch-i71848 b/editors/openoffice-3-devel/files/patch-i71848 new file mode 100644 index 00000000000..053048ec6f7 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i71848 @@ -0,0 +1,30 @@ +--- svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:22:41.000000000 +0100 ++++ svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:52:34.000000000 +0100 +@@ -3516,7 +3516,7 @@ + Scale( rPoly[ nPolyNum ] ); + } + +-void SvxMSDffManager::ScaleEmu( long& rVal ) const ++void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const + { + rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv ); + } + + +--- svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:22:43.000000000 +0100 ++++ svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:53:00.000000000 +0100 +@@ -183,7 +183,7 @@ + rOutliner.Clear(); + rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); + rOutliner.SetText(*pPara); +- sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), rOutliner.GetParagraphCount())); ++ sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), (sal_uInt32)rOutliner.GetParagraphCount())); + + if ( nCnt == 1 ) bToLastPoint = TRUE; + else bToLastPoint = FALSE; + + diff --git a/editors/openoffice-3-devel/files/patch-i71977 b/editors/openoffice-3-devel/files/patch-i71977 new file mode 100644 index 00000000000..3feddab4bcd --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i71977 @@ -0,0 +1,15 @@ +Index: sd/inc/CustomAnimationPreset.hxx +=================================================================== +RCS file: /cvs/graphics/sd/inc/CustomAnimationPreset.hxx,v +retrieving revision 1.3 +diff -u -r1.3 CustomAnimationPreset.hxx +--- sd/inc/CustomAnimationPreset.hxx 9 Sep 2005 02:50:54 -0000 1.3 ++++ sd/inc/CustomAnimationPreset.hxx 5 Dec 2006 08:01:01 -0000 +@@ -56,6 +56,7 @@ + #include <CustomAnimationEffect.hxx> + #endif + ++#include <hash_map> + + namespace sd { + diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 5e6f08aa9b0..f011aca5a37 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -18,10 +18,10 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg .if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc +DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) -DISTFILES+= ${ANT_DISTFILE}:antbin +DISTFILES+= ${ANT_DISTFILE}:antbin .endif EXTRACT_ONLY= ${OOOSRC} @@ -38,7 +38,7 @@ USE_GNOME+= libidl .endif .if defined(WITH_KDE) -USE_KDELIBS_VER= 3 +USE_KDELIBS_VER= 3 .endif USE_XLIB= yes USE_GMAKE= yes @@ -71,10 +71,10 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -MILESTONE?= 194 +MILESTONE?= 195 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061123 +SNAPDATE= 20061124 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -88,12 +88,14 @@ PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) .if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- +PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} +PKGNAMESUFFIX= -${LANG_SUFFIX} .endif +RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt @@ -103,11 +105,11 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj .else .if ${ARCH} == amd64 GCCVER=41 -BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 +BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 RUN_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 .else GCCVER=34 -BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo +BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif .endif @@ -118,12 +120,12 @@ CCACHE_PREFIX= ccache CCACHE_PREFIX= .endif .if (${GCCVER} == 41) -CC= gcc41 -CXX= g++41 +CC= gcc41 +CXX= g++41 .endif .if (${GCCVER} == 34) -CC= gcc-ooo -CXX= g++-ooo +CC= gcc-ooo +CXX= g++-ooo .endif CC:= ${CCACHE_PREFIX} ${CC} CXX:= ${CCACHE_PREFIX} ${CXX} @@ -138,7 +140,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ .if defined(WITH_GNUGCJ) LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 +ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 ANT_VERSION= 1.6.5 .else BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant @@ -154,17 +156,20 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 .if defined(WITH_GNUGCJ) -CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" +CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" .endif -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ + --with-gnu-patch=${LOCALBASE}/bin/gpatch \ + --enable-crashdump=yes \ + --enable-symbols=SMALL .if ${ARCH} == amd64 || ${GCCVER} == 41 WITHOUT_MOZILLA= yes .endif .if (${GCCVER} == 41) -LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost -CONFIGURE_ARGS+= --with-system-boost=yes #i58343# +LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost +CONFIGURE_ARGS+= --with-system-boost=yes #i58343# .endif .if (${OSVERSION} <= 492000) EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch @@ -250,29 +255,30 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "" > ${TMPPLIST} -.if defined(WITH_MENU) + @${ECHO_CMD} "" > ${TMPPLIST} @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak + @${RM} -f ${PREFIX}/share/applications/${EXECBASE} + @${MKDIR} ${PREFIX}/share/applications @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} - @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} + @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ done ; \ done -.endif @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index b398a100e9a..d0e6e346207 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 618601ecd29e21974c6f401c69f12ce7 -SHA256 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = da2c3eb111511a439886f25421eed4294e306a46f80c7bdfa3ca28ea3fcb806b -SIZE (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 263478405 +MD5 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 1ba55cdc451442df436e57d4cc367e3c +SHA256 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = b134076f201ab55a0aaafda55d338801e6571d5c0ec2bb615e4948ca0622265c +SIZE (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 263554482 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-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs index 33fa59095e1..95662f9f5d0 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2-devel/files/Makefile.knobs @@ -133,11 +133,6 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if !defined(WITH_MENU) - @${ECHO} - @${ECHO} "You can install OOo with menu items by" - @${ECHO} "make -DWITH_MENU" -.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice.org-2-devel/files/patch-i65514 b/editors/openoffice.org-2-devel/files/patch-i65514 index 8589161a029..d0cf3aafbd1 100644 --- a/editors/openoffice.org-2-devel/files/patch-i65514 +++ b/editors/openoffice.org-2-devel/files/patch-i65514 @@ -1,14 +1,15 @@ Index: berkeleydb/db-4.2.52.patch =================================================================== RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.13 -diff -u -r1.13 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jul 2006 10:23:22 -0000 1.13 -+++ berkeleydb/db-4.2.52.patch 29 Jul 2006 11:01:12 -0000 -@@ -518,6 +518,20 @@ - emode= 555 - fmode= 444 - +retrieving revision 1.15 +diff -u -r1.15 db-4.2.52.patch +--- berkeleydb/db-4.2.52.patch 22 Nov 2006 10:35:13 -0000 1.15 ++++ berkeleydb/db-4.2.52.patch 6 Dec 2006 00:28:05 -0000 +@@ -205,6 +205,21 @@ + ! $(SLO)$/dbreg_util.obj + ! + ! .INCLUDE : target.mk ++ +*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003 +--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006 +*************** @@ -23,13 +24,13 @@ diff -u -r1.13 db-4.2.52.patch + /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/configure Wed Dec 3 22:10:02 2003 - --- misc/build/db-4.2.52.NC/dist/configure Tue Jul 25 09:05:20 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2006-05-02 17:06:13.000000000 +0200 *************** -@@ -554,6 +568,76 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -273,6 +288,77 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -100,10 +101,11 @@ diff -u -r1.13 db-4.2.52.patch + _ACEOF + + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2006-05-02 16:55:53.000000000 +0200 *************** -@@ -1010,3 +1094,39 @@ +@@ -975,3 +1061,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice.org-2-devel/files/patch-i66666 b/editors/openoffice.org-2-devel/files/patch-i66666 deleted file mode 100644 index 11b05eaf081..00000000000 --- a/editors/openoffice.org-2-devel/files/patch-i66666 +++ /dev/null @@ -1,18 +0,0 @@ -Index: tools/inc/solar.h -=================================================================== -RCS file: /cvs/util/tools/inc/solar.h,v -retrieving revision 1.44 -diff -u -r1.44 solar.h ---- tools/inc/solar.h 26 Apr 2006 20:42:59 -0000 1.44 -+++ tools/inc/solar.h 23 Jun 2006 13:32:04 -0000 -@@ -55,9 +55,6 @@ - #define FALSE 0 - #endif - --#undef NULL --#define NULL 0 -- - #ifdef _SOLAR__PRIVATE - #undef _SOLAR__PRIVATE - #endif - diff --git a/editors/openoffice.org-2-devel/files/patch-i71848 b/editors/openoffice.org-2-devel/files/patch-i71848 new file mode 100644 index 00000000000..053048ec6f7 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i71848 @@ -0,0 +1,30 @@ +--- svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:22:41.000000000 +0100 ++++ svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:52:34.000000000 +0100 +@@ -3516,7 +3516,7 @@ + Scale( rPoly[ nPolyNum ] ); + } + +-void SvxMSDffManager::ScaleEmu( long& rVal ) const ++void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const + { + rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv ); + } + + +--- svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:22:43.000000000 +0100 ++++ svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:53:00.000000000 +0100 +@@ -183,7 +183,7 @@ + rOutliner.Clear(); + rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); + rOutliner.SetText(*pPara); +- sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), rOutliner.GetParagraphCount())); ++ sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), (sal_uInt32)rOutliner.GetParagraphCount())); + + if ( nCnt == 1 ) bToLastPoint = TRUE; + else bToLastPoint = FALSE; + + diff --git a/editors/openoffice.org-2-devel/files/patch-i71977 b/editors/openoffice.org-2-devel/files/patch-i71977 new file mode 100644 index 00000000000..3feddab4bcd --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i71977 @@ -0,0 +1,15 @@ +Index: sd/inc/CustomAnimationPreset.hxx +=================================================================== +RCS file: /cvs/graphics/sd/inc/CustomAnimationPreset.hxx,v +retrieving revision 1.3 +diff -u -r1.3 CustomAnimationPreset.hxx +--- sd/inc/CustomAnimationPreset.hxx 9 Sep 2005 02:50:54 -0000 1.3 ++++ sd/inc/CustomAnimationPreset.hxx 5 Dec 2006 08:01:01 -0000 +@@ -56,6 +56,7 @@ + #include <CustomAnimationEffect.hxx> + #endif + ++#include <hash_map> + + namespace sd { + diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 5e6f08aa9b0..f011aca5a37 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -18,10 +18,10 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg .if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc +DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) -DISTFILES+= ${ANT_DISTFILE}:antbin +DISTFILES+= ${ANT_DISTFILE}:antbin .endif EXTRACT_ONLY= ${OOOSRC} @@ -38,7 +38,7 @@ USE_GNOME+= libidl .endif .if defined(WITH_KDE) -USE_KDELIBS_VER= 3 +USE_KDELIBS_VER= 3 .endif USE_XLIB= yes USE_GMAKE= yes @@ -71,10 +71,10 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -MILESTONE?= 194 +MILESTONE?= 195 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061123 +SNAPDATE= 20061124 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -88,12 +88,14 @@ PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) .if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- +PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} +PKGNAMESUFFIX= -${LANG_SUFFIX} .endif +RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt @@ -103,11 +105,11 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj .else .if ${ARCH} == amd64 GCCVER=41 -BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 +BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 RUN_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 .else GCCVER=34 -BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo +BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif .endif @@ -118,12 +120,12 @@ CCACHE_PREFIX= ccache CCACHE_PREFIX= .endif .if (${GCCVER} == 41) -CC= gcc41 -CXX= g++41 +CC= gcc41 +CXX= g++41 .endif .if (${GCCVER} == 34) -CC= gcc-ooo -CXX= g++-ooo +CC= gcc-ooo +CXX= g++-ooo .endif CC:= ${CCACHE_PREFIX} ${CC} CXX:= ${CCACHE_PREFIX} ${CXX} @@ -138,7 +140,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ .if defined(WITH_GNUGCJ) LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 +ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 ANT_VERSION= 1.6.5 .else BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant @@ -154,17 +156,20 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 .if defined(WITH_GNUGCJ) -CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" +CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" .endif -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ + --with-gnu-patch=${LOCALBASE}/bin/gpatch \ + --enable-crashdump=yes \ + --enable-symbols=SMALL .if ${ARCH} == amd64 || ${GCCVER} == 41 WITHOUT_MOZILLA= yes .endif .if (${GCCVER} == 41) -LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost -CONFIGURE_ARGS+= --with-system-boost=yes #i58343# +LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost +CONFIGURE_ARGS+= --with-system-boost=yes #i58343# .endif .if (${OSVERSION} <= 492000) EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch @@ -250,29 +255,30 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "" > ${TMPPLIST} -.if defined(WITH_MENU) + @${ECHO_CMD} "" > ${TMPPLIST} @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak + @${RM} -f ${PREFIX}/share/applications/${EXECBASE} + @${MKDIR} ${PREFIX}/share/applications @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} - @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} + @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ done ; \ done -.endif @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index b398a100e9a..d0e6e346207 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 618601ecd29e21974c6f401c69f12ce7 -SHA256 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = da2c3eb111511a439886f25421eed4294e306a46f80c7bdfa3ca28ea3fcb806b -SIZE (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 263478405 +MD5 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 1ba55cdc451442df436e57d4cc367e3c +SHA256 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = b134076f201ab55a0aaafda55d338801e6571d5c0ec2bb615e4948ca0622265c +SIZE (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 263554482 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-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index 33fa59095e1..95662f9f5d0 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-devel/files/Makefile.knobs @@ -133,11 +133,6 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if !defined(WITH_MENU) - @${ECHO} - @${ECHO} "You can install OOo with menu items by" - @${ECHO} "make -DWITH_MENU" -.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice.org-3-devel/files/patch-i65514 b/editors/openoffice.org-3-devel/files/patch-i65514 index 8589161a029..d0cf3aafbd1 100644 --- a/editors/openoffice.org-3-devel/files/patch-i65514 +++ b/editors/openoffice.org-3-devel/files/patch-i65514 @@ -1,14 +1,15 @@ Index: berkeleydb/db-4.2.52.patch =================================================================== RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.13 -diff -u -r1.13 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jul 2006 10:23:22 -0000 1.13 -+++ berkeleydb/db-4.2.52.patch 29 Jul 2006 11:01:12 -0000 -@@ -518,6 +518,20 @@ - emode= 555 - fmode= 444 - +retrieving revision 1.15 +diff -u -r1.15 db-4.2.52.patch +--- berkeleydb/db-4.2.52.patch 22 Nov 2006 10:35:13 -0000 1.15 ++++ berkeleydb/db-4.2.52.patch 6 Dec 2006 00:28:05 -0000 +@@ -205,6 +205,21 @@ + ! $(SLO)$/dbreg_util.obj + ! + ! .INCLUDE : target.mk ++ +*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003 +--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006 +*************** @@ -23,13 +24,13 @@ diff -u -r1.13 db-4.2.52.patch + /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/configure Wed Dec 3 22:10:02 2003 - --- misc/build/db-4.2.52.NC/dist/configure Tue Jul 25 09:05:20 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2006-05-02 17:06:13.000000000 +0200 *************** -@@ -554,6 +568,76 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -273,6 +288,77 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -100,10 +101,11 @@ diff -u -r1.13 db-4.2.52.patch + _ACEOF + + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2006-05-02 16:55:53.000000000 +0200 *************** -@@ -1010,3 +1094,39 @@ +@@ -975,3 +1061,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice.org-3-devel/files/patch-i66666 b/editors/openoffice.org-3-devel/files/patch-i66666 deleted file mode 100644 index 11b05eaf081..00000000000 --- a/editors/openoffice.org-3-devel/files/patch-i66666 +++ /dev/null @@ -1,18 +0,0 @@ -Index: tools/inc/solar.h -=================================================================== -RCS file: /cvs/util/tools/inc/solar.h,v -retrieving revision 1.44 -diff -u -r1.44 solar.h ---- tools/inc/solar.h 26 Apr 2006 20:42:59 -0000 1.44 -+++ tools/inc/solar.h 23 Jun 2006 13:32:04 -0000 -@@ -55,9 +55,6 @@ - #define FALSE 0 - #endif - --#undef NULL --#define NULL 0 -- - #ifdef _SOLAR__PRIVATE - #undef _SOLAR__PRIVATE - #endif - diff --git a/editors/openoffice.org-3-devel/files/patch-i71848 b/editors/openoffice.org-3-devel/files/patch-i71848 new file mode 100644 index 00000000000..053048ec6f7 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i71848 @@ -0,0 +1,30 @@ +--- svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:22:41.000000000 +0100 ++++ svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:52:34.000000000 +0100 +@@ -3516,7 +3516,7 @@ + Scale( rPoly[ nPolyNum ] ); + } + +-void SvxMSDffManager::ScaleEmu( long& rVal ) const ++void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const + { + rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv ); + } + + +--- svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:22:43.000000000 +0100 ++++ svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:53:00.000000000 +0100 +@@ -183,7 +183,7 @@ + rOutliner.Clear(); + rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); + rOutliner.SetText(*pPara); +- sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), rOutliner.GetParagraphCount())); ++ sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), (sal_uInt32)rOutliner.GetParagraphCount())); + + if ( nCnt == 1 ) bToLastPoint = TRUE; + else bToLastPoint = FALSE; + + diff --git a/editors/openoffice.org-3-devel/files/patch-i71977 b/editors/openoffice.org-3-devel/files/patch-i71977 new file mode 100644 index 00000000000..3feddab4bcd --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i71977 @@ -0,0 +1,15 @@ +Index: sd/inc/CustomAnimationPreset.hxx +=================================================================== +RCS file: /cvs/graphics/sd/inc/CustomAnimationPreset.hxx,v +retrieving revision 1.3 +diff -u -r1.3 CustomAnimationPreset.hxx +--- sd/inc/CustomAnimationPreset.hxx 9 Sep 2005 02:50:54 -0000 1.3 ++++ sd/inc/CustomAnimationPreset.hxx 5 Dec 2006 08:01:01 -0000 +@@ -56,6 +56,7 @@ + #include <CustomAnimationEffect.hxx> + #endif + ++#include <hash_map> + + namespace sd { + diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 5e6f08aa9b0..f011aca5a37 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -18,10 +18,10 @@ MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680 MASTER_SITE_SUBDIR+= mozilla/releases/mozilla${MOZILLA_VERSION}/source/:mozsrc DISTFILES+= ${OOOSRC} unowinreg.dll:unowinreg .if defined(WITH_GPC) -DISTFILES+= gpc231.tar.Z:gpc +DISTFILES+= gpc231.tar.Z:gpc .endif .if defined(WITH_GNUGCJ) -DISTFILES+= ${ANT_DISTFILE}:antbin +DISTFILES+= ${ANT_DISTFILE}:antbin .endif EXTRACT_ONLY= ${OOOSRC} @@ -38,7 +38,7 @@ USE_GNOME+= libidl .endif .if defined(WITH_KDE) -USE_KDELIBS_VER= 3 +USE_KDELIBS_VER= 3 .endif USE_XLIB= yes USE_GMAKE= yes @@ -71,10 +71,10 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -MILESTONE?= 194 +MILESTONE?= 195 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061123 +SNAPDATE= 20061124 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -88,12 +88,14 @@ PACKAGE_BASENAME= OOo_${OOOTAG}_${OPSYS}${SIMPLEOSVER}Intel LOCALIZED_LANG?= en-US # FIXME (Somehow INDEX build fails) .if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- +PKGNAMEPREFIX= ${LANG_PKGNAME}- .endif .if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} +PKGNAMESUFFIX= -${LANG_SUFFIX} .endif +RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme + .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt @@ -103,11 +105,11 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj .else .if ${ARCH} == amd64 GCCVER=41 -BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 +BUILD_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 RUN_DEPENDS+= gcc41:${PORTSDIR}/lang/gcc41 .else GCCVER=34 -BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo +BUILD_DEPENDS+= gcc-ooo:${PORTSDIR}/lang/gcc-ooo .endif .endif @@ -118,12 +120,12 @@ CCACHE_PREFIX= ccache CCACHE_PREFIX= .endif .if (${GCCVER} == 41) -CC= gcc41 -CXX= g++41 +CC= gcc41 +CXX= g++41 .endif .if (${GCCVER} == 34) -CC= gcc-ooo -CXX= g++-ooo +CC= gcc-ooo +CXX= g++-ooo .endif CC:= ${CCACHE_PREFIX} ${CC} CXX:= ${CCACHE_PREFIX} ${CXX} @@ -138,7 +140,7 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ .if defined(WITH_GNUGCJ) LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 +ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin.tar.bz2 ANT_VERSION= 1.6.5 .else BUILD_DEPENDS+= ant:${PORTSDIR}/devel/apache-ant @@ -154,17 +156,20 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 .if defined(WITH_GNUGCJ) -CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" +CONFIGURE_ENV+= PATH="${LOCALBASE}/lib/jvm/java-gcj41/bin:${PATH}" .endif -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --enable-crashdump=yes --enable-symbols=SMALL +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ + --with-gnu-patch=${LOCALBASE}/bin/gpatch \ + --enable-crashdump=yes \ + --enable-symbols=SMALL .if ${ARCH} == amd64 || ${GCCVER} == 41 WITHOUT_MOZILLA= yes .endif .if (${GCCVER} == 41) -LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost -CONFIGURE_ARGS+= --with-system-boost=yes #i58343# +LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost +CONFIGURE_ARGS+= --with-system-boost=yes #i58343# .endif .if (${OSVERSION} <= 492000) EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch @@ -250,29 +255,30 @@ post-install: @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter - @${PRINTF} "" > ${TMPPLIST} -.if defined(WITH_MENU) + @${ECHO_CMD} "" > ${TMPPLIST} @${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak + @${RM} -f ${PREFIX}/share/applications/${EXECBASE} + @${MKDIR} ${PREFIX}/share/applications @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} - @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} + @${ECHO_CMD} "share/applications/${EXECBASE}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ for app in base calc draw impress math printeradmin writer; do \ if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \ ${CP} ${ICONS}/hicolor/$${dir}/apps/$${app}.png \ ${PREFIX}/share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/apps/openofficeorg-21-$${app}.png" >> ${TMPPLIST} ; \ fi \ done ; \ for file in `cd ${ICONS}/hicolor/$${dir}/mimetypes; ls *.png`; do \ ${CP} ${ICONS}/hicolor/$${dir}/mimetypes/$${file} \ ${PREFIX}/share/icons/hicolor/$${dir}/mimetypes/ ; \ - ${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \ + ${ECHO_CMD} "share/icons/hicolor/$${dir}/mimetypes/$${file}" >> ${TMPPLIST} ; \ done ; \ done -.endif @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST} @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST} diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index b398a100e9a..d0e6e346207 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 618601ecd29e21974c6f401c69f12ce7 -SHA256 (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = da2c3eb111511a439886f25421eed4294e306a46f80c7bdfa3ca28ea3fcb806b -SIZE (openoffice.org2.0/OOo_SRC680_m194_source.tar.bz2) = 263478405 +MD5 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 1ba55cdc451442df436e57d4cc367e3c +SHA256 (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = b134076f201ab55a0aaafda55d338801e6571d5c0ec2bb615e4948ca0622265c +SIZE (openoffice.org2.0/OOo_SRC680_m195_source.tar.bz2) = 263554482 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-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index 33fa59095e1..95662f9f5d0 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs @@ -133,11 +133,6 @@ pre-fetch: @${ECHO} "You can compile OOo with evolution2 support by" @${ECHO} "make -DWITH_EVOLUTION2" .endif -.if !defined(WITH_MENU) - @${ECHO} - @${ECHO} "You can install OOo with menu items by" - @${ECHO} "make -DWITH_MENU" -.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65514 b/editors/openoffice.org-vcltesttool/files/patch-i65514 index 8589161a029..d0cf3aafbd1 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i65514 +++ b/editors/openoffice.org-vcltesttool/files/patch-i65514 @@ -1,14 +1,15 @@ Index: berkeleydb/db-4.2.52.patch =================================================================== RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v -retrieving revision 1.13 -diff -u -r1.13 db-4.2.52.patch ---- berkeleydb/db-4.2.52.patch 25 Jul 2006 10:23:22 -0000 1.13 -+++ berkeleydb/db-4.2.52.patch 29 Jul 2006 11:01:12 -0000 -@@ -518,6 +518,20 @@ - emode= 555 - fmode= 444 - +retrieving revision 1.15 +diff -u -r1.15 db-4.2.52.patch +--- berkeleydb/db-4.2.52.patch 22 Nov 2006 10:35:13 -0000 1.15 ++++ berkeleydb/db-4.2.52.patch 6 Dec 2006 00:28:05 -0000 +@@ -205,6 +205,21 @@ + ! $(SLO)$/dbreg_util.obj + ! + ! .INCLUDE : target.mk ++ +*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003 +--- misc/build/db-4.2.52.NC/dist/config.hin Fri May 19 17:37:41 2006 +*************** @@ -23,13 +24,13 @@ diff -u -r1.13 db-4.2.52.patch + /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ + #undef HAVE_NDIR_H + - *** misc/db-4.2.52.NC/dist/configure Wed Dec 3 22:10:02 2003 - --- misc/build/db-4.2.52.NC/dist/configure Tue Jul 25 09:05:20 2006 + *** misc/db-4.2.52.NC/dist/configure 2003-12-03 22:10:02.000000000 +0100 + --- misc/build/db-4.2.52.NC/dist/configure 2006-05-02 17:06:13.000000000 +0200 *************** -@@ -554,6 +568,76 @@ - fi - - # Commands to make compiler produce verbose output that lists +@@ -273,6 +288,77 @@ + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' +*************** +*** 28556,28561 **** +--- 28556,28606 ---- @@ -100,10 +101,11 @@ diff -u -r1.13 db-4.2.52.patch + _ACEOF + + - *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003 - --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006 ++ + *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200 + --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2006-05-02 16:55:53.000000000 +0200 *************** -@@ -1010,3 +1094,39 @@ +@@ -975,3 +1061,39 @@ ! $(SLO)$/xa_map.obj ! ! .INCLUDE : target.mk diff --git a/editors/openoffice.org-vcltesttool/files/patch-i66666 b/editors/openoffice.org-vcltesttool/files/patch-i66666 deleted file mode 100644 index 11b05eaf081..00000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i66666 +++ /dev/null @@ -1,18 +0,0 @@ -Index: tools/inc/solar.h -=================================================================== -RCS file: /cvs/util/tools/inc/solar.h,v -retrieving revision 1.44 -diff -u -r1.44 solar.h ---- tools/inc/solar.h 26 Apr 2006 20:42:59 -0000 1.44 -+++ tools/inc/solar.h 23 Jun 2006 13:32:04 -0000 -@@ -55,9 +55,6 @@ - #define FALSE 0 - #endif - --#undef NULL --#define NULL 0 -- - #ifdef _SOLAR__PRIVATE - #undef _SOLAR__PRIVATE - #endif - diff --git a/editors/openoffice.org-vcltesttool/files/patch-i71848 b/editors/openoffice.org-vcltesttool/files/patch-i71848 new file mode 100644 index 00000000000..053048ec6f7 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i71848 @@ -0,0 +1,30 @@ +--- svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:22:41.000000000 +0100 ++++ svx/source/msfilter/msdffimp.cxx 2006-11-22 +11:52:34.000000000 +0100 +@@ -3516,7 +3516,7 @@ + Scale( rPoly[ nPolyNum ] ); + } + +-void SvxMSDffManager::ScaleEmu( long& rVal ) const ++void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const + { + rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv ); + } + + +--- svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:22:43.000000000 +0100 ++++ svx/source/svdraw/svdtxhdl.cxx 2006-11-22 +11:53:00.000000000 +0100 +@@ -183,7 +183,7 @@ + rOutliner.Clear(); + rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); + rOutliner.SetText(*pPara); +- sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), rOutliner.GetParagraphCount())); ++ sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), (sal_uInt32)rOutliner.GetParagraphCount())); + + if ( nCnt == 1 ) bToLastPoint = TRUE; + else bToLastPoint = FALSE; + + diff --git a/editors/openoffice.org-vcltesttool/files/patch-i71977 b/editors/openoffice.org-vcltesttool/files/patch-i71977 new file mode 100644 index 00000000000..3feddab4bcd --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i71977 @@ -0,0 +1,15 @@ +Index: sd/inc/CustomAnimationPreset.hxx +=================================================================== +RCS file: /cvs/graphics/sd/inc/CustomAnimationPreset.hxx,v +retrieving revision 1.3 +diff -u -r1.3 CustomAnimationPreset.hxx +--- sd/inc/CustomAnimationPreset.hxx 9 Sep 2005 02:50:54 -0000 1.3 ++++ sd/inc/CustomAnimationPreset.hxx 5 Dec 2006 08:01:01 -0000 +@@ -56,6 +56,7 @@ + #include <CustomAnimationEffect.hxx> + #endif + ++#include <hash_map> + + namespace sd { + |