diff options
Diffstat (limited to 'app-office/openoffice-infra/files')
14 files changed, 0 insertions, 834 deletions
diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff deleted file mode 100644 index 8437d4c75..000000000 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2008-10-26 12:57:20.000000000 +0500 -+++ configure.in 2008-10-26 12:57:57.000000000 +0500 -@@ -3990,7 +4000,7 @@ - fi - save_CFLAGS=$CFLAGS - save_LIBS=$LIBS --CFLAGS="-I`pg_config --includedir`" -+CFLAGS="-I`pg_config --includedir` -L`pg_config --libdir`" - AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], []) - AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], []) - CFLAGS=$save_CFLAGS diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-configure.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-configure.diff deleted file mode 100644 index e00d4da6c..000000000 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-configure.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.in.orig 2008-10-26 12:57:20.000000000 +0500 -+++ configure.in 2008-10-26 12:57:57.000000000 +0500 -@@ -808,6 +813,10 @@ - --disable-verbose Decrease build verbosity. - ],,) - -+AC_ARG_ENABLE(gstreamer, -+[ --enable-gstreamer Enables GStreamer avmedia backend -+],,) -+ - BUILD_TYPE="OOo" - - dnl =================================================================== -@@ -3367,12 +3376,12 @@ - for a in "$RPM" rpmbuild rpm; do - $a --usage >/dev/null 2> /dev/null - if test $? -eq 0; then -- RPM=$a -+# RPM=$a - break - else - $a --version >/dev/null 2> /dev/null - if test $? -eq 0; then -- RPM=$a -+# RPM=$a - break - fi - fi -@@ -3385,7 +3394,8 @@ - fi - fi - if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then -- AC_PATH_PROG(DPKG, dpkg, no) -+# AC_PATH_PROG(DPKG, dpkg, no) -+ DPKG=no - if test "$DPKG" = "no"; then - AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.]) - fi -@@ -4171,7 +4181,7 @@ - AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity]) - if test "$enable_mozilla" = "no"; then - AC_MSG_RESULT([no]) --elif test "$with_system_mozilla" = "yes"; then -+elif test "$with_system_mozilla" = "yes" -o "$enable_kdeab" = "yes"; then - AC_MSG_RESULT([no, not possible with system-mozilla]) - else - AC_MSG_RESULT([yes]) diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-builder.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-infra-builder.diff deleted file mode 100644 index 823570216..000000000 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-builder.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- bin/apply.pl.orig 2009-05-30 14:14:39.000000000 +0600 -+++ bin/apply.pl 2009-05-30 14:14:53.000000000 +0600 -@@ -918,7 +918,7 @@ - my $ver_line; - my $is_old = 1; - -- open ($Patch, "/usr/local/bin/gpatch --version|") || die "Can't run patch: $!"; -+ open ($Patch, "patch --version|") || die "Can't run patch: $!"; - $ver_line = <$Patch>; - $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n"; - if ($1 >= 2 && $2 >= 5 && $3 >= 9) { -@@ -1280,7 +1280,7 @@ - - $opts = join ' ', @arguments; - $patch_args = " -l -p0 $opts -d $dest_dir"; -- $patch_cmd = "/usr/local/bin/gpatch"; -+ $patch_cmd = "patch"; - if ($pieces) { - # nasty path mess - $patch_cmd = "$patch_dir/../../bin/sloppypatch.pl"; ---- bin/enable-dict.orig 2009-05-30 13:44:33.000000000 +0600 -+++ bin/enable-dict 2009-05-30 13:44:40.000000000 +0600 -@@ -6,7 +6,7 @@ - - test -f $ARC || exit 1 - cd $WRKDIR/dictionaries || exit 2 --gtar xjf $ARC -+tar xjf $ARC - grep -q $LNG prj/build.lst && exit 0 - line="di dictionaries\\$LNG nmake - all di_$LNG NULL" - echo "$line" >> prj/build.lst diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff deleted file mode 100644 index 8c7f38290..000000000 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff +++ /dev/null @@ -1,88 +0,0 @@ ---- patches/dev300/apply.orig 2009-06-28 13:42:16.000000000 +0600 -+++ patches/dev300/apply 2009-06-28 13:58:45.000000000 +0600 -@@ -151,6 +151,12 @@ - - InfraUnix: LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions - InfraLinux: UbuntuJaunty, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, InfraLinuxOnly -+InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, NotInfraLinux, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly -+InfraGentoo: InfraGentooBase -+InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL -+InfraDictru: InfraDictRU -+InfraDictuk: InfraDictUK -+InfraDicttr: InfraDictTR - InfraSolaris: LinuxCommon, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, IntegrateExtensions - InfraWin32: Win32Common, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions - InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock -@@ -1601,7 +1607,7 @@ - sc-export-shape-macro-bindings.diff, n#304739, noelpwer - - # export of hlink bindings for shapes --# sc-export-shape-hlink-bindings.diff, n#304739, noelpwer -+sc-export-shape-hlink-bindings.diff, n#304739, noelpwer - - # attributes present in the vba streams can override the default shape name - # used for the control in the binary format -@@ -1768,6 +1774,8 @@ - # fix crash when attempting to use geometry attributes of - # control on sheet/document - vba-fix-control-shape-geom-fix.diff, n#500006 -+#must ask kendy about this ( noelp ) -+vba-parallel-build.diff, #no-upstrea - [ VBAUntested ] - SectionOwner => noelpwer - # needs more extensive testing, disable for 3.1 -@@ -2970,7 +2978,7 @@ - xlsx-shared-import-and-export.diff - - xlsx-arabic-export-crash.diff, n#497419, janneke --xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke -+#xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke - xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke - xlsx-export-simple-autofilter.diff, n#497559, janneke - # hack to ignore writerfilter when odf-converter is present -@@ -3065,15 +3073,22 @@ - sc-toogle-grid-menubar.diff - infra-palette.diff - -+[InfraDictRU] -+dictionaries-ru-RU.diff -+ -+[InfraDictUK] -+dict-uk.diff -+ -+[InfraDictTR] -+extensions-zemberek.diff -+ - [NotInfraLinux] - build-xterm-title.diff --no-ure-sdk.diff -+#no-ure-sdk.diff - enable-quickstart.diff - updates.diff - build-javainstaller2.diff - icons-galaxy-as-default.diff --dictionaries-ru-RU.diff --dict-uk.diff - extras-add-educate-officorr-misc-offimisc.diff - reportbuilder-no-license-infra.diff - wikipublisher-no-license-infra.diff -@@ -3081,7 +3096,6 @@ - scp2_extensions-remove-SUN.diff - extensions-dont-install-by-default.diff - extensions-separate-java-based.diff --extensions-zemberek.diff - officecfg-create-backups.diff - - [InfraLinuxOnly] -@@ -3090,8 +3104,10 @@ - sfx2-remove-check-update-on-fileload.diff, kohei - default-system-fpicker.diff, michael - --[InfraUnixPatches] -+[InfraUnixPatchesPG] - connectivity-freebsd-libs.diff -+ -+[InfraUnixPatches] - freebsd-store-alloca.diff - freebsd-gperf.diff, i#85469, rail - freebsd-writerfilter.diff diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-layout-simple-dialogs-svx.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-layout-simple-dialogs-svx.diff deleted file mode 100644 index c65a7160a..000000000 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-layout-simple-dialogs-svx.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- patches/dev300/layout-simple-dialogs-svx.diff.orig 2009-05-30 16:22:25.000000000 +0600 -+++ patches/dev300/layout-simple-dialogs-svx.diff 2009-05-30 16:23:35.000000000 +0600 -@@ -38,9 +38,9 @@ - inline BOOL SvxSearchDialog::HasSearchAttributes() const - { - int bLen = aSearchAttrText.GetText().Len(); ----- svx/source/dialog/makefile.mk.old 2009-04-06 16:41:56.000000000 +0000 --+++ svx/source/dialog/makefile.mk 2009-04-06 16:42:13.000000000 +0000 --@@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE -+--- svx/source/dialog/makefile.mk 2009-04-06 16:42:06.000000000 +0000 -++++ svx/source/dialog/makefile.mk 2009-04-06 16:42:13.000000000 +0000 -+@@ -39,8 +39,4 @@ ENABLE_EXCEPTIONS=TRUE - .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/util$/makefile.pmk - -@@ -48,9 +48,9 @@ - -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc - -.ENDIF # ENABLE_LAYOUT == TRUE - - -- .IF "$(ENABLE_GTK)" != "" -- CFLAGS+=-DENABLE_GTK -- .ENDIF -+ # --- Files -------------------------------------------------------- -+ -+ SRS1NAME=dialogs - --- svx/source/dialog/srchdlg.cxx.old 2009-04-06 16:42:06.000000000 +0000 - +++ svx/source/dialog/srchdlg.cxx 2009-04-06 16:42:13.000000000 +0000 - @@ -78,6 +78,8 @@ diff --git a/app-office/openoffice-infra/files/3.1.0/solenv.workaround-for-the-kde-mess.diff b/app-office/openoffice-infra/files/3.1.0/solenv.workaround-for-the-kde-mess.diff deleted file mode 100644 index 714709e21..000000000 --- a/app-office/openoffice-infra/files/3.1.0/solenv.workaround-for-the-kde-mess.diff +++ /dev/null @@ -1,262 +0,0 @@ -unchanged: ---- solenv/inc/_tg_shl.mk -+++ solenv/inc/_tg_shl.mk -@@ -441,10 +441,10 @@ $(SHL1TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd -- @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ -+ @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \ - $(SHL1VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd -+ $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd - .IF "$(UPDATER)"=="YES" -@@ -981,10 +981,10 @@ $(SHL2TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd -- @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ -+ @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \ - $(SHL2VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd -+ $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd - .IF "$(UPDATER)"=="YES" -@@ -1521,10 +1521,10 @@ $(SHL3TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd -- @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ -+ @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \ - $(SHL3VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd -+ $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd - .IF "$(UPDATER)"=="YES" -@@ -2061,10 +2061,10 @@ $(SHL4TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd -- @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ -+ @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \ - $(SHL4VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd -+ $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd - .IF "$(UPDATER)"=="YES" -@@ -2601,10 +2601,10 @@ $(SHL5TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd -- @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ -+ @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \ - $(SHL5VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd -+ $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd - .IF "$(UPDATER)"=="YES" -@@ -3141,10 +3141,10 @@ $(SHL6TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd -- @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ -+ @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \ - $(SHL6VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd -+ $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd - .IF "$(UPDATER)"=="YES" -@@ -3681,10 +3681,10 @@ $(SHL7TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd -- @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ -+ @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \ - $(SHL7VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd -+ $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd - .IF "$(UPDATER)"=="YES" -@@ -4221,10 +4221,10 @@ $(SHL8TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd -- @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ -+ @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \ - $(SHL8VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd -+ $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd - .IF "$(UPDATER)"=="YES" -@@ -4761,10 +4761,10 @@ $(SHL9TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd -- @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ -+ @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \ - $(SHL9VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd -+ $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd - .IF "$(UPDATER)"=="YES" -@@ -5301,10 +5301,10 @@ $(SHL10TARGETN) : \ - .ENDIF - .ELSE # "$(OS)"=="MACOSX" - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd -- @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ -+ @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \ - $(SHL10VERSIONOBJ) -o $@ \ - `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ -- $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd -+ $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd - .IF "$(UPDATER)"=="YES" -diff -u solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk ---- solenv/inc/_tg_app.mk (working copy) -+++ solenv/inc/_tg_app.mk -@@ -116,10 +116,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd -- @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_1.cmd - @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_1.cmd -- @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd -+ @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd - cat $(MISC)$/$(TARGET).$(@:b)_1.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd - @ls -l $@ -@@ -400,10 +400,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd -- @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_2.cmd - @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_2.cmd -- @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd -+ @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd - cat $(MISC)$/$(TARGET).$(@:b)_2.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd - @ls -l $@ -@@ -684,10 +684,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd -- @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_3.cmd - @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_3.cmd -- @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd -+ @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd - cat $(MISC)$/$(TARGET).$(@:b)_3.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd - @ls -l $@ -@@ -968,10 +968,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd -- @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_4.cmd - @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_4.cmd -- @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd -+ @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd - cat $(MISC)$/$(TARGET).$(@:b)_4.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd - @ls -l $@ -@@ -1252,10 +1252,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd -- @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_5.cmd - @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_5.cmd -- @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd -+ @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd - cat $(MISC)$/$(TARGET).$(@:b)_5.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd - @ls -l $@ -@@ -1536,10 +1536,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd -- @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_6.cmd - @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_6.cmd -- @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd -+ @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd - cat $(MISC)$/$(TARGET).$(@:b)_6.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd - @ls -l $@ -@@ -1820,10 +1820,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd -- @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_7.cmd - @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_7.cmd -- @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd -+ @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd - cat $(MISC)$/$(TARGET).$(@:b)_7.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd - @ls -l $@ -@@ -2104,10 +2104,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd -- @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_8.cmd - @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_8.cmd -- @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd -+ @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd - cat $(MISC)$/$(TARGET).$(@:b)_8.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd - @ls -l $@ -@@ -2388,10 +2388,10 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd -- @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_9.cmd - @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_9.cmd -- @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd -+ @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd - cat $(MISC)$/$(TARGET).$(@:b)_9.cmd - @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd - @ls -l $@ -@@ -2672,7 +2672,7 @@ - .ELSE # "$(OS)"=="MACOSX" - @echo unx - @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd -- @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ -+ @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \ - $(APP10OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_10.cmd - @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_10.cmd - @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd diff --git a/app-office/openoffice-infra/files/buildfix-gcc44.diff b/app-office/openoffice-infra/files/buildfix-gcc44.diff deleted file mode 100644 index 5da661e1f..000000000 --- a/app-office/openoffice-infra/files/buildfix-gcc44.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- sw/source/core/doc/docbm.cxx 2009-05-17 16:41:34.765483089 -0500 -+++ sw/source/core/doc/docbm.cxx 2009-05-17 16:41:39.141355157 -0500 -@@ -33,6 +33,7 @@ - #include "precompiled_sw.hxx" - - -+#include <cstdio> - #include <tools/pstm.hxx> - #include <svx/linkmgr.hxx> - #include <fmtanchr.hxx> ---- sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:33.556313757 -0500 -+++ sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:46.964547351 -0500 -@@ -32,6 +32,7 @@ - #include "precompiled_sw.hxx" - - #include <iostream> -+#include <cstdio> - #include "WW8TableInfo.hxx" - #include "swtable.hxx" - #include "pam.hxx" diff --git a/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff b/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff deleted file mode 100644 index 1f77f9a3f..000000000 --- a/app-office/openoffice-infra/files/gentoo-dont_strip_libs.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- solenv/bin/make_installer.pl.orig 2009-03-14 14:28:15.000000000 +0500 -+++ solenv/bin/make_installer.pl 2009-03-14 14:29:33.000000000 +0500 -@@ -1388,11 +1388,11 @@ - # 1. copy all files that need to be stripped locally - # 2. strip all these files - -- if ( $installer::globals::strip ) -- { -- installer::strip::strip_libraries($filesinpackage, $languagestringref); -- if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); } -- } -+ #if ( $installer::globals::strip ) -+ #{ -+ # installer::strip::strip_libraries($filesinpackage, $languagestringref); -+ # if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); } -+ #} - - ############################################################### - # Searching for files in $filesinpackage with flag LINUXLINK diff --git a/app-office/openoffice-infra/files/gentoo-epm-3.7.patch.diff b/app-office/openoffice-infra/files/gentoo-epm-3.7.patch.diff deleted file mode 100644 index a256e0f9a..000000000 --- a/app-office/openoffice-infra/files/gentoo-epm-3.7.patch.diff +++ /dev/null @@ -1,88 +0,0 @@ ---- epm/epm-3.7.patch.orig 2008-09-21 21:01:59.000000000 +0600 -+++ epm/epm-3.7.patch 2008-09-21 22:31:54.000000000 +0600 -@@ -98,8 +98,8 @@ - *** misc/epm-3.7/configure Thu Jul 24 03:20:54 2003 - --- misc/build/epm-3.7/configure Mon Nov 20 15:01:11 2006 - *************** --*** 1238,1244 **** ----- 1238,1249 ---- -+*** 1238,1243 **** -+--- 1238,1248 ---- - fi - fi; - -@@ -107,11 +107,48 @@ - + if test "${enable_fltk+set}" = set; then - + enableval="$enable_fltk" - + fi; -- - + -+ - # Check whether --with-docdir or --without-docdir was given. - if test "${with_docdir+set}" = set; then -- withval="$with_docdir" -+*************** -+*** 2683,2690 **** -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+! ac_cv_path_RPM="$as_dir/$ac_word$ac_exec_ext" -+! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+ done -+--- 2688,2695 ---- -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+! # ac_cv_path_RPM="$as_dir/$ac_word$ac_exec_ext" -+! # echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+ done -+*************** -+*** 2722,2729 **** -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+! ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext" -+! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+ done -+--- 2727,2734 ---- -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+! # ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext" -+! # echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+ done - *************** - *** 4904,4939 **** - fi -@@ -410,8 +447,22 @@ - *** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003 - --- misc/build/epm-3.7/epm.c Mon Nov 20 14:54:51 2006 - *************** -+*** 184,194 **** -+ /* -+ * Use dpkg as the native format, if installed... -+ */ -+- -+- if (access("/usr/bin/dpkg", 0)) -+ format = PACKAGE_RPM; -+- else -+- format = PACKAGE_DEB; -+ } -+ #elif defined(__sgi) -+ format = PACKAGE_INST; -+--- 184,190 ---- -+*************** - *** 547,552 **** ----- 547,553 ---- -+--- 543,549 ---- - { - puts(EPM_VERSION); - puts("Copyright 1999-2003 by Easy Software Products."); diff --git a/app-office/openoffice-infra/files/gentoo-mkdepend.diff b/app-office/openoffice-infra/files/gentoo-mkdepend.diff deleted file mode 100644 index d62b8a828..000000000 --- a/app-office/openoffice-infra/files/gentoo-mkdepend.diff +++ /dev/null @@ -1,53 +0,0 @@ ---- soltools/mkdepend/makefile.mk.orig 2008-04-11 00:06:06.000000000 +0600 -+++ soltools/mkdepend/makefile.mk 2008-10-25 22:25:48.000000000 +0600 -@@ -49,7 +49,7 @@ - LIBSALCPPRT= - UWINAPILIB= - --CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS -+CDEFS+=-Wno-implicit-function-declaration -DNO_X11 -DXP_PC -DHW_THREADS - - OBJFILES= \ - $(OBJ)$/cppsetup.obj \ ---- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200 -+++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200 -@@ -154,7 +154,7 @@ - - char *copy(); - char *base_name(); --char *getline(); -+char *ooo_getline(); - char *isdefined(); - struct filepointer *getfile(); - struct inclist *newinclude(); ---- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200 -+++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200 -@@ -548,7 +548,7 @@ - * Get the next line. We only return lines beginning with '#' since that - * is all this program is ever interested in. - */ --char *getline(filep) -+char *ooo_getline(filep) - register struct filepointer *filep; - { - register char *p, /* walking pointer */ ---- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200 -+++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200 -@@ -45,7 +45,7 @@ - register int type; - boolean recfailOK; - -- while ((line = getline(filep))) { -+ while ((line = ooo_getline(filep))) { - switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) { - case IF: - doif: -@@ -168,7 +168,7 @@ - register char *line; - register int type; - -- while ((line = getline(filep))) { -+ while ((line = ooo_getline(filep))) { - switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) { - case IF: - case IFFALSE: diff --git a/app-office/openoffice-infra/files/gentoo-system_pgsql.diff b/app-office/openoffice-infra/files/gentoo-system_pgsql.diff deleted file mode 100644 index f94f210c1..000000000 --- a/app-office/openoffice-infra/files/gentoo-system_pgsql.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- connectivity/source/drivers/postgresql/makefile.mk.orig 2008-11-22 13:45:15.000000000 +0500 -+++ connectivity/source/drivers/postgresql/makefile.mk 2008-11-22 13:46:58.000000000 +0500 -@@ -94,6 +94,10 @@ - POSTGRESQL_INCLUDES=-I`pg_config --includedir` - .ENDIF - -+.IF "$(SYSTEM_POSTGRESQL)" = "YES" -+POSTGRESQL_LIBS=-L`pg_config --libdir` -+.ENDIF -+ - CFLAGS+=$(POSTGRESQL_INCLUDES) \ - -DPOSTGRESQL_MAJOR=$(POSTGRESQL_MAJOR) \ - -DPOSTGRESQL_MINOR=$(POSTGRESQL_MINOR) \ -@@ -124,6 +128,8 @@ - PQLIB=-lpq -lcrypt - .IF "$(OS)"=="FREEBSD" - PQLIB+=-L/usr/local/lib -+.ELSE -+PQLIB+=$(POSTGRESQL_LIBS) - .ENDIF - .ENDIF - SHL2TARGET=postgresql-sdbc-impl.uno diff --git a/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff b/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff deleted file mode 100644 index 1f49fa0a9..000000000 --- a/app-office/openoffice-infra/files/gentoo-vba-parallel-build.diff +++ /dev/null @@ -1,97 +0,0 @@ ---- patches/vba/vba-parallel-build.diff.orig 2009-06-28 18:20:22.000000000 +0600 -+++ patches/vba/vba-parallel-build.diff 2009-06-28 18:43:58.000000000 +0600 -@@ -1,79 +1,33 @@ ----- basic/source/classes/makefile.mk 2007-03-01 16:50:05.000000000 +0100 --+++ basic/source/classes/makefile.mk 2007-03-01 16:50:39.000000000 +0100 --@@ -53,10 +53,6 @@ ALLTAR : \ -- $(MISC)$/$(TARGET).don \ -- $(SLOTARGET) -+--- scripting/source/vbaevents/makefile.mk.orig 2009-05-31 14:11:28.000000000 +0600 -++++ scripting/source/vbaevents/makefile.mk 2009-05-31 15:25:22.000000000 +0600 -+@@ -19,15 +19,6 @@ - ---$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb --- +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ --- echo $@ --- -- # --- Allgemein ----------------------------------------------------------- -- -- COMMON_SLOFILES= \ --@@ -85,3 +81,9 @@ LIB1OBJFILES = $(SLOFILES) -- -- .INCLUDE : target.mk -- --+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb --+ +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ --+ echo $@ --+ --+$(OBJFILES) : $(MISC)$/$(TARGET).don --+ ----- sc/source/ui/vba/makefile.mk 2007-03-01 14:51:01.000000000 +0100 --+++ sc/source/ui/vba/makefile.mk 2007-03-01 15:24:47.000000000 +0100 --@@ -1,6 +1,6 @@ ---PRJ=../..$/.. --+PRJ=..$/..$/.. -- ---PRJNAME= --+PRJNAME=sc -- TARGET=vbaobj -- .IF "$(ENABLE_VBA)"!="YES" -- dummy: --@@ -21,10 +21,6 @@ ALLTAR : \ -- $(MISC)$/$(TARGET).don \ -- $(SLOTARGET) -+ # ------------------------------------------------------------------ - -+-ALLTAR : \ -+- $(MISC)$/$(TARGET).don \ -+- $(SLOTARGET) -+- - -$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb - - +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ - - echo $@ -+-# ------------------------------------------------------------------ - - -- # ------------------------------------------------------------------ -+ #.INCLUDE : ..$/cppumaker.mk - - SLOFILES= \ --@@ -65,3 +61,10 @@ SLOFILES= \ -+@@ -56,3 +47,14 @@ - # --- Targets ------------------------------------------------------ - - .INCLUDE : target.mk - + --+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb --+ +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ --+ echo $@ --+ --+$(OBJFILES) : $(MISC)$/$(TARGET).don -++ALLTAR : \ -++ $(MISC)$/$(TARGET).don \ -++ $(SLOTARGET) - + ----- scripting/source/vbaevents/makefile.mk 2007-03-01 16:54:36.000000000 +0100 --+++ scripting/source/vbaevents/makefile.mk 2007-03-01 16:56:15.000000000 +0100 --@@ -24,9 +24,6 @@ ALLTAR : \ -- $(MISC)$/$(TARGET).don \ -- $(SLOTARGET) -- ---$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb --- +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ --- echo $@ -- # ------------------------------------------------------------------ -- -- #.INCLUDE : ..$/cppumaker.mk --@@ -57,3 +54,10 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib -- # --- Targets ------------------------------------------------------ -- -- .INCLUDE : target.mk -++$(SLOFILES) : $(MISC)$/$(TARGET).don - + - +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb - + +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ - + echo $@ - + --+$(OBJFILES) : $(MISC)$/$(TARGET).don --+ diff --git a/app-office/openoffice-infra/files/java-set-classpath.in b/app-office/openoffice-infra/files/java-set-classpath.in deleted file mode 100644 index 50f81552a..000000000 --- a/app-office/openoffice-infra/files/java-set-classpath.in +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh - -#***************************************************************************** -# -# java-set-classpath - Utility to update the default CLASSPATH for OpenOffice.org -# -# Initial version by: Petr Mladek <pmladek@suse.cz> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -#***************************************************************************** - -if test "z$1" = "z" ; then - echo "Update the default CLASSPATH for OpenOffice.org" - echo "" - echo "Usage: $0 [dir|jar]..." - echo "" - echo "The utility updates the OpenOffice.org system setting. It adds or removes" - echo "the given directories and jar-files to or from the default CLASSPATH" - echo "depending on if they are available on the system or not." - echo "" - echo "Parameters:" - echo " dir - absolute path to a directory" - echo " jar - absolute path to a jar-file" - exit 0; -fi - -JVM_CONFIG_FILE=@OOINSTBASE@/program/jvmfwk3rc - -for path in $@ ; do - if test "z${path%%/*}" != "z" ; then - echo "Warning: the path "$path" is not absolute and will be ignored" - continue - fi - if test -e $path ; then - # the file exist - grep "UNO_JAVA_JFW_CLASSPATH_URLS.*file:/*$path\([[:space:]].*\)\?$" $JVM_CONFIG_FILE >/dev/null && continue - # it is not registered - TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1 - sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)$|\1 file:$path|" $JVM_CONFIG_FILE >$TMP_FILE - mv -f $TMP_FILE $JVM_CONFIG_FILE - chmod 644 $JVM_CONFIG_FILE - else - # the file does not exist, remove it from the configuration - TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1; - sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)file:/*$path\([[:space:]].*\)\?$|\1\2|" \ - -e "s/\(UNO_JAVA_JFW_CLASSPATH_URLS=\)[[:space:]]\+/\1/" \ - -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]\+/ /g" \ - -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]*$//" $JVM_CONFIG_FILE >$TMP_FILE - mv -f $TMP_FILE $JVM_CONFIG_FILE - chmod 644 $JVM_CONFIG_FILE - fi -done diff --git a/app-office/openoffice-infra/files/wrapper.in b/app-office/openoffice-infra/files/wrapper.in deleted file mode 100644 index 364b2af8d..000000000 --- a/app-office/openoffice-infra/files/wrapper.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export OOO_EXTRA_ARG='' -unset PYTHONPATH -/usr/LIBDIR/openoffice/program/soffice "$@" |