[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: fix-ooo-collision.diff scrap-pixmap-links.diff gentoo-3.3.0_rc4.diff enable-startup-notification.diff env_log.diff gentoo-pythonpath.diff

[Andreas Proschofsky (suka)]

suka        11/01/24 19:57:42

  Added:                fix-ooo-collision.diff scrap-pixmap-links.diff
                        gentoo-3.3.0_rc4.diff
                        enable-startup-notification.diff env_log.diff
                        gentoo-pythonpath.diff
  Log:
  Initial commit for LibreOffice, should be mostly working, masked for testing.
  
  (Portage version: 2.1.9.35/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-office/libreoffice/files/fix-ooo-collision.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/fix-ooo-collision.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/fix-ooo-collision.diff?rev=1.1&content-type=text/plain

Index: fix-ooo-collision.diff
===================================================================
--- bin/package-ooo.orig	2010-11-29 20:16:08.700004578 +0100
+++ bin/package-ooo	2010-11-29 20:20:47.972004579 +0100
@@ -104,12 +104,12 @@
 ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
 
 # no man-page so ...
-if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
+if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva" -a "z$VENDORNAME" != "zGentoo"; then
     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
 fi
 
-if test "z$VENDORNAME" = "zMandriva"; then
+if test "z$VENDORNAME" = "zMandriva" -o "z$VENDORNAME" = "zGentoo"; then
     install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
     install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
 fi
@@ -210,9 +210,9 @@
 	done
 	
 	# shared MIME info
-	mkdir -p $PREFIX/share/mime/packages
+	mkdir -p $DATADIR/mime/packages
 	cd $TOOLSDIR/desktop
-	cp openoffice.xml $PREFIX/share/mime/packages
+	cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml
 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
 	   which update-mime-database >/dev/null 2>&1 ; then
 	    update-mime-database /usr/share/mime || :



1.1                  app-office/libreoffice/files/scrap-pixmap-links.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/scrap-pixmap-links.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/scrap-pixmap-links.diff?rev=1.1&content-type=text/plain

Index: scrap-pixmap-links.diff
===================================================================
--- bin/package-ooo 
+++ bin/package-ooo 
@@ -212,14 +212,6 @@
 	    done
 	done
 
-	# create symlinks below share/pixmaps to keep the backward compatibility
-	pixmapsdir=$PREFIX/share/pixmaps
-	mkdir -p $pixmapsdir
-	cd $OODESTDIR$icondir/48x48/apps
-	for icon in ooo-*.png ; do
-	    ln -sf $icondir/48x48/apps/$icon $pixmapsdir
-	done
-	
 	# shared MIME info
 	mkdir -p $DATADIR/mime/packages
 	cd $TOOLSDIR/desktop
--- bin/piece/desktop-support-app 
+++ bin/piese/desktop-support-app 
@@ -75,17 +75,6 @@
 	test -n "$list_icon_dirs" && echo "%dir $icon_dir/$size/$category" >>files-$piece.txt
     done
 
-    # create symlink below share/pixmaps to keep the backward compatibility
-    if test "$category" = "apps" ; then
-	file=$DESTDIR/$icon_dir/48x48/apps/$icon_name.png
-	if test -f $file ; then
-	    filename=`basename $file`
-	    pixmaps_dir=/usr/share/pixmaps
-	    mkdir -p $DESTDIR$pixmaps_dir
-	    ln -sf $icon_dir/48x48/apps/$filename $DESTDIR$pixmaps_dir
-	    test -n "$DESTDIR" && echo "$pixmaps_dir/$filename" >>files-$piece.txt
-	fi
-    fi
 }
 
 case "$app" in



1.1                  app-office/libreoffice/files/gentoo-3.3.0_rc4.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-3.3.0_rc4.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-3.3.0_rc4.diff?rev=1.1&content-type=text/plain

Index: gentoo-3.3.0_rc4.diff
===================================================================
--- patches/dev300/apply 
+++ patches/dev300/apply
@@ -1687,16 +1687,8 @@
 [ GentooOnly ]
 SectionOwner => aprosky
 
-# Allow build to proceed with PaX enabled
-gentoo-pax-fix.diff, aprosky
 # support server-only versions of 64bit JDKs
 64bit-jdk-server-paths.diff, i#65974, hmth
-# use IBM j9vm over IBM classic JVM
-ibm-j9vm.diff, hmth
-# system db check
-system-db-check.diff, i#65979, hmth
-# User ~/.ooo3 as user dir
-scp2-user-config-ooo3.diff, pmladek
 # default inc/lib
 config_office-XINC-XLIB-defaults.diff, i#65976
 # Sandbox problem with wrong path
--- configure.in 
+++ configure.in 
@@ -1326,12 +1326,18 @@
 	done
     fi
     SUNTEMPLATES_LANG=
-    # check whether the langs are requested at all
-    for lang in $wanted_sun_templates ; do
-        if test -n "`echo $with_lang | grep "$lang"`" ; then
-                SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
-        fi
-    done
+
+    # --with-lang="" now used for en-US
+    if test "z$with_lang" = "z" ; then
+        SUNTEMPLATES_LANG="en-US"
+    else
+        # check whether the langs are requested at all
+        for lang in $wanted_sun_templates ; do
+	    if test -n "`echo $with_lang | grep "$lang"`" ; then
+		  SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+	    fi
+        done
+    fi
     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
 fi
 AC_SUBST(SUNTEMPLATES_LANG)




1.1                  app-office/libreoffice/files/enable-startup-notification.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/enable-startup-notification.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/enable-startup-notification.diff?rev=1.1&content-type=text/plain

Index: enable-startup-notification.diff
===================================================================
--- desktop/base.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/base.desktop.in.in	2010-03-25 14:23:29.000000000 +0200
@@ -6,7 +6,7 @@
 Icon=ooo-base@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;Database;
-StartupNotify=false
+StartupNotify=true
 MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
 _Name=OpenOffice.org Base
 _GenericName=Database
--- desktop/calc.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/calc.desktop.in.in	2010-03-25 14:23:36.000000000 +0200
@@ -7,7 +7,7 @@
 Type=Application
 InitialPreference=6
 Categories=Office;Spreadsheet;
-StartupNotify=false
+StartupNotify=true
 MimeType=application/msexcel;application/vnd.lotus-1-2-3;application/vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;application/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x-csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/csv;application/excel;application/tab-separated-values;application/x-123;application/x-dos_ms_excel;application/x-excel;application/x-ms-excel;application/x-msexcel;text/comma-sep
 arated-values;text/tab-separated-values;text/x-comma-separated-values;
 _Name=OpenOffice.org Calc
 _GenericName=Spreadsheet
--- desktop/draw.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/draw.desktop.in.in	2010-03-25 14:23:44.000000000 +0200
@@ -6,7 +6,7 @@
 Icon=ooo-draw@OOO_BINSUFFIX@
 Type=Application
 Categories=Graphics;VectorGraphics;
-StartupNotify=false
+StartupNotify=true
 InitialPreference=6
 MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.stardivision.draw;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
 _Name=OpenOffice.org Draw
--- desktop/impress.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/impress.desktop.in.in	2010-03-25 14:23:52.000000000 +0200
@@ -6,7 +6,7 @@
 Icon=ooo-impress@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;Presentation;
-StartupNotify=false
+StartupNotify=true
 MimeType=application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.stardivision.impress;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;
 InitialPreference=5
 _Name=OpenOffice.org Impress
--- desktop/math.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/math.desktop.in.in	2010-03-25 14:24:02.000000000 +0200
@@ -7,7 +7,7 @@
 Icon=ooo-math@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;Math;
-StartupNotify=false
+StartupNotify=true
 MimeType=application/vnd.oasis.opendocument.formula;application/vnd.oasis.opendocument.formula-template;application/vnd.stardivision.math;application/vnd.sun.xml.math;text/mathml;
 _Name=OpenOffice.org Math
 _GenericName=Formula
--- desktop/ooo-extension-manager.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/ooo-extension-manager.desktop.in.in	2010-03-25 14:24:10.000000000 +0200
@@ -5,7 +5,7 @@
 Exec=unopkg@OOO_BINSUFFIX@ gui %U
 NoDisplay=true
 Type=Application
-StartupNotify=false
+StartupNotify=true
 Categories=X-SuSE-Core-Office;Office;
 MimeType=application/vnd.openofficeorg.extension;
 Name=OpenOffice.org Extension Manager
--- desktop/startcenter.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/startcenter.desktop.in.in	2010-03-25 14:24:20.000000000 +0200
@@ -6,7 +6,7 @@
 Icon=ooo-gulls@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;X-SuSE-Core-Office;
-StartupNotify=false
+StartupNotify=true
 InitialPreference=5
 _Name=OpenOffice.org
 _GenericName=Office
--- desktop/template.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/template.desktop.in.in	2010-03-25 14:24:27.000000000 +0200
 Icon=ooo-gulls@OOO_BINSUFFIX@
 Type=Application
 Categories=X-SuSE-Core-Office;Office;
-StartupNotify=false
+StartupNotify=true
 _Name=LibreOffice
 _GenericName=Office Suite
--- desktop/web.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/web.desktop.in.in	2010-03-25 14:24:33.000000000 +0200
@@ -6,7 +6,7 @@
 Icon=ooo-web@OOO_BINSUFFIX@
 Type=Application
 Categories=Network;WebDevelopment;
-StartupNotify=false
+StartupNotify=true
 MimeType=application/vnd.oasis.opendocument.text-web;
 _Name=OpenOffice.org Writer/Web
 _GenericName=Web Page Creation
--- desktop/writer.desktop.in.in	2010-01-12 12:35:25.000000000 +0200
+++ desktop/writer.desktop.in.in	2010-03-25 14:24:39.000000000 +0200
@@ -6,7 +6,7 @@
 Icon=ooo-writer@OOO_BINSUFFIX@
 Type=Application
 Categories=Office;WordProcessor;
-StartupNotify=false
+StartupNotify=true
 MimeType=application/msword;application/rtf;application/vnd.ms-works;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.stardivision.writer-global;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/wordperfect;application/x-extension-txt;application/x-t602;text/plain;text/rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;
 InitialPreference=5
 _Name=OpenOffice.org Writer



1.1                  app-office/libreoffice/files/env_log.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/env_log.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/env_log.diff?rev=1.1&content-type=text/plain

Index: env_log.diff
===================================================================
--- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
@@ -21,9 +21,8 @@
 echo "configuring ...";
 autoconf || exit 1;
 
-echo "Env for configure:"
-set
-echo "Env for configure ends"
+echo "Log Env for configure to `pwd`/env.log"
+set > env.log
 
 eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
 
@@ -88,8 +88,8 @@
 # similar that gives child nmake's pain.
 unset MAKEFLAGS
 
-echo "Env:"
-set
+echo "Log Env to `pwd`/env.log"
+set > env.log
 
 # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
 # already merged?



1.1                  app-office/libreoffice/files/gentoo-pythonpath.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-pythonpath.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-pythonpath.diff?rev=1.1&content-type=text/plain

Index: gentoo-pythonpath.diff
===================================================================
--- bin/package-ooo 
+++ bin/package-ooo 
@@ -33,6 +33,7 @@
 {
     cat <<EOT >$1
 #!/bin/sh
+unset PYTHONPATH
 $OOINSTBASE/program/soffice $2 "\$@"
 EOT
     chmod 755 $1