From 1e4dcdff78191f7dde8aa68e6f00c821550d9f79 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Mon, 29 Aug 2005 01:32:13 +0000 Subject: After repocopied by PR 85372, old ports must be removed. PR: 85372 --- editors/openoffice-1.0/files/Makefile.knobs | 63 - editors/openoffice-1.0/files/Makefile.localized | 156 -- editors/openoffice-1.0/files/generate.pl | 21 - editors/openoffice-1.0/files/moz-patch | 40 - .../openoffice-1.0/files/openoffice.org-wrapper | 15 - editors/openoffice-1.0/files/optpatch-freetype | 211 --- .../files/patch-berkeleydb+db-3.2.9.patch | 106 -- .../files/patch-berkeleydb+makefile.mk | 12 - .../files/patch-bridges+prj+build.lst | 11 - ...s+source+cpp_uno+gcc2_freebsd_intel+makefile.mk | 11 - ...-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj | 1734 -------------------- ...patch-bridges+source+cpp_uno+gcc3_freebsd_intel | 1608 ------------------ .../patch-bridges+source+remote+iiop+dispatch.cxx | 23 - .../patch-bridges+source+remote+iiop+unmarshal.cxx | 23 - .../patch-bridges+source+remote+static+proxy.cxx | 23 - .../patch-bridges+source+remote+static+stub.cxx | 23 - ...atch-bridges+source+remote+urp+urp_dispatch.cxx | 23 - .../files/patch-chaos+util+makefile.mk | 11 - .../patch-codemaker+source+codemaker+global.cxx | 14 - .../patch-codemaker+source+cppumaker+makefile.mk | 15 - ...h-codemaker+source+source+javamaker+makefile.mk | 15 - .../files/patch-config_office+configure.in | 51 - .../files/patch-config_office+setsoenv.in | 102 -- ...-connectivity+source+drivers+adabas+makefile.mk | 11 - ...ch-connectivity+source+drivers+calc+makefile.mk | 12 - ...h-connectivity+source+drivers+dbase+makefile.mk | 11 - ...ch-connectivity+source+drivers+file+makefile.mk | 11 - ...ch-connectivity+source+drivers+flat+makefile.mk | 11 - ...ch-connectivity+source+drivers+jdbc+makefile.mk | 11 - ...h-connectivity+source+drivers+mozab+makefile.mk | 12 - ...ity+source+drivers+mozab+mozillasrc+makefile.mk | 54 - ...ivity+source+drivers+mozaddressbook+makefile.mk | 12 - .../files/patch-cppu+inc+cppu+macros.hxx | 11 - .../files/patch-cppu+inc+uno+lbnames.h | 11 - .../openoffice-1.0/files/patch-cppu+prj+build.lst | 8 - .../files/patch-cppu+source+typelib+typelib.cxx | 20 - .../files/patch-cppu+source+uno+data.cxx | 20 - .../files/patch-cppu+source+uno+lbenv.cxx | 18 - .../files/patch-cppu+test+alignment+diagnose.h | 11 - .../files/patch-cppu+util+makefile.mk | 12 - .../files/patch-cppuhelper+source+implbase_ex.cxx | 20 - .../files/patch-cppuhelper+source+makefile.mk | 13 - .../files/patch-cppuhelper+source+tdmgr.cxx | 16 - .../files/patch-desktop+source+pkgchk_packages.cxx | 13 - .../files/patch-desktop+util+makefile.mk | 20 - .../files/patch-dmake+unix+linux+gnu+make.sh | 244 --- .../patch-dtrans+source+X11+X11_selection.cxx | 19 - .../files/patch-external+dt+dtpatch.sh | 11 - .../files/patch-external+expat+expatpatch.sh | 11 - .../files/patch-external+glibc+glibcpatch | 35 - .../files/patch-external+jpeg+jpegpatch.sh | 11 - .../files/patch-external+neon+md5.c.pat | 112 -- .../files/patch-external+neon+neonpatch.sh | 14 - .../files/patch-external+npsdk+npsdkpatch.sh | 11 - .../files/patch-freetype+makefile.mk | 11 - .../files/patch-i18n+inc+collator.hxx | 11 - ...patch-i18npool+source+localedata+localedata.cxx | 10 - ...ch-i18npool+source+localedata_ascii+makefile.mk | 18 - ...atch-i18npool+source+localedata_ascii+uk_UA.xml | 454 ----- .../files/patch-idlc+source+parser.yy | 36 - .../openoffice-1.0/files/patch-nas+nas-1.4.1.patch | 246 --- .../files/patch-odk+pack+copying+makefile.mk | 15 - .../files/patch-odk+source+OOSupport+makefile.mk | 14 - .../patch-odk+source+bean+native+unix+makefile.mk | 21 - .../files/patch-odk+util+makefile.pmk | 31 - .../patch-offapi+com+sun+star+setup+OSType.idl | 12 - .../files/patch-offapi+util+makefile.pmk | 11 - .../files/patch-package+inc+HashMaps.hxx | 20 - .../files/patch-package+inc+ZipPackageFolder.hxx | 11 - ...patch-package+source+zippackage+ContentInfo.hxx | 34 - ...-package+source+zippackage+ZipPackageFolder.cxx | 41 - .../files/patch-product+inc+scp+udk_basefiles.scp | 18 - .../files/patch-product+settings+settings.mk | 75 - .../files/patch-product+util+makefile.mk | 32 - ...h-psprint+source+printer+printerinfomanager.cxx | 11 - .../patch-psprint+source+printergfx+psheader.ps | 13 - .../files/patch-registry+source+registry.cxx | 14 - .../files/patch-registry+source+regkey.cxx | 12 - .../files/patch-registry+tools+makefile.mk | 39 - .../files/patch-rsc+source+rscpp+cpp.h | 12 - .../files/patch-rsc+source+rscpp+cpp3.c | 12 - .../files/patch-sablot+Sablot-0.52.patch | 20 - .../files/patch-sal+inc+osl+endian.h | 20 - .../files/patch-sal+inc+rtl+textenc.h | 21 - .../files/patch-sal+osl+unx+interlck.c | 30 - .../files/patch-sal+osl+unx+nlsupport.c | 135 -- .../openoffice-1.0/files/patch-sal+osl+unx+pipe.c | 14 - .../files/patch-sal+osl+unx+process.c | 20 - .../files/patch-sal+osl+unx+socket.c | 20 - .../files/patch-sal+osl+unx+system.c | 137 -- .../files/patch-sal+osl+unx+system.h | 57 - .../files/patch-sal+rtl+source+strtmpl.c | 19 - .../files/patch-sal+textenc+tcvtest1.tab | 173 -- .../files/patch-sal+textenc+tencinfo.c | 37 - .../files/patch-sal+textenc+textenc.c | 12 - .../files/patch-sal+workben+makefile.mk | 29 - .../patch-salhelper+source+gcc2_freebsd_intel.map | 31 - .../patch-salhelper+source+gcc3_freebsd_intel.map | 34 - .../files/patch-salhelper+source+makefile.mk | 13 - .../files/patch-salhelper+test+rtti+makefile.mk | 13 - .../files/patch-sc+source+core+data+cell.cxx | 11 - .../files/patch-scp+source+player+player.scp | 20 - .../files/patch-scptools+source+linker+searchcache | 27 - .../files/patch-scptools+source+linker+ziplst.cxx | 19 - .../files/patch-setup2+inc+fields.hxx | 10 - .../files/patch-setup2+mow+source+loader+loader.c | 30 - .../patch-setup2+mow+source+loader+makefile.mk | 11 - .../files/patch-setup2+patch+makefile.mk | 11 - .../files/patch-setup2+script+setupserver | 10 - .../files/patch-setup2+source+compiler+decltor.cxx | 20 - .../patch-setup2+source+custom+jvmsetup+jvmdlg.cxx | 11 - ...etup2+source+custom+jvmsetup+loader+jvmsetup.sh | 10 - .../patch-setup2+source+service+interface.cxx | 35 - .../patch-sfx2+source+appl+officeacceptthread.cxx | 18 - ...ch-shell+source+proxysettings+soprxsettings.cxx | 18 - .../files/patch-solenv+bin+addsym.awk | 10 - .../files/patch-solenv+bin+mapgen.pl | 21 - .../files/patch-solenv+inc+postset.mk | 22 - .../patch-solenv+inc+startup+FREEBSD+macros.mk | 5 - .../files/patch-solenv+inc+tg_ext.mk | 12 - .../files/patch-solenv+inc+tg_moz.mk | 17 - .../files/patch-solenv+inc+tg_shl.mk | 11 - .../files/patch-solenv+inc+unitools.mk | 16 - .../files/patch-solenv+inc+unxfbsdi.mk | 285 ---- .../files/patch-soltools+mkdepend+main.c | 12 - .../files/patch-stlport+STLport-4.5.patch | 113 -- .../openoffice-1.0/files/patch-stlport+makefile.mk | 36 - .../patch-stoc+source+corereflection+criface.cxx | 23 - ...c+source+implementationregistration+implreg.cxx | 11 - .../files/patch-svx+source+dialog+txenctab.src | 44 - .../files/patch-sw+source+filter+basflt+fltini.cxx | 22 - ...unix+office+gnome-vfs-filetype-registration.cxx | 11 - .../files/patch-sysui+tools+lngconv+lngconv.cxx | 19 - .../files/patch-sysui+unix+office+cde+locales.tab | 10 - .../files/patch-tools+bootstrp+static.mk | 20 - .../files/patch-tools+inc+inetdef.hxx | 11 - .../files/patch-tools+source+inet+inetmime.cxx | 54 - .../files/patch-tools+source+rc+resmgr.cxx | 19 - .../files/patch-transex3+inc+export.hxx | 31 - .../files/patch-transex3+source+export.cxx | 13 - .../files/patch-transex3+source+export2.cxx | 44 - .../files/patch-transex3+source+gsiconv.cxx | 12 - .../files/patch-transex3+source+merge.cxx | 12 - .../patch-ucb+source+ucp+hierarchy+makefile.mk | 11 - .../files/patch-ucb+source+ucp+webdav+makefile.mk | 11 - .../files/patch-unzip+source+file_io.c | 13 - .../openoffice-1.0/files/patch-unzip+source+misc.c | 16 - .../files/patch-vcl+source+gdi+print.cxx | 11 - .../files/patch-vcl+unx+source+app+osssound.cxx | 14 - .../files/patch-vcl+unx+source+app+rptpsound.cxx | 13 - .../files/patch-vcl+unx+source+app+saldata.cxx | 14 - .../files/patch-vcl+unx+source+app+vsound.hxx | 20 - .../files/patch-vcl+unx+source+gdi+salcvt.cxx | 20 - .../files/patch-vcl+unx+source+gdi+xlfd_extd.cxx | 10 - .../files/patch-vcl+util+makefile.mk | 14 - editors/openoffice-1.0/files/pkg-message.in | 64 - 156 files changed, 8594 deletions(-) delete mode 100644 editors/openoffice-1.0/files/Makefile.knobs delete mode 100644 editors/openoffice-1.0/files/Makefile.localized delete mode 100644 editors/openoffice-1.0/files/generate.pl delete mode 100644 editors/openoffice-1.0/files/moz-patch delete mode 100644 editors/openoffice-1.0/files/openoffice.org-wrapper delete mode 100644 editors/openoffice-1.0/files/optpatch-freetype delete mode 100644 editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch delete mode 100644 editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-bridges+prj+build.lst delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx delete mode 100644 editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx delete mode 100644 editors/openoffice-1.0/files/patch-chaos+util+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx delete mode 100644 editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-config_office+configure.in delete mode 100644 editors/openoffice-1.0/files/patch-config_office+setsoenv.in delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx delete mode 100644 editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h delete mode 100644 editors/openoffice-1.0/files/patch-cppu+prj+build.lst delete mode 100644 editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx delete mode 100644 editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx delete mode 100644 editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx delete mode 100644 editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h delete mode 100644 editors/openoffice-1.0/files/patch-cppu+util+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx delete mode 100644 editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx delete mode 100644 editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx delete mode 100644 editors/openoffice-1.0/files/patch-desktop+util+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh delete mode 100644 editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx delete mode 100644 editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh delete mode 100644 editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh delete mode 100644 editors/openoffice-1.0/files/patch-external+glibc+glibcpatch delete mode 100644 editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh delete mode 100644 editors/openoffice-1.0/files/patch-external+neon+md5.c.pat delete mode 100644 editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh delete mode 100644 editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh delete mode 100644 editors/openoffice-1.0/files/patch-freetype+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx delete mode 100644 editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx delete mode 100644 editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml delete mode 100644 editors/openoffice-1.0/files/patch-idlc+source+parser.yy delete mode 100644 editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch delete mode 100644 editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-odk+util+makefile.pmk delete mode 100644 editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl delete mode 100644 editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk delete mode 100644 editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx delete mode 100644 editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx delete mode 100644 editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx delete mode 100644 editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx delete mode 100644 editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp delete mode 100644 editors/openoffice-1.0/files/patch-product+settings+settings.mk delete mode 100644 editors/openoffice-1.0/files/patch-product+util+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx delete mode 100644 editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps delete mode 100644 editors/openoffice-1.0/files/patch-registry+source+registry.cxx delete mode 100644 editors/openoffice-1.0/files/patch-registry+source+regkey.cxx delete mode 100644 editors/openoffice-1.0/files/patch-registry+tools+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h delete mode 100644 editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c delete mode 100644 editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch delete mode 100644 editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h delete mode 100644 editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+process.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+system.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+osl+unx+system.h delete mode 100644 editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab delete mode 100644 editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+textenc+textenc.c delete mode 100644 editors/openoffice-1.0/files/patch-sal+workben+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map delete mode 100644 editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map delete mode 100644 editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx delete mode 100644 editors/openoffice-1.0/files/patch-scp+source+player+player.scp delete mode 100644 editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache delete mode 100644 editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx delete mode 100644 editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx delete mode 100644 editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c delete mode 100644 editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-setup2+script+setupserver delete mode 100644 editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx delete mode 100644 editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx delete mode 100644 editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh delete mode 100644 editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx delete mode 100644 editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx delete mode 100644 editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx delete mode 100644 editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+postset.mk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk delete mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk delete mode 100644 editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c delete mode 100644 editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch delete mode 100644 editors/openoffice-1.0/files/patch-stlport+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx delete mode 100644 editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx delete mode 100644 editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src delete mode 100644 editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx delete mode 100644 editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx delete mode 100644 editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx delete mode 100644 editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab delete mode 100644 editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk delete mode 100644 editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx delete mode 100644 editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx delete mode 100644 editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx delete mode 100644 editors/openoffice-1.0/files/patch-transex3+inc+export.hxx delete mode 100644 editors/openoffice-1.0/files/patch-transex3+source+export.cxx delete mode 100644 editors/openoffice-1.0/files/patch-transex3+source+export2.cxx delete mode 100644 editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx delete mode 100644 editors/openoffice-1.0/files/patch-transex3+source+merge.cxx delete mode 100644 editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk delete mode 100644 editors/openoffice-1.0/files/patch-unzip+source+file_io.c delete mode 100644 editors/openoffice-1.0/files/patch-unzip+source+misc.c delete mode 100644 editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx delete mode 100644 editors/openoffice-1.0/files/patch-vcl+util+makefile.mk delete mode 100644 editors/openoffice-1.0/files/pkg-message.in (limited to 'editors/openoffice-1.0/files') diff --git a/editors/openoffice-1.0/files/Makefile.knobs b/editors/openoffice-1.0/files/Makefile.knobs deleted file mode 100644 index a62166a46a40..000000000000 --- a/editors/openoffice-1.0/files/Makefile.knobs +++ /dev/null @@ -1,63 +0,0 @@ -.if defined(WITH_DEBUG) -CFLAGS+= -g -.if ${WITH_DEBUG} == 2 -BUILD= dmake debug="true" -.else -BUILD= dmake -.endif -.else -BUILD= dmake strip="true" -.endif - -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-debug -.endif - -.if defined(ALL_LOCALIZED_LANGS) -CONFIGURE_ARGS+= --with-lang=ALL -.else -CONFIGURE_ARGS+= --with-lang=${LANG_CONFIGURE_ARG} -.endif - -pre-fetch: - @${ECHO} - @${ECHO} "OPTIONS:" -.if !defined(WITH_DEBUG) - @${ECHO} - @${ECHO} "You can compile OO with debug symbols" - @${ECHO} "if you call make with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OO.org debug support." - @${ECHO} -.endif -.if !defined(LOCALIZED_LANG) - @${ECHO} - @${ECHO} "You can select the language for OOo by making it with 'make LOCALIZED_LANG=xx'" - @${ECHO} "while xx can be one of the following:" - @${ECHO} "ar de dk el es fr it ja ko nl pl pt ru" - @${ECHO} "sv tr zh-CN zh-TW" - @${ECHO} -.endif -.if !defined(WITH_TTF_BYTECODE_ENABLED) - @${ECHO} - @${ECHO} "You may set WITH_TTF_BYTECODE_ENABLED=YES" - @${ECHO} "if you like to use the Freetype library to" - @${ECHO} "render TTF fonts. Normally the TTF lib is" - @${ECHO} "not used to render fonts." - @${ECHO} - @${ECHO} "If you have licensed the Apple patents" - @${ECHO} "US05155805 US05159668 and US05325479" - @${ECHO} "you can enable this option to get better" - @${ECHO} "quality of glyphs at small bitmap sizes." - @${ECHO} -.endif - @${ECHO} - @${ECHO} "NOTICE:" - @${ECHO} - @${ECHO} "To build Openoffice, you should have a lot" -.if defined(WITH_DEBUG) - @${ECHO} "of free diskspace (~ 8GB)." -.else - @${ECHO} "of free diskspace (~ 4GB)." -.endif diff --git a/editors/openoffice-1.0/files/Makefile.localized b/editors/openoffice-1.0/files/Makefile.localized deleted file mode 100644 index 1a267d20aaf2..000000000000 --- a/editors/openoffice-1.0/files/Makefile.localized +++ /dev/null @@ -1,156 +0,0 @@ -# localized makefile -# Whom: Maho Nakata -# $FreeBSD$ - -################################################################ -# consult oo_1.0.3_src/config_office/set_soenv.in for -# available localized languages -################################################################ -.if defined(LOCALIZED_LANG) -################################################################ -.if ${LOCALIZED_LANG} == "ar" -CATEGORIES= arabic -LANG_PKGNAME= ar -LANG_EXT= 96 -LANG_CONFIGURE_ARG= ARAB -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-CN" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= CN -LANG_EXT= 86 -LANG_CONFIGURE_ARG= CHINSIM -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "zh-TW" -CATEGORIES= chinese -LANG_PKGNAME= zh -LANG_SUFFIX= TW -LANG_EXT= 88 -LANG_CONFIGURE_ARG= CHINTRAD -BUILD_DEPENDS+= ${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "dk" -LANG_PKGNAME= dk -LANG_EXT= 45 -LANG_CONFIGURE_ARG= DAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "nl" -LANG_PKGNAME= nl -LANG_EXT= 31 -LANG_CONFIGURE_ARG= DTCH -.endif -################################################################ -.if ${LOCALIZED_LANG} == "fr" -CATEGORIES= french -LANG_PKGNAME= fr -LANG_EXT= 33 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= FREN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "el" -LANG_PKGNAME= el -LANG_EXT= 30 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GREEK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "de" -CATEGORIES= german -LANG_PKGNAME= de -LANG_EXT= 49 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= GER -COMMENT= Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und Praesentationsprogramm -.endif -################################################################ -.if ${LOCALIZED_LANG} == "it" -LANG_PKGNAME= it -LANG_EXT= 39 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= ITAL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ja" -CATEGORIES= japanese -LANG_PKGNAME= ja -LANG_EXT= 81 -LANG_CONFIGURE_ARG= JAPN -MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/stable/&,} -RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/TrueType/sazanami-mincho.ttf:${PORTSDIR}/japanese/sazanami-ttf -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ko" -CATEGORIES= korean -LANG_PKGNAME= ko -LANG_EXT= 82 -LANG_CONFIGURE_ARG= KOREAN -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pl" -CATEGORIES= polish -LANG_PKGNAME= pl -LANG_EXT= 48 -LANG_CONFIGURE_ARG= POL -.endif -################################################################ -.if ${LOCALIZED_LANG} == "pt" -COMMENT= Editor texto/grBaGico, banco de dados/planilha/navegador integrado -CATEGORIES= portuguese -LANG_PKGNAME= pt -LANG_EXT= 03 -LANG_CONFIGURE_ARG= PORT -.endif -################################################################ -.if ${LOCALIZED_LANG} == "ru" -CATEGORIES= russian -LANG_PKGNAME= ru -LANG_EXT= 07 -LANG_CONFIGURE_ARG= RUSS -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -.endif -################################################################ -.if ${LOCALIZED_LANG} == "es" -LANG_PKGNAME= es -LANG_EXT= 34 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SPAN -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if ${LOCALIZED_LANG} == "sv" -LANG_PKGNAME= sv -LANG_EXT= 46 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= SWED -.endif -################################################################ -.if ${LOCALIZED_LANG} == "tr" -LANG_PKGNAME= tr -LANG_EXT= 90 -L10NHELP= helpcontent_${LANG_EXT}_unix.tgz -LANG_CONFIGURE_ARG= TURK -.endif -################################################################ -.if defined(LANG_PKGNAME) -PKGNAMEPREFIX= ${LANG_PKGNAME}- -.endif -.if defined(LANG_SUFFIX) -PKGNAMESUFFIX?= -${LANG_SUFFIX} -.endif -.endif - diff --git a/editors/openoffice-1.0/files/generate.pl b/editors/openoffice-1.0/files/generate.pl deleted file mode 100644 index b9edd8f6fedd..000000000000 --- a/editors/openoffice-1.0/files/generate.pl +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl -# generate full build shell script for OpenOffice.org -# Whom: Maho Nakata -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/generate.pl,v 1.3 2005-08-28 08:25:09 maho Exp $ - -print "#!/bin/csh\n"; -print "make deinstall clean\n"; -print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n"; -print "rm work/.configure* work/.build* \n"; -print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; - -open ( FILE, "< Makefile.localized") ; -while(){ -@tmp=split (' ',$_); -@tmp2=split ('"',$tmp[3]); -if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; - print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; - } -} -close FILE; diff --git a/editors/openoffice-1.0/files/moz-patch b/editors/openoffice-1.0/files/moz-patch deleted file mode 100644 index 2eafbc036881..000000000000 --- a/editors/openoffice-1.0/files/moz-patch +++ /dev/null @@ -1,40 +0,0 @@ -o disable freetype2 support since build broken and - this functionality is not used at all. -o reduce dependency (gtk is no longer needed) -o GNUCOPY is not supported by 1.0 series - ---- moz/extractfiles.mk.org Sat Oct 30 22:01:49 2004 -+++ moz/extractfiles.mk Sat Oct 30 22:00:21 2004 -@@ -269,8 +269,8 @@ - +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) - +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ELSE -- +$(GNUCOPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) -- +$(GNUCOPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) -+ +cp -pr $(INCLUDE_PATH)* $(INCLUDE_DIR) -+ +cp -pr $(PUBLIC_PATH)* $(INCLUDE_DIR) - .ENDIF - - .IF "$(GUI)"=="UNX" - ---- moz/mozilla-source-1.0.patch.org Tue Feb 10 19:44:34 2004 -+++ moz/mozilla-source-1.0.patch Sat Mar 19 12:51:35 2005 -@@ -4471,14 +4471,16 @@ - return NS_OK; - } - ----- miss/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 -+--- misc/build/mozilla/.mozconfig Tue Jul 22 21:52:27 2003 - +++ misc/build/mozilla/.mozconfig Mon Jul 28 15:07:20 2003 --@@ -0,0 +1,8 @@ -+@@ -0,0 +1,10 @@ - +ac_add_options --disable-tests - +ac_add_options --disable-xprint - +ac_add_options --without-system-zlib - +ac_add_options --enable-ldap - +ac_add_options --disable-debug -++ac_add_options --disable-freetype2 -++ac_add_options --enable-default-toolkit=xlib - +ac_add_options --enable-optimize - +ac_add_options --enable-crypto - +ac_add_options --enable-strip diff --git a/editors/openoffice-1.0/files/openoffice.org-wrapper b/editors/openoffice-1.0/files/openoffice.org-wrapper deleted file mode 100644 index 150792e7fde8..000000000000 --- a/editors/openoffice-1.0/files/openoffice.org-wrapper +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.0/files/Attic/openoffice.org-wrapper,v 1.1 2005-07-29 02:16:38 maho Exp $ - -oopath=%%PREFIX%%/OpenOffice.org1.0.3/program/ -program=`echo $0 | sed -e 's|.*-%%RELEASE_NR%%-||'` - -case $program in -$0) - exec $oopath/soffice "$@" - ;; - *) - exec $oopath/$program "$@" - ;; -esac diff --git a/editors/openoffice-1.0/files/optpatch-freetype b/editors/openoffice-1.0/files/optpatch-freetype deleted file mode 100644 index 287676e14dc0..000000000000 --- a/editors/openoffice-1.0/files/optpatch-freetype +++ /dev/null @@ -1,211 +0,0 @@ ---- freetype/freetype-2.0.5.patch Fri Apr 5 21:07:34 2002 -+++ freetype/freetype-2.0.5.patch Sat Mar 9 18:04:17 2002 -@@ -1,118 +1,79 @@ --*** misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 14 00:44:33 2000 ----- misc/build/freetype-2.0.5/builds/compiler/visualc.mk Wed Nov 7 16:11:47 2001 --*************** --*** 63,69 **** -- # ANSI compliance. -- # -- ifndef CFLAGS --! CFLAGS := /nologo /c /Ox /G5 /W3 /WX -- endif -- -- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. ----- 63,69 ---- -- # ANSI compliance. -- # -- ifndef CFLAGS --! CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -- endif -- -- # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. --*** misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Jun 7 19:36:17 2001 ----- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Wed Nov 7 16:11:47 2001 --*************** --*** 631,637 **** -- if test "$build_old_libs" = yes; then -- if test "$pic_mode" != yes; then -- # Don't build PIC code --! command="$base_compile $srcfile" -- else -- # All platforms use -DPIC, to notify preprocessed assembler code. -- command="$base_compile $srcfile $pic_flag -DPIC" ----- 631,637 ---- -- if test "$build_old_libs" = yes; then -- if test "$pic_mode" != yes; then -- # Don't build PIC code --! command="$base_compile $srcfile -DPIC $pic_flag" -- else -- # All platforms use -DPIC, to notify preprocessed assembler code. -- command="$base_compile $srcfile $pic_flag -DPIC" --*** misc/freetype-2.0.5/include/freetype/config/ftmodule.h Mon Jan 1 18:25:21 2001 ----- misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Wed Nov 7 16:11:47 2001 --*************** --*** 1,7 **** ----- 1,9 ---- -- FT_USE_MODULE(autohint_module_class) -- FT_USE_MODULE(cff_driver_class) -- FT_USE_MODULE(t1cid_driver_class) --+ /* -- FT_USE_MODULE(pcf_driver_class) --+ */ -- FT_USE_MODULE(psaux_module_class) -- FT_USE_MODULE(psnames_module_class) -- FT_USE_MODULE(ft_raster1_renderer_class) --*************** --*** 9,12 **** ----- 11,16 ---- -- FT_USE_MODULE(ft_smooth_renderer_class) -- FT_USE_MODULE(tt_driver_class) -- FT_USE_MODULE(t1_driver_class) --+ /* -- FT_USE_MODULE(winfnt_driver_class) --+ */ --*** misc/freetype-2.0.5/include/freetype/config/ftoption.h Tue Aug 21 10:50:45 2001 ----- misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Wed Nov 7 16:11:47 2001 --*************** --*** 70,76 **** ----- 70,79 ---- -- /* All convenience functions are declared as such in their */ -- /* documentation. */ -- /* */ --+ /* -- #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS --+ */ --+ #define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -- -- -- /*************************************************************************/ --*************** --*** 108,116 **** -- /* use a vector `plotter' format that isn't supported when this */ -- /* macro is undefined. */ -- /* */ -- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -- --- -- /*************************************************************************/ -- /* */ -- /* Glyph Postscript Names handling */ ----- 111,121 ---- -- /* use a vector `plotter' format that isn't supported when this */ -- /* macro is undefined. */ -- /* */ --+ /* -- #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS --+ */ --+ #undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -- -- /*************************************************************************/ -- /* */ -- /* Glyph Postscript Names handling */ --*** misc/build/freetype-2.0.5/builds/unix/ltmain.sh.orig Mon Jan 7 14:21:35 2002 ----- misc/build/freetype-2.0.5/builds/unix/ltmain.sh Mon Jan 7 14:21:40 2002 --*************** --*** 2251,2257 **** -- ;; -- -- irix) --! major=`expr $current - $age + 1` -- verstring="sgi$major.$revision" -- -- # Add in all the interfaces that we are compatible with. ----- 2251,2257 ---- -- ;; -- -- irix) --! major=`expr $current - $age` -- verstring="sgi$major.$revision" -- -- # Add in all the interfaces that we are compatible with. -+diff -ur misc/freetype-2.0.5/builds/compiler/visualc.mk misc/build/freetype-2.0.5/builds/compiler/visualc.mk -+--- misc/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:47:57 2001 -++++ misc/build/freetype-2.0.5/builds/compiler/visualc.mk Thu Dec 27 14:49:17 2001 -+@@ -63,7 +63,7 @@ -+ # ANSI compliance. -+ # -+ ifndef CFLAGS -+- CFLAGS := /nologo /c /Ox /G5 /W3 /WX -++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS -+ endif -+ -+ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant. -+diff -ur misc/freetype-2.0.5/builds/unix/ltmain.sh misc/build/freetype-2.0.5/builds/unix/ltmain.sh -+--- misc/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:47:56 2001 -++++ misc/build/freetype-2.0.5/builds/unix/ltmain.sh Thu Dec 27 14:49:17 2001 -+@@ -631,7 +631,7 @@ -+ if test "$build_old_libs" = yes; then -+ if test "$pic_mode" != yes; then -+ # Don't build PIC code -+- command="$base_compile $srcfile" -++ command="$base_compile $srcfile -DPIC $pic_flag" -+ else -+ # All platforms use -DPIC, to notify preprocessed assembler code. -+ command="$base_compile $srcfile $pic_flag -DPIC" -+diff -ur misc/freetype-2.0.5/include/freetype/config/ftmodule.h misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h -+--- misc/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:47:57 2001 -++++ misc/build/freetype-2.0.5/include/freetype/config/ftmodule.h Thu Dec 27 14:49:17 2001 -+@@ -1,7 +1,9 @@ -+ FT_USE_MODULE(autohint_module_class) -+ FT_USE_MODULE(cff_driver_class) -+ FT_USE_MODULE(t1cid_driver_class) -++/* -+ FT_USE_MODULE(pcf_driver_class) -++*/ -+ FT_USE_MODULE(psaux_module_class) -+ FT_USE_MODULE(psnames_module_class) -+ FT_USE_MODULE(ft_raster1_renderer_class) -+@@ -9,4 +11,6 @@ -+ FT_USE_MODULE(ft_smooth_renderer_class) -+ FT_USE_MODULE(tt_driver_class) -+ FT_USE_MODULE(t1_driver_class) -++/* -+ FT_USE_MODULE(winfnt_driver_class) -++*/ -+diff -ur misc/freetype-2.0.5/include/freetype/config/ftoption.h misc/build/freetype-2.0.5/include/freetype/config/ftoption.h -+--- misc/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:47:57 2001 -++++ misc/build/freetype-2.0.5/include/freetype/config/ftoption.h Thu Dec 27 14:51:15 2001 -+@@ -70,7 +70,10 @@ -+ /* All convenience functions are declared as such in their */ -+ /* documentation. */ -+ /* */ -++/* -+ #undef FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -++*/ -++#define FT_CONFIG_OPTION_NO_CONVENIENCE_FUNCS -+ -+ -+ /*************************************************************************/ -+@@ -108,8 +111,10 @@ -+ /* use a vector `plotter' format that isn't supported when this */ -+ /* macro is undefined. */ -+ /* */ -++/* -+ #define FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+- -++*/ -++#undef FT_CONFIG_OPTION_ALTERNATE_GLYPH_FORMATS -+ -+ /*************************************************************************/ -+ /* */ -+@@ -338,7 +343,7 @@ -+ /* By undefining this, you will only compile the code necessary to load */ -+ /* TrueType glyphs without hinting. */ -+ /* */ -+-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER -++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER -+ -+ -+ /*************************************************************************/ ---- vcl/util/makefile.pmk.orig Mon Apr 28 10:25:02 2003 -+++ vcl/util/makefile.pmk Mon Apr 28 10:25:17 2003 -@@ -67,7 +67,7 @@ - .IF "$(remote)" != "" - USE_BUILTIN_RASTERIZER=true - .ENDIF --.IF "$(GUI)" == "UNX" -+.IF "$(GUI)" == "UNX" && "$(OS)" != "FREEBSD" - USE_BUILTIN_RASTERIZER=true - .ENDIF - diff --git a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch b/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch deleted file mode 100644 index 174bd03fac25..000000000000 --- a/editors/openoffice-1.0/files/patch-berkeleydb+db-3.2.9.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- berkeleydb/db-3.2.9.patch.orig Sun Jan 19 14:58:19 2003 -+++ berkeleydb/db-3.2.9.patch Sun Jan 19 15:00:02 2003 -@@ -62,54 +62,57 @@ - solaris*) JINCSUBDIRS="solaris";; - linux*) JINCSUBDIRS="linux genunix";; - + irix*) JINCSUBDIRS="irix";; --+ netbsd*) JINCSUBDIRS="netbsd linux solaris genunix";; -++ freebsd*) JINCSUBDIRS="freebsd linux solaris genunix";; - *) JINCSUBDIRS="genunix";; - esac - - *** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 - --- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 --*************** --*** 1194,1204 **** -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then --- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' --- else -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -- # can we support soname and/or expsyms with a.out? -oliva -- fi -- ;; -- ----- 1194,1205 ---- -- -- netbsd*) -- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -- # can we support soname and/or expsyms with a.out? -oliva --+ else --+ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' --+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' --+ need_version=no -- fi -- ;; -- --*** misc/db-3.2.9/dist/ltconfig Fri Oct 13 16:23:00 2000 ----- misc/build/db-3.2.9/dist/ltconfig Tue Jan 7 11:37:05 2003 --*************** --*** 1955,1961 **** -- version_type=irix -- need_lib_prefix=no -- need_version=no --! soname_spec='${libname}${release}.so.$major' -- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -- case "$host_os" in -- irix5*) ----- 1955,1961 ---- -- version_type=irix -- need_lib_prefix=no -- need_version=no --! soname_spec='${libname}${release}.so' -- library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -- case "$host_os" in -- irix5*) -+@@ -1202,6 +1202,17 @@ -+ fi -+ ;; -+ -++ freebsd*) -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' -++ # can we support soname and/or expsyms with a.out? -oliva -++ else -++ archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' -++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -++ need_version=no -++ fi -++ ;; -++ -+ solaris* | sysv5*) -+ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+@@ -1955,7 +1966,7 @@ -+ version_type=irix -+ need_lib_prefix=no -+ need_version=no -+- soname_spec='${libname}${release}.so.$major' -++ soname_spec='${libname}${release}.so' -+ library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so' -+ case "$host_os" in -+ irix5*) -+@@ -2019,6 +2030,20 @@ -+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -+ soname_spec='${libname}${release}.so$major' -+ dynamic_linker='NetBSD ld.elf_so' -++ fi -++ shlibpath_var=LD_LIBRARY_PATH -++ ;; -++ -++freebsd*) -++ version_type=sunos -++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -++ library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' -++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -++ dynamic_linker='FreeBSD (a.out) ld.so' -++ else -++ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' -++ soname_spec='${libname}${release}.so$major' -++ dynamic_linker='FreeBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; diff --git a/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk b/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk deleted file mode 100644 index 43fee3b58750..000000000000 --- a/editors/openoffice-1.0/files/patch-berkeleydb+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- berkeleydb/makefile.mk.orig Sat Apr 12 14:45:40 2003 -+++ berkeleydb/makefile.mk Sat Apr 12 14:46:29 2003 -@@ -84,7 +84,9 @@ - - BUILD_DIR=$(CONFIGURE_DIR) - BUILD_ACTION=make -+.IF "$(OS)"!="FREEBSD" - BUILD_FLAGS=-j$(MAXPROCESS) -+.ENDIF - - OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so - diff --git a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst b/editors/openoffice-1.0/files/patch-bridges+prj+build.lst deleted file mode 100644 index bcf3a8aa850f..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+prj+build.lst +++ /dev/null @@ -1,11 +0,0 @@ ---- bridges/prj/build.lst.orig Tue Mar 19 22:06:50 2002 -+++ bridges/prj/build.lst Tue Jun 4 12:24:46 2002 -@@ -9,6 +9,8 @@ - br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL - br bridges\source\cpp_uno\gcc3_linux_intel nmake - u br_gcc3li br_unotypes NULL - br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc2_freebsd_intel-sjlj nmake - u br_gccfi br_unotypes NULL -+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL - br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL - br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL - br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk deleted file mode 100644 index 011bc09d09a7..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk.orig Fri May 31 10:22:18 2002 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel/makefile.mk Fri May 31 10:22:46 2002 -@@ -76,7 +76,7 @@ - - # --- Files -------------------------------------------------------- - --.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI" -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-dwarf2" - - CFLAGSNOOPT=-O0 - NOOPTFILES=$(SLO)$/uno2cpp.obj diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj deleted file mode 100644 index d4eeabf5c05a..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj +++ /dev/null @@ -1,1734 +0,0 @@ ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/cpp2uno.cxx Tue Jun 4 10:49:43 2002 -@@ -0,0 +1,615 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#define LEAK_STATIC_DATA -+// #define TRACE(x) OSL_TRACE(x) -+#define TRACE(x) -+ -+#include -+#if STLPORT_VERSION<321 -+#include -+#include -+#else -+#include -+#include -+#endif -+#include -+#ifndef _RTL_ALLOC_H_ -+#include -+#endif -+#ifndef _OSL_MUTEX_HXX_ -+#include -+#endif -+ -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include -+#endif -+#ifndef _UNO_DATA_H_ -+#include -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace com::sun::star::uno; -+using namespace std; -+using namespace osl; -+using namespace rtl; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ gcc291_freebsd_intel_raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, -+ "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( OUString::createFromAscii("illegal vtable index!"), (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( OUString::createFromAscii("no member description found!"), (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+class MediateClassData -+{ -+public: -+ struct ClassDataBuffer -+ { -+ void* m_pVTable; -+ -+ ~ClassDataBuffer(); -+ }; -+private: -+ -+ map< OUString, ClassDataBuffer* > m_aClassData; -+ Mutex m_aMutex; -+ -+ void createVTable( ClassDataBuffer*, typelib_InterfaceTypeDescription* ); -+public: -+ const ClassDataBuffer* getClassData( typelib_InterfaceTypeDescription* ); -+ -+ MediateClassData() {} -+ ~MediateClassData(); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::ClassDataBuffer::~ClassDataBuffer() -+{ -+ delete m_pVTable; -+} -+ -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() -+{ -+ TRACE( "> calling ~MediateClassData(): freeing mediate vtables... <\n" ); -+ -+ // this MUST be the absolute last one which is called! -+ for ( map< OUString, ClassDataBuffer* >::iterator iPos( m_aClassData.begin() ); iPos != m_aClassData.end(); ++iPos ) -+ { -+ // todo -+// delete (*iPos).second; -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+const MediateClassData::ClassDataBuffer* MediateClassData::getClassData( typelib_InterfaceTypeDescription* pType ) -+{ -+ MutexGuard aGuard( m_aMutex ); -+ -+ map< OUString, ClassDataBuffer* >::iterator element = m_aClassData.find( pType->aBase.pTypeName ); -+ if( element != m_aClassData.end() ) -+ return (*element).second; -+ -+ ClassDataBuffer* pBuffer = new ClassDataBuffer(); -+ createVTable( pBuffer, pType ); -+ m_aClassData[ pType->aBase.pTypeName ] = pBuffer; -+ return pBuffer; -+} -+ -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ -+ typelib_TypeClass aType = -+ cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+//__________________________________________________________________________________________________ -+ -+void MediateClassData::createVTable( ClassDataBuffer* pBuffer, typelib_InterfaceTypeDescription* pType ) -+{ -+ // get all member functions -+ list< sal_Bool > aComplexReturn; -+ -+ for( int n = 0; n < pType->nAllMembers; n++ ) -+ { -+ typelib_TypeDescription* pMember = NULL; -+ TYPELIB_DANGER_GET( &pMember, pType->ppAllMembers[n] ); -+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE ) -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceAttributeTypeDescription *)pMember)->pAttributeTypeRef ); -+ // get method -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ // set method -+ if( ! ((typelib_InterfaceAttributeTypeDescription*)pMember)->bReadOnly ) -+ aComplexReturn.push_back( sal_False ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ else -+ { -+ typelib_TypeDescription * pRetTD = 0; -+ TYPELIB_DANGER_GET( &pRetTD, ((typelib_InterfaceMethodTypeDescription *)pMember)->pReturnTypeRef ); -+ aComplexReturn.push_back( !cppu_isSimpleType( pRetTD ) ); -+ TYPELIB_DANGER_RELEASE( pRetTD ); -+ } -+ TYPELIB_DANGER_RELEASE( pMember ); -+ } -+ -+ int nSize = aComplexReturn.size(); -+ char * pSpace = (char *)rtl_allocateMemory( (2*(nSize+1)*sizeof(void *)) + (nSize*20) ); -+ pBuffer->m_pVTable = (void*)pSpace; -+ -+ char * pCode = pSpace + (2*(nSize+1)*sizeof(void *)); -+ void ** pvft = (void **)pSpace; -+ pvft[0] = NULL; -+ pvft[1] = NULL; -+ -+ // setup vft and code -+ for ( sal_Int32 nPos = 0; nPos < nSize; ++nPos ) -+ { -+ unsigned char * codeSnip = (unsigned char *)pCode + (nPos*20); -+ pvft[(nPos << 1) + 2 ] = NULL; -+ pvft[(nPos << 1) + 3 ] = codeSnip; -+ -+ // mov $nPos, %eax -+ *codeSnip++ = 0xb8; -+ *(sal_Int32 *)codeSnip = nPos | ( aComplexReturn.front() ? 0x80000000 : 0 ); -+ codeSnip += sizeof(sal_Int32); -+ aComplexReturn.pop_front(); -+ // mov %esp, %edx -+ *codeSnip++ = 0x89; -+ *codeSnip++ = 0xe2; -+ // jmp cpp_vtable_call -+ *codeSnip++ = 0xe9; -+ *(sal_Int32 *)codeSnip = ((unsigned char *)cpp_vtable_call) - codeSnip - sizeof(sal_Int32); -+ codeSnip += sizeof(sal_Int32); -+ } -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(const void **)pCppI = s_pMediateClassData->getClassData( pTypeDescr )->m_pVTable; -+} -+ -+} -+ -+//################################################################################################## -+extern "C" SAL_DLLEXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( pCppEnv ); -+} -+//################################################################################################## -+extern "C" SAL_DLLEXPORT void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( ppMapping, pFrom, pTo ); -+} -+ - ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/except.cxx Tue Jun 4 10:49:44 2002 -@@ -0,0 +1,365 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+#include -+#include -+#include -+#if STLPORT_VERSION<321 -+#include -+#else -+#include -+#endif -+#ifndef _RTL_ALLOC_H_ -+#include -+#endif -+#ifndef _OSL_DIAGNOSE_H_ -+#include -+#endif -+ -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include -+#endif -+#ifndef _TYPELIB_TYPEDESCRIPTION_HXX_ -+#include -+#endif -+#ifndef _COM_SUN_STAR_UNO_ANY_HXX_ -+#include -+#endif -+ -+#include -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+#ifdef DEBUG -+#include -+#endif -+ -+using namespace std; -+using namespace osl; -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static OString toUNOname( const OString & rRTTIname ) -+{ -+ OString aRet; -+ -+ sal_Char* pStr = rRTTIname.getStr(); -+ sal_Char* pOrg = pStr; -+ -+ // check for namespace -+ if( *pStr == '_' ) -+ pStr++; -+ if( *pStr == 'Q' ) -+ { -+ pStr++; -+ if( *pStr++ == '_' ) -+ { -+ while( *pStr++ != '_' ) -+ ; -+ } -+ } -+ -+ while( *pStr ) -+ { -+ int nCharsToCopy = 0; -+ while( *pStr >= '0' && *pStr <= '9' ) -+ nCharsToCopy = 10*nCharsToCopy + (int)(*pStr++ - '0'); -+ if( aRet.getLength() ) -+ aRet += "."; -+ aRet += rRTTIname.copy( pStr - pOrg, nCharsToCopy ); -+ pStr += nCharsToCopy; -+ } -+ -+ return aRet; -+} -+//================================================================================================== -+static OString toRTTIname( const OString & rUNOname ) -+{ -+ if( ! rUNOname.getLength() ) -+ return OString(); -+ -+ OStringBuffer aRet( 64 ); -+ -+ sal_Int32 nIndex = 0; -+ sal_Int32 nToken = 0; -+ do -+ { -+ OString aToken( rUNOname.getToken( 0, '.', nIndex ) ); -+ aRet.append( OString::valueOf( (sal_Int32)aToken.getLength() ) ); -+ aRet.append( aToken ); -+ ++nToken; -+ } -+ while (nIndex >= 0); -+ -+ OString ret( aRet.makeStringAndClear() ); -+ -+ if( nToken >= 2 ) -+ { -+ OStringBuffer buf( 64 ); -+ buf.append( 'Q' ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( OString::valueOf( (sal_Int32)nToken ) ); -+ if( nToken > 9 ) -+ aRet.append( '_' ); -+ buf.append( ret ); -+ ret = buf.makeStringAndClear(); -+ } -+ -+ return ret; -+} -+ -+ -+//################################################################################################## -+//#### RTTI simulation ############################################################################# -+//################################################################################################## -+ -+class RTTIHolder -+{ -+ static std::map< OString, void* > aAllRTTI; -+public: -+ static void* getRTTI( const OString& rTypename ); -+ static void* getRTTI_UnoName( const OString& rUnoTypename ) -+ { return getRTTI( toRTTIname( rUnoTypename ) ); } -+ -+ static void* insertRTTI( const OString& rTypename ); -+ static void* insertRTTI_UnoName( const OString& rTypename ) -+ { return insertRTTI( toRTTIname( rTypename ) ); } -+ -+ // rSuperTypename MUST exist !!! -+ static void* insertRTTI( const OString& rTypename, const OString& rSuperTypename ); -+ static void* insertRTTI_UnoNames( const OString& rTypename, const OString& rSuperTypename ) -+ { return insertRTTI( toRTTIname( rTypename ), toRTTIname( rSuperTypename ) ); } -+ -+ // for complex RTTI -+ static void* insertRTTI( const OString& rTypename, void* pRTTI ); -+ static void* insertRTTI_UnoName( const OString&rTypename, void* pRTTI ) -+ { return insertRTTI( toRTTIname( rTypename ), pRTTI ); } -+}; -+ -+std::map< OString, void* > RTTIHolder::aAllRTTI; -+ -+void* RTTIHolder::getRTTI( const OString& rTypename ) -+{ -+ std::map< OString, void* >::iterator element; -+ -+ element = aAllRTTI.find( rTypename ); -+ return element != aAllRTTI.end() ? (*element).second : NULL; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating base RTTI: %s\n", rTypename.getStr() ); -+#endif -+ void* pRTTI = new __user_type_info( strdup( rTypename.getStr() ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, const OString& rSuperTypename ) -+{ -+#ifdef DEBUG -+ fprintf( stderr, "generating subclass RTTI: %s %s\n", rTypename.getStr(), rSuperTypename.getStr() ); -+#endif -+ OSL_ENSURE( ! getRTTI( rTypename ), "insert RTTI called on already existing type" ); -+ void* pRTTI = new __si_type_info( strdup( rTypename.getStr() ), *(__user_type_info*)getRTTI( rSuperTypename ) ); -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+void* RTTIHolder::insertRTTI( const OString& rTypename, void* pRTTI ) -+{ -+ aAllRTTI[ rTypename ] = pRTTI; -+ return pRTTI; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static void* generateRTTI( typelib_CompoundTypeDescription * pCompTypeDescr ) -+{ -+ OString aCompTypeName( OUStringToOString( pCompTypeDescr->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) ); -+ void* pRTTI = RTTIHolder::getRTTI_UnoName( aCompTypeName ); -+ if( pRTTI ) -+ return pRTTI; -+ -+ if( ! pCompTypeDescr->pBaseTypeDescription ) -+ // this is a base type -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName ); -+ if( ! pCompTypeDescr->pBaseTypeDescription->pBaseTypeDescription ) -+ { -+ OString aBasename( -+ OUStringToOString( pCompTypeDescr->pBaseTypeDescription->aBase.pTypeName, RTL_TEXTENCODING_ASCII_US ) -+ ); -+ if( ! RTTIHolder::getRTTI_UnoName( aBasename ) ) -+ RTTIHolder::insertRTTI_UnoName( aBasename ); -+ -+ // this type has only one supertype -+ return RTTIHolder::insertRTTI_UnoNames( aCompTypeName, aBasename ); -+ } -+ -+ // create __si_type_info -+ void* pSuperRTTI = generateRTTI( pCompTypeDescr->pBaseTypeDescription ); -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+#ifdef DEBUG -+ fprintf( stderr, "generating RTTI: %s\n", aCompTypeRTTIname.getStr() ); -+#endif -+ pRTTI = new __si_type_info( strdup( aCompTypeRTTIname.getStr() ), -+ *(__user_type_info*)pSuperRTTI ); -+#if 0 -+ __class_type_info::base_info* pBaseInfo = new __class_type_info::base_info; -+ pBaseInfo->base = (__user_type_info*)pSuperRTTI; -+ pBaseInfo->offset = 0; -+ pBaseInfo->is_virtual = 0; -+ pBaseInfo->access1 = __class_type_info::PUBLIC; -+ -+ OString aCompTypeRTTIname( toRTTIname( aCompTypeName ) ); -+ pRTTI = new __class_type_info( -+ strdup( aCompTypeRTTIname.getStr() ), -+ pBaseInfo, -+ 1 -+ ); -+#endif -+ return RTTIHolder::insertRTTI_UnoName( aCompTypeName, pRTTI ); -+} -+ -+//-------------------------------------------------------------------------------------------------- -+ -+static Mutex s_aMutex; -+static std::map< void*, typelib_TypeDescription* > aExceptionMap; -+ -+static void deleteException( void* pExc, int nDummy ) -+{ -+ MutexGuard aGuard( s_aMutex ); -+ std::map< void*, typelib_TypeDescription* >::iterator element = -+ aExceptionMap.find( pExc ); -+ OSL_ASSERT( element != aExceptionMap.end() ); -+ if( element != aExceptionMap.end() ) -+ { -+ typelib_TypeDescription* pType = (*element).second; -+ aExceptionMap.erase( pExc ); -+ uno_destructData( pExc, pType, cpp_release ); -+ typelib_typedescription_release( pType ); -+ } -+} -+ -+//__________________________________________________________________________________________________ -+ -+//################################################################################################## -+//#### exported #################################################################################### -+//################################################################################################## -+ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ typelib_typedescriptionreference_getDescription( &pTypeDescr, pUnoExc->pType ); -+ -+ void * pCppExc = __eh_alloc( pTypeDescr->nSize ); // will be released in generated dtor -+ uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ uno_any_destruct( pUnoExc, 0 ); -+ -+ // a must be -+ OSL_ENSURE( sizeof(sal_Int32) == sizeof(void *), "### pointer size differs from sal_Int32!" ); -+ -+ typelib_CompoundTypeDescription * pCompTypeDescr = (typelib_CompoundTypeDescription *)pTypeDescr; -+ void* pRTTI = generateRTTI( pCompTypeDescr ); -+ -+ { -+ MutexGuard aGuard( s_aMutex ); -+ aExceptionMap[ pCppExc ] = pTypeDescr; -+ } -+ -+ __cp_push_exception( pCppExc, pRTTI, deleteException ); -+ __sjthrow(); -+} -+ -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info* pInfo, uno_Any* pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OUString aName( OStringToOUString( -+ toUNOname( ((__user_type_info*)(pInfo->type))->name() ), RTL_TEXTENCODING_ASCII_US ) ); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ typelib_typedescription_getByName( -+ &pExcTypeDescr, -+ aName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "could not get type description for exception" ); -+ if (pExcTypeDescr) -+ { -+ // construct cpp exception any -+ Any aAny( pInfo->value, pExcTypeDescr ); // const_cast -+ typelib_typedescription_release( pExcTypeDescr ); -+ // construct uno exception any -+ typelib_TypeDescription* pAnyDescr = 0; -+ getCppuType( (const Any *)0 ).getDescription( &pAnyDescr ); -+ uno_copyAndConvertData( pExc, &aAny, pAnyDescr, pCpp2Uno ); -+ typelib_typedescription_release( pAnyDescr ); -+ } -+} -+ -+} -+ - ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/gcc2_freebsd_intel.hxx Tue Jun 4 10:49:36 2002 -@@ -0,0 +1,153 @@ -+/************************************************************************* -+ * -+ * $RCSfile: gcc2_freebsd_intel.hxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#ifndef _RTL_STRING_HXX_ -+#include -+#endif -+#include -+ -+typedef struct _uno_Any uno_Any; -+typedef struct _uno_Mapping uno_Mapping; -+ -+// private egcs type info structs -+ -+// type_info for a simple class ( no base classes or an enum ) -+struct __user_type_info : public std::type_info { -+ __user_type_info (const char *n) : type_info (n) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+// type_info for a class with one public, nonvirtual base class. -+ -+class __si_type_info : public __user_type_info { -+ const __user_type_info &base; -+ -+public: -+ __si_type_info (const char *n, const __user_type_info &b) -+ : __user_type_info (n), base (b) { } -+ -+ // dynamic cast. built by gcc -+ virtual void *dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+// type_info for a general class. -+ -+typedef unsigned int USItype __attribute__ ((mode (SI))); -+ -+struct __class_type_info : public __user_type_info { -+ enum access { PUBLIC = 1, PROTECTED = 2, PRIVATE = 3 }; -+ -+ struct base_info { -+ const __user_type_info *base; -+ USItype offset: 29; -+ bool is_virtual: 1; -+ access access1: 2; -+ }; -+ -+ const base_info *base_list; -+ size_t n_bases; -+ -+ __class_type_info (const char *name, const base_info *bl, size_t bn) -+ : __user_type_info (name), base_list (bl), n_bases (bn) {} -+ -+ // dynamic cast. built by gcc -+ virtual void* dcast (const type_info &, int, void *, -+ const type_info * = 0, void * = 0) const; -+}; -+ -+struct cp_eh_info -+{ -+ struct __eh_info -+ { -+ void* match_function; -+ short language; -+ short version; -+ }; -+ __eh_info eh_info; -+ void *value; -+ void *type; -+ void (*cleanup)(void *, int); -+ bool caught; -+ cp_eh_info *next; -+ long handlers; -+ void *original_value; -+}; -+ -+extern "C" { -+ void __cp_push_exception( void*, void*, void(*)(void*, int) ); -+ void __sjthrow(void) __attribute__ ((__noreturn__)); -+} -+ -+//################################################################################################## -+//#### exceptions ################################################################################## -+//################################################################################################## -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void gcc291_freebsd_intel_raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+void gcc291_freebsd_intel_fillUnoException( cp_eh_info*, uno_Any*, uno_Mapping * pCpp2Uno ); -+ -+} -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/makefile.mk Tue Jun 4 12:20:58 2002 -@@ -0,0 +1,109 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.1 $ -+# -+# last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc2_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)-$(EXCEPTIONS)" == "GCCFREEBSDIgcc2-sjlj" -+ -+CFLAGSNOOPT=-O0 -+NOOPTFILES=$(SLO)$/uno2cpp.obj -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF= $(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB= i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ -diff -ruN /dev/null ../bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx ---- /dev/null Thu Jan 1 01:00:00 1970 -+++ bridges/source/cpp_uno/gcc2_freebsd_intel-sjlj/uno2cpp.cxx Tue Jun 4 10:49:44 2002 -@@ -0,0 +1,473 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: svesik $ $Date: 2001/11/12 22:43:04 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include -+#ifndef _RTL_ALLOC_H_ -+#include -+#endif -+ -+#ifndef _UNO_DATA_H_ -+#include -+#endif -+#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_ -+#include -+#endif -+#ifndef _BRIDGES_CPP_UNO_TYPE_MISC_HXX_ -+#include -+#endif -+ -+#include "gcc2_freebsd_intel.hxx" -+ -+using namespace rtl; -+using namespace com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+static void callVirtualMethod( void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs, -+ sal_Int32 nThisOffset ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && -+ (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ __asm__ ( -+ // copy values -+ "pushl %%edx\n\t" -+ "pushl %%ecx\n\t" -+ "pushl %%eax\n\t" -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "mov 0(%%edx), %%ecx\n\t" -+ "sub $4, %%edx\n\t" -+ "push %%ecx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n" -+ "Lcall:\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "add $1, %%eax\n\t" // first entry is reserved -+ "shl $3, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov %4, %%eax\n\t" -+ "movswl (%%edx), %%ecx\n\t" -+ "add %%esp, %%eax\n\t" -+ "add %%ecx, (%%eax)\n\t" -+ "mov 4(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %5\n\t" -+ "mov %%edx, %6\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ "popl %%eax\n\t" -+ "popl %%ecx\n\t" -+ "popl %%edx\n\t" -+ : : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), -+ "m"(nThisOffset), "m"(eax), "m"(edx) ); -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__ ( -+ "fstps %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__ ( -+ "fstpl %0\n\t" -+ : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ sal_Int32 nThisOffset = 0; -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ nThisOffset = sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32), -+ nThisOffset); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch( ... ) -+ { -+ // get exception -+ cp_eh_info* pEHInfo = (cp_eh_info*)__cp_eh_info(); -+ gcc291_freebsd_intel_fillUnoException( pEHInfo, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel b/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel deleted file mode 100644 index bda7f0e32487..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel +++ /dev/null @@ -1,1608 +0,0 @@ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/cpp2uno.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,594 @@ -+/************************************************************************* -+ * -+ * $RCSfile: cpp2uno.cxx,v $ -+ * -+ * $Revision: 1.3 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/10/26 07:22:57 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include -+#include -+ -+#include -+#include -+ -+#include -+#include -+ -+#include -+#include -+ -+#include "share.hxx" -+ -+ -+using namespace ::osl; -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+//================================================================================================== -+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; -+ -+//================================================================================================== -+static typelib_TypeClass cpp2uno_call( -+ cppu_cppInterfaceProxy * pThis, -+ const typelib_TypeDescription * pMemberTypeDescr, -+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ // pCallStack: ret, [return ptr], this, params -+ char * pCppStack = (char *)(pCallStack +1); -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ if (pReturnTypeRef) -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ -+ void * pUnoReturn = 0; -+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pUnoReturn = pRegisterReturn; // direct way for simple types -+ } -+ else // complex return via ptr (pCppReturn) -+ { -+ pCppReturn = *(void **)pCppStack; -+ pCppStack += sizeof(void *); -+ -+ pUnoReturn = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pCppReturn); // direct way -+ } -+ } -+ // pop this -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // parameters -+ void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams ); -+ void ** pCppArgs = pUnoArgs + nParams; -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams)); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) // value -+ { -+ pCppArgs[nPos] = pCppStack; -+ pUnoArgs[nPos] = pCppStack; -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ pCppArgs[nPos] = *(void **)pCppStack; -+ -+ if (! rParam.bIn) // is pure out -+ { -+ // uno out is unconstructed mem! -+ pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ); -+ pTempIndizes[nTempIndizes] = nPos; -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ *(void **)pCppStack, pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ pUnoArgs[nPos] = *(void **)pCppStack; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ // ExceptionHolder -+ uno_Any aUnoExc; // Any will be constructed by callee -+ uno_Any * pUnoExc = &aUnoExc; -+ -+ // invoke uno dispatch call -+ (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc ); -+ -+ // in case an exception occured... -+ if (pUnoExc) -+ { -+ // destruct temporary in/inout params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) // is in/inout => was constructed -+ uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ -+ raiseException( &aUnoExc, &pThis->pBridge->aUno2Cpp ); // has to destruct the any -+ // is here for dummy -+ return typelib_TypeClass_VOID; -+ } -+ else // else no exception occured... -+ { -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bOut) // inout/out -+ { -+ // convert and assign -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ } -+ // destroy temp uno param -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return -+ if (pCppReturn) // has complex return -+ { -+ if (pUnoReturn != pCppReturn) // needs reconversion -+ { -+ uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ // destroy temp uno return -+ uno_destructData( pUnoReturn, pReturnTypeDescr, 0 ); -+ } -+ // complex return ptr is set to eax -+ *(void **)pRegisterReturn = pCppReturn; -+ } -+ if (pReturnTypeDescr) -+ { -+ typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass; -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ return eRet; -+ } -+ else -+ return typelib_TypeClass_VOID; -+ } -+} -+ -+ -+//================================================================================================== -+static typelib_TypeClass cpp_mediate( -+ sal_Int32 nVtableCall, -+ void ** pCallStack, -+ sal_Int64 * pRegisterReturn /* space for register return */ ) -+{ -+ OSL_ENSURE( sizeof(sal_Int32)==sizeof(void *), "### unexpected!" ); -+ -+ // pCallStack: ret adr, [ret *], this, params -+ // _this_ ptr is patched cppu_XInterfaceProxy object -+ cppu_cppInterfaceProxy * pCppI = NULL; -+ if( nVtableCall & 0x80000000 ) -+ { -+ nVtableCall &= 0x7fffffff; -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +2); -+ } -+ else -+ { -+ pCppI = (cppu_cppInterfaceProxy *)(XInterface *)*(pCallStack +1); -+ } -+ -+ typelib_InterfaceTypeDescription * pTypeDescr = pCppI->pTypeDescr; -+ -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ if (nVtableCall >= pTypeDescr->nMapFunctionIndexToMemberIndex) -+ { -+ throw RuntimeException( -+ OUString::createFromAscii("illegal vtable index!"), -+ (XInterface *)pCppI ); -+ } -+ -+ // determine called method -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nVtableCall]; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!" ); -+ -+ TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] ); -+ -+ typelib_TypeClass eRet; -+ switch (aMemberDescr.get()->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ if (pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nVtableCall) -+ { -+ // is GET method -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef, -+ 0, 0, // no params -+ pCallStack, pRegisterReturn ); -+ } -+ else -+ { -+ // is SET method -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)aMemberDescr.get())->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ 0, // indicates void return -+ 1, &aParam, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // is METHOD -+ switch (nVtableCall) -+ { -+ case 1: // acquire() -+ pCppI->acquireProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 2: // release() -+ pCppI->releaseProxy(); // non virtual call! -+ eRet = typelib_TypeClass_VOID; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pCallStack[3] )->getTypeLibType() ); -+ if (pTD) -+ { -+ XInterface * pInterface = 0; -+ (*pCppI->pBridge->pCppEnv->getRegisteredInterface)( -+ pCppI->pBridge->pCppEnv, -+ (void **)&pInterface, pCppI->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pCallStack[1] ), -+ &pInterface, pTD, cpp_acquire ); -+ pInterface->release(); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *(void **)pRegisterReturn = pCallStack[1]; -+ eRet = typelib_TypeClass_ANY; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ eRet = cpp2uno_call( -+ pCppI, aMemberDescr.get(), -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)aMemberDescr.get())->pParams, -+ pCallStack, pRegisterReturn ); -+ } -+ break; -+ } -+ default: -+ { -+ throw RuntimeException( -+ OUString::createFromAscii("no member description found!"), -+ (XInterface *)pCppI ); -+ // is here for dummy -+ eRet = typelib_TypeClass_VOID; -+ } -+ } -+ -+ return eRet; -+} -+ -+//================================================================================================== -+/** -+ * is called on incoming vtable calls -+ * (called by asm snippets) -+ */ -+static void cpp_vtable_call( int nTableEntry, void** pCallStack ) __attribute__((regparm(2))); -+ -+void cpp_vtable_call( int nTableEntry, void** pCallStack ) -+{ -+ volatile long nRegReturn[2]; -+ typelib_TypeClass aType = cpp_mediate( nTableEntry, pCallStack, (sal_Int64*)nRegReturn ); -+ -+ switch( aType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ __asm__( "movl %1, %%edx\n\t" -+ "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]), "m"(nRegReturn[1]) ); -+ break; -+ case typelib_TypeClass_FLOAT: -+ __asm__( "flds %0\n\t" -+ "fstp %%st(0)\n\t" -+ "flds %0\n" -+ : : "m"(*(float *)nRegReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ __asm__( "fldl %0\n\t" -+ "fstp %%st(0)\n\t" -+ "fldl %0\n" -+ : : "m"(*(double *)nRegReturn) ); -+ break; -+// case typelib_TypeClass_UNSIGNED_SHORT: -+// case typelib_TypeClass_SHORT: -+// __asm__( "movswl %0, %%eax\n" -+// : : "m"(nRegReturn) ); -+// break; -+ default: -+ __asm__( "movl %0, %%eax\n" -+ : : "m"(nRegReturn[0]) ); -+ break; -+ } -+} -+ -+ -+//================================================================================================== -+class MediateClassData -+{ -+ typedef ::std::hash_map< OUString, void *, OUStringHash > t_classdata_map; -+ t_classdata_map m_map; -+ Mutex m_mutex; -+ -+public: -+ void const * get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () ); -+ -+ inline MediateClassData() SAL_THROW( () ) -+ {} -+ ~MediateClassData() SAL_THROW( () ); -+}; -+//__________________________________________________________________________________________________ -+MediateClassData::~MediateClassData() SAL_THROW( () ) -+{ -+ OSL_TRACE( "> calling ~MediateClassData(): freeing mediate vtables." ); -+ -+ for ( t_classdata_map::const_iterator iPos( m_map.begin() ); iPos != m_map.end(); ++iPos ) -+ { -+ ::rtl_freeMemory( iPos->second ); -+ } -+} -+//-------------------------------------------------------------------------------------------------- -+static inline void codeSnippet( char * code, sal_uInt32 vtable_pos, bool simple_ret_type ) SAL_THROW( () ) -+{ -+ if (! simple_ret_type) -+ vtable_pos |= 0x80000000; -+ OSL_ASSERT( sizeof (long) == 4 ); -+ // mov $nPos, %eax -+ *code++ = 0xb8; -+ *(long *)code = vtable_pos; -+ code += sizeof (long); -+ // mov %esp, %edx -+ *code++ = 0x89; -+ *code++ = 0xe2; -+ // jmp cpp_vtable_call -+ *code++ = 0xe9; -+ *(long *)code = ((char *)cpp_vtable_call) - code - sizeof (long); -+} -+//__________________________________________________________________________________________________ -+void const * MediateClassData::get_vtable( typelib_InterfaceTypeDescription * pTD ) SAL_THROW( () ) -+{ -+ void * buffer; -+ -+ // avoiding locked counts -+ OUString const & unoName = *(OUString const *)&((typelib_TypeDescription *)pTD)->pTypeName; -+ { -+ MutexGuard aGuard( m_mutex ); -+ t_classdata_map::const_iterator iFind( m_map.find( unoName ) ); -+ if (iFind == m_map.end()) -+ { -+ // create new vtable -+ sal_Int32 nSlots = pTD->nMapFunctionIndexToMemberIndex; -+ buffer = ::rtl_allocateMemory( ((2+ nSlots) * sizeof (void *)) + (nSlots *20) ); -+ -+ ::std::pair< t_classdata_map::iterator, bool > insertion( -+ m_map.insert( t_classdata_map::value_type( unoName, buffer ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new vtable buffer failed?!" ); -+ -+ void ** slots = (void **)buffer; -+ *slots++ = 0; -+ *slots++ = 0; // rtti -+ char * code = (char *)(slots + nSlots); -+ -+ sal_uInt32 vtable_pos = 0; -+ sal_Int32 nAllMembers = pTD->nAllMembers; -+ typelib_TypeDescriptionReference ** ppAllMembers = pTD->ppAllMembers; -+ for ( sal_Int32 nPos = 0; nPos < nAllMembers; ++nPos ) -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, ppAllMembers[ nPos ] ); -+ OSL_ASSERT( pTD ); -+ if (typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass) -+ { -+ bool simple_ret = cppu_isSimpleType( -+ ((typelib_InterfaceAttributeTypeDescription *)pTD)->pAttributeTypeRef->eTypeClass ); -+ // get method -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, simple_ret ); -+ code += 20; -+ if (! ((typelib_InterfaceAttributeTypeDescription *)pTD)->bReadOnly) -+ { -+ // set method -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, true ); -+ code += 20; -+ } -+ } -+ else -+ { -+ bool simple_ret = cppu_isSimpleType( -+ ((typelib_InterfaceMethodTypeDescription *)pTD)->pReturnTypeRef->eTypeClass ); -+ *slots++ = code; -+ codeSnippet( code, vtable_pos++, simple_ret ); -+ code += 20; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ OSL_ASSERT( vtable_pos == nSlots ); -+ } -+ else -+ { -+ buffer = iFind->second; -+ } -+ } -+ -+ return ((void **)buffer +2); -+} -+ -+//================================================================================================== -+void SAL_CALL cppu_cppInterfaceProxy_patchVtable( -+ XInterface * pCppI, typelib_InterfaceTypeDescription * pTypeDescr ) throw () -+{ -+ static MediateClassData * s_pMediateClassData = 0; -+ if (! s_pMediateClassData) -+ { -+ MutexGuard aGuard( Mutex::getGlobalMutex() ); -+ if (! s_pMediateClassData) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_pMediateClassData = new MediateClassData(); -+#else -+ static MediateClassData s_aMediateClassData; -+ s_pMediateClassData = &s_aMediateClassData; -+#endif -+ } -+ } -+ *(void const **)pCppI = s_pMediateClassData->get_vtable( pTypeDescr ); -+} -+ -+} -+ -+extern "C" -+{ -+//################################################################################################## -+sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) -+ SAL_THROW_EXTERN_C() -+{ -+ return CPPU_CURRENT_NAMESPACE::g_moduleCount.canUnload( -+ &CPPU_CURRENT_NAMESPACE::g_moduleCount, pTime ); -+} -+//################################################################################################## -+void SAL_CALL uno_initEnvironment( uno_Environment * pCppEnv ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_cppenv_initEnvironment( -+ pCppEnv ); -+} -+//################################################################################################## -+void SAL_CALL uno_ext_getMapping( -+ uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) -+ SAL_THROW_EXTERN_C() -+{ -+ CPPU_CURRENT_NAMESPACE::cppu_ext_getMapping( -+ ppMapping, pFrom, pTo ); -+} -+} ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,317 @@ -+/************************************************************************* -+ * -+ * $RCSfile: except.cxx,v $ -+ * -+ * $Revision: 1.6 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/11/08 12:35:28 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include "share.hxx" -+ -+ -+using namespace ::std; -+using namespace ::osl; -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+using namespace ::__cxxabiv1; -+ -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void dummy_can_throw_anything( char const * ) -+{ -+} -+ -+//================================================================================================== -+static OUString toUNOname( char const * p ) SAL_THROW( () ) -+{ -+#ifdef DEBUG -+ char const * start = p; -+#endif -+ -+ // example: N3com3sun4star4lang24IllegalArgumentExceptionE -+ -+ OUStringBuffer buf( 64 ); -+ OSL_ASSERT( 'N' == *p ); -+ ++p; // skip N -+ -+ while ('E' != *p) -+ { -+ // read chars count -+ long n = (*p++ - '0'); -+ while ('0' <= *p && '9' >= *p) -+ { -+ n *= 10; -+ n += (*p++ - '0'); -+ } -+ buf.appendAscii( p, n ); -+ p += n; -+ if ('E' != *p) -+ buf.append( (sal_Unicode)'.' ); -+ } -+ -+#ifdef DEBUG -+ OUString ret( buf.makeStringAndClear() ); -+ OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) ); -+ fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() ); -+ return ret; -+#else -+ return buf.makeStringAndClear(); -+#endif -+} -+ -+//================================================================================================== -+class RTTI -+{ -+ typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map; -+ -+ Mutex m_mutex; -+ t_rtti_map m_rttis; -+ t_rtti_map m_generatedRttis; -+ -+ void * m_hApp; -+ -+public: -+ RTTI() SAL_THROW( () ); -+ ~RTTI() SAL_THROW( () ); -+ -+ type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () ); -+}; -+//__________________________________________________________________________________________________ -+RTTI::RTTI() SAL_THROW( () ) -+ : m_hApp( dlopen( 0, RTLD_LAZY ) ) -+{ -+} -+//__________________________________________________________________________________________________ -+RTTI::~RTTI() SAL_THROW( () ) -+{ -+ dlclose( m_hApp ); -+} -+ -+//__________________________________________________________________________________________________ -+type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () ) -+{ -+ type_info * rtti; -+ -+ OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName; -+ -+ MutexGuard guard( m_mutex ); -+ t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) ); -+ if (iFind == m_rttis.end()) -+ { -+ // RTTI symbol -+ OStringBuffer buf( 64 ); -+ buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") ); -+ sal_Int32 index = 0; -+ do -+ { -+ OUString token( unoName.getToken( 0, '.', index ) ); -+ buf.append( token.getLength() ); -+ OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) ); -+ buf.append( c_token ); -+ } -+ while (index >= 0); -+ buf.append( 'E' ); -+ -+ OString symName( buf.makeStringAndClear() ); -+ rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); -+ -+ if (rtti) -+ { -+ pair< t_rtti_map::iterator, bool > insertion( -+ m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" ); -+ } -+ else -+ { -+ // try to lookup the symbol in the generated rtti map -+ t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); -+ if (iFind == m_generatedRttis.end()) -+ { -+ // we must generate it ! -+ // symbol and rtti-name is nearly identical, -+ // the symbol is prefixed with _ZTI -+ char const * rttiName = symName.getStr() +4; -+#ifdef DEBUG -+ fprintf( stderr,"generated rtti for %s\n", rttiName ); -+#endif -+ if (pTypeDescr->pBaseTypeDescription) -+ { -+ // ensure availability of base -+ type_info * base_rtti = getRTTI( -+ (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -+ rtti = new __si_class_type_info( -+ strdup( rttiName ), (__class_type_info *)base_rtti ); -+ } -+ else -+ { -+ // this class has no base class -+ rtti = new __class_type_info( strdup( rttiName ) ); -+ } -+ -+ pair< t_rtti_map::iterator, bool > insertion( -+ m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); -+ OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" ); -+ } -+ else // taking already generated rtti -+ { -+ rtti = iFind->second; -+ } -+ } -+ } -+ else -+ { -+ rtti = iFind->second; -+ } -+ -+ return rtti; -+} -+ -+//-------------------------------------------------------------------------------------------------- -+static void deleteException( void * pExc ) -+{ -+ __cxa_exception const * header = ((__cxa_exception const *)pExc - 1); -+ typelib_TypeDescription * pTD = 0; -+ OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ ::typelib_typedescription_getByName( &pTD, unoName.pData ); -+ OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" ); -+ if (pTD) -+ { -+ ::uno_destructData( pExc, pTD, cpp_release ); -+ ::typelib_typedescription_release( pTD ); -+ } -+} -+ -+//================================================================================================== -+void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ) -+{ -+ void * pCppExc; -+ type_info * rtti; -+ -+ { -+ // construct cpp exception object -+ typelib_TypeDescription * pTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType ); -+ OSL_ASSERT( pTypeDescr ); -+ if (! pTypeDescr) -+ terminate(); -+ -+ pCppExc = __cxa_allocate_exception( pTypeDescr->nSize ); -+ ::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp ); -+ -+ // destruct uno exception -+ ::uno_any_destruct( pUnoExc, 0 ); -+ // avoiding locked counts -+ static RTTI * s_rtti = 0; -+ if (! s_rtti) -+ { -+ MutexGuard guard( Mutex::getGlobalMutex() ); -+ if (! s_rtti) -+ { -+#ifdef LEAK_STATIC_DATA -+ s_rtti = new RTTI(); -+#else -+ static RTTI rtti_data; -+ s_rtti = &rtti_data; -+#endif -+ } -+ } -+ rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr ); -+ TYPELIB_DANGER_RELEASE( pTypeDescr ); -+ OSL_ENSURE( rtti, "### no rtti for throwing exception!" ); -+ if (! rtti) -+ terminate(); -+ } -+ -+ __cxa_throw( pCppExc, rtti, deleteException ); -+} -+ -+//================================================================================================== -+void fillUnoException( __cxa_exception * header, uno_Any * pExc, uno_Mapping * pCpp2Uno ) -+{ -+ OSL_ENSURE( header, "### no exception header!!!" ); -+ if (! header) -+ terminate(); -+ -+ typelib_TypeDescription * pExcTypeDescr = 0; -+ OUString unoName( toUNOname( header->exceptionType->name() ) ); -+ ::typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData ); -+ OSL_ENSURE( pExcTypeDescr, "### can not get type description for exception!!!" ); -+ if (! pExcTypeDescr) -+ terminate(); -+ -+ // construct uno exception any -+ ::uno_any_constructAndConvert( pExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno ); -+ ::typelib_typedescription_release( pExcTypeDescr ); -+} -+ -+} -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/makefile.mk Mon Mar 4 21:24:53 2002 -@@ -0,0 +1,112 @@ -+#************************************************************************* -+# -+# $RCSfile: makefile.mk,v $ -+# -+# $Revision: 1.2 $ -+# -+# last change: $Author: dbo $ $Date: 2001/10/26 14:23:30 $ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* -+ -+PRJ=..$/..$/.. -+ -+PRJNAME=bridges -+TARGET=gcc3_uno -+LIBTARGET=no -+ENABLE_EXCEPTIONS=TRUE -+NO_BSYMBOLIC=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : svpre.mk -+.INCLUDE : settings.mk -+.INCLUDE : sv.mk -+ -+# --- Files -------------------------------------------------------- -+ -+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" -+ -+.IF "$(cppu_no_leak)" == "" -+CFLAGS += -DLEAK_STATIC_DATA -+.ENDIF -+ -+CFLAGSNOOPT=-O0 -+ -+SLOFILES= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1TARGET= $(TARGET) -+ -+SHL1DEF=$(MISC)$/$(SHL1TARGET).def -+SHL1IMPLIB=i$(TARGET) -+SHL1VERSIONMAP=..$/..$/bridge_exports.map -+ -+SHL1OBJS= \ -+ $(SLO)$/except.obj \ -+ $(SLO)$/cpp2uno.obj \ -+ $(SLO)$/uno2cpp.obj -+ -+SHL1STDLIBS= \ -+ $(CPPULIB) \ -+ $(SALLIB) -+ -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,120 @@ -+/************************************************************************* -+ * -+ * $RCSfile: share.hxx,v $ -+ * -+ * $Revision: 1.1 $ -+ * -+ * last change: $Author: dbo $ $Date: 2001/10/19 13:32:39 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include -+#include -+#include -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h -+ -+struct _Unwind_Exception -+{ -+ unsigned exception_class __attribute__((__mode__(__DI__))); -+ void * exception_cleanup; -+ unsigned private_1 __attribute__((__mode__(__word__))); -+ unsigned private_2 __attribute__((__mode__(__word__))); -+} __attribute__((__aligned__)); -+ -+struct __cxa_exception -+{ -+ ::std::type_info *exceptionType; -+ void (*exceptionDestructor)(void *); -+ -+ ::std::unexpected_handler unexpectedHandler; -+ ::std::terminate_handler terminateHandler; -+ -+ __cxa_exception *nextException; -+ -+ int handlerCount; -+ -+ int handlerSwitchValue; -+ const unsigned char *actionRecord; -+ const unsigned char *languageSpecificData; -+ void *catchTemp; -+ void *adjustedPtr; -+ -+ _Unwind_Exception unwindHeader; -+}; -+ -+extern "C" void *__cxa_allocate_exception( -+ std::size_t thrown_size ) throw(); -+extern "C" void __cxa_throw ( -+ void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); -+ -+struct __cxa_eh_globals -+{ -+ __cxa_exception *caughtExceptions; -+ unsigned int uncaughtExceptions; -+}; -+extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); -+ -+// ----- -+ -+//================================================================================================== -+void raiseException( -+ uno_Any * pUnoExc, uno_Mapping * pUno2Cpp ); -+//================================================================================================== -+void fillUnoException( -+ __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); -+} ---- /dev/null Mon Mar 4 21:33:00 2002 -+++ bridges/source/cpp_uno/gcc3_freebsd_intel/uno2cpp.cxx Mon Mar 4 21:23:27 2002 -@@ -0,0 +1,450 @@ -+/************************************************************************* -+ * -+ * $RCSfile: uno2cpp.cxx,v $ -+ * -+ * $Revision: 1.3 $ -+ * -+ * last change: $Author: hr $ $Date: 2001/10/31 14:46:47 $ -+ * -+ * The Contents of this file are made available subject to the terms of -+ * either of the following licenses -+ * -+ * - GNU Lesser General Public License Version 2.1 -+ * - Sun Industry Standards Source License Version 1.1 -+ * -+ * Sun Microsystems Inc., October, 2000 -+ * -+ * GNU Lesser General Public License Version 2.1 -+ * ============================================= -+ * Copyright 2000 by Sun Microsystems, Inc. -+ * 901 San Antonio Road, Palo Alto, CA 94303, USA -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License version 2.1, as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ * -+ * -+ * Sun Industry Standards Source License Version 1.1 -+ * ================================================= -+ * The contents of this file are subject to the Sun Industry Standards -+ * Source License Version 1.1 (the "License"); You may not use this file -+ * except in compliance with the License. You may obtain a copy of the -+ * License at http://www.openoffice.org/license.html. -+ * -+ * Software provided under this License is provided on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+ * See the License for the specific provisions governing your rights and -+ * obligations concerning the Software. -+ * -+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+ * -+ * Copyright: 2000 by Sun Microsystems, Inc. -+ * -+ * All Rights Reserved. -+ * -+ * Contributor(s): _______________________________________ -+ * -+ * -+ ************************************************************************/ -+ -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include "share.hxx" -+ -+ -+using namespace ::rtl; -+using namespace ::com::sun::star::uno; -+ -+namespace CPPU_CURRENT_NAMESPACE -+{ -+ -+void dummy_can_throw_anything( char const * ); -+ -+//================================================================================================== -+static void callVirtualMethod( -+ void * pThis, -+ sal_Int32 nVtableIndex, -+ void * pRegisterReturn, -+ typelib_TypeClass eReturnType, -+ sal_Int32 * pStackLongs, -+ sal_Int32 nStackLongs ) -+{ -+ // parameter list is mixed list of * and values -+ // reference parameters are pointers -+ -+ OSL_ENSURE( pStackLongs && pThis, "### null ptr!" ); -+ OSL_ENSURE( (sizeof(void *) == 4) && (sizeof(sal_Int32) == 4), "### unexpected size of int!" ); -+ OSL_ENSURE( nStackLongs && pStackLongs, "### no stack in callVirtualMethod !" ); -+ -+ // never called -+ if (! pThis) dummy_can_throw_anything("xxx"); // address something -+ -+ volatile long edx = 0, eax = 0; // for register returns -+ asm volatile ( -+ // copy values -+ "mov %0, %%eax\n\t" -+ "mov %%eax, %%edx\n\t" -+ "dec %%edx\n\t" -+ "shl $2, %%edx\n\t" -+ "add %1, %%edx\n" -+ "Lcopy:\n\t" -+ "pushl 0(%%edx)\n\t" -+ "sub $4, %%edx\n\t" -+ "dec %%eax\n\t" -+ "jne Lcopy\n\t" -+ // do the actual call -+ "mov %2, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "mov %3, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%edx\n\t" -+ "mov 0(%%edx), %%edx\n\t" -+ "call *%%edx\n\t" -+ // save return registers -+ "mov %%eax, %4\n\t" -+ "mov %%edx, %5\n\t" -+ // cleanup stack -+ "mov %0, %%eax\n\t" -+ "shl $2, %%eax\n\t" -+ "add %%eax, %%esp\n\t" -+ : -+ : "m"(nStackLongs), "m"(pStackLongs), "m"(pThis), "m"(nVtableIndex), "m"(eax), "m"(edx) -+ : "eax", "edx" ); -+ -+ switch( eReturnType ) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ ((long*)pRegisterReturn)[1] = edx; -+ case typelib_TypeClass_LONG: -+ case typelib_TypeClass_UNSIGNED_LONG: -+ case typelib_TypeClass_CHAR: -+ case typelib_TypeClass_ENUM: -+ ((long*)pRegisterReturn)[0] = eax; -+ break; -+ case typelib_TypeClass_SHORT: -+ case typelib_TypeClass_UNSIGNED_SHORT: -+ *(unsigned short*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_BOOLEAN: -+ case typelib_TypeClass_BYTE: -+ *(unsigned char*)pRegisterReturn = eax; -+ break; -+ case typelib_TypeClass_FLOAT: -+ asm ( "fstps %0" : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ case typelib_TypeClass_DOUBLE: -+ asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) ); -+ break; -+ } -+} -+ -+//================================================================================================== -+static void cpp_call( -+ cppu_unoInterfaceProxy * pThis, -+ sal_Int32 nVtableCall, -+ typelib_TypeDescriptionReference * pReturnTypeRef, -+ sal_Int32 nParams, typelib_MethodParameter * pParams, -+ void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc ) -+{ -+ // max space for: [complex ret ptr], values|ptr ... -+ char * pCppStack = -+ (char *)alloca( sizeof(sal_Int32) + ((nParams+2) * sizeof(sal_Int64)) ); -+ char * pCppStackStart = pCppStack; -+ -+ // return -+ typelib_TypeDescription * pReturnTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); -+ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); -+ -+ void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion -+ -+ if (pReturnTypeDescr) -+ { -+ if (cppu_isSimpleType( pReturnTypeDescr )) -+ { -+ pCppReturn = pUnoReturn; // direct way for simple types -+ } -+ else -+ { -+ // complex return via ptr -+ pCppReturn = *(void **)pCppStack = (cppu_relatesToInterface( pReturnTypeDescr ) -+ ? alloca( pReturnTypeDescr->nSize ) -+ : pUnoReturn); // direct way -+ pCppStack += sizeof(void *); -+ } -+ } -+ // push this -+ *(void**)pCppStack = pThis->pCppI; -+ pCppStack += sizeof( void* ); -+ -+ // stack space -+ OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), "### unexpected size!" ); -+ // args -+ void ** pCppArgs = (void **)alloca( 3 * sizeof(void *) * nParams ); -+ // indizes of values this have to be converted (interface conversion cpp<=>uno) -+ sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams); -+ // type descriptions for reconversions -+ typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams)); -+ -+ sal_Int32 nTempIndizes = 0; -+ -+ for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos ) -+ { -+ const typelib_MethodParameter & rParam = pParams[nPos]; -+ typelib_TypeDescription * pParamTypeDescr = 0; -+ TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef ); -+ -+ if (!rParam.bOut && cppu_isSimpleType( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr, -+ &pThis->pBridge->aUno2Cpp ); -+ -+ switch (pParamTypeDescr->eTypeClass) -+ { -+ case typelib_TypeClass_HYPER: -+ case typelib_TypeClass_UNSIGNED_HYPER: -+ case typelib_TypeClass_DOUBLE: -+ pCppStack += sizeof(sal_Int32); // extra long -+ } -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ else // ptr to complex value | ref -+ { -+ if (! rParam.bIn) // is pure out -+ { -+ // cpp out is constructed mem, uno out is not! -+ uno_constructData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pParamTypeDescr ); -+ pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ // is in/inout -+ else if (cppu_relatesToInterface( pParamTypeDescr )) -+ { -+ uno_copyAndConvertData( -+ *(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ), -+ pUnoArgs[nPos], pParamTypeDescr, &pThis->pBridge->aUno2Cpp ); -+ -+ pTempIndizes[nTempIndizes] = nPos; // has to be reconverted -+ // will be released at reconversion -+ ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr; -+ } -+ else // direct way -+ { -+ *(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos]; -+ // no longer needed -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ } -+ pCppStack += sizeof(sal_Int32); // standard parameter length -+ } -+ -+ try -+ { -+ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" ); -+ callVirtualMethod( -+ pThis->pCppI, nVtableCall, -+ pCppReturn, pReturnTypeDescr->eTypeClass, -+ (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); -+ // NO exception occured... -+ *ppUnoExc = 0; -+ -+ // reconvert temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes]; -+ -+ if (pParams[nIndex].bIn) -+ { -+ if (pParams[nIndex].bOut) // inout -+ { -+ uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ } -+ else // pure out -+ { -+ uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ } -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release ); -+ -+ TYPELIB_DANGER_RELEASE( pParamTypeDescr ); -+ } -+ // return value -+ if (pCppReturn && pUnoReturn != pCppReturn) -+ { -+ uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr, -+ &pThis->pBridge->aCpp2Uno ); -+ uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release ); -+ } -+ } -+ catch (...) -+ { -+ // fill uno exception -+ fillUnoException( __cxa_get_globals()->caughtExceptions, *ppUnoExc, &pThis->pBridge->aCpp2Uno ); -+ -+ // temporary params -+ for ( ; nTempIndizes--; ) -+ { -+ sal_Int32 nIndex = pTempIndizes[nTempIndizes]; -+ // destroy temp cpp param => cpp: every param was constructed -+ uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release ); -+ TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] ); -+ } -+ // return type -+ if (pReturnTypeDescr) -+ TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); -+ } -+} -+ -+ -+//================================================================================================== -+void SAL_CALL cppu_unoInterfaceProxy_dispatch( -+ uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr, -+ void * pReturn, void * pArgs[], uno_Any ** ppException ) throw () -+{ -+ // is my surrogate -+ cppu_unoInterfaceProxy * pThis = (cppu_unoInterfaceProxy *)pUnoI; -+ typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr; -+ -+ switch (pMemberDescr->eTypeClass) -+ { -+ case typelib_TypeClass_INTERFACE_ATTRIBUTE: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ if (pReturn) -+ { -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef, -+ 0, 0, // no params -+ pReturn, pArgs, ppException ); -+ } -+ else -+ { -+ // is SET -+ typelib_MethodParameter aParam; -+ aParam.pTypeRef = -+ ((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef; -+ aParam.bIn = sal_True; -+ aParam.bOut = sal_False; -+ -+ typelib_TypeDescriptionReference * pReturnTypeRef = 0; -+ OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") ); -+ typelib_typedescriptionreference_new( -+ &pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData ); -+ -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall +1, // get, then set method -+ pReturnTypeRef, -+ 1, &aParam, -+ pReturn, pArgs, ppException ); -+ -+ typelib_typedescriptionreference_release( pReturnTypeRef ); -+ } -+ -+ break; -+ } -+ case typelib_TypeClass_INTERFACE_METHOD: -+ { -+ // determine vtable call index -+ sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition; -+ OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" ); -+ -+ sal_Int32 nVtableCall = pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos]; -+ OSL_ENSURE( nVtableCall < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!" ); -+ -+ switch (nVtableCall) -+ { -+ // standard calls -+ case 1: // acquire uno interface -+ (*pUnoI->acquire)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 2: // release uno interface -+ (*pUnoI->release)( pUnoI ); -+ *ppException = 0; -+ break; -+ case 0: // queryInterface() opt -+ { -+ typelib_TypeDescription * pTD = 0; -+ TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() ); -+ if (pTD) -+ { -+ uno_Interface * pInterface = 0; -+ (*pThis->pBridge->pUnoEnv->getRegisteredInterface)( -+ pThis->pBridge->pUnoEnv, -+ (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD ); -+ -+ if (pInterface) -+ { -+ ::uno_any_construct( -+ reinterpret_cast< uno_Any * >( pReturn ), -+ &pInterface, pTD, 0 ); -+ (*pInterface->release)( pInterface ); -+ TYPELIB_DANGER_RELEASE( pTD ); -+ *ppException = 0; -+ break; -+ } -+ TYPELIB_DANGER_RELEASE( pTD ); -+ } -+ } // else perform queryInterface() -+ default: -+ // dependent dispatch -+ cpp_call( -+ pThis, nVtableCall, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams, -+ ((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams, -+ pReturn, pArgs, ppException ); -+ } -+ break; -+ } -+ default: -+ { -+ ::com::sun::star::uno::RuntimeException aExc( -+ OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ), -+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); -+ -+ Type const & rExcType = ::getCppuType( &aExc ); -+ // binary identical null reference -+ ::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 ); -+ } -+ } -+} -+ -+} -+ diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx deleted file mode 100644 index 5735846cf20b..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+dispatch.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/iiop/dispatch.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/iiop/dispatch.cxx,v -retrieving revision 1.5.14.1 -diff -u -r1.5.14.1 dispatch.cxx ---- bridges/source/remote/iiop/dispatch.cxx 8 Aug 2002 02:49:44 -0000 1.5.14.1 -+++ bridges/source/remote/iiop/dispatch.cxx 28 Jul 2005 12:17:15 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include --#elif defined MACOSX --#include --#include --#else --#include --#endif -+#include - - #include - diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx deleted file mode 100644 index 7a37360e6fe1..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+remote+iiop+unmarshal.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/iiop/unmarshal.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/iiop/unmarshal.cxx,v -retrieving revision 1.4.10.1 -diff -u -r1.4.10.1 unmarshal.cxx ---- bridges/source/remote/iiop/unmarshal.cxx 8 Aug 2002 02:49:44 -0000 1.4.10.1 -+++ bridges/source/remote/iiop/unmarshal.cxx 28 Jul 2005 12:18:13 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include --#elif defined MACOSX --#include --#include --#else --#include --#endif -+#include - - #include - diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx deleted file mode 100644 index cbf4f9552c70..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+proxy.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/static/proxy.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/static/proxy.cxx,v -retrieving revision 1.3.6.1 -diff -u -r1.3.6.1 proxy.cxx ---- bridges/source/remote/static/proxy.cxx 8 Aug 2002 02:49:46 -0000 1.3.6.1 -+++ bridges/source/remote/static/proxy.cxx 28 Jul 2005 12:08:44 -0000 -@@ -59,14 +59,7 @@ - * - ************************************************************************/ - #include --#if defined(SOLARIS) || defined(IRIX) --#include --#elif defined MACOSX --#include --#include --#else --#include --#endif -+#include - - #include - #include diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx deleted file mode 100644 index dde90d83c4c2..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+remote+static+stub.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/static/stub.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/static/stub.cxx,v -retrieving revision 1.2.26.1 -diff -u -r1.2.26.1 stub.cxx ---- bridges/source/remote/static/stub.cxx 8 Aug 2002 02:49:47 -0000 1.2.26.1 -+++ bridges/source/remote/static/stub.cxx 28 Jul 2005 12:13:32 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include --#elif defined MACOSX --#include --#include --#else --#include --#endif -+#include - - #include - diff --git a/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx b/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx deleted file mode 100644 index eabe859aee7e..000000000000 --- a/editors/openoffice-1.0/files/patch-bridges+source+remote+urp+urp_dispatch.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: bridges/source/remote/urp/urp_dispatch.cxx -=================================================================== -RCS file: /cvs/udk/bridges/source/remote/urp/urp_dispatch.cxx,v -retrieving revision 1.8.2.1 -diff -u -r1.8.2.1 urp_dispatch.cxx ---- bridges/source/remote/urp/urp_dispatch.cxx 8 Aug 2002 02:49:48 -0000 1.8.2.1 -+++ bridges/source/remote/urp/urp_dispatch.cxx 28 Jul 2005 12:15:51 -0000 -@@ -58,14 +58,7 @@ - * - * - ************************************************************************/ --#if defined(SOLARIS) || defined(IRIX) --#include --#elif MACOSX --#include --#include --#else --#include --#endif -+#include - - #include - #include diff --git a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk b/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk deleted file mode 100644 index 7bd2a784d49d..000000000000 --- a/editors/openoffice-1.0/files/patch-chaos+util+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- chaos/util/makefile.mk.orig Wed Jun 12 01:16:35 2002 -+++ chaos/util/makefile.mk Wed Jun 12 01:16:47 2002 -@@ -100,7 +100,7 @@ - - SHL1TARGET= cnt$(UPD)$(DLLPOSTFIX) - SHL1IMPLIB= i$(TARGET) --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP= exports.$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP= exports.map diff --git a/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx b/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx deleted file mode 100644 index 6f2ed220356a..000000000000 --- a/editors/openoffice-1.0/files/patch-codemaker+source+codemaker+global.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- codemaker/source/codemaker/global.cxx.orig Fri Apr 4 00:14:50 2003 -+++ codemaker/source/codemaker/global.cxx Fri Apr 4 00:14:53 2003 -@@ -149,11 +149,7 @@ - strcat(tmpPattern, "\\"); - strcat(tmpPattern, pPrefix); - strcat(tmpPattern, "XXXXXX"); --#if defined(FREEBSD) || defined(MACOSX) -- pTmpName = mkstemp(tmpPattern); --#else - pTmpName = mktemp(tmpPattern); --#endif - #endif - - return OString(pTmpName); diff --git a/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk b/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk deleted file mode 100644 index b83a620116f9..000000000000 --- a/editors/openoffice-1.0/files/patch-codemaker+source+cppumaker+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -Index: codemaker/source/cppumaker/makefile.mk -=================================================================== -RCS file: /cvs/udk/codemaker/source/cppumaker/makefile.mk,v -retrieving revision 1.5 -diff -u -r1.5 makefile.mk ---- codemaker/source/cppumaker/makefile.mk 17 Aug 2001 13:15:48 -0000 1.5 -+++ codemaker/source/cppumaker/makefile.mk 10 Jul 2005 07:39:54 -0000 -@@ -92,6 +92,7 @@ - APP1STDLIBS= \ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - APP1LIBS= \ diff --git a/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk b/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk deleted file mode 100644 index 56906191f2f0..000000000000 --- a/editors/openoffice-1.0/files/patch-codemaker+source+source+javamaker+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -Index: codemaker/source/javamaker/makefile.mk -=================================================================== -RCS file: /cvs/udk/codemaker/source/javamaker/makefile.mk,v -retrieving revision 1.7 -diff -u -r1.7 makefile.mk ---- codemaker/source/javamaker/makefile.mk 17 Aug 2001 13:15:48 -0000 1.7 -+++ codemaker/source/javamaker/makefile.mk 10 Jul 2005 08:39:43 -0000 -@@ -96,6 +96,7 @@ - APP1STDLIBS= \ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - APP1LIBS= \ diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in deleted file mode 100644 index e0af7351d24e..000000000000 --- a/editors/openoffice-1.0/files/patch-config_office+configure.in +++ /dev/null @@ -1,51 +0,0 @@ -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.41.2.18 -diff -u -r1.41.2.18 configure.in ---- config_office/configure.in 12 Mar 2003 11:38:41 -0000 1.41.2.18 -+++ config_office/configure.in 10 Jul 2005 03:38:11 -0000 -@@ -383,10 +383,7 @@ - if test "$COMPATH" != "NO_GCC"; then - AC_MSG_RESULT([checked (gcc $_gcc_version)]) - fi -- --dnl Set the include paths -- _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include --fi -+fi - - dnl =================================================================== - dnl Test the solaris compiler version -@@ -545,14 +542,27 @@ - fi - - dnl =================================================================== --dnl Set the gxx include directories -+dnl Set the gcc/gxx include directories - dnl =================================================================== -+if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then -+if test "$GXX" = "yes"; then -+ if test "$_gcc_major" = "3" ; then -+ _gccincname1="g++-v3" -+ else -+ _gccincname1="g++-3" #not checked -+ fi -+ _gcc_include_path=".." -+ _gxx_include_path="$_gcc_include_path/$_gccincname1" -+fi -+else - if test "$GXX" = "yes"; then -- _gxx_include_path=`echo "#include " | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` -+ _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+ _gxx_include_path=`echo "#include " | $CXX -E -xc++ - \ -+ | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1` - dnl This is the original code... --dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+dnl _gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include -+fi - fi -- - - dnl =================================================================== - dnl Extra checking for the SUN OS compiler diff --git a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in b/editors/openoffice-1.0/files/patch-config_office+setsoenv.in deleted file mode 100644 index 5c894af6e1e2..000000000000 --- a/editors/openoffice-1.0/files/patch-config_office+setsoenv.in +++ /dev/null @@ -1,102 +0,0 @@ -Index: config_office/set_soenv.in -=================================================================== -RCS file: /cvs/tools/config_office/set_soenv.in,v -retrieving revision 1.3.2.2.2.8.2.2.2.3 -diff -u -r1.3.2.2.2.8.2.2.2.3 set_soenv.in ---- config_office/set_soenv.in 3 Apr 2003 04:52:43 -0000 1.3.2.2.2.8.2.2.2.3 -+++ config_office/set_soenv.in 3 Aug 2005 22:14:14 -0000 -@@ -52,8 +52,8 @@ - #------------------------------------------------- - # - # Platform independent constant values. --my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "ITAL", --"JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); -+my @LANGUAGES = ("ARAB", "CHINSIM", "CHINTRAD", "DAN", "DTCH", "ENUS", "FREN", "GREEK", "GER", -+"ITAL", "JAPN", "KOREAN", "POL", "PORT", "RUSS", "SPAN", "SWED", "TURK" ); - my ( $CALL_CDECL, $COMMON_OUTDIR, $NO_SRS_PATCH, $PRODUCT, $PROFULLSWITCH, $BIG_GOODIES, $BMP_WRITES_FLAG, - $common_build, $MK_UNROLL, $NO_REC_RES, $PROEXT, $SO3, $SOLAR_JAVA, - $SOLAR_PLUGIN, $TF_PACKAGES, $TF_SDBAPI, $TF_FILEURL, $UPDATER, $BUILD_DELIVER, $USE_NEWCHARSET, $USE_NEW_RSC, $VCL, -@@ -65,7 +65,7 @@ - my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $DLLSUFFIX, $GLIBC, $GUI, $GUIBASE, $GUIENV, - $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $PROSWITCH, $XPVERSION, $BOTH, - $DEMO_ENV, $DYNAMIC_CRT, $SET_EXCEPTIONS, $emergency, $use_shl_versions, $CDPATHx, $JRELIBDIR, -- $JRETOOLKITDIR, $JRETHREADDIR, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD ); -+ $JRETOOLKITDIR, $JRETHREADDIR, $JRETHREADDIR2, $PTHREAD_CFLAGS, $PTHREAD_LIBS, $EXCEPTIONS, $WRAPCMD ); - # - #------------------------------------------- - # IIc. Declaring the environment variables. -@@ -335,6 +335,7 @@ - $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."green_threads"; -+ $JRETHREADDIR2 = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."classic"; - } - elsif ( $platform eq "$Linux" ) - { -@@ -875,24 +876,18 @@ - $ps.$JRETHREADDIR. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$FreeBSD") || ($platform eq "$Tru64")) - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$JRELIBDIR. - $ps.$JRETOOLKITDIR. - $ps.$JRETHREADDIR. -+ $ps.$JRETHREADDIR2. - $ps.$par_dir.$LIB. - $ps_STLPORT_LIB. - $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $ps.$ENV{'LD_LIBRARY_PATH'}; - } --elsif ($platform eq "$FreeBSD") --{ $LD_LIBRARY_PATH = $cur_dir. -- $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -- $ps.$par_dir.$LIB. -- $ps_STLPORT_LIB. -- $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; --} - elsif ($platform eq "$Irix" || $platform eq "$Irix64") - { $LD_LIBRARY_PATH = $cur_dir. - $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. -@@ -1165,7 +1160,7 @@ - $L_STLPORT_LIB. - $L.$XLIB; - } --elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) -+elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD")) - { $SOLARLIB = $L.$par_dir.$LIB. - $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -@@ -1174,18 +1169,10 @@ - $L.$JRELIBDIR. - $L.$JRETOOLKITDIR. - $L.$JRETHREADDIR. -+ $L.$JRETHREADDIR2. - $L_STLPORT_LIB. - $L.$XLIB; - } --elsif ($platform eq "$FreeBSD") --{ $SOLARLIB = $L.$par_dir.$LIB. -- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -- $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. -- $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. -- $L.'$JAVA_HOME'.$LIB. -- $L_STLPORT_LIB. -- $L.$XLIB; --} - elsif ($platform eq "$Winnt") - { $SOLARLIB = $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. - $L.$par_dir.$LIB. -@@ -1251,7 +1238,9 @@ - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; - } - elsif ($platform eq "$FreeBSD") --{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; -+{ -+ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd". -+ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; - } - elsif ($platform eq "$NetBSD") - { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd"; diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk deleted file mode 100644 index 985c87525e68..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+adabas+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/adabas/makefile.mk.orig Wed Jun 12 01:06:20 2002 -+++ connectivity/source/drivers/adabas/makefile.mk Wed Jun 12 01:06:34 2002 -@@ -104,7 +104,7 @@ - $(SLO)$/BResultSetMetaData.obj \ - $(SLO)$/BResultSet.obj - --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(ADABAS_TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(ADABAS_TARGET).map diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk deleted file mode 100644 index 845cdffa9915..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+calc+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- connectivity/source/drivers/calc/makefile.mk.orig Wed Jun 12 01:36:16 2002 -+++ connectivity/source/drivers/calc/makefile.mk Wed Jun 12 01:36:22 2002 -@@ -92,9 +92,7 @@ - $(SLO)$/CDriver.obj - - .IF "$(OS)"!="MACOSX" --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - .ENDIF - # --- Library ----------------------------------- - diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk deleted file mode 100644 index 50a7123bb829..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+dbase+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/dbase/makefile.mk.orig Wed Jun 12 01:26:39 2002 -+++ connectivity/source/drivers/dbase/makefile.mk Wed Jun 12 01:26:48 2002 -@@ -116,7 +116,7 @@ - $(SLO)$/DDriver.obj - - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk deleted file mode 100644 index a94e5e388d10..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+file+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/file/makefile.mk.orig Wed Jun 12 01:12:42 2002 -+++ connectivity/source/drivers/file/makefile.mk Wed Jun 12 01:12:44 2002 -@@ -112,7 +112,7 @@ - $(SLO)$/fanalyzer.obj \ - $(SLO)$/fcomp.obj - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map - .ELSE - #SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk deleted file mode 100644 index 0e863e93ad65..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+flat+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/flat/makefile.mk.orig Wed Jun 12 01:14:43 2002 -+++ connectivity/source/drivers/flat/makefile.mk Wed Jun 12 01:15:03 2002 -@@ -104,7 +104,7 @@ - $(SLO)$/EDriver.obj - - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(TARGET).map diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk deleted file mode 100644 index 8c35f8387963..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+jdbc+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- connectivity/source/drivers/jdbc/makefile.mk.orig Wed Jun 12 00:57:12 2002 -+++ connectivity/source/drivers/jdbc/makefile.mk Wed Jun 12 00:57:21 2002 -@@ -111,7 +111,7 @@ - $(SLO)$/tools.obj - - --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - #SHL1VERSIONMAP=$(JDBC_TARGET).$(DLLPOSTFIX).map - .ELSE - SHL1VERSIONMAP=$(JDBC_TARGET).map diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk deleted file mode 100644 index a72837ceded0..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002 -+++ connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002 -@@ -107,9 +107,7 @@ - # --- MOZAB BASE Library ----------------------------------- - - SHL1VERSIONMAP= $(TARGET).map --.IF "$(OS)"!="FREEBSD" - SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) --.ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ - $(CPPULIB) \ diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk deleted file mode 100644 index eea25f2b889c..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ ---- connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 -+++ connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 15:51:13 2002 -@@ -64,8 +64,8 @@ - #mozilla specific stuff. - MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) - MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla --#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib --#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla -+#MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib -+#MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla - #End of mozilla specific stuff. - - PRJ=..$/..$/..$/.. -@@ -107,7 +107,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -123,7 +123,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ - -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ - -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ -@@ -141,7 +141,7 @@ - -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ - -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ - -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ -- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -+ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr - CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI - .IF "$(OS)" == "LINUX" -@@ -157,6 +157,13 @@ - -fno-rtti -Wall -Wconversion -Wpointer-arith \ - -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ - -Wno-long-long -+CDEFS += -DTRACING -+.ELIF "$(OS)" == "FREEBSD" -+CFLAGS += -fPIC -+CFLAGSCXX += \ -+ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -+ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ -+ -Wno-long-long -pthread - CDEFS += -DTRACING - .ENDIF - .ENDIF diff --git a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk b/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk deleted file mode 100644 index d9655c5e9855..000000000000 --- a/editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozaddressbook+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- connectivity/source/drivers/mozaddressbook/makefile.mk.orig Wed Jun 12 01:40:36 2002 -+++ connectivity/source/drivers/mozaddressbook/makefile.mk Wed Jun 12 01:40:37 2002 -@@ -134,9 +134,7 @@ - SLOFILES+=$(SLO)$/staticmbmozab.obj - .ENDIF - --.IF "$(OS)"!="FREEBSD" - SHL1VERSIONMAP= $(TARGET).map --.ENDIF - # --- Library ----------------------------------- - - SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX) diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx b/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx deleted file mode 100644 index 3e6e3f558c4f..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+inc+cppu+macros.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- cppu/inc/cppu/macros.hxx.kan Wed Jul 24 23:28:55 2002 -+++ cppu/inc/cppu/macros.hxx Wed Jul 24 23:29:45 2002 -@@ -76,7 +76,7 @@ - the struct inherits from a base struct the first member is no double or [unsigned] long long. - @internal - */ --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3) - #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct)))) - #else - #define CPPU_GCC3_ALIGN( base_struct ) diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h deleted file mode 100644 index ec9dbb3a299c..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 -+++ cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 -@@ -94,7 +94,7 @@ - #define __CPPU_ENV gcc2 - #elif (__GNUC__ == 2) - #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." --#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0) -+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) - #define __CPPU_ENV gcc3 - #elif (__GNUC__ == 3) - #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." diff --git a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst b/editors/openoffice-1.0/files/patch-cppu+prj+build.lst deleted file mode 100644 index c4e803c46e69..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+prj+build.lst +++ /dev/null @@ -1,8 +0,0 @@ ---- cppu/prj/build.lst.orig Mon Mar 11 14:13:47 2002 -+++ cppu/prj/build.lst Mon Mar 11 14:14:30 2002 -@@ -1,4 +1,4 @@ --cu cppu : codemaker udkapi NULL -+cu cppu : codemaker udkapi offuh NULL - cu cppu usr1 - all cu_mkout NULL - cu cppu\source nmake - all cu_source NULL - cu cppu\source\uno nmake - all cu_uno cu_source NULL diff --git a/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx b/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx deleted file mode 100644 index 226c6033836e..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+source+typelib+typelib.cxx +++ /dev/null @@ -1,20 +0,0 @@ -Index: cppu/source/typelib/typelib.cxx -=================================================================== -RCS file: /cvs/udk/cppu/source/typelib/typelib.cxx,v -retrieving revision 1.14.10.1 -diff -u -r1.14.10.1 typelib.cxx ---- cppu/source/typelib/typelib.cxx 9 Aug 2002 02:30:50 -0000 1.14.10.1 -+++ cppu/source/typelib/typelib.cxx 10 Jul 2005 09:13:22 -0000 -@@ -71,12 +71,6 @@ - #include - #include - #include --#ifdef MACOSX --#include --#include --#else --#include --#endif - #if defined(SOLARIS) || defined(IRIX) - #include - #endif diff --git a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx b/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx deleted file mode 100644 index 3a610504c83b..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+source+uno+data.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- cppu/source/uno/data.cxx.kan Wed Jul 24 23:39:23 2002 -+++ cppu/source/uno/data.cxx Wed Jul 24 23:38:49 2002 -@@ -295,7 +295,7 @@ - # pragma pack(8) - #endif - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define MAX_ALIGNMENT_4 - #endif - -@@ -307,7 +307,7 @@ - if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } - - #ifdef DEBUG --#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC)) - #define BINTEST_VERIFYSIZE( s, n ) \ - fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } diff --git a/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx b/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx deleted file mode 100644 index 45a097727c30..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+source+uno+lbenv.cxx +++ /dev/null @@ -1,18 +0,0 @@ -Index: cppu/source/uno/lbenv.cxx -=================================================================== -RCS file: /cvs/udk/cppu/source/uno/lbenv.cxx,v -retrieving revision 1.23 -diff -u -r1.23 lbenv.cxx ---- cppu/source/uno/lbenv.cxx 13 Aug 2002 15:07:09 -0000 1.23 -+++ cppu/source/uno/lbenv.cxx 10 Jul 2005 09:32:20 -0000 -@@ -93,10 +93,6 @@ - #include - #ifdef SOLARIS - #include --#elif defined MACOSX --#include --#else --#include - #endif - #include - #include diff --git a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h b/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h deleted file mode 100644 index c8eb02d754c5..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+test+alignment+diagnose.h +++ /dev/null @@ -1,11 +0,0 @@ ---- cppu/test/alignment/diagnose.h.orig Sat Jul 20 23:54:59 2002 -+++ cppu/test/alignment/diagnose.h Sat Jul 20 23:55:06 2002 -@@ -64,7 +64,7 @@ - #include - #include - --#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -+#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) - #define __ALIGNMENT__(s, n) __alignof__ (s) - #else - #define __ALIGNMENT__(s, n) n diff --git a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk b/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk deleted file mode 100644 index db6dafce246f..000000000000 --- a/editors/openoffice-1.0/files/patch-cppu+util+makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- cppu/util/makefile.mk.orig Wed Jun 12 01:39:28 2002 -+++ cppu/util/makefile.mk Wed Jun 12 01:39:32 2002 -@@ -87,9 +87,7 @@ - - SHL1DEPN= - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"!="FREEBSD" - SHL1DEF=$(MISC)$/$(SHL1TARGET).def --.ENDIF - - SHL1VERSIONMAP=$(TARGET).map - diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx b/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx deleted file mode 100644 index 1ff1d3920840..000000000000 --- a/editors/openoffice-1.0/files/patch-cppuhelper+source+implbase_ex.cxx +++ /dev/null @@ -1,20 +0,0 @@ -Index: cppuhelper/source/implbase_ex.cxx -=================================================================== -RCS file: /cvs/udk/cppuhelper/source/implbase_ex.cxx,v -retrieving revision 1.5 -diff -u -r1.5 implbase_ex.cxx ---- cppuhelper/source/implbase_ex.cxx 15 Aug 2002 12:36:30 -0000 1.5 -+++ cppuhelper/source/implbase_ex.cxx 10 Jul 2005 09:41:00 -0000 -@@ -61,11 +61,8 @@ - - #ifdef SOLARIS - #include --#elif defined MACOSX --#include --#include - #else --#include -+#include - #endif - #include - diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk deleted file mode 100644 index 3e74fb33e425..000000000000 --- a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- cppuhelper/source/makefile.mk.orig Mon Mar 11 22:17:52 2002 -+++ cppuhelper/source/makefile.mk Wed Apr 3 00:31:19 2002 -@@ -175,6 +175,10 @@ - #SHL1VERSIONMAP=gcc2_freebsd_intel.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+#SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+#SHL1VERSIONMAP=gcc3_freebsd_intel.map - .ENDIF - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx b/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx deleted file mode 100644 index a3f59112ea22..000000000000 --- a/editors/openoffice-1.0/files/patch-cppuhelper+source+tdmgr.cxx +++ /dev/null @@ -1,16 +0,0 @@ -Index: cppuhelper/source/tdmgr.cxx -=================================================================== -RCS file: /cvs/udk/cppuhelper/source/tdmgr.cxx,v -retrieving revision 1.4 -diff -u -r1.4 tdmgr.cxx ---- cppuhelper/source/tdmgr.cxx 15 Oct 2001 16:07:59 -0000 1.4 -+++ cppuhelper/source/tdmgr.cxx 10 Jul 2005 09:41:51 -0000 -@@ -60,7 +60,7 @@ - ************************************************************************/ - - #ifndef MACOSX --#include -+#include - #endif - #ifdef SOLARIS - #include diff --git a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx b/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx deleted file mode 100644 index b60b684b25ee..000000000000 --- a/editors/openoffice-1.0/files/patch-desktop+source+pkgchk_packages.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- desktop/source/pkgchk/pkgchk_packages.cxx.orig Sun Jan 19 20:00:08 2003 -+++ desktop/source/pkgchk/pkgchk_packages.cxx Sun Jan 19 20:01:51 2003 -@@ -124,6 +124,10 @@ - static char const s_platform_path [] = "/macosx_powerpc.plt"; - #elif defined (NETBSD) && defined (SPARC) - static char const s_platform_path [] = "/netbsd_sparc.plt"; -+#elif defined (FREEBSD) && defined (INTEL) -+static char const s_platform_path [] = "/freebsd_x86.plt"; -+#elif defined (FREEBSD) && defined (SPARC) -+static char const s_platform_path [] = "/freebsd_sparc.plt"; - #else - #error "unkonwn platform" - insert your platform identifier above; inserted for the case the preprocessor ignores error diff --git a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk b/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk deleted file mode 100644 index bb622aa62e25..000000000000 --- a/editors/openoffice-1.0/files/patch-desktop+util+makefile.mk +++ /dev/null @@ -1,20 +0,0 @@ ---- desktop/util/makefile.mk.orig Sun Jul 21 00:04:35 2002 -+++ desktop/util/makefile.mk Sun Jul 21 00:04:38 2002 -@@ -81,7 +81,7 @@ - - # --- Linken der Applikation --------------------------------------- - --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, - # winXX is handled like solaris for now - APP1_STDPRE= -@@ -111,7 +111,7 @@ - $(SALHELPERLIB) - - .IF "$(GUI)" == "UNX" --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - - APP1STDLIBS+= -lXext -lSM -lICE - diff --git a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh b/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh deleted file mode 100644 index 0956ef9c130a..000000000000 --- a/editors/openoffice-1.0/files/patch-dmake+unix+linux+gnu+make.sh +++ /dev/null @@ -1,244 +0,0 @@ ---- dmake/unix/linux/gnu/make.sh.orig Wed Mar 13 20:32:53 2002 -+++ dmake/unix/linux/gnu/make.sh Wed Mar 13 20:33:00 2002 -@@ -3,188 +3,188 @@ - mkdir objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O infer.c - fi - mv infer.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O make.c - fi - mv make.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O stat.c - fi - mv stat.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O expand.c - fi - mv expand.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmstring.c - fi - mv dmstring.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O hash.c - fi - mv hash.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dag.c - fi - mv dag.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmake.c - fi - mv dmake.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O path.c - fi - mv path.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O imacs.c - fi - mv imacs.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O sysintf.c - fi - mv sysintf.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O parse.c - fi - mv parse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O getinp.c - fi - mv getinp.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O quit.c - fi - mv quit.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O state.c - fi - mv state.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O dmdump.c - fi - mv dmdump.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O macparse.c - fi - mv macparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O rulparse.c - fi - mv rulparse.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O percent.c - fi - mv percent.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O function.c - fi - mv function.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/arlib.c - fi - mv arlib.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dirbrk.c - fi - mv dirbrk.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/rmprq.c - fi - mv rmprq.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/ruletab.c - fi - mv ruletab.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/runargv.c - fi - mv runargv.o objects - - if test $platform = sparc -o $platform = sparc64; then --gcc -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -ansi -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - else --gcc -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c -+${CC} ${CFLAGS} -c -I. -Iunix -Iunix/linux -Iunix/linux/gnu -O unix/dcache.c - fi - mv dcache.o objects - --gcc -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ -+${CC} ${CFLAGS} -O -o dmake objects/infer.o objects/make.o objects/stat.o objects/expand.o \ - objects/dmstring.o objects/hash.o objects/dag.o objects/dmake.o objects/path.o \ - objects/imacs.o objects/sysintf.o objects/parse.o objects/getinp.o \ - objects/quit.o objects/state.o objects/dmdump.o objects/macparse.o \ diff --git a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx b/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx deleted file mode 100644 index a1e3006b3022..000000000000 --- a/editors/openoffice-1.0/files/patch-dtrans+source+X11+X11_selection.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- dtrans/source/X11/X11_selection.cxx.orig Sat Jul 20 23:18:03 2002 -+++ dtrans/source/X11/X11_selection.cxx Sat Jul 20 23:18:05 2002 -@@ -65,7 +65,7 @@ - #include - #include - #include --#if defined(LINUX) || defined(NETBSD) -+#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) - #include - #else - #include -@@ -175,6 +175,7 @@ - { 0, "text/plain;charset=ksc5601.1992-0", "KSC5601.1992-0", 8 }, - // eastern european encodings - { 0, "text/plain;charset=koi8-r", "KOI8-R", 8 }, -+ { 0, "text/plain;charset=koi8-u", "KOI8-U", 8 }, - // String (== iso8859-1) - { XA_STRING, "text/plain;charset=string", "STRING", 8 }, - // special for compound text diff --git a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh b/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh deleted file mode 100644 index 528a1110f48d..000000000000 --- a/editors/openoffice-1.0/files/patch-external+dt+dtpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/dt/dtpatch.sh.orig Wed Mar 13 17:09:43 2002 -+++ external/dt/dtpatch.sh Wed Mar 13 17:09:47 2002 -@@ -96,7 +96,7 @@ - done - - chmod -R +w rtufiles/*.h -- patch -i pat/editor.h.pat rtufiles/editor.h 2> newpatch -+ patch < pat/editor.h.pat rtufiles/editor.h 2> newpatch - - if test -s "patcherror"; then - echo "Please install the SUNWdtinc Version 1.2 package on your Solaris machine" >> patcherror diff --git a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh b/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh deleted file mode 100644 index 5140022b3e99..000000000000 --- a/editors/openoffice-1.0/files/patch-external+expat+expatpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/expat/expatpatch.sh.orig Wed Mar 13 16:59:16 2002 -+++ external/expat/expatpatch.sh Wed Mar 13 17:00:18 2002 -@@ -87,7 +87,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -+ patch < pat/$PNAME.pat rtufiles/$PNAME - done - - for SDNAME in `cat flist.sd` diff --git a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch b/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch deleted file mode 100644 index b77c0644b3fd..000000000000 --- a/editors/openoffice-1.0/files/patch-external+glibc+glibcpatch +++ /dev/null @@ -1,35 +0,0 @@ ---- /dev/null Sun Jun 2 16:11:00 2002 -+++ external/glibc/flist.pat Sun Jun 2 12:00:09 2002 -@@ -0,0 +1 @@ -+patch-getopt.h ---- /dev/null Sun Jun 2 16:11:00 2002 -+++ external/glibc/patch-getopt.h Sun Jun 2 16:14:52 2002 -@@ -0,0 +1,14 @@ -+--- rtufiles/getopt.h.orig Fri May 31 16:46:21 2002 -++++ rtufiles/getopt.h Fri May 31 17:07:19 2002 -+@@ -133,7 +133,11 @@ -+ errors, only prototype getopt for the GNU C library. */ -+ extern int getopt (int __argc, char *const *__argv, const char *__shortopts); -+ # else /* not __GNU_LIBRARY__ */ -++#if (__GNUC__ == 3 && defined(FREEBSD)) -++/* skip getopt() definition , it conflicts with std.h */ -++#else -+ extern int getopt (); -++# endif /* FREEBSD */ -+ # endif /* __GNU_LIBRARY__ */ -+ -+ # ifndef __need_getopt ---- external/glibc/glibcpatch.sh.orig Sun Jun 2 11:46:42 2002 -+++ external/glibc/glibcpatch.sh Sun Jun 2 16:13:51 2002 -@@ -113,7 +113,10 @@ - # apply the patches - # - --# there is no need to apply patch here -+for PNAME in `cat flist.pat` -+ do -+ patch < $PNAME -+ done - - - # diff --git a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh b/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh deleted file mode 100644 index c742b4f31e5a..000000000000 --- a/editors/openoffice-1.0/files/patch-external+jpeg+jpegpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/jpeg/jpegpatch.sh.orig Wed Mar 13 17:04:35 2002 -+++ external/jpeg/jpegpatch.sh Wed Mar 13 17:08:02 2002 -@@ -112,7 +112,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat $PNAME -+ patch < pat/$PNAME.pat $PNAME - done - - cp -rf jpeg-6b/* rtufiles/ diff --git a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat b/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat deleted file mode 100644 index 6c0b7624be45..000000000000 --- a/editors/openoffice-1.0/files/patch-external+neon+md5.c.pat +++ /dev/null @@ -1,112 +0,0 @@ ---- /dev/null Thu Aug 8 22:39:51 2002 -+++ external/neon/md5.c.pat Thu Aug 8 22:35:33 2002 -@@ -0,0 +1,109 @@ -+*** ..\download\neon-0.14.0\src\md5.c Sun Apr 29 13:23:08 2001 -+--- sub\md5.c Tue May 08 12:52:02 2001 -+*************** -+*** 278,290 **** -+ const void *buffer; -+ size_t len; -+ struct md5_ctx *ctx; -+ { -+ md5_uint32 correct_words[16]; -+! const md5_uint32 *words = buffer; -+! size_t nwords = len / sizeof (md5_uint32); -+! const md5_uint32 *endp = words + nwords; -+ md5_uint32 A = ctx->A; -+ md5_uint32 B = ctx->B; -+ md5_uint32 C = ctx->C; -+ md5_uint32 D = ctx->D; -+ -+--- 278,289 ---- -+ const void *buffer; -+ size_t len; -+ struct md5_ctx *ctx; -+ { -+ md5_uint32 correct_words[16]; -+! const unsigned char *words = buffer; -+! const unsigned char *endp = words + len; -+ md5_uint32 A = ctx->A; -+ md5_uint32 B = ctx->B; -+ md5_uint32 C = ctx->C; -+ md5_uint32 D = ctx->D; -+ -+*************** -+*** 313,324 **** -+ we store the swapped words in the array CORRECT_WORDS. */ -+ -+ #define OP(a, b, c, d, s, T) \ -+ do \ -+ { \ -+! a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \ -+! ++words; \ -+ CYCLIC (a, s); \ -+ a += b; \ -+ } \ -+ while (0) -+ -+--- 312,325 ---- -+ we store the swapped words in the array CORRECT_WORDS. */ -+ -+ #define OP(a, b, c, d, s, T) \ -+ do \ -+ { \ -+! md5_uint32 WORD_ = words[0] | (words[1] << 8) \ -+! | (words[2] << 16) | (words[3] << 24); \ -+! a += FF (b, c, d) + (*cwp++ = WORD_) + T; \ -+! words += 4; \ -+ CYCLIC (a, s); \ -+ a += b; \ -+ } \ -+ while (0) -+ -+*************** -+*** 431,441 **** -+ ctx->D = D; -+ } -+ -+ /* Writes the ASCII representation of the MD5 digest into the -+ * given buffer, which must be at least 33 characters long. */ -+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4); -+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f); -+--- 432,442 ---- -+ ctx->D = D; -+ } -+ -+ /* Writes the ASCII representation of the MD5 digest into the -+ * given buffer, which must be at least 33 characters long. */ -+! void ne_md5_to_ascii(const unsigned char md5_buf[16], char *buffer) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ buffer[count*2] = HEX2ASC(md5_buf[count] >> 4); -+ buffer[count*2+1] = HEX2ASC(md5_buf[count] & 0x0f); -+*************** -+*** 443,453 **** -+ buffer[32] = '\0'; -+ } -+ -+ /* Reads the ASCII representation of an MD5 digest. The buffer must -+ * be at least 32 characters long. */ -+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) | -+ ASC2HEX(buffer[count*2+1]); -+--- 444,454 ---- -+ buffer[32] = '\0'; -+ } -+ -+ /* Reads the ASCII representation of an MD5 digest. The buffer must -+ * be at least 32 characters long. */ -+! void ne_ascii_to_md5(const char *buffer, unsigned char md5_buf[16]) -+ { -+ int count; -+ for (count = 0; count<16; count++) { -+ md5_buf[count] = ((ASC2HEX(buffer[count*2])) << 4) | -+ ASC2HEX(buffer[count*2+1]); diff --git a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh b/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh deleted file mode 100644 index ac228884ad46..000000000000 --- a/editors/openoffice-1.0/files/patch-external+neon+neonpatch.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- external/neon/neonpatch.sh.orig Tue May 29 17:40:10 2001 -+++ external/neon/neonpatch.sh Thu Aug 8 22:43:04 2002 -@@ -119,10 +119,7 @@ - # apply the patches - # - -- for PNAME in `cat flist.pat` -- do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -- done -+ patch < md5.c.pat rtufiles/md5.c - - # - # copy the SD files into rtufiles directory diff --git a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh b/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh deleted file mode 100644 index 658223558005..000000000000 --- a/editors/openoffice-1.0/files/patch-external+npsdk+npsdkpatch.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- external/npsdk/npsdkpatch.sh.orig Wed Mar 13 16:49:19 2002 -+++ external/npsdk/npsdkpatch.sh Wed Mar 13 16:49:39 2002 -@@ -121,7 +121,7 @@ - - for PNAME in `cat flist.pat` - do -- patch -i pat/$PNAME.pat rtufiles/$PNAME -+ patch < pat/$PNAME.pat rtufiles/$PNAME - done - - # diff --git a/editors/openoffice-1.0/files/patch-freetype+makefile.mk b/editors/openoffice-1.0/files/patch-freetype+makefile.mk deleted file mode 100644 index 4d29bbb79d9c..000000000000 --- a/editors/openoffice-1.0/files/patch-freetype+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype/makefile.mk.orig Fri Aug 16 17:28:36 2002 -+++ freetype/makefile.mk Sat Jan 18 13:39:03 2003 -@@ -95,6 +99,8 @@ - objs$/.libs$/libfreetype.a - .IF "$(OS)"=="MACOSX" - OUT2LIB+=objs$/.libs$/libfreetype.*.dylib -+.ELIF "$(OS)"=="FREEBSD" -+OUT2LIB+=objs$/.libs$/libfreetype.so.7* - .ELSE - OUT2LIB+=objs$/.libs$/libfreetype.so.6* - .ENDIF # "$(OS)"=="MACOSX" diff --git a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx b/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx deleted file mode 100644 index a484b5db2fc5..000000000000 --- a/editors/openoffice-1.0/files/patch-i18n+inc+collator.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- i18n/inc/collator.hxx.orig Sat Apr 6 12:19:32 2002 -+++ i18n/inc/collator.hxx Wed May 1 22:31:57 2002 -@@ -78,7 +78,7 @@ - #include - #endif - --#if !(defined WIN32 || defined MACOSX || defined NETBSD) -+#if !(defined WIN32 || defined MACOSX || defined NETBSD || defined FREEBSD) - #include - #endif - #include diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx b/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx deleted file mode 100644 index e6dab620463f..000000000000 --- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata+localedata.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- i18npool/source/localedata/localedata.cxx.orig Mon Feb 24 17:47:22 2003 -+++ i18npool/source/localedata/localedata.cxx Tue Feb 25 16:41:58 2003 -@@ -150,6 +150,7 @@ - { "pt_BR", lcl_ASCII }, - { "pt_PT", lcl_ASCII }, - { "ru_RU", lcl_ASCII }, -+ { "uk_UA", lcl_ASCII }, - { "sv_FI", lcl_ASCII }, - { "tr_TR", lcl_ASCII }, - { "th_TH", lcl_ASCII }, // PlaDao convenience entry diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk deleted file mode 100644 index 45089ef1ec01..000000000000 --- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- i18npool/source/localedata_ascii/makefile.mk.orig Sun Nov 17 23:27:32 2002 -+++ i18npool/source/localedata_ascii/makefile.mk Tue Feb 25 16:43:21 2003 -@@ -138,6 +138,7 @@ - $(MISC)$/localedata_pt_BR.cxx \ - $(MISC)$/localedata_pt_PT.cxx \ - $(MISC)$/localedata_ru_RU.cxx \ -+ $(MISC)$/localedata_uk_UA.cxx \ - $(MISC)$/localedata_sv_FI.cxx \ - $(MISC)$/localedata_tr_TR.cxx \ - $(MISC)$/localedata_nb_NO.cxx \ -@@ -208,6 +209,7 @@ - $(SLO)$/localedata_pt_BR.obj \ - $(SLO)$/localedata_pt_PT.obj \ - $(SLO)$/localedata_ru_RU.obj \ -+ $(SLO)$/localedata_uk_UA.obj \ - $(SLO)$/localedata_sv_FI.obj \ - $(SLO)$/localedata_tr_TR.obj \ - $(SLO)$/localedata_nb_NO.obj \ diff --git a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml b/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml deleted file mode 100644 index 03b434315902..000000000000 --- a/editors/openoffice-1.0/files/patch-i18npool+source+localedata_ascii+uk_UA.xml +++ /dev/null @@ -1,454 +0,0 @@ ---- i18npool/source/localedata_ascii/uk_UA.xml.orig Thu Jan 1 00:00:00 1970 -+++ i18npool/source/localedata_ascii/uk_UA.xml Fri Feb 28 13:04:01 2003 -@@ -0,0 +1,451 @@ -+ -+ -+ -+ -+ -+uk -+Ukrainian -+ -+ -+UA -+Ukraine -+ -+ -+generic -+ -+ -+ -+ -+ -+. -+ -+, -+: -+, -+; -+ -+ -+ -+ р. -+ -+ -+‘ -+’ -+“ -+” -+ -+AM -+PM -+Metric -+ -+ -+ -+M/D/YY -+ -+ -+ -+NN DD/MMM YY -+ -+ -+ -+MM/YY -+ -+ -+ -+MMM DD -+ -+ -+ -+MMMM -+ -+ -+ -+QQ YY -+ -+ -+ -+MM/DD/YYYY -+ -+ -+ -+MM/DD/YY -+ -+ -+ -+NNNNMMMM DD, YYYY -+ -+ -+ -+MMM D, YY -+ -+ -+ -+MMM D, YYYY -+ -+ -+ -+MMMM D, YYYY -+ -+ -+ -+NN, MMM D, YY -+ -+ -+ -+NN, MMMM D, YYYY -+ -+ -+ -+NNNNMMMM D, YYYY -+DIN 5008 (EN 28601) -+ -+ -+D. MMM. YYYY -+DIN 5008 (EN 28601) -+ -+ -+D. MMMM YYYY -+DIN 5008 (EN 28601) -+ -+ -+MM-DD -+DIN 5008 (EN 28601) -+ -+ -+YY-MM-DD -+DIN 5008 (EN 28601) -+ -+ -+YYYY-MM-DD -+ -+ -+ -+WW -+ -+ -+ -+HH:MM -+ -+ -+ -+HH:MM:SS -+ -+ -+ -+HH:MM AM/PM -+ -+ -+ -+HH:MM:SS AM/PM -+ -+ -+ -+[HH]:MM:SS -+ -+ -+ -+MM:SS,00 -+ -+ -+ -+[HH]:MM:SS,00 -+ -+ -+ -+MM/DD/YY HH:MM -+ -+ -+ -+MM/DD/YYYY HH:MM:SS -+ -+ -+ -+Standard -+ -+ -+ -+0 -+ -+ -+ -+0,00 -+ -+ -+ -+# ##0 -+ -+ -+ -+# ##0,00 -+ -+ -+ -+# ###,00 -+ -+ -+ -+[$грн.-419]# ##0;-[$грн.-419]# ##0 -+ -+ -+ -+[$грн.-419]# ##0,00;-[$грн.-419]# ##0,00 -+ -+ -+ -+ [$грн.-419]# ##0;[RED]-[$грн.-419]# ##0 -+ -+ -+ -+[$грн.-419]# ##0,00;[RED]-[$грн.-419]# ##0,00 -+ -+ -+ -+# ##0,00 CCC -+ -+ -+ -+[$грн.-419]# ##0,--;[RED]-[$грн.-419]# ##0,-- -+ -+ -+ -+0% -+ -+ -+ -+0,00% -+ -+ -+ -+0,00E+000 -+ -+ -+ -+0,00E+00 -+ -+ -+ -+ -+ -+ -+IGNORE_CASE -+ -+ -+ -+ -+IGNORE_CASE -+ -+ -+ -+ -+ -+ -+sun -+Нд -+неділя -+ -+ -+mon -+Пн -+понеділок -+ -+ -+tue -+Вт -+вівторок -+ -+ -+wed -+Ср -+середа -+ -+ -+thu -+Чт -+четвер -+ -+ -+fri -+Пт -+п'ятниця -+ -+ -+sat -+Сб -+субота -+ -+ -+ -+ -+jan -+січ -+Січень -+ -+ -+feb -+лют -+Лютий -+ -+ -+mar -+бер -+Березень -+ -+ -+apr -+квт -+Квітень -+ -+ -+may -+трв -+Травень -+ -+ -+jun -+чер -+Червень -+ -+ -+jul -+лип -+Липень -+ -+ -+aug -+сер -+Серпень -+ -+ -+sep -+вер -+Вересень -+ -+ -+oct -+жов -+Жовтень -+ -+ -+nov -+лис -+Листопад -+ -+ -+dec -+гру -+Грудень -+ -+ -+ -+ -+bc -+до н.е. -+до н.е. -+ -+ -+ad -+н.е. -+н.е. -+ -+ -+ -+sun -+ -+1 -+ -+ -+ -+ -+грн. -+грн. -+UAH -+Hrivnya -+2 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+true -+false -+1st quarter -+2nd quarter -+3rd quarter -+4th quarter -+above -+below -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy b/editors/openoffice-1.0/files/patch-idlc+source+parser.yy deleted file mode 100644 index 77b46c571f59..000000000000 --- a/editors/openoffice-1.0/files/patch-idlc+source+parser.yy +++ /dev/null @@ -1,36 +0,0 @@ ---- idlc/source/parser.yy.orig Wed Jul 10 11:43:18 2002 -+++ idlc/source/parser.yy Thu Oct 31 10:00:47 2002 -@@ -995,7 +995,8 @@ - { - idlc()->setParseState(PS_ConstantDeclSeen); - } -- ';' -+ ';' {}; -+ - - const_dcl : - IDL_CONST -@@ -1316,7 +1317,7 @@ - * Push the scope of the exception on the scopes stack - */ - idlc()->scopes()->push(pExcept); -- delete $1 -+ delete $1; - } - '{' - { -@@ -1705,10 +1706,10 @@ - { - idlc()->setParseState(PS_TypedefSeen); - } -- type_declarator -- | struct_type -- | union_type -- | enum_type -+ type_declarator {} -+ | struct_type {} -+ | union_type {} -+ | enum_type {} - ; - - type_declarator : diff --git a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch deleted file mode 100644 index 2fb8d0cc15ff..000000000000 --- a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch +++ /dev/null @@ -1,246 +0,0 @@ ---- nas/nas-1.4.1.patch.orig Wed Jan 8 02:52:13 2003 -+++ nas/nas-1.4.1.patch Sat Jan 18 17:55:19 2003 -@@ -1,5 +1,5 @@ --*** misc/nas-1.4.1/config/NetAudio.tmpl Sat Mar 4 21:40:50 2000 ----- misc/build/nas-1.4.1/config/NetAudio.tmpl Tue Jan 7 19:30:41 2003 -+*** misc/nas-1.4.1/config/NetAudio.tmpl Sun Mar 5 03:40:50 2000 -+--- misc/build/nas-1.4.1/config/NetAudio.tmpl Thu Nov 1 13:08:21 2001 - *************** - *** 166,171 **** - --- 166,177 ---- -@@ -15,8 +15,8 @@ - INCLUDESRC = $(TOP)/include - INCDIR = $(INCROOT)/audio - WIDGET_DIR = $(TOP)/clients/audio/widgets --*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 13:45:21 1999 ----- misc/build/nas-1.4.1/lib/audio/Alibint.c Tue Jan 7 19:30:41 2003 -+*** misc/nas-1.4.1/lib/audio/Alibint.c Sun Oct 24 19:45:21 1999 -+--- misc/build/nas-1.4.1/lib/audio/Alibint.c Thu Nov 1 13:11:51 2001 - *************** - *** 1336,1348 **** - static char *_SysErrorMsg (n) -@@ -40,8 +40,8 @@ - } - - #endif /* USL sharedlibs in don't define for AUD3.2 */ --*** misc/nas-1.4.1/lib/audio/Astreams.c Sat May 8 21:10:05 1999 ----- misc/build/nas-1.4.1/lib/audio/Astreams.c Tue Jan 7 19:30:41 2003 -+*** misc/nas-1.4.1/lib/audio/Astreams.c Sun May 9 03:10:05 1999 -+--- misc/build/nas-1.4.1/lib/audio/Astreams.c Thu Nov 1 13:05:48 2001 - *************** - *** 51,59 **** - #include -@@ -120,59 +120,157 @@ - return(-1); - } - --*** misc/nas-1.4.1/lib/audio/Imakefile Sat Jan 1 04:28:13 2000 ----- misc/build/nas-1.4.1/lib/audio/Imakefile Tue Jan 7 19:30:41 2003 --*************** --*** 25,30 **** ----- 25,32 ---- -- -- #include "../../config/NetAudio.tmpl" -- --+ CCOPTIONS += $(EXTRA_CCOPTIONS) --+ -- #if ProjectX < 5 -- /* Pre-X11R5 compatability */ -- #ifndef NormalLibX --*************** --*** 119,124 **** ----- 121,127 ---- -- -- #endif -- BuildIncludes($(HEADERS),audio,..) --+ BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -- InstallMultiple($(HEADERS),$(INCDIR)) -- #if ProjectX >= 5 -- InstallNonExecFile(AuErrorDB,$(LIBDIR)) --*** misc/nas-1.4.1/server/dia/gram.y Sat Jan 1 22:35:49 2000 ----- misc/build/nas-1.4.1/server/dia/gram.y Tue Jan 7 19:42:40 2003 --*************** --*** 119,132 **** -- } -- | MAXRATE number -- { ddaSetConfig(MAXRATE, (void *)$2); } --! | MINRATE number --! { ddaSetConfig(MINRATE, (void *)$2); } -- -- string : STRING { ptr = (char *)malloc(strlen($1)+1); -- strcpy(ptr, $1); -- RemoveDQuote(ptr); -- $$ = ptr; --! } -- number : NUMBER { $$ = $1; } -- ; -- ----- 119,132 ---- -- } -- | MAXRATE number -- { ddaSetConfig(MAXRATE, (void *)$2); } --! | MINRATE number --! { ddaSetConfig(MINRATE, (void *)$2); } ; -- -- string : STRING { ptr = (char *)malloc(strlen($1)+1); -- strcpy(ptr, $1); -- RemoveDQuote(ptr); -- $$ = ptr; --! }; -- number : NUMBER { $$ = $1; } -- ; -- -+--- misc/nas-1.4.1/Imakefile.orig Wed Mar 6 02:20:01 2002 -++++ misc/build/nas-1.4.1/Imakefile Wed Mar 6 02:20:07 2002 -+@@ -42,6 +42,8 @@ -+ @echo "" -+ Date -+ @echo "" -++ @find . | egrep "\.(cxx|h|c)$$" | xargs \ -++ ${PERL} -pi -e "s|||g" -+ $(MAKE) $(MFLAGS) Makefiles -+ $(MAKE) $(MFLAGS) clean -+ $(MAKE) $(MFLAGS) includes -+--- misc/nas-1.4.1/clients/audio/audial/audial.c.orig Wed Nov 5 18:50:21 1997 -++++ misc/build/nas-1.4.1/clients/audio/audial/audial.c Wed Nov 5 18:56:33 1997 -+@@ -133,6 +133,7 @@ -+ signal(SIGALRM, SIG_DFL); -+ } -+ -++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3) -+ static void -+ usleep(usecs) -+ unsigned int usecs; -+@@ -149,7 +150,7 @@ -+ setitimer(ITIMER_REAL, &ntval, &otval); -+ pause(); -+ } -+- -++#endif -+ #endif /* SYSV else not */ -+ #endif /* VMS else not */ -+ #endif /* NEEDUSLEEP */ -+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000 -++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000 -+@@ -155,8 +155,10 @@ -+ #include -+ -+ #ifdef __FreeBSD__ -+-# include -+-# include -++# include -++# ifdef __i386__ -++# include -++# endif -+ #else -+ # ifdef __NetBSD__ -+ # include -+@@ -610,7 +612,11 @@ -+ -+ if(sndStatOut.fd == -1) -+ { -++#ifdef __FreeBSD__ -++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait) -++#else -+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait) -++#endif -+ { -+ osLogMsg("openDevice: waiting on output device\n"); -+ sleep(1); -+@@ -1230,6 +1236,11 @@ -+ /* -+ * Setup soundcard at maximum audio quality. -+ */ -++ -++#ifdef __FreeBSD__ -++#define NO_16_BIT_SAMPLING -++#endif -++ -+ static void setupSoundcard(sndStatPtr) -+ SndStat* sndStatPtr; -+ { -+@@ -1380,7 +1391,11 @@ -+ -+ AL_initialized = AuTrue; -+ -++#ifdef __FreeBSD__ -++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) { -++#else -+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) { -++#endif -+ UNIDENTMSG; -+ return AuFalse; -+ } -+--- misc/nas-1.4.1/clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999 -++++ misc/build/nas-1.4.1/clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000 -+@@ -28,7 +28,7 @@ -+ */ -+ -+ #ifndef WIN32 -+-# ifdef __NetBSD__ -++# if defined(__NetBSD__) || defined(__FreeBSD__) -+ # include -+ # define MAXSHORT SHRT_MAX -+ # define MINSHORT SHRT_MIN -+--- misc/nas-1.4.1/lib/audio/Imakefile.orig Sun May 19 14:52:20 2002 -++++ misc/build/nas-1.4.1/lib/audio/Imakefile Sun May 19 14:54:25 2002 -+@@ -25,6 +25,8 @@ -+ -+ #include "../../config/NetAudio.tmpl" -+ -++CCOPTIONS += $(EXTRA_CCOPTIONS) -++ -+ #if ProjectX < 5 -+ /* Pre-X11R5 compatability */ -+ #ifndef NormalLibX -+@@ -64,10 +66,14 @@ -+ COMPAT_OBJS = AuGetBest.o -+ #endif /* ProjectX < 5 */ -+ -++#if HasBSD44Sockets -++ SOCK_DEFINES = -DBSD44SOCKETS -++#endif -++ -+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\" -+ -+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES) -+- CONN_DEFINES = ConnectionFlags -++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES) -+ -+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \ -+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \ -+@@ -119,6 +125,7 @@ -+ -+ #endif -+ BuildIncludes($(HEADERS),audio,..) -++BuildIncludes($(HEADERS),audio,$(BUILDINCTOP:../..=.)) -+ InstallMultiple($(HEADERS),$(INCDIR)) -+ #if ProjectX >= 5 -+ InstallNonExecFile(AuErrorDB,$(LIBDIR)) -+--- misc/nas-1.4.1/config/NetAudio.def.orig Sun Feb 13 05:31:14 2000 -++++ misc/build/nas-1.4.1/config/NetAudio.def Fri Mar 24 04:55:49 2000 -+@@ -8,5 +8,5 @@ -+ -+ XCOMM Directory where NAS will look for it's config file(s) -+ #ifndef NasConfigSearchPath -+-#define NasConfigSearchPath /etc/nas/ -++#define NasConfigSearchPath $(PROJECTROOT)/etc/ -+ #endif -+--- misc/nas-1.4.1/server/dia/gram.y.orig Thu Oct 31 10:13:28 2002 -++++ misc/build/nas-1.4.1/server/dia/gram.y Thu Oct 31 10:15:18 2002 -+@@ -120,13 +120,13 @@ -+ | MAXRATE number -+ { ddaSetConfig(MAXRATE, (void *)$2); } -+ | MINRATE number -+- { ddaSetConfig(MINRATE, (void *)$2); } -++ { ddaSetConfig(MINRATE, (void *)$2); }; -+ -+ string : STRING { ptr = (char *)malloc(strlen($1)+1); -+ strcpy(ptr, $1); -+ RemoveDQuote(ptr); -+ $$ = ptr; -+- } -++ }; -+ number : NUMBER { $$ = $1; } -+ ; -+ diff --git a/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk b/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk deleted file mode 100644 index 13512504fa1c..000000000000 --- a/editors/openoffice-1.0/files/patch-odk+pack+copying+makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -Index: odk/pack/copying/makefile.mk -=================================================================== -RCS file: /cvs/api/odk/pack/copying/makefile.mk,v -retrieving revision 1.46.2.9 -diff -u -r1.46.2.9 makefile.mk ---- odk/pack/copying/makefile.mk 24 Feb 2003 16:48:59 -0000 1.46.2.9 -+++ odk/pack/copying/makefile.mk 4 Aug 2005 03:03:48 -0000 -@@ -16,6 +16,7 @@ - - DIRLIST = \ - $(DESTDIRDOCU) \ -+ $(DESTDIR)$/settings \ - $(DESTDIRDOCUIMAGES) \ - $(DESTDIRDOCU)$/DevStudioWizards \ - $(DESTDIRDOCU)$/DevStudioWizards$/images \ diff --git a/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk b/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk deleted file mode 100644 index d29cebfd753d..000000000000 --- a/editors/openoffice-1.0/files/patch-odk+source+OOSupport+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ -Index: odk/source/OOSupport/makefile.mk -=================================================================== -RCS file: /cvs/api/odk/source/OOSupport/makefile.mk,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 makefile.mk ---- odk/source/OOSupport/makefile.mk 13 Jan 2003 10:58:17 -0000 1.1.2.1 -+++ odk/source/OOSupport/makefile.mk 4 Aug 2005 03:44:04 -0000 -@@ -336,5 +336,5 @@ - +cp -R ParserDB $(CLASSDIR)$/netbeans$/system - +cp openoffice-nbm-license.txt $(CLASSDIR) - +-mkdir $(CLASSDIR)$/netbeans$/modules -- +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java MakeModule -+ +cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java -classpath $(CLASSDIR) MakeModule - +cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans diff --git a/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk b/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk deleted file mode 100644 index 459335c2a3b1..000000000000 --- a/editors/openoffice-1.0/files/patch-odk+source+bean+native+unix+makefile.mk +++ /dev/null @@ -1,21 +0,0 @@ -Index: odk/source/bean/native/unix/makefile.mk -=================================================================== -RCS file: /cvs/api/odk/source/bean/native/unix/Attic/makefile.mk,v -retrieving revision 1.4 -diff -u -r1.4 makefile.mk ---- odk/source/bean/native/unix/makefile.mk 6 May 2002 18:56:38 -0000 1.4 -+++ odk/source/bean/native/unix/makefile.mk 3 Aug 2005 07:10:36 -0000 -@@ -20,9 +20,12 @@ - SHL1LIBS= $(SLB)$/$(TARGET).lib - SHL1STDLIBS=-ljawt -lsal - --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - SHL1STDLIBS+=-lstdc++ - .ENDIF -+.IF "$(OS)" == "FREEBSD" -+SHL1STDLIBS+=-ljvm -lhpi -+.ENDIF - - NO_SHL1DESCRIPTION=TRUE - diff --git a/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk b/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk deleted file mode 100644 index f3056308a682..000000000000 --- a/editors/openoffice-1.0/files/patch-odk+util+makefile.pmk +++ /dev/null @@ -1,31 +0,0 @@ -Index: odk/util/makefile.pmk -=================================================================== -RCS file: /cvs/api/odk/util/makefile.pmk,v -retrieving revision 1.26.2.4 -diff -u -r1.26.2.4 makefile.pmk ---- odk/util/makefile.pmk 17 Feb 2003 15:51:33 -0000 1.26.2.4 -+++ odk/util/makefile.pmk 29 Jul 2005 13:57:12 -0000 -@@ -76,7 +76,7 @@ - #-------------------- - MY_DELETE_RECURSIVE=rm -rf - MY_DIRCMP=dircmp --MY_TEXTCOPY= tr -d "\015" -+MY_TEXTCOPY=%%GNUTR%% -d "\015" - #MY_COPY=cat - - MY_DLLPREFIX=lib -@@ -116,6 +116,14 @@ - DESTDIRLIB=$(DESTDIR)$/netbsd$/lib - DESTDIRDLL=$(DESTDIRLIB) - -+.ELIF "$(OS)"=="FREEBSD" -+########### -+# FREEBSD -+########### -+DESTDIRBIN=$(DESTDIR)$/freebsd$/bin -+DESTDIRLIB=$(DESTDIR)$/freebsd$/lib -+DESTDIRDLL=$(DESTDIRLIB) -+ - .ELIF "$(OS)"=="IRIX " - ########### - # IRIX diff --git a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl b/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl deleted file mode 100644 index f6bb7fbd9886..000000000000 --- a/editors/openoffice-1.0/files/patch-offapi+com+sun+star+setup+OSType.idl +++ /dev/null @@ -1,12 +0,0 @@ ---- offapi/com/sun/star/setup/OSType.idl.orig Mon Dec 18 16:34:26 2000 -+++ offapi/com/sun/star/setup/OSType.idl Sun Jul 21 01:37:15 2002 -@@ -88,6 +88,9 @@ - UNIX_LINUX, - - // DocMerge: empty anyway -+ UNIX_FREEBSD, -+ -+ // DocMerge: empty anyway - UNIX_HP, - - // DocMerge: empty anyway diff --git a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk b/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk deleted file mode 100644 index 418bf7386412..000000000000 --- a/editors/openoffice-1.0/files/patch-offapi+util+makefile.pmk +++ /dev/null @@ -1,11 +0,0 @@ ---- offapi/util/makefile.pmk.orig Mon Mar 11 01:37:55 2002 -+++ offapi/util/makefile.pmk Mon Mar 11 01:37:57 2002 -@@ -85,7 +85,7 @@ - - URDDOC=TRUE - --.IF "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - .IF "$(CPU)"=="I" - UNOIDL=unoidl - .ENDIF diff --git a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx deleted file mode 100644 index 13b28b2a978f..000000000000 --- a/editors/openoffice-1.0/files/patch-package+inc+HashMaps.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- package/inc/HashMaps.hxx.orig Tue Oct 30 14:52:18 2001 -+++ package/inc/HashMaps.hxx Wed Jun 12 23:10:42 2002 -@@ -79,7 +79,7 @@ - }; - - class ZipPackageFolder; --class ContentInfo; -+class ZipContentInfo; - - typedef std::hash_map < rtl::OUString, - ZipPackageFolder *, -@@ -87,7 +87,7 @@ - eqFunc > FolderHash; - - typedef std::hash_map < rtl::OUString, -- vos::ORef < ContentInfo >, -+ vos::ORef < ZipContentInfo >, - ::rtl::OUStringHash, - eqFunc > ContentHash; - diff --git a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx deleted file mode 100644 index a6b291661686..000000000000 --- a/editors/openoffice-1.0/files/patch-package+inc+ZipPackageFolder.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- package/inc/ZipPackageFolder.hxx.orig Thu Nov 15 21:01:49 2001 -+++ package/inc/ZipPackageFolder.hxx Wed Jun 12 23:10:42 2002 -@@ -106,7 +106,7 @@ - - void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent ) - throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); -- ContentInfo & doGetByName( const ::rtl::OUString& aName ) -+ ZipContentInfo & doGetByName( const ::rtl::OUString& aName ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource); - static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId() diff --git a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx deleted file mode 100644 index adf7578a5b96..000000000000 --- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ContentInfo.hxx +++ /dev/null @@ -1,34 +0,0 @@ ---- package/source/zippackage/ContentInfo.hxx.orig Tue Oct 30 14:54:47 2001 -+++ package/source/zippackage/ContentInfo.hxx Wed Jun 12 23:10:42 2002 -@@ -75,7 +75,7 @@ - #endif - #include - --class ContentInfo : public cppu::OWeakObject -+class ZipContentInfo : public cppu::OWeakObject - { - public: - com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel; -@@ -85,19 +85,19 @@ - ZipPackageFolder *pFolder; - ZipPackageStream *pStream; - }; -- ContentInfo ( ZipPackageStream * pNewStream ) -+ ZipContentInfo ( ZipPackageStream * pNewStream ) - : bFolder ( false ) - , pStream ( pNewStream ) - , xTunnel ( pNewStream ) - { - } -- ContentInfo ( ZipPackageFolder * pNewFolder ) -+ ZipContentInfo ( ZipPackageFolder * pNewFolder ) - : bFolder ( true ) - , pFolder ( pNewFolder ) - , xTunnel ( pNewFolder ) - { - } -- virtual ~ContentInfo () -+ virtual ~ZipContentInfo () - { - if ( bFolder ) - pFolder->releaseUpwardRef(); diff --git a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx deleted file mode 100644 index dc0f493f124d..000000000000 --- a/editors/openoffice-1.0/files/patch-package+source+zippackage+ZipPackageFolder.cxx +++ /dev/null @@ -1,41 +0,0 @@ ---- package/source/zippackage/ZipPackageFolder.cxx.orig Wed Jun 12 23:09:16 2002 -+++ package/source/zippackage/ZipPackageFolder.cxx Wed Jun 12 23:10:42 2002 -@@ -212,7 +212,7 @@ - return maContents.size() > 0; - } - // XNameAccess --ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) -+ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) - { - ContentHash::iterator aIter = maContents.find ( aName ); -@@ -286,7 +286,7 @@ - aCI++) - { - const OUString &rShortName = (*aCI).first; -- const ContentInfo &rInfo = *(*aCI).second; -+ const ZipContentInfo &rInfo = *(*aCI).second; - - Sequence < PropertyValue > aPropSet (2); - PropertyValue *pValue = aPropSet.getArray(); -@@ -533,7 +533,7 @@ - aCI!=maContents.end(); - aCI++) - { -- ContentInfo &rInfo = * (*aCI).second; -+ ZipContentInfo &rInfo = * (*aCI).second; - if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () ) - rInfo.pFolder->releaseUpwardRef(); - else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() ) -@@ -577,9 +577,9 @@ - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) - { - if ( pEntry->IsFolder() ) -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); - else -- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); -+ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); - - if ( bSetParent ) - pEntry->setParent ( *this ); diff --git a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp b/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp deleted file mode 100644 index 1850fe136c9e..000000000000 --- a/editors/openoffice-1.0/files/patch-product+inc+scp+udk_basefiles.scp +++ /dev/null @@ -1,18 +0,0 @@ ---- product/inc/scp/udk_basefiles.scp.orig Tue Jan 7 14:52:10 2003 -+++ product/inc/scp/udk_basefiles.scp Sun Jan 19 22:37:05 2003 -@@ -2,6 +2,7 @@ - - // Temporary solution/hack: at the moment libstdc++.so and libgcc_s.so are needed for unxlngi4 environment - // (setup is linked against it). -+#if ( !defined ( FREEBSD )) - #if ( defined( _gcc3 ) && defined( C300 ) ) - - File gid_File_Lib_gcc -@@ -34,6 +35,7 @@ - End - - -+#endif - #endif - - File gid_File_Lib_Sal diff --git a/editors/openoffice-1.0/files/patch-product+settings+settings.mk b/editors/openoffice-1.0/files/patch-product+settings+settings.mk deleted file mode 100644 index c7824cec2938..000000000000 --- a/editors/openoffice-1.0/files/patch-product+settings+settings.mk +++ /dev/null @@ -1,75 +0,0 @@ ---- product/settings/settings.mk.orig Sat Jan 18 18:23:17 2003 -+++ product/settings/settings.mk Sat Jan 18 18:37:12 2003 -@@ -225,3 +226,72 @@ - - endif - -+ifeq "$(PLATFORM)" "FreeBSD" -+# Settings for FreeBSD using gcc compiler -+ -+OS=FREEBSD -+PLATFORM=freebsd -+PS=/ -+LINK=$(CC) -+LIB=$(CC) -+ECHO=@echo -+MKDIR=mkdir -p -+CAT=cat -+OBJ_EXT=o -+SHAREDLIB_EXT=so -+SHAREDLIB_PRE=lib -+SHAREDLIB_OUT=$(OUT_LIB) -+PACKAGE_LIB_DIR=freebsd_x86.plt -+ -+GCC_VERSION=$(shell $(CC) -dumpversion) -+ -+ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" -+COMID=gcc3 -+CPPU_ENV=gcc3 -+else -+COMID=GCC -+CPPU_ENV=gcc2 -+endif -+ -+OSEP=\< -+CSEP=\> -+ -+DEL=rm -f -+DELRECURSIVE=rm -rf -+COPY=cp -+URLPREFIX=file:// -+ -+# Include UDK version numbers -+include $(PRJ)/include/udkversion.mk -+ -+SALLIB=-lsal -+CPPULIB=-lcppu -+CPPUHELPERLIB=-lcppuhelper$(COMID) -+SALHELPERLIB=-lsalhelper$(COMID) -+STLPORTLIB=-lstlport_gcc -+ -+EMPTYSTRING= -+PATH_SEPARATOR=: -+ -+# -O is necessary for inlining (see gcc documentation) -+ifeq "$(DEBUG)" "yes" -+CC_FLAGS=-c -g -+else -+CC_FLAGS=-c -O -+endif -+SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd -I$(OO_SDK_JAVA_HOME)/include/linux -+CC_INCLUDES=-I. -I/usr/include -I$(OUT)/inc/examples -I$(PRJ)/include -+STL_INCLUDES=-I$(OO_STLPORT_HOME)/stlport -+CC_DEFINES=-DUNX -DGCC -DFREEBSD -DCPPU_ENV=$(CPPU_ENV) %%PTHREAD_CFLAGS%% -+ -+# define for used compiler necessary for UNO -+#-DCPPU_ENV=gcc2 -- gcc 2.91/2.95 -+#-DCPPU_ENV=gcc3 -- gcc3 3.0 -+ -+CC_OUTPUT_SWITCH=-o -+ -+LIBRARY_LINK_FLAGS=-shared -+EXE_LINK_FLAGS=-Wl -export-dynamic -+LINK_LIBS=-L$(OUT)/lib -L$(PRJ)/$(PLATFORM)/lib -L$(OFFICE_PROGRAM_PATH) %%PTHREAD_LIBS%% -+ -+endif diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk deleted file mode 100644 index 7b7e6d665ec7..000000000000 --- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk +++ /dev/null @@ -1,32 +0,0 @@ ---- product/util/makefile.mk.orig Sat Jan 18 13:31:50 2003 -+++ product/util/makefile.mk Sat Jan 18 13:30:54 2003 -@@ -131,13 +131,6 @@ - DESTDIRDLL=$(DESTDIRLIB) - STLPORTLIBNAME=libstlport_gcc.so - BINDINGDLL=$(COMNAME)_uno --.IF "$(COMID)"=="gcc3" --ADDITIONAL_DLLS= \ -- $(DESTDIRDLL)$/libgcc_s.so.1 \ -- $(DESTDIRDLL)$/libgcc_s.so \ -- $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) \ -- $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) --.ENDIF - - .ELIF "$(OS)"=="NETBSD" - ########### -@@ -491,6 +484,7 @@ - # special targets for linux gcc3 - .IF "$(COMID)"=="gcc3" - -+.IF "$(OS)"!="FREEBSD" - $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : - $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT) - -@@ -514,6 +508,7 @@ - $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) - -rm -f $@ - +ln -s libgcc_s.so.1 $@ -+.ENDIF - #------------------------------------------------------------- - - $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) diff --git a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx b/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx deleted file mode 100644 index fa1e6ccb68b2..000000000000 --- a/editors/openoffice-1.0/files/patch-psprint+source+printer+printerinfomanager.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- psprint/source/printer/printerinfomanager.cxx.orig Sat Apr 6 11:56:35 2002 -+++ psprint/source/printer/printerinfomanager.cxx Wed May 1 22:42:58 2002 -@@ -883,7 +883,7 @@ - - static const struct SystemCommandParameters aParms[] = - { --#if defined(LINUX) || defined(NETBSD) -+#if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) - { "/usr/sbin/lpc status", "lpr -P (PRINTER)", "", ":", 0 }, - { "lpc status", "lpr -P (PRINTER)", "", ":", 0 }, - { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d (PRINTER)", "system for ", ": ", 1 } diff --git a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps b/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps deleted file mode 100644 index f0b93e643758..000000000000 --- a/editors/openoffice-1.0/files/patch-psprint+source+printergfx+psheader.ps +++ /dev/null @@ -1,13 +0,0 @@ ---- psprint/source/printergfx/psheader.ps.orig Tue Jun 4 22:33:58 2002 -+++ psprint/source/printergfx/psheader.ps -@@ -303,8 +303,8 @@ - /h /i /j /k /l /m /n /o - /p /q /r /s /t /u /v /w - /x /y /z /braceleft /bar /braceright /asciitilde /unused -- /euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -- /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /zcaron /unused -+ /Euro /unused /quotesinglbase /florin /quotedblbase /ellipsis /dagger /daggerdbl -+ /circumflex /perthousand /Scaron /guilsinglleft /OE /unused /Zcaron /unused - /unused /quoteleft /quoteright /quotedblleft /quotedblright /bullet /endash /emdash - /tilde /trademark /scaron /guilsinglright /oe /unused /zcaron /Ydieresis - /space /exclamdown /cent /sterling /currency /yen /brokenbar /section diff --git a/editors/openoffice-1.0/files/patch-registry+source+registry.cxx b/editors/openoffice-1.0/files/patch-registry+source+registry.cxx deleted file mode 100644 index afa16cc20a6d..000000000000 --- a/editors/openoffice-1.0/files/patch-registry+source+registry.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- registry/source/registry.cxx.orig Fri Apr 4 00:09:08 2003 -+++ registry/source/registry.cxx Fri Apr 4 00:06:25 2003 -@@ -134,11 +134,7 @@ - - #ifdef UNX - strcat(tmpPattern, "/reg_XXXXXX"); --#if defined(FREEBSD) || defined(MACOSX) -- pTmpName = mkstemp(tmpPattern); --#else - pTmpName = mktemp(tmpPattern); --#endif - #endif - - return OString(pTmpName); diff --git a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx b/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx deleted file mode 100644 index a04188601413..000000000000 --- a/editors/openoffice-1.0/files/patch-registry+source+regkey.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- registry/source/regkey.cxx.orig Mon Mar 11 01:27:56 2002 -+++ registry/source/regkey.cxx Mon Mar 11 01:28:51 2002 -@@ -228,6 +228,9 @@ - { - RegError _ret = REG_NO_ERROR; - -+ if (!nSubKeys) -+ return REG_NO_ERROR; -+ - if (phSubKeys) - { - ORegistry* pReg = NULL; diff --git a/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk b/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk deleted file mode 100644 index 488b4a2eed71..000000000000 --- a/editors/openoffice-1.0/files/patch-registry+tools+makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -Index: registry/tools/makefile.mk -=================================================================== -RCS file: /cvs/udk/registry/tools/makefile.mk,v -retrieving revision 1.4 -diff -u -r1.4 makefile.mk ---- registry/tools/makefile.mk 18 May 2001 15:20:12 -0000 1.4 -+++ registry/tools/makefile.mk 10 Jul 2005 05:16:53 -0000 -@@ -88,6 +88,7 @@ - APP1STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" -@@ -102,6 +103,7 @@ - APP2STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" -@@ -115,6 +117,7 @@ - APP3STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" -@@ -128,6 +131,7 @@ - APP4STDLIBS=\ - $(SALLIB) \ - $(SALHELPERLIB) \ -+ $(STORELIB) \ - $(REGLIB) - - .IF "$(GUI)"=="WNT" diff --git a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h deleted file mode 100644 index c49c2533f367..000000000000 --- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp.h +++ /dev/null @@ -1,12 +0,0 @@ ---- rsc/source/rscpp/cpp.h.orig Fri Mar 1 00:14:38 2002 -+++ rsc/source/rscpp/cpp.h Fri Mar 1 00:15:03 2002 -@@ -462,7 +462,9 @@ - extern char *strrchr(); - extern char *strchr(); - #if ! ( defined UNX && defined ALPHA ) -+#if ! ( defined FREEBSD ) - extern long time(); -+#endif - #endif - /* extern char *sprintf(); */ /* Lint needs this */ - diff --git a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c b/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c deleted file mode 100644 index 3a4aa79dee18..000000000000 --- a/editors/openoffice-1.0/files/patch-rsc+source+rscpp+cpp3.c +++ /dev/null @@ -1,12 +0,0 @@ ---- rsc/source/rscpp/cpp3.c.orig Thu Jul 25 00:00:25 2002 -+++ rsc/source/rscpp/cpp3.c Thu Jul 25 00:01:50 2002 -@@ -82,7 +82,9 @@ - #ifdef IRIX - extern void abort(void); - #else -+#ifndef FREEBSD - extern int abort(); /* For debugging */ -+#endif - #endif - #endif - diff --git a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch deleted file mode 100644 index 59837cad556c..000000000000 --- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sablot/Sablot-0.52.patch.orig Sun Jan 19 15:13:42 2003 -+++ sablot/Sablot-0.52.patch Sun Jan 19 15:15:15 2003 -@@ -3,7 +3,7 @@ - *************** - *** 1 **** - ! dummy ----- 1,159 ---- -+--- 1,161 ---- - ! #************************************************************************* - ! # - ! # $RCSfile: makefile.mk,v $ -@@ -96,6 +96,8 @@ - ! .IF "$(GUI)"=="UNX" - ! .IF "$(OS)"=="NETBSD" - ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE -+! .ELIF "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE - ! .ELSE - ! .IF "$(OS)"=="MACOSX" - ! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_SYS_TIME_H -DHAVE_ISNAN -DHAVE_FINITE diff --git a/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h b/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h deleted file mode 100644 index 7f709a502e81..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+inc+osl+endian.h +++ /dev/null @@ -1,20 +0,0 @@ ---- sal/inc/osl/endian.h.orig Thu May 8 20:19:09 2003 -+++ sal/inc/osl/endian.h Thu May 8 20:29:00 2003 -@@ -107,7 +107,9 @@ - #endif - - #ifdef FREEBSD -+# include - # include -+#if __FreeBSD_version < 500000 - # if BYTE_ORDER == LITTLE_ENDIAN - # define _LITTLE_ENDIAN - # elif BYTE_ORDER == BIG_ENDIAN -@@ -115,6 +117,7 @@ - # elif BYTE_ORDER == PDP_ENDIAN - # define _PDP_ENDIAN - # endif -+#endif - #endif - - #ifdef SCO diff --git a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h b/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h deleted file mode 100644 index b7869a30acfb..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+inc+rtl+textenc.h +++ /dev/null @@ -1,21 +0,0 @@ ---- sal/inc/rtl/textenc.h.orig Mon Feb 24 17:46:26 2003 -+++ sal/inc/rtl/textenc.h Tue Feb 25 16:45:00 2003 -@@ -173,8 +173,9 @@ - #define RTL_TEXTENCODING_MS_1361 (RTL_TEXTENC_CAST( 84 )) - #define RTL_TEXTENCODING_GB_18030 (RTL_TEXTENC_CAST( 85 )) - #define RTL_TEXTENCODING_BIG5_HKSCS (RTL_TEXTENC_CAST( 86 )) -+#define RTL_TEXTENCODING_KOI8_U (RTL_TEXTENC_CAST( 87 )) - --#define RTL_TEXTENCODING_STD_COUNT (RTL_TEXTENC_CAST( 87 )) -+#define RTL_TEXTENCODING_STD_COUNT (RTL_TEXTENC_CAST( 88 )) - - #define RTL_TEXTENCODING_USER_START (RTL_TEXTENC_CAST( 0x8000 )) - #define RTL_TEXTENCODING_USER_END (RTL_TEXTENC_CAST( 0xEFFF )) -@@ -223,6 +224,7 @@ - Cyrillic (DOS/OS2-866/Russian) RTL_TEXTENCODING_IBM_866 - Cyrillic (ISO-8859-5) RTL_TEXTENCODING_ISO_8859_5 - Cyrillic (KOI8-R) RTL_TEXTENCODING_KOI8_R -+Cyrillic (KOI8-U) RTL_TEXTENCODING_KOI8_U - Cyrillic (Windows-1251) RTL_TEXTENCODING_MS_1251 - - Greek (Apple Macintosh) RTL_TEXTENCODING_APPLE_GREEK diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c deleted file mode 100644 index d7f43eaa741a..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+interlck.c +++ /dev/null @@ -1,30 +0,0 @@ ---- sal/osl/unx/interlck.c.orig Mon Jul 22 17:51:34 2002 -+++ sal/osl/unx/interlck.c Mon Jul 22 18:03:42 2002 -@@ -81,10 +81,10 @@ - __asm__ __volatile__ ( - "movl $1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "incl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - -@@ -95,10 +95,10 @@ - __asm__ __volatile__ ( - "movl $-1, %0\n\t" - "lock\n\t" -- "xadd %0, %2\n\t" -+ "xadd %0, %1\n\t" - "decl %0" -- : "=a" (nCount), "=m" (*pCount) -- : "m" (*pCount) -+ : "=&a" (nCount), "+m" (*pCount) -+ : - : "memory"); - } - diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c deleted file mode 100644 index a21898194f4d..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c +++ /dev/null @@ -1,135 +0,0 @@ ---- sal/osl/unx/nlsupport.c.orig Tue May 21 15:22:11 2002 -+++ sal/osl/unx/nlsupport.c Tue Sep 3 12:58:48 2002 -@@ -63,7 +63,7 @@ - #include - #include - --#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) - #include - #include - #include -@@ -241,12 +240,13 @@ - return NULL; - } - --#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(FREEBSD) || defined(NETBSD) - - /* - * This implementation of osl_getTextEncodingFromLocale maps - * from nl_langinfo(CODESET) to rtl_textencoding defines. -- * nl_langinfo() is supported only on Linux, Solaris and IRIX. -+ * nl_langinfo() is supported only on Linux, Solaris and IRIX, -+ * >= NetBSD 1.6 and >= FreeBSD 4.4 - * - * This routine is SLOW because of the setlocale call, so - * grab the result and cache it. -@@ -260,6 +260,12 @@ - #endif - #endif - -+/* -+ * _nl_language_list[] is an array list of supported encodings. Because -+ * we are using a binary search, the list has to be in ascending order. -+ * We are comparing the encodings case insensitiv, so the list has -+ * to be completly upper- , or lowercase. -+ */ - - #if defined(SOLARIS) - -@@ -497,7 +503,59 @@ - { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ - }; - --#endif /* ifdef LINUX || NETBSD */ -+#elif defined(FREEBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#elif defined(NETBSD) -+ -+const _pair _nl_language_list[] = { -+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */ -+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */ -+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */ -+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */ -+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */ -+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */ -+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */ -+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */ -+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */ -+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */ -+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */ -+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */ -+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */ -+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */ -+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */ -+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8 */ -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */ -+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */ -+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ -+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */ -+}; -+ -+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */ - - static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER; - -@@ -619,7 +677,7 @@ - return ret; - } - --#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || NETBSD */ -+#elif defined(MACOSX) /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD */ - - /* - * FIXME: the MacOS X implemetation is missing -@@ -652,7 +710,7 @@ - return 0; - } - --#else /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */ -+#else /* ifdef LINUX || SOLARIS || IRIX || FREEBSD || NETBSD || MACOSX */ - - /* - * This implementation of osl_getTextEncodingFromLocale maps -@@ -685,6 +743,7 @@ - { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, - { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, - { "koi8-r", RTL_TEXTENCODING_KOI8_R }, -+ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, - { "pck", RTL_TEXTENCODING_MS_932 }, - #if (0) - { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, -@@ -888,6 +947,6 @@ - return 0; - } - --#endif /* ifdef LINUX || SOLARIS || MACOSX || NETBSD */ -+#endif /* ifdef LINUX || SOLARIS || FREEBSD || NETBSD || MACOSX */ - - diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c deleted file mode 100644 index acf47ad85552..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c +++ /dev/null @@ -1,14 +0,0 @@ ---- sal/osl/unx/pipe.c.orig Mon Feb 18 13:48:55 2002 -+++ sal/osl/unx/pipe.c Wed Apr 3 00:59:15 2002 -@@ -264,7 +264,11 @@ - - addr.sun_family = AF_UNIX; - strncpy(addr.sun_path, name, sizeof(addr.sun_path)); -+#if defined(FREEBSD) -+ len = SUN_LEN(&addr); -+#else - len = sizeof(addr); -+#endif - - if ( Options & osl_Pipe_CREATE ) - { diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c deleted file mode 100644 index 9f94bc83493c..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+process.c +++ /dev/null @@ -1,20 +0,0 @@ ---- sal/osl/unx/process.c.orig Wed Jun 5 16:24:42 2002 -+++ sal/osl/unx/process.c Wed Jan 15 01:25:17 2003 -@@ -222,7 +222,7 @@ - /* Memory layout of CMD_ARG_PRG: - progname\0arg1\0...argn[\0]\0environ\0env2\0...envn\0[\0] */ - --#if !defined(NETBSD) -+#if !defined(NETBSD) && !defined(FREEBSD) - extern sal_Char* CMD_ARG_PRG; - #endif - extern sal_Char** CMD_ARG_ENV; -@@ -862,7 +862,7 @@ - - if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0)) - OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno)); --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - unsetenv("HOME"); - #else - putenv("HOME="); diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c deleted file mode 100644 index c10adeb079b3..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c +++ /dev/null @@ -1,20 +0,0 @@ ---- sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ - #undef HAVE_POLL_H - #endif - --#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) - #include - #define HAVE_POLL_H - #endif /* HAVE_POLL_H */ -@@ -1965,7 +1965,7 @@ - /*****************************************************************************/ - oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) - { --#ifdef LINUX -+#ifdef LINUX || defined(FREEBSD) - socklen_t AddrLen; - #else - /* mfe: Solaris 'cc +w' means Addrlen should be signed! */ diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c deleted file mode 100644 index a50abf9acbf9..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.c +++ /dev/null @@ -1,137 +0,0 @@ ---- sal/osl/unx/system.c.orig Tue Aug 20 08:49:46 2002 -+++ sal/osl/unx/system.c Sat Apr 19 22:15:25 2003 -@@ -74,7 +74,8 @@ - static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER; - - /* struct passwd differs on some platforms */ --#if defined NETBSD || defined MACOSX || defined FREEBSD -+#if defined NETBSD || defined MACOSX || \ -+ (defined FREEBSD && (__FreeBSD_version < 500112)) - #include - #include - -@@ -203,6 +204,73 @@ - } - #endif - -+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, -+ size_t buflen, struct passwd **result) -+{ -+ struct passwd* res; -+ -+ pthread_mutex_lock(&getrtl_mutex); -+ -+ if ( res = getpwuid(uid) ) -+ { -+ size_t pw_name, pw_passwd, pw_class, pw_gecos, pw_dir, pw_shell; -+ -+ pw_name = strlen(res->pw_name)+1; -+ pw_passwd = strlen(res->pw_passwd)+1; -+ pw_class = strlen(res->pw_class)+1; -+ pw_gecos = strlen(res->pw_gecos)+1; -+ pw_dir = strlen(res->pw_dir)+1; -+ pw_shell = strlen(res->pw_shell)+1; -+ -+ if (pw_name+pw_passwd+pw_class+pw_gecos -+ +pw_dir+pw_shell < buflen) -+ { -+ memcpy(pwd, res, sizeof(struct passwd)); -+ -+ strncpy(buffer, res->pw_name, pw_name); -+ pwd->pw_name = buffer; -+ buffer += pw_name; -+ -+ strncpy(buffer, res->pw_passwd, pw_passwd); -+ pwd->pw_passwd = buffer; -+ buffer += pw_passwd; -+ -+ strncpy(buffer, res->pw_class, pw_class); -+ pwd->pw_class = buffer; -+ buffer += pw_class; -+ -+ strncpy(buffer, res->pw_gecos, pw_gecos); -+ pwd->pw_gecos = buffer; -+ buffer += pw_gecos; -+ -+ strncpy(buffer, res->pw_dir, pw_dir); -+ pwd->pw_dir = buffer; -+ buffer += pw_dir; -+ -+ strncpy(buffer, res->pw_shell, pw_shell); -+ pwd->pw_shell = buffer; -+ buffer += pw_shell; -+ -+ *result = pwd ; -+ res = 0 ; -+ -+ } else { -+ -+ res = ENOMEM ; -+ -+ } -+ -+ } else { -+ -+ res = errno ; -+ -+ } -+ -+ pthread_mutex_unlock(&getrtl_mutex); -+ -+ return res; -+} -+ - struct tm *localtime_r(const time_t *timep, struct tm *buffer) - { - struct tm* res; -@@ -712,3 +780,50 @@ - } - #endif - -+#if defined(NETBSD) || defined(FREEBSD) -+char *fcvt(double value, int ndigit, int *decpt, int *sign) -+{ -+ static char ret[256]; -+ char buf[256],zahl[256],format[256]="%"; -+ char *v1,*v2; -+ -+ if (value==0.0) value=1e-30; -+ -+ if (value<0.0) *sign=1; else *sign=0; -+ -+ if (value<1.0) -+ { -+ *decpt=(int)log10(value); -+ value*=pow(10.0,1-*decpt); -+ ndigit+=*decpt-1; -+ if (ndigit<0) ndigit=0; -+ } -+ else -+ { -+ *decpt=(int)log10(value)+1; -+ } -+ -+ sprintf(zahl,"%d",ndigit); -+ strcat(format,zahl); -+ strcat(format,"."); -+ strcat(format,zahl); -+ strcat(format,"f"); -+ -+ sprintf(buf,format,value); -+ -+ if (ndigit!=0) -+ { -+ v1=strtok(buf,"."); -+ v2=strtok(NULL,"."); -+ strcpy(ret,v1); -+ strcat(ret,v2); -+ } -+ else -+ { -+ strcpy(ret,buf); -+ } -+ -+ return(ret); -+} -+ -+#endif diff --git a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h deleted file mode 100644 index a6ba577cda4b..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+osl+unx+system.h +++ /dev/null @@ -1,57 +0,0 @@ ---- sal/osl/unx/system.h.orig Tue Aug 20 15:54:55 2002 -+++ sal/osl/unx/system.h Thu May 8 20:31:08 2003 -@@ -203,12 +203,19 @@ - # include - # include - # include -+# include - # include - # include -+# include -+# include -+# include -+# include -+# include - # include - # include - # define IORESOURCE_TRANSFER_BSD - # include -+#ifdef __FreeBSD_version < 500000 - # if BYTE_ORDER == LITTLE_ENDIAN - # define _LITTLE_ENDIAN - # elif BYTE_ORDER == BIG_ENDIAN -@@ -216,12 +223,14 @@ - # elif BYTE_ORDER == PDP_ENDIAN - # define _PDP_ENDIAN - # endif --# define sched_yield() pthread_yield() --# define pthread_testcancel() -+#endif - # define NO_PTHREAD_RTL --# define NO_PTHREAD_PRIORITY --# define CMD_ARG_PRG __progname --# define CMD_ARG_ENV environ -+/* __progname isn't sufficient here. We need the full path as well -+ * for e.g. setup and __progname only points to the binary name. -+ */ -+# define CMD_ARG_PRG_IS_DEFINED -+# define CMD_ARG_PRG *((struct ps_strings *)PS_STRINGS)->ps_argvstr -+# define CMD_ARG_ENV environ - #endif - - #ifdef SCO -@@ -569,12 +578,14 @@ - #endif - - #ifdef NO_PTHREAD_RTL -+#if !defined FREEBSD || (__FreeBSD_version < 500112) - struct passwd *getpwent_r(struct passwd *pwd, char *buffer, int buflen); - extern struct spwd *getspnam_r(const char *name, struct spwd *result, - char *buffer, int buflen); - - struct tm *localtime_r(const time_t *timep, struct tm *buffer); - struct tm *gmtime_r(const time_t *timep, struct tm *buffer); -+#endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */ - struct hostent *gethostbyname_r(const char *name, struct hostent *result, - char *buffer, int buflen, int *h_errnop); - #endif diff --git a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c b/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c deleted file mode 100644 index 7630ff8cf8c1..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+rtl+source+strtmpl.c +++ /dev/null @@ -1,19 +0,0 @@ ---- sal/rtl/source/strtmpl.c.orig Mon Mar 11 01:28:38 2002 -+++ sal/rtl/source/strtmpl.c Mon Mar 11 01:30:42 2002 -@@ -1104,10 +1104,12 @@ - } - else if ( *pStr == '+' ) - { -- if ( bExp && (nExp != 0) ) -- break; -- if ( fRet != 0.0 ) -- break; -+ if ( bExp ) { -+ if ( nExp != 0 ) -+ break; -+ } -+ else if ( fRet != 0.0 ) -+ break; - } - /* Exponent separator */ - else if ( (*pStr == 'e') || (*pStr == 'E') ) diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab b/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab deleted file mode 100644 index 3fd7b4a43560..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+textenc+tcvtest1.tab +++ /dev/null @@ -1,173 +0,0 @@ ---- sal/textenc/tcvtest1.tab.orig Fri Oct 12 13:44:53 2001 -+++ sal/textenc/tcvtest1.tab Tue Feb 25 16:47:50 2003 -@@ -4328,3 +4328,170 @@ - "koi8-r", - RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; - /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ -+ -+/* ======================================================================= */ -+ -+/* KOI8_U */ -+/* Standard Charset for Ukrainian Cyrillic */ -+/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */ -+/* Convert-Tables: typed per hand */ -+/* Last-Changes from us: */ -+ -+#define KOI8UUNI_START 0x80 -+#define KOI8UUNI_END 0xFF -+static sal_uInt16 const aImplKOI8UToUniTab[KOI8UUNI_END - KOI8UUNI_START + 1] = -+{ -+/* 0 1 2 3 4 5 6 7 */ -+/* 8 9 A B C D E F */ -+ 0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524, /* 0x80 */ -+ 0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590, /* 0x80 */ -+ 0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248, /* 0x90 */ -+ 0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7, /* 0x90 */ -+ 0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457, /* 0xA0 */ -+ 0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E, /* 0xA0 */ -+ 0x255F, 0x2560, 0x2561, 0x0401, 0x0404, 0x2563, 0x0406, 0x0407, /* 0xB0 */ -+ 0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9, /* 0xB0 */ -+ 0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0xC0 */ -+ 0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, /* 0xC0 */ -+ 0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0xD0 */ -+ 0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A, /* 0xD0 */ -+ 0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0xE0 */ -+ 0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, /* 0xE0 */ -+ 0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0xF0 */ -+ 0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A /* 0xF0 */ -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+#define KOI8UCHAR_START 0x0410 -+#define KOI8UCHAR_END 0x044F -+static sal_uChar const aImplKOI8UToCharTab[KOI8UCHAR_END - KOI8UCHAR_START + 1] = -+{ -+/* 0 1 2 3 4 5 6 7 */ -+/* 8 9 A B C D E F */ -+ 0xE1, 0xE2, 0xF7, 0xE7, 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0410 */ -+ 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, /* 0x0410 */ -+ 0xF2, 0xF3, 0xF4, 0xF5, 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0420 */ -+ 0xFB, 0xFD, 0xFF, 0xF9, 0xF8, 0xFC, 0xE0, 0xF1, /* 0x0420 */ -+ 0xC1, 0xC2, 0xD7, 0xC7, 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0430 */ -+ 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, /* 0x0430 */ -+ 0xD2, 0xD3, 0xD4, 0xD5, 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0440 */ -+ 0xDB, 0xDD, 0xDF, 0xD9, 0xD8, 0xDC, 0xC0, 0xD1 /* 0x0440 */ -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+#define KOI8UTOCHARTABEX_COUNT 72 -+static ImplUniCharTabData const aImplKOI8UToCharTabEx[KOI8UTOCHARTABEX_COUNT] = -+{ -+ { 0x00A0, 0x9A }, -+ { 0x00A9, 0xBF }, -+ { 0x00B0, 0x9C }, -+ { 0x00B2, 0x9D }, -+ { 0x00B7, 0x9E }, -+ { 0x00F7, 0x9F }, -+ { 0x0401, 0xB3 }, -+ { 0x0404, 0xB4 }, -+ { 0x0406, 0xB6 }, -+ { 0x0407, 0xB7 }, -+ { 0x0451, 0xA3 }, -+ { 0x0454, 0xA4 }, -+ { 0x0456, 0xA6 }, -+ { 0x0457, 0xA7 }, -+ { 0x0490, 0xBD }, -+ { 0x0491, 0xAD }, -+ { 0x2219, 0x95 }, -+ { 0x221A, 0x96 }, -+ { 0x2248, 0x97 }, -+ { 0x2264, 0x98 }, -+ { 0x2265, 0x99 }, -+ { 0x2320, 0x93 }, -+ { 0x2321, 0x9B }, -+ { 0x2500, 0x80 }, -+ { 0x2502, 0x81 }, -+ { 0x250C, 0x82 }, -+ { 0x2510, 0x83 }, -+ { 0x2514, 0x84 }, -+ { 0x2518, 0x85 }, -+ { 0x251C, 0x86 }, -+ { 0x2524, 0x87 }, -+ { 0x252C, 0x88 }, -+ { 0x2534, 0x89 }, -+ { 0x253C, 0x8A }, -+ { 0x2550, 0xA0 }, -+ { 0x2551, 0xA1 }, -+ { 0x2552, 0xA2 }, -+ { 0x2553, 0xA4 }, -+ { 0x2554, 0xA5 }, -+ { 0x2555, 0xA6 }, -+ { 0x2556, 0xA7 }, -+ { 0x2557, 0xA8 }, -+ { 0x2558, 0xA9 }, -+ { 0x2559, 0xAA }, -+ { 0x255A, 0xAB }, -+ { 0x255B, 0xAC }, -+ { 0x255C, 0xAD }, -+ { 0x255D, 0xAE }, -+ { 0x255E, 0xAF }, -+ { 0x255F, 0xB0 }, -+ { 0x2560, 0xB1 }, -+ { 0x2561, 0xB2 }, -+ { 0x2562, 0xB4 }, -+ { 0x2563, 0xB5 }, -+ { 0x2564, 0xB6 }, -+ { 0x2565, 0xB7 }, -+ { 0x2566, 0xB8 }, -+ { 0x2567, 0xB9 }, -+ { 0x2568, 0xBA }, -+ { 0x2569, 0xBB }, -+ { 0x256A, 0xBC }, -+ { 0x256B, 0xBD }, -+ { 0x256C, 0xBE }, -+ { 0x2580, 0x8B }, -+ { 0x2584, 0x8C }, -+ { 0x2588, 0x8D }, -+ { 0x258C, 0x8E }, -+ { 0x2590, 0x8F }, -+ { 0x2591, 0x90 }, -+ { 0x2592, 0x91 }, -+ { 0x2593, 0x92 }, -+ { 0x25A0, 0x94 } -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+static ImplByteConvertData const aImplKOI8UByteCvtData = -+{ -+ aImplKOI8UToUniTab, -+ NULL, -+ KOI8UUNI_START, KOI8UUNI_END, -+ NOTABUNI_START, NOTABUNI_END, -+ aImplKOI8UToCharTab, -+ NULL, -+ aImplKOI8UToCharTabEx, -+ KOI8UCHAR_START, KOI8UCHAR_END, -+ NOTABCHAR_START, NOTABCHAR_END, -+ KOI8UTOCHARTABEX_COUNT -+}; -+ -+/* ----------------------------------------------------------------------- */ -+ -+static ImplTextEncodingData const aImplKOI8UTextEncodingData -+ = { { &aImplKOI8UByteCvtData, -+ ImplCharToUnicode, -+ ImplUnicodeToChar, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ NULL, -+ NULL }, -+ RTL_TEXTENCODING_KOI8_U, -+ 1, -+ 1, -+ 1, -+ 204, -+ "koi8-u", -+ "koi8-u", -+ RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; -+ /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c b/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c deleted file mode 100644 index d91b0fecccc6..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+textenc+tencinfo.c +++ /dev/null @@ -1,37 +0,0 @@ ---- sal/textenc/tencinfo.c.orig Wed Jul 31 11:44:35 2002 -+++ sal/textenc/tencinfo.c Wed Jul 31 11:45:47 2002 -@@ -532,6 +532,7 @@ - static ImplStrCharsetDef const aUnixCharsetKOI8Tab[] = - { - { "r", RTL_TEXTENCODING_KOI8_R }, -+ { "u", RTL_TEXTENCODING_KOI8_U }, - { NULL, RTL_TEXTENCODING_DONTKNOW } - }; - -@@ -695,6 +695,10 @@ - /* characters. The function search for the first equal string in */ - /* the table. In this table are only the most used mime types. */ - /* Sort order: important */ -+ -+ if (pMimeCharset == NULL) -+ pMimeCharset = "usascii"; -+ - static ImplStrCharsetDef const aVIPMimeCharsetTab[] = - { - { "usascii", RTL_TEXTENCODING_ASCII_US }, -@@ -741,6 +742,7 @@ - { "windows1256", RTL_TEXTENCODING_MS_1256 }, - { "windows1257", RTL_TEXTENCODING_MS_1257 }, - { "windows1258", RTL_TEXTENCODING_MS_1258 }, -+ { "koi8u", RTL_TEXTENCODING_KOI8_U }, - { NULL, RTL_TEXTENCODING_DONTKNOW } - }; - -@@ -815,6 +817,7 @@ - { "iso10646us", RTL_TEXTENCODING_ASCII_US }, - { "iso646irv", RTL_TEXTENCODING_ASCII_US }, - { "cskoi8r", RTL_TEXTENCODING_KOI8_R }, -+ { "cskoi8u", RTL_TEXTENCODING_KOI8_U }, - { "ibm437", RTL_TEXTENCODING_IBM_437 }, - { "cp437", RTL_TEXTENCODING_IBM_437 }, - { "437", RTL_TEXTENCODING_IBM_437 }, diff --git a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c b/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c deleted file mode 100644 index 47cfbbdca8bd..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+textenc+textenc.c +++ /dev/null @@ -1,12 +0,0 @@ ---- sal/textenc/textenc.c.orig Mon Feb 24 17:46:29 2003 -+++ sal/textenc/textenc.c Tue Feb 25 16:51:28 2003 -@@ -254,7 +254,8 @@ - &aImplJISX0212TextEncodingData, /* JIS_X_0212 */ - &aImplMS1361TextEncodingData, /* MS_1361 */ - &aImplGb18030TextEncodingData, /* GB_18030 */ -- &aImplBig5HkscsTextEncodingData }; /* BIG5_HKSCS */ -+ &aImplBig5HkscsTextEncodingData, /* BIG5_HKSCS */ -+ &aImplKOI8UTextEncodingData }; /* KOI8_U */ - OSL_ENSURE(nEncoding >= RTL_TEXTENCODING_DONTKNOW - && nEncoding <= RTL_TEXTENCODING_UNICODE, - "specification violation"); diff --git a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk deleted file mode 100644 index 103ddd1b4166..000000000000 --- a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk +++ /dev/null @@ -1,29 +0,0 @@ ---- sal/workben/makefile.mk.orig Tue May 15 14:11:20 2001 -+++ sal/workben/makefile.mk Sun Mar 10 23:46:59 2002 -@@ -113,7 +113,7 @@ - - .IF "$(TESTAPP)" == "salstattest" - -- CFLAGS+= /DUSE_SAL_STATIC -+ CFLAGS+= -DUSE_SAL_STATIC - - OBJFILES= $(OBJ)$/salstattest.obj - -@@ -325,7 +325,7 @@ - # tgetpwnam - # - .IF "$(TESTAPP)" == "tgetpwnam" --.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" -+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" - - CXXFILES= tgetpwnam.cxx - OBJFILES= $(OBJ)$/tgetpwnam.obj -@@ -335,7 +335,7 @@ - APP5STDLIBS=$(SALLIB) - APP5DEPN= $(SLB)$/sal.lib - --.ENDIF # (sco | netbsd) -+.ENDIF # (sco | netbsd | freebsd) - .ENDIF # tgetpwname - - # --- Targets ------------------------------------------------------ diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map b/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map deleted file mode 100644 index 15efdfc2a5d1..000000000000 --- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc2_freebsd_intel.map +++ /dev/null @@ -1,31 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:24 2002 -+++ salhelper/source/gcc2_freebsd_intel.map Thu Jun 6 20:02:18 2002 -@@ -0,0 +1,28 @@ -+SALHLP_1_0 { -+global: -+GetVersionInfo; -+_._Q28salhelper18ORealDynamicLoader; -+__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2PvT4; -+__tfQ29salhelper18ORealDynamicLoader; -+__tiQ29salhelper18ORealDynamicLoader; -+__vt_Q29salhelper18ORealDynamicLoader; -+_fini; -+_init; -+acquire__Q29salhelper18ORealDynamicLoader; -+getApi__CQ29salhelper18ORealDynamicLoader; -+newInstance__Q29salhelper18ORealDynamicLoaderPPQ29salhelper18ORealDynamicLoaderRCQ23rtl8OUStringT2; -+release__Q29salhelper18ORealDynamicLoader; -+_._Q29salhelper21SimpleReferenceObject; -+__Q29salhelper21SimpleReferenceObject; -+__dl__Q29salhelper21SimpleReferenceObjectPv; -+__dl__Q29salhelper21SimpleReferenceObjectPvRC9nothrow_t; -+__nw__Q29salhelper21SimpleReferenceObjectUi; -+__nw__Q29salhelper21SimpleReferenceObjectUiRC9nothrow_t; -+__tfQ29salhelper21SimpleReferenceObject; -+__tiQ29salhelper21SimpleReferenceObject; -+__vt_Q29salhelper21SimpleReferenceObject; -+acquire__Q29salhelper21SimpleReferenceObject; -+release__Q29salhelper21SimpleReferenceObject; -+local: -+*; -+}; diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map b/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map deleted file mode 100644 index 0b7d6c6ddf86..000000000000 --- a/editors/openoffice-1.0/files/patch-salhelper+source+gcc3_freebsd_intel.map +++ /dev/null @@ -1,34 +0,0 @@ ---- /dev/null Thu Jun 6 20:06:34 2002 -+++ salhelper/source/gcc3_freebsd_intel.map Thu Jun 6 20:02:29 2002 -@@ -0,0 +1,31 @@ -+UDK_3_0_0 { -+ global: -+GetVersionInfo; -+_DYNAMIC; -+_GLOBAL_OFFSET_TABLE_; -+_ZN9salhelper18ORealDynamicLoader11newInstanceEPPS0_RKN3rtl8OUStringES6_; -+_ZN9salhelper18ORealDynamicLoader7acquireEv; -+_ZN9salhelper18ORealDynamicLoader7releaseEv; -+_ZN9salhelper18ORealDynamicLoaderC1EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderC2EPPS0_RKN3rtl8OUStringES6_PvS7_; -+_ZN9salhelper18ORealDynamicLoaderD0Ev; -+_ZN9salhelper18ORealDynamicLoaderD1Ev; -+_ZN9salhelper18ORealDynamicLoaderD2Ev; -+_ZN9salhelper21SimpleReferenceObjectD0Ev; -+_ZN9salhelper21SimpleReferenceObjectD1Ev; -+_ZN9salhelper21SimpleReferenceObjectD2Ev; -+_ZN9salhelper21SimpleReferenceObjectdlEPv; -+_ZN9salhelper21SimpleReferenceObjectnwEj; -+_ZNK9salhelper18ORealDynamicLoader6getApiEv; -+_ZTVN9salhelper18ORealDynamicLoaderE; -+_ZTVN9salhelper21SimpleReferenceObjectE; -+__bss_start; -+_edata; -+_end; -+_fini; -+_init; -+component_getDescriptionFunc; -+ local: -+ *; -+}; -+ diff --git a/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk deleted file mode 100644 index aa0f41647531..000000000000 --- a/editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001 -+++ salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002 -@@ -109,6 +109,10 @@ - SHL1VERSIONMAP=lngi.map - .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" - SHL1VERSIONMAP=gcc3_linux_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+SHL1VERSIONMAP=gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+SHL1VERSIONMAP=gcc3_freebsd_intel.map - .ENDIF - - diff --git a/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk b/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk deleted file mode 100644 index 3abd9347b78e..000000000000 --- a/editors/openoffice-1.0/files/patch-salhelper+test+rtti+makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- salhelper/test/rtti/makefile.mk.orig Sat Jul 20 23:11:56 2002 -+++ salhelper/test/rtti/makefile.mk Sat Jul 20 23:12:01 2002 -@@ -116,6 +116,10 @@ - SHL1VERSIONMAP= sols.map - .ELIF "$(OS)$(CPU)"=="LINUXI" - SHL1VERSIONMAP= lngi.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc2" -+SHL1VERSIONMAP= gcc2_freebsd_intel.map -+.ELIF "$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" -+SHL1VERSIONMAP= gcc3_freebsd_intel.map - .ENDIF - - diff --git a/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx b/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx deleted file mode 100644 index 15b6118abc52..000000000000 --- a/editors/openoffice-1.0/files/patch-sc+source+core+data+cell.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- sc/source/core/data/cell.cxx.orig Sun Jul 21 00:39:25 2002 -+++ sc/source/core/data/cell.cxx Sun Jul 21 00:39:26 2002 -@@ -75,7 +75,7 @@ - #include - #endif - --#ifdef SOLARIS -+#if defined (SOLARIS) || defined (FREEBSD) - #include - #elif ( defined ( LINUX ) && ( GLIBC < 2 ) ) - #include diff --git a/editors/openoffice-1.0/files/patch-scp+source+player+player.scp b/editors/openoffice-1.0/files/patch-scp+source+player+player.scp deleted file mode 100644 index d1fbf56ad0d3..000000000000 --- a/editors/openoffice-1.0/files/patch-scp+source+player+player.scp +++ /dev/null @@ -1,20 +0,0 @@ ---- scp/source/player/player.scp.orig Sun Jul 21 00:30:27 2002 -+++ scp/source/player/player.scp Sun Jul 21 00:30:28 2002 -@@ -62,7 +62,7 @@ - // directories - //////////////////////// - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - - Directory GID_DIR_KDE2 - ParentID = PREDEFINED_HOMEDIR; -@@ -701,7 +701,7 @@ - Name = "gnomeappplayer.zip"; - End - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - - File GID_FILE_EXTRA_KDEAPPPLAYER - Dir = GID_DIR_KDE2_SHARE_APPLNK_STAR; diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache b/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache deleted file mode 100644 index 1a2067f1fa61..000000000000 --- a/editors/openoffice-1.0/files/patch-scptools+source+linker+searchcache +++ /dev/null @@ -1,27 +0,0 @@ ---- scptools/source/linker/searchcache.hxx.orig Thu Mar 27 23:21:09 2003 -+++ scptools/source/linker/searchcache.hxx Thu Mar 27 23:21:40 2003 -@@ -72,11 +72,11 @@ - // types - /////////////////////////////////////////////////////////////////////////////// - --DECLARE_LIST( FileList, ByteString* ) -+DECLARE_LIST( SCacheFileList, ByteString* ) - struct Include - { - ByteString aBaseDir; -- FileList aFileLst; -+ SCacheFileList aFileLst; - }; - DECLARE_LIST( IncludeList, Include* ) - ---- scptools/source/linker/searchcache.cxx.orig Thu Mar 27 23:23:04 2003 -+++ scptools/source/linker/searchcache.cxx Thu Mar 27 23:23:51 2003 -@@ -218,7 +218,7 @@ - rPath += aDelim; - } - --void ScanFileList( const ByteString& rPath, FileList& rLst ) -+void ScanFileList( const ByteString& rPath, SCacheFileList& rLst ) - { - Dir aFiles( rPath, FSYS_KIND_FILE ); - for( USHORT i = 0; i < aFiles.Count(); ++i ) diff --git a/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx b/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx deleted file mode 100644 index d15aba2f7b2e..000000000000 --- a/editors/openoffice-1.0/files/patch-scptools+source+linker+ziplst.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- scptools/source/linker/ziplst.cxx.orig Sun Jul 21 00:32:40 2002 -+++ scptools/source/linker/ziplst.cxx Sun Jul 21 00:32:43 2002 -@@ -278,6 +278,7 @@ - #define OS_SOLI "solia" - #define OS_WINDOWS "windows" - #define OS_LINUX "linux" -+#define OS_FREEBSD "freebsd" - #define OS_OS2 "os2" - - ByteString _OS2Alpha( const ByteString& rStr ) -@@ -290,6 +291,8 @@ - return OS_SOLI; - else if( rStr.CompareIgnoreCaseToAscii("unxlngi",7) == COMPARE_EQUAL ) - return OS_LINUX; -+ else if( rStr.CompareIgnoreCaseToAscii("unxfbsdi",7) == COMPARE_EQUAL ) -+ return OS_FREEBSD; - else if( rStr.CompareIgnoreCaseToAscii("os2icci",7) == COMPARE_EQUAL ) - return OS_OS2; - diff --git a/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx b/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx deleted file mode 100644 index f2637f906727..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+inc+fields.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- setup2/inc/fields.hxx.orig Sun Jul 21 00:19:07 2002 -+++ setup2/inc/fields.hxx Sun Jul 21 00:19:12 2002 -@@ -104,6 +104,7 @@ - extern char const VALUE_YES_IF_HPUX_HP9000[]; - extern char const VALUE_YES_IF_AIX_RS6000[]; - extern char const VALUE_YES_IF_LINUX_X86[]; -+extern char const VALUE_YES_IF_FREEBSD_X86[]; - extern char const VALUE_KEEP_OLD_VERSION[]; - extern char const VALUE_NETWORK[]; - extern char const VALUE_NO[]; diff --git a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c deleted file mode 100644 index f15dd902f548..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+loader.c +++ /dev/null @@ -1,30 +0,0 @@ ---- setup2/mow/source/loader/loader.c.orig Thu Oct 31 21:46:52 2002 -+++ setup2/mow/source/loader/loader.c Wed Jan 22 14:56:44 2003 -@@ -85,6 +85,12 @@ - # include - #endif - -+#ifdef FREEBSD -+#if (OSVERSION < 500000) -+#define iswspace(c) ((c)==' ' || (c)=='\t' || (c)=='\n') -+#endif -+#endif -+ - #include "bitmap" - #include "logo.xpm" - -@@ -650,6 +656,14 @@ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ - " Linux)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" FreeBSD)\n" \ -+" LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ -+" export LD_LIBRARY_PATH\n" \ -+" ;;\n" \ -+" NetBSD)\n" \ - " LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \ - " export LD_LIBRARY_PATH\n" \ - " ;;\n" \ diff --git a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk deleted file mode 100644 index 8c143732b985..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+mow+source+loader+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- setup2/mow/source/loader/makefile.mk.orig Sun Mar 3 01:45:18 2002 -+++ setup2/mow/source/loader/makefile.mk Sun Mar 3 01:45:22 2002 -@@ -85,7 +85,7 @@ - APP1NOSAL=TRUE - APP1TARGET= $(TARGET) - APP1OBJS= $(OBJFILES) --APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -+APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11 - - .ENDIF # "$(OS)"=="MACOSX" - diff --git a/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk b/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk deleted file mode 100644 index 4614208daac9..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+patch+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- setup2/patch/makefile.mk.orig Sun Jul 21 00:21:46 2002 -+++ setup2/patch/makefile.mk Sun Jul 21 00:21:52 2002 -@@ -92,7 +92,7 @@ - .IF "$(OS)"=="SOLARIS" - STATIC_LIBS+= -Bdynamic -lnsl -lsocket -lposix4 - .ENDIF --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - STATIC_LIBS+= -Bdynamic -lcrypt - .ENDIF - .ELSE diff --git a/editors/openoffice-1.0/files/patch-setup2+script+setupserver b/editors/openoffice-1.0/files/patch-setup2+script+setupserver deleted file mode 100644 index d637810f69b7..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+script+setupserver +++ /dev/null @@ -1,10 +0,0 @@ ---- setup2/script/setupserver.orig Sat Apr 6 12:22:21 2002 -+++ setup2/script/setupserver Wed May 1 22:30:13 2002 -@@ -234,6 +234,7 @@ - sd_platform=`uname -s` - case $sd_platform in - SCO_SV) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - NetBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac diff --git a/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx b/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx deleted file mode 100644 index 0f828b694ac8..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+source+compiler+decltor.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- setup2/source/compiler/decltor.cxx.orig Sun Jul 21 00:25:00 2002 -+++ setup2/source/compiler/decltor.cxx Sun Jul 21 00:24:06 2002 -@@ -304,6 +304,7 @@ - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLSG || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SOLIG || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_LINUX || -+ m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_FREEBSD || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_HP || - m_xCompiler->GetOsType() == com::sun::star::setup::OSType_UNIX_SCO; - } ---- setup2/source/compiler/fields.cxx.orig Sun Jul 21 00:25:42 2002 -+++ setup2/source/compiler/fields.cxx Sun Jul 21 00:25:45 2002 -@@ -105,6 +105,7 @@ - char const VALUE_YES_IF_HPUX_HP9000[] = "YES_IF_HPUX_HP9000"; - char const VALUE_YES_IF_AIX_RS6000[] = "YES_IF_AIX_RS6000"; - char const VALUE_YES_IF_LINUX_X86[] = "YES_IF_LINUX_X86"; -+char const VALUE_YES_IF_FREEBSD_X86[] = "YES_IF_FREEBSD_X86"; - char const VALUE_KEEP_OLD_VERSION[] = "KEEP_OLD_VERSION"; - char const VALUE_NETWORK[] = "NETWORK"; - char const VALUE_NO[] = "NO"; diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx deleted file mode 100644 index f8a044ad3b62..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+jvmdlg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- setup2/source/custom/jvmsetup/jvmdlg.cxx.orig Sat Jul 20 23:33:50 2002 -+++ setup2/source/custom/jvmsetup/jvmdlg.cxx Sat Jul 20 23:34:00 2002 -@@ -154,7 +154,7 @@ - - #if defined (OS2) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_OS2, pResMgr) ); --#elif defined (LINUX) -+#elif defined (LINUX) || defined (FREEBSD) || defined (NETBSD) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_LINUX, pResMgr) ); - #elif defined (SOLARIS) - maHelpEdit.SetText( ResId(STR_HELP_TEXT_SOLARIS, pResMgr) ); diff --git a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh b/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh deleted file mode 100644 index 9caaf49ec0d2..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+source+custom+jvmsetup+loader+jvmsetup.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- setup2/source/custom/jvmsetup/loader/jvmsetup.sh.orig Sat Apr 6 12:22:21 2002 -+++ setup2/source/custom/jvmsetup/loader/jvmsetup.sh Wed May 1 22:38:21 2002 -@@ -66,6 +66,7 @@ - case $sd_platform in - SCO_SV) test=/bin/test ;; - NetBSD) test=/bin/test ;; -+ FreeBSD) test=/bin/test ;; - *) test=/usr/bin/test ;; - esac - diff --git a/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx b/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx deleted file mode 100644 index 3a7d3d70c689..000000000000 --- a/editors/openoffice-1.0/files/patch-setup2+source+service+interface.cxx +++ /dev/null @@ -1,35 +0,0 @@ ---- setup2/source/service/interface.cxx.orig Sat Jul 20 23:29:33 2002 -+++ setup2/source/service/interface.cxx Sat Jul 20 23:30:02 2002 -@@ -126,6 +126,8 @@ - aExtension = "UNIX_SOLIG"; - else if( eType == OSType_UNIX_LINUX ) - aExtension = "UNIX_LINUX"; -+ else if( eType == OSType_UNIX_LINUX ) -+ aExtension = "UNIX_FREEBSD"; - else if( eType == OSType_UNIX_HP ) - aExtension = "UNIX_HP"; - else if( eType == OSType_UNIX_SCO ) -@@ -238,6 +240,7 @@ - readOSConfiguration( OSType_UNIX_SOLSG ); - readOSConfiguration( OSType_UNIX_SOLIG ); - readOSConfiguration( OSType_UNIX_LINUX ); -+ readOSConfiguration( OSType_UNIX_FREEBSD ); - readOSConfiguration( OSType_UNIX_HP ); - readOSConfiguration( OSType_UNIX_SCO ); - fprintf( stdout, "\n" ); -@@ -577,6 +580,7 @@ - case OSType_UNIX_SOLSG: - case OSType_UNIX_SOLIG: - case OSType_UNIX_LINUX: -+ case OSType_UNIX_FREEBSD: - case OSType_UNIX_HP: - case OSType_UNIX_SCO: - return ByteString(UNX_README_FILE_NAME); -@@ -599,6 +603,7 @@ - case OSType_UNIX_SOLSG: - case OSType_UNIX_SOLIG: - case OSType_UNIX_LINUX: -+ case OSType_UNIX_FREEBSD: - case OSType_UNIX_HP: - case OSType_UNIX_SCO: - return ByteString(UNX_LICENSE_FILE_NAME); diff --git a/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx b/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx deleted file mode 100644 index e99ad46303a5..000000000000 --- a/editors/openoffice-1.0/files/patch-sfx2+source+appl+officeacceptthread.cxx +++ /dev/null @@ -1,18 +0,0 @@ ---- sfx2/source/appl/officeacceptthread.cxx.orig Sat Jul 20 22:56:19 2002 -+++ sfx2/source/appl/officeacceptthread.cxx Sat Jul 20 22:56:54 2002 -@@ -123,13 +123,13 @@ - sal_Bool static isProcessRunning( ::vos::OProcess::TProcessInfo& aProcessInfo ) - { - int nRet; --#if defined (SOLARIS) || defined (IRIX) -+#if defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) - int status; - nRet = waitpid(aProcessInfo.Ident, &status,WNOHANG); - #elif defined(LINUX) - nRet = kill(aProcessInfo.Ident, 0); - #endif --#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) -+#if defined (LINUX) || defined (SOLARIS) || defined (IRIX) || defined (FREEBSD) || defined (NETBSD) - if ( nRet == 0 ) - return sal_True; // process is running - if ( nRet < 0 ) diff --git a/editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx b/editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx deleted file mode 100644 index ea41c8e28b7f..000000000000 --- a/editors/openoffice-1.0/files/patch-shell+source+proxysettings+soprxsettings.cxx +++ /dev/null @@ -1,18 +0,0 @@ -Index: shell/source/proxysettings/soprxsettings.cxx -=================================================================== -RCS file: /cvs/gsl/shell/source/proxysettings/Attic/soprxsettings.cxx,v -retrieving revision 1.4 -diff -u -r1.4 soprxsettings.cxx ---- shell/source/proxysettings/soprxsettings.cxx 15 Aug 2002 13:26:49 -0000 1.4 -+++ shell/source/proxysettings/soprxsettings.cxx 28 Jul 2005 22:03:30 -0000 -@@ -87,9 +87,7 @@ - #include - #endif - --#ifndef MACOSX --#include --#endif -+#include - #include - #include - diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk b/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk deleted file mode 100644 index c8e3464a75b1..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+bin+addsym.awk +++ /dev/null @@ -1,10 +0,0 @@ ---- solenv/bin/addsym.awk.kan Sat Jul 27 10:10:19 2002 -+++ solenv/bin/addsym.awk Thu Jul 25 14:49:30 2002 -@@ -62,6 +62,7 @@ - BEGIN { global_found = "false" } - /[ \t]*local:/ { global_found = "false" } - global_found == "true" { -+ print "\t\tGetVersionInfo;" - print "\t\t_ZTS*;" - print "\t\t_ZTI*;" - global_found = "false" } diff --git a/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl b/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl deleted file mode 100644 index 15514eaba176..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+bin+mapgen.pl +++ /dev/null @@ -1,21 +0,0 @@ ---- solenv/bin/mapgen.pl.orig Sat Jul 20 22:30:21 2002 -+++ solenv/bin/mapgen.pl Sat Jul 20 22:31:31 2002 -@@ -112,7 +112,7 @@ - - if ($ENV{OS} eq 'SOLARIS') { - &gen_sol; --} elsif ($ENV{OS} eq 'LINUX') { -+} elsif ($ENV{OS} eq 'LINUX' || $ENV{OS} eq 'FREEBSD') { - &gen_lnx; - } else { - &print_error ('Environment not set!!'); -@@ -169,7 +169,8 @@ - s/\n//; - $env_section = '1' and next if ((/^# SOLARIS #$/) && ($ENV{OS} eq 'SOLARIS')); - $env_section = '1' and next if ((/^# LINUX #$/) && ($ENV{OS} eq 'LINUX')); -- last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/))); -+ $env_section = '1' and next if ((/^# FREEBSD #$/) && ($ENV{OS} eq 'FREEBSD')); -+ last if ($env_section && ((/^# SOLARIS #$/) || (/^# LINUX #$/) || (/^# FREEBSD #$/))); - next if (!$_ || /^#/); - push(@filters, $_); - }; diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk b/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk deleted file mode 100644 index fec8ea1b4ab6..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+postset.mk +++ /dev/null @@ -1,22 +0,0 @@ ---- solenv/inc/postset.mk.orig Tue Jan 7 17:22:04 2003 -+++ solenv/inc/postset.mk Tue Feb 25 16:52:34 2003 -@@ -220,6 +220,19 @@ - RCLANGFLAGS_07+= -d RUSS - iso_07=ru - -+.IF "$(RES_UKRA)"!="" || "$(give_me_all_languages)"!="" -+alllangext+=38 -+ukra$(LANG_GUI)*=$(default$(LANG_GUI)) -+cmd_ukra:=ukra 38 -lgUKRAINIAN $(IBM_PC_852) $(ukra$(LANG_GUI)) -+lang_38=ukra -+longlang_38=ukrainian -+langext_38=38 -+rsclang_38=-lgUKRAINIAN $(IBM_PC_852) -+rescharset_38=$(ukra$(LANG_GUI)) -+RCLANGFLAGS_38+= -d UKRA -+iso_38=uk -+.ENDIF -+ - .IF "$(RES_POL)"!="" || "$(give_me_all_languages)"!="" - alllangext+=48 - .ENDIF diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk b/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk deleted file mode 100644 index b624b834495c..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+startup+FREEBSD+macros.mk +++ /dev/null @@ -1,5 +0,0 @@ ---- /dev/null Mon Mar 11 14:55:01 2002 -+++ solenv/inc/startup/FREEBSD/macros.mk Mon Mar 11 14:54:59 2002 -@@ -0,0 +1,2 @@ -+ -+.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk deleted file mode 100644 index dd3cc059345a..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk +++ /dev/null @@ -1,12 +0,0 @@ ---- solenv/inc/tg_ext.mk.orig Fri May 10 14:12:12 2002 -+++ solenv/inc/tg_ext.mk Mon Jul 15 14:34:30 2002 -@@ -81,7 +81,9 @@ - .ENDIF # "$(GUI)"=="WNT" - - .IF "$(OS)"!="NETBSD" -+.IF "$(OS)"!="FREEBSD" - PATCHFLAGS=-b -+.ENDIF # "$(OS)"=="FREEBSD" - .ENDIF # "$(OS)"=="NETBSD" - - #override diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk deleted file mode 100644 index f5d6a86d7346..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_moz.mk +++ /dev/null @@ -1,17 +0,0 @@ ---- solenv/inc/tg_moz.mk.orig Sat Jul 20 23:57:37 2002 -+++ solenv/inc/tg_moz.mk Sat Jul 20 23:57:55 2002 -@@ -36,6 +36,14 @@ - CPUCFG=_linux.cfg - .ENDIF - -+.IF "$(OS)"=="FREEBSD" -+CPUCFG=_freebsd.cfg -+.ENDIF -+ -+.IF "$(OS)"=="NETBSD" -+CPUCFG=_netbsd.cfg -+.ENDIF -+ - .IF "$(GEN_PRCPUCFG)"!="" - $(GEN_PRCPUCFG): $(PRJ)$/pr$/include$/md$/$(CPUCFG) - @+$(COPY) $(PRJ)$/pr$/include$/md$/$(CPUCFG) $@ diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk deleted file mode 100644 index d7657528eade..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+tg_shl.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/inc/tg_shl.mk.orig Tue Jan 7 16:22:13 2003 -+++ solenv/inc/tg_shl.mk Sat Jan 18 12:51:58 2003 -@@ -319,7 +319,7 @@ - .IF "$(GUI)" == "WNT" - .IF "$(UPDATER)"=="YES" - .IF "$(COM)"=="GCC" -- gcc -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c -+ ${CC} -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ELSE - $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c - .ENDIF # "$(COM)"=="GCC" diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk deleted file mode 100644 index 983adcf1cf4f..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unitools.mk +++ /dev/null @@ -1,16 +0,0 @@ -Index: solenv/inc/unitools.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unitools.mk,v -retrieving revision 1.12.4.2 -diff -u -r1.12.4.2 unitools.mk ---- solenv/inc/unitools.mk 7 Jan 2003 15:22:16 -0000 1.12.4.2 -+++ solenv/inc/unitools.mk 4 Aug 2005 01:42:23 -0000 -@@ -147,7 +147,7 @@ - GNUPATCH=gnupatch - .ELSE # "$(OS)"=="SOLARIS" - AWK=awk --GNUCOPY=cp -+GNUCOPY=%%GNUCOPY%% - GNUPATCH=patch - .ENDIF # "$(OS)"=="SOLARIS" - .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk deleted file mode 100644 index e2fe57952517..000000000000 --- a/editors/openoffice-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ /dev/null @@ -1,285 +0,0 @@ -Index: solenv/inc/unxfbsdi.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v -retrieving revision 1.4.4.1 -diff -u -r1.4.4.1 unxfbsdi.mk ---- solenv/inc/unxfbsdi.mk 7 Jan 2003 15:22:18 -0000 1.4.4.1 -+++ solenv/inc/unxfbsdi.mk 18 Jul 2005 04:00:18 -0000 -@@ -1,49 +1,162 @@ -+#************************************************************************* -+# -+# $RCSfile:$ -+# -+# $Revision:$ -+# -+# last change: $Author:$ -+# -+# The Contents of this file are made available subject to the terms of -+# either of the following licenses -+# -+# - GNU Lesser General Public License Version 2.1 -+# - Sun Industry Standards Source License Version 1.1 -+# -+# Sun Microsystems Inc., October, 2000 -+# -+# GNU Lesser General Public License Version 2.1 -+# ============================================= -+# Copyright 2000 by Sun Microsystems, Inc. -+# 901 San Antonio Road, Palo Alto, CA 94303, USA -+# -+# This library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License version 2.1, as published by the Free Software Foundation. -+# -+# This library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+# -+# You should have received a copy of the GNU Lesser General Public -+# License along with this library; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+# -+# Sun Industry Standards Source License Version 1.1 -+# ================================================= -+# The contents of this file are subject to the Sun Industry Standards -+# Source License Version 1.1 (the "License"); You may not use this file -+# except in compliance with the License. You may obtain a copy of the -+# License at http://www.openoffice.org/license.html. -+# -+# Software provided under this License is provided on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, -+# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, -+# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. -+# See the License for the specific provisions governing your rights and -+# obligations concerning the Software. -+# -+# The Initial Developer of the Original Code is: Sun Microsystems, Inc. -+# -+# Copyright: 2000 by Sun Microsystems, Inc. -+# -+# All Rights Reserved. -+# -+# Contributor(s): _______________________________________ -+# -+# -+# -+#************************************************************************* - --# mak file fuer unxfbsdi -- -+# mk file for unxfbsdi - ASM= - AFLAGS= - - SOLAR_JAVA=TRUE - JAVAFLAGSDEBUG=-g - --LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -- -+# filter for supressing verbose messages from linker -+#not needed at the moment -+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" -+ -+# options for C and C++ Compiler -+CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) -+ -+# this is a platform with JAVA support -+.IF "$(SOLAR_JAVA)"!="" -+JAVADEF=-DSOLAR_JAVA -+.IF "$(debug)"=="" -+JAVA_RUNTIME=-ljava -+.ELSE -+JAVA_RUNTIME=-ljava_g -+.ENDIF -+.ENDIF - --CC= gcc --CXX= g++ --CDEFS+= -D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 --CDEFS+= -D_REENTRANT -D_PTHREADS -D_THREAD_SAFE --CFLAGS+= -w -c $(INCLUDE) --CFLAGS+= -I/usr/X11R6/include --CFLAGSCC= -pipe --CFLAGSCXX= -pipe -fno-for-scope -fpermissive --CFLAGSEXCEPTIONS= -fexceptions --CFLAGS_NO_EXCEPTIONS= -fno-exceptions --CFLAGSOBJGUIST= -fPIC --CFLAGSOBJCUIST= -fPIC --CFLAGSOBJGUIMT= -fPIC --CFLAGSOBJCUIMT= -fPIC --CFLAGSSLOGUIMT= -fPIC --CFLAGSSLOCUIMT= -fPIC --CFLAGSPROF= -pg --CFLAGSDEBUG= -g -+# name of C++ Compiler -+CXX*=g++ -+# name of C Compiler -+CC*=gcc -+# flags for C and C++ Compiler -+# do not use standard header search paths -+# if installed elsewhere -+.IF "$(BUILD_SOSL)"!="" -+CFLAGS= -+.ENDIF -+CFLAGS+=-fmessage-length=0 -c $(INCLUDE) -+# flags for the C++ Compiler -+CFLAGSCC= -pipe -mcpu=pentiumpro -+# Flags for enabling exception handling -+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs -+# Flags for disabling exception handling -+CFLAGS_NO_EXCEPTIONS=-fno-exceptions -+ -+# -fpermissive should be removed as soon as possible -+CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -+ -+# FIXME: This 'if' does not work due to a sequence error in files. -+#.IF "$(CCNUMVER)"<"000300020000" -+#CFLAGSCXX+=-fno-rtti -+#.ENDIF -+ -+# Compiler flags for compiling static object in single threaded environment with graphical user interface -+CFLAGSOBJGUIST= -+# Compiler flags for compiling static object in single threaded environment with character user interface -+CFLAGSOBJCUIST= -+# Compiler flags for compiling static object in multi threaded environment with graphical user interface -+CFLAGSOBJGUIMT= -+# Compiler flags for compiling static object in multi threaded environment with character user interface -+CFLAGSOBJCUIMT= -+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -+CFLAGSSLOGUIMT=-fpic -+# Compiler flags for compiling shared object in multi threaded environment with character user interface -+CFLAGSSLOCUIMT=-fpic -+# Compiler flags for profiling -+CFLAGSPROF= -+# Compiler flags for debugging -+CFLAGSDEBUG=-g - CFLAGSDBGUTIL= --CFLAGSOPT= -O2 --CFLAGSNOOPT= -O --CFLAGSOUTOBJ= -o -- --STATIC= -Wl,-Bstatic --DYNAMIC= -Wl,-Bdynamic -- --#THREADLIB= -pthread --LINK= gcc --# -v -nostdlib -+# Compiler flags for enabling optimazations -+# CFLAGSOPT=-O2 -+# reduce to -O1 to avoid optimisation problems -+CFLAGSOPT=-O1 -+# Compiler flags for disabling optimazations -+CFLAGSNOOPT=-O -+# Compiler flags for discibing the output path -+CFLAGSOUTOBJ=-o -+# Enable all warnings -+CFLAGSWALL=-Wall -+# Set default warn level -+CFLAGSDFLTWARN=-w -+ -+# switches for dynamic and static linking -+STATIC = -Wl,-Bstatic -+DYNAMIC = -Wl,-Bdynamic -+ -+# name of linker -+LINK*=$(CC) -+# default linker flags - LINKFLAGS= --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+ -+# linker flags for linking applications -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+ -+# linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared - LINKFLAGSSHLCUI= -shared -+ - LINKFLAGSTACK= - LINKFLAGSPROF= - LINKFLAGSDEBUG=-g -@@ -51,35 +164,46 @@ - - .IF "$(NO_BSYMBOLIC)"=="" - .IF "$(PRJNAME)" != "envtest" --LINKFLAGSSHLGUI+= -Wl,-Bsymbolic --LINKFLAGSSHLCUI+= -Wl,-Bsymbolic --.ENDIF -+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic -+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic - .ENDIF -+.ENDIF # "$(NO_BSYMBOLIC)"=="" - - LINKVERSIONMAPFLAG=-Wl,--version-script - --STDLIBCPP=-lstdc++ -+SONAME_SWITCH=-Wl,-h - --# _SYSLIBS= -L/usr/lib -lm --# _X11LIBS= -L/usr/X11R6/lib -lXext -lX11 --# _CXXLIBS= -L/usr/lib -lstdc++ -L/usr/local/lib -+# Sequence of libs does matter ! - -+STDLIBCPP=-lstdc++ -+ -+# default objectfilenames to link - STDOBJGUI= - STDSLOGUI= - STDOBJCUI= - STDSLOCUI= - -+# libraries for linking applications - STDLIBCUIST=-lm -+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm -+STDLIBCUIMT=$(PTHREAD_LIBS) -lm - STDLIBGUIST=-lX11 -lm --STDLIBGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc --STDLIBCUIMT=-pthread -lm -lstlport_gcc --STDSHLGUIMT=-lX11 -lXext -pthread -lm -lstlport_gcc --STDSHLCUIMT=-pthread -lm -lstlport_gcc -- --LIBMGR= ar --LIBFLAGS= -r --LIBEXT= .a -+# libraries for linking shared libraries -+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm -+STDSHLCUIMT=$(PTHREAD_LIBS) -lm -+STDSHLGUIST=-lX11 -lXext -lm -+STDSHLCUIST=-lm -+ -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+ -+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) -+ -+# name of library manager -+LIBMGR=ar -+LIBFLAGS=-r - -+# tool for generating import libraries - IMPLIB= - IMPLIBFLAGS= - -@@ -87,12 +211,13 @@ - MAPSYMFLAGS= - - RC=irc --RCFLAGS= -fo$@ $(RCFILES) -+RCFLAGS=-fo$@ $(RCFILES) - RCLINK= - RCLINKFLAGS= - RCSETVERSION= - --DLLPOSTFIX= fi --DLLPRE= lib --DLLPOST= .so --LDUMP= -+# platform specific identifier for shared libs -+DLLPOSTFIX=fi -+DLLPRE=lib -+DLLPOST=.so -+ diff --git a/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c b/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c deleted file mode 100644 index aec4487ae529..000000000000 --- a/editors/openoffice-1.0/files/patch-soltools+mkdepend+main.c +++ /dev/null @@ -1,12 +0,0 @@ ---- soltools/mkdepend/main.c.orig Mon Apr 15 15:55:43 2002 -+++ soltools/mkdepend/main.c Mon Apr 15 16:54:06 2002 -@@ -27,6 +27,9 @@ - - */ - -+#include -+#include -+ - #include "def.h" - #ifdef hpux - #define sigvec sigvector diff --git a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch b/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch deleted file mode 100644 index eb8ca5822940..000000000000 --- a/editors/openoffice-1.0/files/patch-stlport+STLport-4.5.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 -+++ stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 -@@ -174,3 +174,110 @@ - class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { - public: - __Named_exception(const string& __str) -+--- misc/STLport-4.5/src/gcc-freebsd.mak Sun Jul 29 05:36:25 2001 -++++ misc/build/STLport-4.5/src/gcc-freebsd.mak Tue May 28 23:04:27 2002 -+@@ -5,8 +5,8 @@ -+ # -+ # compiler -+ # -+-CC = gcc -pthread -+-CXX = c++ -pthread -fexceptions -++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT -++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -+ -+ # -+ # Basename for libraries -+@@ -19,7 +19,7 @@ -+ # -+ LINK=ar cr -+ # 2.95 flag -+-DYN_LINK=c++ -pthread -fexceptions -shared -o -++DYN_LINK=${CXX} ${PTHREAD_LIBS} -fexceptions -shared -o -+ -+ OBJEXT=o -+ DYNEXT=so -+@@ -41,8 +41,8 @@ -+ -+ CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -+ -+-CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -+-CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC -++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -+ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -+--- /dev/null Tue May 28 22:55:00 2002 -++++ misc/build/STLport-4.5/src/gcc-3.0-freebsd.mak Tue May 28 22:38:52 2002 -+@@ -0,0 +1,59 @@ -++# -++# Note : this makefile is for gcc-3 ! -++# -++ -++# -++# compiler -++# -++CC+= ${PTHREAD_CFLAGS} -D_REENTRANT -++CXX+= ${PTHREAD_CFLAGS} -D_REENTRANT -fexceptions -++ -++# -++# Basename for libraries -++# -++LIB_BASENAME = libstlport_gcc -++ -++# -++# guts for common stuff -++# -++# -++LINK=ar cr -++DYN_LINK=${CXX} ${PTHREAD_LIBS} --fexceptions -shared -o -++ -++OBJEXT=o -++DYNEXT=so -++STEXT=a -++RM=rm -rf -++PATH_SEP=/ -++MKDIR=mkdir -p -++COMP=GCC-FREEBSD -++INSTALL_STEP = install_unix -++ -++all: all_dynamic all_static symbolic_links -++ -++include common_macros.mak -++ -++WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32 -++ -++CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -++ -++CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${CXXFLAGS} -++CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${CXXFLAGS} -fPIC -++ -++CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -++CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC -++ -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -++ -++include common_percent_rules.mak -++include common_rules.mak -++ -++ -++#install: all -++# cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib -++ -++#%.s: %.cpp -++# $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@ -++ -++ -+--- misc/STLport-4.5/stlport/cwchar.orig Tue May 28 22:51:31 2002 -++++ misc/build/STLport-4.5/stlport/cwchar Tue May 28 22:55:33 2002 -+@@ -21,6 +21,9 @@ -+ # include -+ # endif -+ -++#ifdef __FreeBSD__ -++# include <../wchar.h> -++#endif -+ # include -+ -+ # if (_STLP_OUTERMOST_HEADER_ID == 0x120) diff --git a/editors/openoffice-1.0/files/patch-stlport+makefile.mk b/editors/openoffice-1.0/files/patch-stlport+makefile.mk deleted file mode 100644 index 2341f7225a25..000000000000 --- a/editors/openoffice-1.0/files/patch-stlport+makefile.mk +++ /dev/null @@ -1,36 +0,0 @@ ---- stlport/makefile.mk.orig Tue Jan 7 13:13:37 2003 -+++ stlport/makefile.mk Sat Jan 18 13:01:53 2003 -@@ -98,16 +98,28 @@ - - .IF "$(COM)"=="GCC" - .IF "$(COMID)"=="gcc3" --BUILD_FLAGS=-f gcc-3.0.mak -+.IF # "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-3.0-freebsd.mak -+.ELSE -+ BUILD_FLAGS=-f gcc-3.0.mak -+.ENDIF - .ELSE # "$(COMID)"=="gcc3" --# MacOS X/Darwin need a special makefile -+# FreeBSD / MacOS X/Darwin need a special makefile - .IF "$(OS)"=="MACOSX" - BUILD_FLAGS=-f gcc-apple-macosx.mak --.ELSE # "$(OS)"=="MACOSX" -+.ELSIF # "$(OS)"=="FREEBSD" -+ BUILD_FLAGS=-f gcc-freebsd.mak -+.ELSE - BUILD_FLAGS=-f gcc.mak --.ENDIF # "$(OS)"=="MACOSX" -+.ENDIF # "$(OS)"=="MACOSX || $(OS)"=="FREEBSD" - .ENDIF # "$(COMID)"=="gcc3" --BUILD_ACTION=make -+ -+.IF "$(OS)"=="FREEBSD" -+ BUILD_ACTION=gmake -+.ELSE -+ BUILD_ACTION=make -+.ENDIF -+ - # build in parallel - BUILD_FLAGS+= -j$(MAXPROCESS) - .ENDIF diff --git a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx b/editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx deleted file mode 100644 index 6016d8eade94..000000000000 --- a/editors/openoffice-1.0/files/patch-stoc+source+corereflection+criface.cxx +++ /dev/null @@ -1,23 +0,0 @@ -Index: stoc/source/corereflection/criface.cxx -=================================================================== -RCS file: /cvs/udk/stoc/source/corereflection/criface.cxx,v -retrieving revision 1.6 -diff -u -r1.6 criface.cxx ---- stoc/source/corereflection/criface.cxx 3 May 2001 13:56:57 -0000 1.6 -+++ stoc/source/corereflection/criface.cxx 28 Jul 2005 12:24:08 -0000 -@@ -60,14 +60,7 @@ - ************************************************************************/ - - #include --#ifdef SAL_UNX --#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD)) --#include --#endif --#endif --#ifndef MACOSX --#include --#endif -+#include - #ifndef _RTL_ALLOC_H_ - #include - #endif diff --git a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx b/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx deleted file mode 100644 index f82860ca0c4b..000000000000 --- a/editors/openoffice-1.0/files/patch-stoc+source+implementationregistration+implreg.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- stoc/source/implementationregistration/implreg.cxx.orig Tue Apr 16 19:54:58 2002 -+++ stoc/source/implementationregistration/implreg.cxx Tue Apr 16 19:55:26 2002 -@@ -60,6 +60,8 @@ - ************************************************************************/ - #include - -+#include -+ - #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ - #include - #endif diff --git a/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src b/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src deleted file mode 100644 index c48a6f485bdd..000000000000 --- a/editors/openoffice-1.0/files/patch-svx+source+dialog+txenctab.src +++ /dev/null @@ -1,44 +0,0 @@ ---- svx/source/dialog/txenctab.src.orig Thu Oct 31 23:18:23 2002 -+++ svx/source/dialog/txenctab.src Tue Feb 25 16:57:06 2003 -@@ -147,6 +147,7 @@ - < "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Kyrillisch (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -235,6 +236,7 @@ - < "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinese Simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Central European (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -308,6 +310,7 @@ - < "Japanisch (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinesisch vereinfacht (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Kyrillisch (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Kyrillisch (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Osteuropa (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -378,6 +381,7 @@ - < "Japanese (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "Chinese simplified (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; - < "Cyrillic (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "Cyrillic (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "Eastern Europe (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; -@@ -1217,7 +1221,8 @@ - < "繁体字中国語 (EUC-TW)" ; RTL_TEXTENCODING_EUC_TW ; > ; - < "日本語 (ISO-2022-JP)" ; RTL_TEXTENCODING_ISO_2022_JP ; > ; - < "簡体字中国語 (ISO-2022-CN)" ; RTL_TEXTENCODING_ISO_2022_CN ; > ; -- < "キリル語 (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-R)" ; RTL_TEXTENCODING_KOI8_R ; > ; -+ < "\xe3\x82\xad\xe3\x83\xaa\xe3\x83\xab\xe8\xaa\x9e (KOI8-U)" ; RTL_TEXTENCODING_KOI8_U ; > ; - < "Unicode (UTF-7)" ; RTL_TEXTENCODING_UTF7 ; > ; - < "Unicode (UTF-8)" ; RTL_TEXTENCODING_UTF8 ; > ; - < "東欧 (ISO-8859-10)" ; RTL_TEXTENCODING_ISO_8859_10 ; > ; diff --git a/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx b/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx deleted file mode 100644 index c3ed62994322..000000000000 --- a/editors/openoffice-1.0/files/patch-sw+source+filter+basflt+fltini.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- sw/source/filter/basflt/fltini.cxx.orig Mon Feb 24 17:46:43 2003 -+++ sw/source/filter/basflt/fltini.cxx Tue Feb 25 16:59:03 2003 -@@ -1007,7 +1007,8 @@ - sToken081[] = "JIS_X_212", - sToken082[] = "MS_1361", - sToken083[] = "GB_18030", -- sToken084[] = "UNICODE_2" -+ sToken084[] = "KOI8_U", -+ sToken085[] = "UNICODE_2" - ; - struct _Dummy_MAP - { -@@ -1099,7 +1100,8 @@ - RTL_TEXTENCODING_JIS_X_0212, sToken081, - RTL_TEXTENCODING_MS_1361, sToken082, - RTL_TEXTENCODING_GB_18030, sToken083, -- RTL_TEXTENCODING_UCS2, sToken084 -+ RTL_TEXTENCODING_KOI8_U, sToken084, -+ RTL_TEXTENCODING_UCS2, sToken085 - }; - - BOOL bFnd = FALSE; diff --git a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx b/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx deleted file mode 100644 index d194744fd4e1..000000000000 --- a/editors/openoffice-1.0/files/patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx.orig Fri Aug 16 18:56:19 2002 -+++ sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx Sat Jan 18 13:06:16 2003 -@@ -62,7 +62,7 @@ - #include - #include - #include --#ifndef MACOSX -+#if !(defined NETBSD || defined FREEBSD || defined MACOSX) - #include - #endif - #include diff --git a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx b/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx deleted file mode 100644 index 106f6d3ed063..000000000000 --- a/editors/openoffice-1.0/files/patch-sysui+tools+lngconv+lngconv.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- sysui/tools/lngconv/lngconv.cxx.orig Sat Jul 20 23:14:29 2002 -+++ sysui/tools/lngconv/lngconv.cxx Sat Jul 20 23:14:34 2002 -@@ -62,7 +62,7 @@ - #include - #include - --#if defined( LINUX ) || defined (SOLARIS) || defined(IRIX) -+#if defined(LINUX) || defined (SOLARIS) || defined(IRIX) || defined (FREEBSD) - #include - #include - #endif -@@ -143,6 +143,7 @@ - { "iso8859-8", RTL_TEXTENCODING_ISO_8859_8 }, - { "iso8859-9", RTL_TEXTENCODING_ISO_8859_9 }, - { "koi8-r", RTL_TEXTENCODING_KOI8_R }, -+ { "koi8-u", RTL_TEXTENCODING_KOI8_U }, - { "pck", RTL_TEXTENCODING_MS_932 }, - #if (0) - { "sun_eu_greek", RTL_TEXTENCODING_DONTKNOW }, diff --git a/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab b/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab deleted file mode 100644 index 51149a8e797c..000000000000 --- a/editors/openoffice-1.0/files/patch-sysui+unix+office+cde+locales.tab +++ /dev/null @@ -1,10 +0,0 @@ ---- sysui/unix/office/cde/locales.tab.orig Tue Nov 20 19:26:28 2001 -+++ sysui/unix/office/cde/locales.tab Tue Feb 25 17:04:36 2003 -@@ -7,6 +7,7 @@ - locales+=$(assign locale_34 = es es.UTF-8) - locales+=$(assign locale_35 = fi fi.UTF-8) - locales+=$(assign locale_37 = ca) -+locales+=$(assign locale_38 = uk uk_UA.KOI8-U) - locales+=$(assign locale_39 = it it.UTF-8) - locales+=$(assign locale_45 = da da.UTF-8) - locales+=$(assign locale_46 = sv sv.UTF-8) diff --git a/editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk b/editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk deleted file mode 100644 index edc1e226b8a3..000000000000 --- a/editors/openoffice-1.0/files/patch-tools+bootstrp+static.mk +++ /dev/null @@ -1,20 +0,0 @@ -Index: tools/bootstrp/static.mk -=================================================================== -RCS file: /cvs/util/tools/bootstrp/Attic/static.mk,v -retrieving revision 1.14.6.1 -diff -u -r1.14.6.1 static.mk ---- tools/bootstrp/static.mk 17 Dec 2002 15:10:48 -0000 1.14.6.1 -+++ tools/bootstrp/static.mk 28 Jul 2005 11:29:46 -0000 -@@ -154,10 +154,11 @@ - .IF "$(OS)"=="SOLARIS" - STATIC_LIBS += -lnsl -lsocket -lposix4 -lc - .ENDIF --.IF "$(OS)"=="LINUX" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" - STATIC_LIBS += -lsupc++ -lX11 -lXext - .ENDIF - -+ - # ----------------------------------------------------------- - - .ELSE diff --git a/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx b/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx deleted file mode 100644 index 3344734ef143..000000000000 --- a/editors/openoffice-1.0/files/patch-tools+inc+inetdef.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/inc/inetdef.hxx.orig Sun Jul 21 00:59:36 2002 -+++ tools/inc/inetdef.hxx Sun Jul 21 00:59:38 2002 -@@ -90,6 +90,8 @@ - #define TOOLS_INETDEF_OS "NETBSD Sparc" - #elif defined LINUX && defined X86 - #define TOOLS_INETDEF_OS "Linux" -+#elif defined FREEBSD && defined X86 -+#define TOOLS_INETDEF_OS "FreeBSD" - #elif defined SINIX - #define TOOLS_INETDEF_OS "SINIX" - #elif defined IRIX diff --git a/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx b/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx deleted file mode 100644 index 77201507ac1d..000000000000 --- a/editors/openoffice-1.0/files/patch-tools+source+inet+inetmime.cxx +++ /dev/null @@ -1,54 +0,0 @@ ---- tools/source/inet/inetmime.cxx.orig Mon Feb 24 17:46:55 2003 -+++ tools/source/inet/inetmime.cxx Tue Feb 25 17:08:22 2003 -@@ -1633,7 +1633,8 @@ - "ISO-8859-10", // RTL_TEXTENCODING_ISO_8859_10, RFC 2047 - "ISO-8859-13", // RTL_TEXTENCODING_ISO_8859_13, RFC 2047 - "EUC-KR", // RTL_TEXTENCODING_EUC_KR -- "ISO-2022-KR" }; // RTL_TEXTENCODING_ISO_2022_KR -+ "ISO-2022-KR", // RTL_TEXTENCODING_ISO_2022_KR -+ "KOI8-U" }; // RTL_TEXTENCODING_KOI8_U - DBG_ASSERT(aMap[eEncoding], - "INetMIME::getCharsetName(): Unsupported encoding"); - return aMap[eEncoding]; -@@ -1841,7 +1842,8 @@ - { "ISO-10646-UCS-4", RTL_TEXTENCODING_UCS4 }, - { "CSUCS4", RTL_TEXTENCODING_UCS4 }, - { "ISO-10646-UCS-2", RTL_TEXTENCODING_UCS2 }, -- { "CSUNICODE", RTL_TEXTENCODING_UCS2 } }; -+ { "CSUNICODE", RTL_TEXTENCODING_UCS2 }, -+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U } }; - - //============================================================================ - template< typename T > -@@ -2012,6 +2014,18 @@ - // - // version 1.0 of 18 August 1999 - -+ static const sal_uInt32 aKOI8URanges[] -+ = { 0, 0x7F, 0xA0, 0xA0, 0xA9, 0xA9, 0xB0, 0xB0, 0xB2, 0xB2, -+ 0xB7, 0xB7, 0xF7, 0xF7, 0x401, 0x401, 0x410, 0x44F, 0x451, 0x451, -+ 0x2219, 0x221A, 0x2248, 0x2248, 0x2264, 0x2265, 0x2320, 0x2321, -+ 0x2500, 0x2500, 0x2502, 0x2502, 0x250C, 0x250C, 0x2510, 0x2510, -+ 0x2514, 0x2514, 0x2518, 0x2518, 0x251C, 0x251C, 0x2524, 0x2524, -+ 0x252C, 0x252C, 0x2534, 0x2534, 0x253C, 0x253C, 0x2550, 0x256C, -+ 0x2580, 0x2580, 0x2584, 0x2584, 0x2588, 0x2588, 0x258C, 0x258C, -+ 0x2590, 0x2593, 0x25A0, 0x25A0, sal_uInt32(-1) }; -+ // -+ // version 1.0 of 18 August 1999 -+ - static const sal_uInt32 aWindows1252Ranges[] - = { 0, 0x7F, 0xA0, 0xFF, 0x152, 0x153, 0x160, 0x161, 0x178, 0x178, - 0x17D, 0x17E, 0x192, 0x192, 0x2C6, 0x2C6, 0x2DC, 0x2DC, -@@ -2133,6 +2147,12 @@ - pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5, - aISO88595Ranges)); - pList->prepend(Charset(RTL_TEXTENCODING_KOI8_R, aKOI8RRanges)); -+ break; -+ -+ case RTL_TEXTENCODING_KOI8_U: -+ pList->prepend(Charset(RTL_TEXTENCODING_ISO_8859_5, -+ aISO88595Ranges)); -+ pList->prepend(Charset(RTL_TEXTENCODING_KOI8_U, aKOI8URanges)); - break; - - default: //@@@ more cases are missing! diff --git a/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx b/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx deleted file mode 100644 index c00b4f3d4a9f..000000000000 --- a/editors/openoffice-1.0/files/patch-tools+source+rc+resmgr.cxx +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/source/rc/resmgr.cxx.orig Mon Feb 24 17:46:55 2003 -+++ tools/source/rc/resmgr.cxx Tue Feb 25 17:09:39 2003 -@@ -1189,6 +1189,8 @@ - return "36"; - case LANGUAGE_RUSSIAN: - return "07"; -+ case LANGUAGE_UKRAINIAN: -+ return "38"; - case LANGUAGE_SLOVAK: - return "04"; - case LANGUAGE_GREEK: -@@ -1339,6 +1341,7 @@ - LANGUAGE_HUNGARIAN, - LANGUAGE_CZECH, - LANGUAGE_RUSSIAN, -+ LANGUAGE_UKRAINIAN, - LANGUAGE_ARABIC, - LANGUAGE_GREEK, - LANGUAGE_KOREAN, diff --git a/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx b/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx deleted file mode 100644 index 0a4d4b9977c2..000000000000 --- a/editors/openoffice-1.0/files/patch-transex3+inc+export.hxx +++ /dev/null @@ -1,31 +0,0 @@ -Adding ukrainian language - ---- transex3/inc/export.hxx.orig Fri May 24 15:26:18 2002 -+++ transex3/inc/export.hxx Tue Feb 25 17:13:09 2003 -@@ -187,18 +187,22 @@ - #define CATALAN_ISO "ca" - #define CATALAN_INDEX 28 - -+#define UKRAINIAN 38 -+#define UKRAINIAN_ISO "uk" -+#define UKRAINIAN_INDEX 29 -+ - #define THAI 66 - #define THAI_ISO "th" --#define THAI_INDEX 29 -+#define THAI_INDEX 30 - - // special language for l10n framework - #define EXTERN 99 --#define EXTERN_INDEX 30 -+#define EXTERN_INDEX 31 - --#define LANGUAGES 31 -+#define LANGUAGES 32 - - #define LANGUAGE_ALLOWED( n ) (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && \ -- (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || \ -+ (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || ( Export::LangId[ n ] == 38 ) || \ - ( Export::LangId[ n ] == 30 ) || ( Export::LangId[ n ] == 31 ) || ( Export::LangId[ n ] == 33 ) || \ - ( Export::LangId[ n ] == 34 ) || ( Export::LangId[ n ] == 35 ) || ( Export::LangId[ n ] == 37 ) || \ - ( Export::LangId[ n ] == 39 ) || ( Export::LangId[ n ] == 45 ) || ( Export::LangId[ n ] == 46 ) || \ diff --git a/editors/openoffice-1.0/files/patch-transex3+source+export.cxx b/editors/openoffice-1.0/files/patch-transex3+source+export.cxx deleted file mode 100644 index fc2d31d92048..000000000000 --- a/editors/openoffice-1.0/files/patch-transex3+source+export.cxx +++ /dev/null @@ -1,13 +0,0 @@ -Adding UKRAINIAN language - ---- transex3/source/export.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/export.cxx Tue Feb 25 17:14:06 2003 -@@ -1205,6 +1205,8 @@ - return PORTUGUESE_INDEX; - else if ( sLang == "RUSSIAN" ) - return RUSSIAN_INDEX; -+ else if ( sLang == "UKRAINIAN" ) -+ return UKRAINIAN_INDEX; - else if ( sLang == "GREEK" ) - return GREEK_INDEX; - else if ( sLang == "DUTCH" ) diff --git a/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx b/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx deleted file mode 100644 index bf9f89ae2688..000000000000 --- a/editors/openoffice-1.0/files/patch-transex3+source+export2.cxx +++ /dev/null @@ -1,44 +0,0 @@ -adding ukrainian language ---- transex3/source/export2.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/export2.cxx Tue Feb 25 17:19:19 2003 -@@ -144,6 +144,7 @@ - ARABIC, - HEBREW, - CATALAN, -+ UKRAINIAN, - THAI, - EXTERN - }; -@@ -192,6 +193,7 @@ - case ARABIC: return RTL_TEXTENCODING_MS_1256; - case HEBREW: return RTL_TEXTENCODING_MS_1255; - case CATALAN: return RTL_TEXTENCODING_MS_1252; -+ case UKRAINIAN: return RTL_TEXTENCODING_MS_1251; - case THAI: return RTL_TEXTENCODING_UTF8; - case EXTERN: return RTL_TEXTENCODING_UTF8; - } -@@ -214,6 +216,8 @@ - return PORTUGUESE; - else if ( sLang == ByteString( RUSSIAN_ISO ).ToUpperAscii()) - return RUSSIAN; -+ else if ( sLang == ByteString( UKRAINIAN_ISO ).ToUpperAscii()) -+ return UKRAINIAN; - else if ( sLang == ByteString( GREEK_ISO ).ToUpperAscii()) - return GREEK; - else if ( sLang == ByteString( DUTCH_ISO ).ToUpperAscii()) -@@ -279,6 +283,7 @@ - case ENGLISH_US_INDEX: return ENGLISH_US_ISO; - case PORTUGUESE_INDEX: return PORTUGUESE_ISO; - case RUSSIAN_INDEX: return RUSSIAN_ISO; -+ case UKRAINIAN_INDEX: return UKRAINIAN_ISO; - case GREEK_INDEX: return GREEK_ISO; - case DUTCH_INDEX: return DUTCH_ISO; - case FRENCH_INDEX: return FRENCH_ISO; -@@ -429,6 +434,7 @@ - "arabic", - "hebrew", - "catalan", -+ "ukrainian", - "thai", - "extern" - }; diff --git a/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx b/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx deleted file mode 100644 index e712f262edc7..000000000000 --- a/editors/openoffice-1.0/files/patch-transex3+source+gsiconv.cxx +++ /dev/null @@ -1,12 +0,0 @@ -adding ukrainian language - ---- transex3/source/gsiconv.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/gsiconv.cxx Tue Feb 25 17:20:08 2003 -@@ -210,6 +210,7 @@ - fprintf( stdout, " 34 => SPANISH\n" ); - fprintf( stdout, " 35 => FINNISH\n" ); - fprintf( stdout, " 36 => HUNGARIAN\n" ); -+ fprintf( stdout, " 38 => UKRAINIAN\n" ); - fprintf( stdout, " 39 => ITALIAN\n" ); - fprintf( stdout, " 42 => CZECH\n" ); - fprintf( stdout, " 44 => ENGLISH (UK)\n" ); diff --git a/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx b/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx deleted file mode 100644 index bfc0c3ef5d10..000000000000 --- a/editors/openoffice-1.0/files/patch-transex3+source+merge.cxx +++ /dev/null @@ -1,12 +0,0 @@ -adding ukrainian language - ---- transex3/source/merge.cxx.orig Mon Feb 24 17:45:55 2003 -+++ transex3/source/merge.cxx Tue Feb 25 17:20:43 2003 -@@ -388,6 +388,7 @@ - case ENGLISH_US: return ENGLISH_US_INDEX; - case PORTUGUESE: return PORTUGUESE_INDEX; - case RUSSIAN: return RUSSIAN_INDEX; -+ case UKRAINIAN: return UKRAINIAN_INDEX; - case GREEK: return GREEK_INDEX; - case DUTCH: return DUTCH_INDEX; - case FRENCH: return FRENCH_INDEX; diff --git a/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk b/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk deleted file mode 100644 index 8ab5b3ec9f19..000000000000 --- a/editors/openoffice-1.0/files/patch-ucb+source+ucp+hierarchy+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ucb/source/ucp/hierarchy/makefile.mk.orig Wed Jun 12 01:34:50 2002 -+++ ucb/source/ucp/hierarchy/makefile.mk Wed Jun 12 01:34:52 2002 -@@ -96,7 +96,7 @@ - - SHL1TARGET=$(TARGET)$(UCPHIER_MAJOR) - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"=="MACOSX"||"$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - .ELSE - SHL1VERSIONMAP= $(TARGET).map - .ENDIF diff --git a/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk b/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk deleted file mode 100644 index 7f344e226745..000000000000 --- a/editors/openoffice-1.0/files/patch-ucb+source+ucp+webdav+makefile.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ucb/source/ucp/webdav/makefile.mk.orig Wed Jun 12 01:04:43 2002 -+++ ucb/source/ucp/webdav/makefile.mk Wed Jun 12 01:04:53 2002 -@@ -120,7 +120,7 @@ - - SHL1TARGET=$(TARGET)$(UCP_VERSION) - SHL1IMPLIB=i$(TARGET) --.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" -+.IF "$(OS)"=="MACOSX" - .ELSE - SHL1VERSIONMAP=exports.map - .ENDIF diff --git a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c b/editors/openoffice-1.0/files/patch-unzip+source+file_io.c deleted file mode 100644 index 44061a540707..000000000000 --- a/editors/openoffice-1.0/files/patch-unzip+source+file_io.c +++ /dev/null @@ -1,13 +0,0 @@ -FreeBSD support - ---- unzip/source/file_io.c.orig Sat Apr 6 12:13:38 2002 -+++ unzip/source/file_io.c Wed May 1 22:34:51 2002 -@@ -864,7 +864,7 @@ - #ifndef __386BSD__ - static struct timeb tbp; - #endif /* !__386BSD__ */ --#elif !defined(NETBSD) /* !BSD */ -+#elif (!defined(NETBSD) && !defined(FREEBSD))/* !BSD */ - extern long timezone; - #endif /* ?BSD */ - #endif /* ?AMIGA */ diff --git a/editors/openoffice-1.0/files/patch-unzip+source+misc.c b/editors/openoffice-1.0/files/patch-unzip+source+misc.c deleted file mode 100644 index 32db9ec72246..000000000000 --- a/editors/openoffice-1.0/files/patch-unzip+source+misc.c +++ /dev/null @@ -1,16 +0,0 @@ -FreeBSD support ---- unzip/source/misc.c.orig Mon Jul 15 14:25:32 2002 -+++ unzip/source/misc.c Mon Jul 15 14:27:15 2002 -@@ -300,9 +300,9 @@ - static short yday[]={0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; - int yr, mo, dy, hh, mm, ss, leap; - long m_time, days=0; --#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD)) --#if (defined(BSD) || defined(MTS) || defined(FREEBSD)) --#if !defined __386BSD__ && !defined FREEBSD -+#if (!defined(MACOS) && !defined(MSC) && !defined(__GO32__) && !defined(NETBSD) && !defined(FREEBSD)) -+#if (defined(BSD) || defined(MTS) -+#if !defined __386BSD__ - static struct timeb tbp; - #endif /* __386BSD__ */ - #else /* !(BSD || MTS) */ diff --git a/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx b/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx deleted file mode 100644 index 05f264c7316b..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+source+gdi+print.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- vcl/source/gdi/print.cxx.orig Thu Apr 17 18:58:42 2003 -+++ vcl/source/gdi/print.cxx Thu Apr 17 18:59:10 2003 -@@ -532,7 +532,7 @@ - if ( (pJobSetup->maPrinterName != pInfo->maPrinterName) || - (pJobSetup->maDriver != pInfo->maDriver) ) - { -- rtl_freeMemory( pJobSetup->mpDriverData ); -+ delete pJobSetup->mpDriverData; - pJobSetup->mpDriverData = NULL; - pJobSetup->mnDriverDataLen = 0; - } diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx deleted file mode 100644 index 56c5645f9126..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+osssound.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/unx/source/app/osssound.cxx.orig Sun Jul 21 10:20:34 2002 -+++ vcl/unx/source/app/osssound.cxx Sun Jul 21 10:21:28 2002 -@@ -72,7 +72,11 @@ - #include - #include - #include -+#ifdef LINUX - #include -+#else -+#include -+#endif - #include - - #ifdef _USE_NAMESPACE diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx deleted file mode 100644 index 92b3c2e99673..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+rptpsound.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- vcl/unx/source/app/rptpsound.cxx.orig Wed Oct 24 18:32:21 2001 -+++ vcl/unx/source/app/rptpsound.cxx Sun Jun 2 22:01:07 2002 -@@ -78,6 +78,10 @@ - extern "C" int usleep(unsigned int); - #endif - -+#ifdef FREEBSD -+#include -+#endif -+ - #ifdef _USE_NAMESPACE - using namespace vcl_sal; - using namespace vos; diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx deleted file mode 100644 index 482d8b351787..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+saldata.cxx +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/unx/source/app/saldata.cxx.orig Sun Jun 2 22:07:34 2002 -+++ vcl/unx/source/app/saldata.cxx Sun Jun 2 22:08:22 2002 -@@ -78,6 +78,11 @@ - #ifdef AIX - #include - #endif -+#ifdef FREEBSD -+#include -+#include -+#include -+#endif - - #ifndef _VOS_MUTEX_HXX - #include diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx deleted file mode 100644 index 4f3246b24589..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+app+vsound.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/unx/source/app/vsound.hxx.orig Sun Jul 21 00:10:24 2002 -+++ vcl/unx/source/app/vsound.hxx Sun Jul 21 00:10:27 2002 -@@ -61,7 +61,7 @@ - #ifndef _VCL_VSOUND_HXX - #define _VCL_VSOUND_HXX - --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - #define USE_OSS - #endif - -@@ -69,7 +69,7 @@ - #define USE_DEVAUDIO - #endif - --#if defined LINUX || defined SOLARIS -+#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS) - #define USE_NAS - #endif - diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx deleted file mode 100644 index 81bdd1fa836d..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+salcvt.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- vcl/unx/source/gdi/salcvt.cxx.orig Mon Feb 24 17:46:21 2003 -+++ vcl/unx/source/gdi/salcvt.cxx Tue Feb 25 17:21:50 2003 -@@ -261,6 +261,17 @@ - || ( nChar >= 0x2500 && nChar <= 0x25a0 ); - break; - -+ case RTL_TEXTENCODING_KOI8_U: -+ bMatch = ( nChar >= 0x0020 && nChar <= 0x007e ) -+ || ( nChar >= 0x00a0 && nChar <= 0x00b7 ) -+ || ( nChar == 0x00f7 ) -+ || ( nChar >= 0x0401 && nChar <= 0x0491 ) -+ || ( nChar >= 0x2219 && nChar <= 0x221a ) -+ || ( nChar >= 0x2248 && nChar <= 0x2265 ) -+ || ( nChar >= 0x2320 && nChar <= 0x2321 ) -+ || ( nChar >= 0x2500 && nChar <= 0x25a0 ); -+ break; -+ - case RTL_TEXTENCODING_UNICODE: - bMatch = True; - break; diff --git a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx b/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx deleted file mode 100644 index 9f86be8199c5..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+unx+source+gdi+xlfd_extd.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- vcl/unx/source/gdi/xlfd_extd.cxx.orig Mon Feb 24 17:46:21 2003 -+++ vcl/unx/source/gdi/xlfd_extd.cxx Tue Feb 25 17:22:26 2003 -@@ -205,6 +205,7 @@ - case RTL_TEXTENCODING_ISO_8859_15: - case RTL_TEXTENCODING_MS_1251: - case RTL_TEXTENCODING_KOI8_R: -+ case RTL_TEXTENCODING_KOI8_U: - case RTL_TEXTENCODING_JIS_X_0201: - if ( nLargestRange < 0x0080 ) - { diff --git a/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk b/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk deleted file mode 100644 index 907a9d874f0e..000000000000 --- a/editors/openoffice-1.0/files/patch-vcl+util+makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- vcl/util/makefile.mk.orig Sun Jul 21 00:12:09 2002 -+++ vcl/util/makefile.mk Sun Jul 21 00:12:11 2002 -@@ -293,9 +293,9 @@ - .ENDIF # "$(OS)"=="MACOSX" - .ENDIF # "$(OS)"=="SOLARIS" - --.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - SHL1STDLIBS += -laudio --.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" -+.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" - - .ENDIF # "$(GUI)"=="UNX" - diff --git a/editors/openoffice-1.0/files/pkg-message.in b/editors/openoffice-1.0/files/pkg-message.in deleted file mode 100644 index 4e72dc891b04..000000000000 --- a/editors/openoffice-1.0/files/pkg-message.in +++ /dev/null @@ -1,64 +0,0 @@ -OpenOffice.org Build 1.0.3 Personal Install How-To - -Written by: Martin Blapp - -OpenOffice.org will soon been installed in -${PREFIX}/OpenOffice.org1.0.3/ - -1 User installation -------------------- - -Just type "openoffice.org" after you have successfully -installed the package. If there is no installed -OO.org dir in your homedir, you'll be prompted to -install some files and choose a installed JDK. -The setup installs a "OpenOffice.org1.0.3" folder -in your homedir. - -If the setup tells you there is already an installed -version, you may look at the file ".sversionrc" in -your homedir. In this file OpenOffice.org and StarOffice -have both a line for each version which is installed. -After removing the problematic line you should be able to -install again. - -2 Start OO.org --------------- - -There are some wrappers installed for fast startup. -Add "${PREFIX}/bin/" to your PATH and you will be able -to use them. - -${PREFIX}/bin/openoffice.org-1.0.3 -${PREFIX}/bin/openoffice.org-1.0.3-sagenda -${PREFIX}/bin/openoffice.org-1.0.3-scalc -${PREFIX}/bin/openoffice.org-1.0.3-sdraw -${PREFIX}/bin/openoffice.org-1.0.3-setup -${PREFIX}/bin/openoffice.org-1.0.3-sfax -${PREFIX}/bin/openoffice.org-1.0.3-simpress -${PREFIX}/bin/openoffice.org-1.0.3-spadmin -${PREFIX}/bin/openoffice.org-1.0.3-sweb -${PREFIX}/bin/openoffice.org-1.0.3-swriter - -OO.org does need $LANG to be set to a suitable value. -Some old X-Servers before XFree86 4.2 do not like the -western locale with Euro symbol (ISO_8859-15). -You should ignore the warning message then or upgrade to -to a more recent X-server. - -If you have chosen US-ASCII as locale, you cannot load -and save documents with special characters and these -characters are also not available in swriter and scalc. - -3 Crash at startup after using a localized version --------------------------------------------------- - -If you had installed the english version, and then have -switched to a localized OO.org, it will crash instantly. - -To solve this issue, please remove the already installed -OpenOffice.org1.0.3 dir in your homedir and remove the -appropriate entry from ".sversionrc". After you have done -this, redo the user installation and the problem will -go away. - -- cgit v1.2.3