Issue 11326 - cws_srx644_ooo20030223 patch for FreeBSD
Summary: cws_srx644_ooo20030223 patch for FreeBSD
Status: CLOSED FIXED
Alias: None
Product: porting
Classification: Code
Component: code (show other issues)
Version: 644
Hardware: PC FreeBSD
: P3 Trivial (vote)
Target Milestone: OOo 1.1 Beta
Assignee: sander_traveling
QA Contact: issues@porting
URL: http://porting.openoffice.org
Keywords:
Depends on:
Blocks:
 
Reported: 2003-02-09 12:13 UTC by maho.nakata
Modified: 2003-03-24 16:58 UTC (History)
2 users (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---


Attachments
FreeBSD 5-CURRENT Patch file for cws_src644_ooo20030223 (64.35 KB, application/octet-stream)
2003-02-09 12:21 UTC, maho.nakata
no flags Details
revised stlport patch - more generic (557 bytes, patch)
2003-02-13 12:49 UTC, foskey
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this issue.
Description maho.nakata 2003-02-09 12:13:02 UTC
Hi, Kevin and Martin B,
This is Maho.

I made a patch for cws_srx644_ooo20030223 based on
Martin Blapp's 643C porting(FreeBSD' port /usr/ports/openoffice-devel/).

Notice both Martin B. and me are jca signed people.
Comment 1 maho.nakata 2003-02-09 12:21:34 UTC
Created attachment 4618 [details]
FreeBSD 5-CURRENT Patch file for cws_src644_ooo20030223
Comment 2 foskey 2003-02-09 13:05:08 UTC
Config_office patch approved.
solenv/inc/settings.mk approved.
solenv/inc/startup/FREEBSD/macros.mk approved.
solenv/inc/tg_ext.mk approved.
solenv/inc/tg_moz.mk approved.
dmake patches approved.

solenv/inc/unxfbsdi.mk approved with removal of -w from CFLAGS, see
tools discussion.

stlport/STLport-4.5.patch approved - however you should not set option
of CC and CXX they should be moved to the CFLAGS where they belong.

stlport/makefile.mk approved.
sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx approved.
sysui/tools/lngconv/lngconv.cxx	approved.
tools/inc/inetdef.hxx approved.ucb/source/ucp/webdav/makefile.mk	 approved
unzip/source/misc.c approved.
vcl/unx/source/app/osssound.cxx	approved.
vcl/unx/source/app/rptpsound.cxx & vcl/unx/source/app/saldata.cxx	
approved. (perhaps should be generic)
vcl/unx/source/app/vsound.hxx approved.
vcl/unx/source/gdi/getstyle/makefile.mk approved.
vcl/unx/source/gdi/native-msgbox/makefile.mk approved.
vcl/util/makefile.mk approved.


discussion pending:

stoc/source/implementationregistration/implreg.cxx  if windows
compiles this it will break.  perhaps if gcc is appropriate.

rsc & unzip/source/file_io.c patch,  possibly wrong solution, looks
like we should be using an include not defining this.

