From c0bcf00e1bbd6fd33cfeed3b9612b2a5faeb39d1 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Sat, 2 Mar 2002 21:41:34 +0000 Subject: Another patchset from Carlos Fernando Assis Paniago --- .../files/patch-package::util::makefile.mk | 12 +++++++++ ...sprint::source::printer::printerinfomanager.cxx | 11 ++++++++ ...ch-ppsprint::source::printergfx::printerjob.cxx | 14 +++++++++++ .../files/patch-product+util+makefile.mk | 29 ++++++++++++++++++++++ .../files/patch-product::util::makefile.mk | 29 ++++++++++++++++++++++ .../files/patch-psprint::util::makefile.mk | 12 +++++++++ .../files/patch-registry::util::makefile.mk | 12 +++++++++ .../files/patch-sablot+Sablot-0.52.patch | 11 ++++++++ .../files/patch-sablot::Sablot-0.52.patch | 11 ++++++++ .../files/patch-sal::osl::unx::process.c | 11 ++++++++ 10 files changed, 152 insertions(+) create mode 100644 editors/openoffice-1.1-devel/files/patch-package::util::makefile.mk create mode 100644 editors/openoffice-1.1-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-ppsprint::source::printergfx::printerjob.cxx create mode 100644 editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk create mode 100644 editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk create mode 100644 editors/openoffice-1.1-devel/files/patch-psprint::util::makefile.mk create mode 100644 editors/openoffice-1.1-devel/files/patch-registry::util::makefile.mk create mode 100644 editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch create mode 100644 editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch create mode 100644 editors/openoffice-1.1-devel/files/patch-sal::osl::unx::process.c (limited to 'editors/openoffice-1.1-devel/files') diff --git a/editors/openoffice-1.1-devel/files/patch-package::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-package::util::makefile.mk new file mode 100644 index 000000000000..2bf58cecdb01 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-package::util::makefile.mk @@ -0,0 +1,12 @@ +--- ../package/util/makefile.mk.orig Sat Mar 2 22:06:28 2002 ++++ ../package/util/makefile.mk Sat Mar 2 22:06:31 2002 +@@ -88,7 +88,9 @@ + + SHL1TARGET=$(TARGET)$(MAJOR_VERSION) + SHL1IMPLIB=i$(TARGET) ++.IF "$(OS)"!="FREEBSD" + SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map ++.ENDIF + + SHL1STDLIBS=\ + $(CPPULIB) \ diff --git a/editors/openoffice-1.1-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx b/editors/openoffice-1.1-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx new file mode 100644 index 000000000000..5ebff3ce7d3e --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-ppsprint::source::printer::printerinfomanager.cxx @@ -0,0 +1,11 @@ +--- ../psprint/source/printer/printerinfomanager.cxx.orig Sat Mar 2 22:16:34 2002 ++++ ../psprint/source/printer/printerinfomanager.cxx Sat Mar 2 22:16:12 2002 +@@ -883,7 +883,7 @@ + + static const struct SystemCommandParameters aParms[] = + { +-#ifdef LINUX ++#ifdef LINUX || defined(FREEBSD) || defined(NETBSD) + { "/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.1-devel/files/patch-ppsprint::source::printergfx::printerjob.cxx b/editors/openoffice-1.1-devel/files/patch-ppsprint::source::printergfx::printerjob.cxx new file mode 100644 index 000000000000..535e12912b8d --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-ppsprint::source::printergfx::printerjob.cxx @@ -0,0 +1,14 @@ +--- ../psprint/source/printergfx/printerjob.cxx.orig Sat Mar 2 22:22:50 2002 ++++ ../psprint/source/printergfx/printerjob.cxx Sat Mar 2 22:22:40 2002 +@@ -282,7 +282,11 @@ + + sal_Bool bSuccess = sal_False; + ++#ifdef FREEBSD ++ if (pPWEntry = getpwuid(getuid()) != NULL) ++#else + if (getpwuid_r(getuid(), &aPWEntry, pPWBuffer, sizeof(pPWBuffer), &pPWEntry) != 0) ++#endif + pPWEntry = NULL; + + if (pPWEntry != NULL && pPWEntry->pw_name != NULL) diff --git a/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk b/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk new file mode 100644 index 000000000000..0d2033b9a4b2 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-product+util+makefile.mk @@ -0,0 +1,29 @@ +--- ../product/util/makefile.mk.orig Sat Mar 2 22:13:11 2002 ++++ ../product/util/makefile.mk Sat Mar 2 22:14:13 2002 +@@ -111,6 +111,15 @@ + ADDITIONAL_DLLS= \ + $(DESTDIRDLL)$/stlport_vc6.dll \ + $(DESTDIRDLL)$/w9xucwrp.dll ++.ELIF "$(OS)"=="FREEBSD" ++########### ++# FREEBSD ++########### ++DESTDIRBIN=$(DESTDIR)$/freebsd$/bin ++DESTDIRLIB=$(DESTDIR)$/freebsd$/lib ++DESTDIRDLL=$(DESTDIRLIB) ++STLPORTLIBNAME=libstlport_gcc.so ++BINDINGDLL=gcc2_uno + .ENDIF + + .IF "$(STLPORTLIBNAME)" != "" +@@ -360,8 +369,8 @@ + $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ + + $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) +- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ +- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) ++ +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ ++ +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) + + $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) + $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ diff --git a/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk new file mode 100644 index 000000000000..0d2033b9a4b2 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk @@ -0,0 +1,29 @@ +--- ../product/util/makefile.mk.orig Sat Mar 2 22:13:11 2002 ++++ ../product/util/makefile.mk Sat Mar 2 22:14:13 2002 +@@ -111,6 +111,15 @@ + ADDITIONAL_DLLS= \ + $(DESTDIRDLL)$/stlport_vc6.dll \ + $(DESTDIRDLL)$/w9xucwrp.dll ++.ELIF "$(OS)"=="FREEBSD" ++########### ++# FREEBSD ++########### ++DESTDIRBIN=$(DESTDIR)$/freebsd$/bin ++DESTDIRLIB=$(DESTDIR)$/freebsd$/lib ++DESTDIRDLL=$(DESTDIRLIB) ++STLPORTLIBNAME=libstlport_gcc.so ++BINDINGDLL=gcc2_uno + .ENDIF + + .IF "$(STLPORTLIBNAME)" != "" +@@ -360,8 +369,8 @@ + $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ + + $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) +- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ +- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) ++ +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ ++ +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) + + $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST) + $(GNUCOPY) -p $(BINOUT)$/$(@:f) $@ diff --git a/editors/openoffice-1.1-devel/files/patch-psprint::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-psprint::util::makefile.mk new file mode 100644 index 000000000000..faa0b78f18b1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-psprint::util::makefile.mk @@ -0,0 +1,12 @@ +--- ../psprint/util/makefile.mk.orig Sat Mar 2 22:24:38 2002 ++++ ../psprint/util/makefile.mk Sat Mar 2 22:25:27 2002 +@@ -91,7 +91,9 @@ + .IF "$(OS)"=="SOLARIS" + SHL1VERSIONMAP=libpsp_solaris.map + .ELSE # should work for all gcc/binutils based linker (ld) ++.IF "$(OS)"!="FREEBSD" + SHL1VERSIONMAP=libpsp_linux.map ++.ENDIF + .ENDIF + SHL1STDLIBS=$(UNOTOOLSLIB) \ + $(TOOLSLIB) \ diff --git a/editors/openoffice-1.1-devel/files/patch-registry::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-registry::util::makefile.mk new file mode 100644 index 000000000000..f1970ad5e6a1 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-registry::util::makefile.mk @@ -0,0 +1,12 @@ +--- ../registry/util/makefile.mk.orig Sat Mar 2 22:28:13 2002 ++++ ../registry/util/makefile.mk Sat Mar 2 22:28:07 2002 +@@ -95,7 +95,9 @@ + $(STORELIB) \ + $(LIBCIMT) + ++.IF "$(OS)"!="FREEBSD" + SHL1VERSIONMAP= $(TARGET).map ++.ENDIF + + SHL1LIBS= $(LIB1TARGET) + SHL1DEPN= $(LIB1TARGET) diff --git a/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch new file mode 100644 index 000000000000..83fa18b6d11e --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch @@ -0,0 +1,11 @@ +--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002 ++++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002 +@@ -85,7 +85,7 @@ + ! CFLAGS+= -DHAVE_IEEEFP_H + ! .ENDIF + ! +-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX" ++! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX" + ! CFLAGS+= -DHAVE_UNISTD_H + ! .ENDIF + ! diff --git a/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch new file mode 100644 index 000000000000..83fa18b6d11e --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch @@ -0,0 +1,11 @@ +--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002 ++++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002 +@@ -85,7 +85,7 @@ + ! CFLAGS+= -DHAVE_IEEEFP_H + ! .ENDIF + ! +-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX" ++! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX" + ! CFLAGS+= -DHAVE_UNISTD_H + ! .ENDIF + ! diff --git a/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::process.c b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::process.c new file mode 100644 index 000000000000..9d7ffa6686d3 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-sal::osl::unx::process.c @@ -0,0 +1,11 @@ +--- ../sal/osl/unx/process.c.orig Sat Mar 2 22:33:17 2002 ++++ ../sal/osl/unx/process.c Sat Mar 2 22:33:58 2002 +@@ -834,7 +834,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="); -- cgit v1.2.3