setup2/script/* remove the location of test and just call it. 
autoconf assumes test is in the path so can we.

Comment 3 maho.nakata 2003-02-09 13:42:20 UTC
Thank you very much for very fast
reply and some suggestions, Ken.

Please devide our patches to
1. approved
2. should be discussed

As I far As I see, very small number of patches are
approved. Yes I know you are busy, so 
I'll wait for few weeks to finish your work ;-)
Comment 4 foskey 2003-02-13 12:11:38 UTC
dmake patches,  committed 1,  deleted make.sh - not used anymore.
config_office patches - committed.
Comment 5 foskey 2003-02-13 12:48:27 UTC
Berklydb patch applied.   PLease ensure this patch is upstreamed to
berkleydb.
One of the stlport patches applied, other one new version coming.

Comment 6 foskey 2003-02-13 12:49:11 UTC
Created attachment 4705 [details]
revised stlport patch - more generic
Comment 7 foskey 2003-02-13 13:24:57 UTC
Applied comphelper patch.
Comment 8 maho.nakata 2003-02-14 06:36:07 UTC
Hi, Ken.
This is Maho.

Thank you very much for your committing...
yet many patches should be applied...
Comment 9 foskey 2003-02-14 12:49:54 UTC
sablot patch applied.
Comment 10 maho.nakata 2003-02-14 13:17:59 UTC
Thanks for your time, Ken, but
what is the status of my Issue?
Your last comment is quite ambigious...
Is there difference between approved and
applied patch? Yes I can check by myself,
but it takes time for me. As you know CVS repo.
is changed everyday, please apply as soon as possible.
(And 644 snapshot is already released...)
Comment 11 foskey 2003-02-14 13:32:07 UTC
I am plugging through the patches.  I will give a proper status check
at the end of the weekend.
Comment 12 foskey 2003-02-14 14:09:42 UTC
Neon patch does not work for linux.  Rejected.
Comment 13 foskey 2003-02-16 11:52:46 UTC
Mozilla patch works,  not sure of content asked for help before approving.
patch-bridges+source+cpp_uno+gcc2_freebsd_intel - already there and
changes need checking.
patch-connectivity+source+parse+sqlbison.y - did not apply, probable
duplicate
patch-cppu+inc+uno+lbnames.h - not required
patch-cppu+prj+build.lst - did not apply, might not be required.

Comment 14 sander_traveling 2003-02-16 22:55:15 UTC
seems MartinB is otherwise busy, so taking over 
Comment 15 sander_traveling 2003-02-16 23:07:01 UTC
applied: 

vcl/unx/source/app/osssound.cxx
vcl/unx/source/app/rptpsound.cxx
vcl/unx/source/app/saldata.cxx
vcl/unx/source/app/vsound.hxx
vcl/unx/source/gdi/native-msgbox/makefile.mk
vcl/util/makefile.mk

the patch to getstyle.mk seems to be wrong - the freebsd getstyle
binary should have its own name imho instead of reusing linux.
Comment 16 sander_traveling 2003-02-16 23:19:32 UTC
applied:

unzip/source/misc.c
ucb/source/ucp/webdav/makefile.mk
tools/inc/inetdef.hxx
sysui/tools/lngconv/lngconv.cxx
sysui/oounix/office/gnome/gnome-vfs-filetype-registration.cxx
Comment 17 foskey 2003-02-17 11:42:22 UTC
Done:

patch-berkeleydb+db-3.2.9.patch
patch-config_office+configure.in
patch-config_office+set_soenv.in
patch-dmake+unix+runargv.c
patch-stlport+STLport-4.5.patch
patch-sablot+Sablot-0.52.patch
patch-nas+nas-1.6.additional.patch
patch-nas+nas-1.6.patch
patch-bridges+source+cpp_uno+gcc2_freebsd_intel-sjlj
patch-bridges+source+cpp_uno+gcc3_freebsd_intel
patch-bridges+source+prot_uno+makefile.mk
patch-bridges+prj+build.lst
patch-remotebridges+source+unourl_resolver+makefile.mk
patch-comphelper+util+makefile.mk
patch-cppu+inc+cppu+macros.hxx
patch-cppu+source+uno+data.cxx
patch-cppu+test+alignment+diagnose.h
patch-cppuhelper+source+makefile.mk
patch-cpputools+source+registercomponent+makefile.mk
patch-dtrans+source+X11+X11_selection.cxx
patch-extensions+source+plugin+unx+makefile.mk
patch-freetype+makefile.mk
patch-i18npool+inc+collatorImpl.hxx
patch-idl+util+makefile.mk
patch-javaunohelper+source+makefile.mk
patch-moz+prj+d.lst
patch-offapi+com+sun+star+setup+OSType.idl
patch-offapi+util+makefile.pmk
patch-vcl+unx+source+app+osssound.cxx
patch-vcl+unx+source+app+rptpsound.cxx
patch-vcl+unx+source+app+saldata.cxx
patch-vcl+unx+source+app+vsound.hxx
patch-vcl+unx+source+gdi+native-msgbox+makefile.mk
patch-vcl+util+makefile.mk
patch-unzip+source+misc.c
patch-sysui+oounix+office+gnome-vfs-filetype-registration.cxx
patch-sysui+tools+lngconv+lngconv.cxx
patch-tools+inc+inetdef.hxx
patch-ucb+source+ucp+webdav+makefile.mk
patch-psprint+source+printer+printerinfomanager.cxx
patch-psprint+source+printergfx+printerjob.cxx
patch-psprint+source+printergfx+psheader.ps
Comment 18 foskey 2003-02-17 11:49:10 UTC
Branch 644 is temporarily closed so we have to wait for the next tree
to be openned.  In the mean time we should look at rest of the patches:

The following patches change content to zip content.  This is not port
related:  raise a separate issue direct to the owner of package and
describe why this is desirable.

patch-package+inc+HashMaps.hxx
patch-package+inc+ZipPackageFolder.hxx
patch-package+source+zippackage+ContentInfo.hxx
patch-package+source+zippackage+ZipPackageFolder.cxx

The connectivity patches worked however I don't feel confident to
apply them.  Raise a separate issue and put to the owner of connectivity.
patch-connectivity+source+drivers+mozab+makefile.mk
patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk
patch-connectivity+source+drivers+mozaddressbook+makefile.mk

patch-neon+neon.patch - does not work with Linux x86
patch-bridges+source+cpp_uno+gcc2_freebsd_intel - already there and
changes need checking.
patch-connectivity+source+parse+sqlbison.y - did not apply, probable
duplicate
patch-cppu+inc+uno+lbnames.h - not required
patch-cppu+prj+build.lst - did not apply, might not be required.
patch-idlc+source+parser.y - did not apply, might not be required
patch-odk+pack+unzip_udk+makefile.mk - unnessecary


patch-rsc+source+rscpp+cpp.h - There is a decalaration of time
subroutine,  this should be headers not hardcoded.

The product patches I am not sure of their content.  I think perhaps
there should be a different approach.  Get one thing to work across
the board, appears to work against the current state of the code.

patch-product+inc+scp+udk_basefiles.scp
patch-product+settings+settings.mk
patch-product+util+makefile.mk
Comment 19 Martin Hollmichel 2003-02-17 17:12:47 UTC
branched closed now, setting to fixed to patches committed so far,
please open new issue for next cws and rest of patches.
Comment 20 Martin Hollmichel 2003-02-17 17:13:05 UTC
in cws_srx644_ooo20030223
Comment 21 maho.nakata 2003-02-18 18:01:38 UTC
Thank you very much for Ken, Sander.
I'll remake patches which are rejected for next
porting branch.
Comment 22 Martin Hollmichel 2003-03-24 16:58:56 UTC
cpputools/source/registercomponents/makefile.mk.

I reject change in makefile.mk (add of TOOLSLIB). please explain why
this is needed for FREEBSD. to reduce link dependencies unneeded libs
should be avoided.