commit libreoffice-bootstrap for openSUSE:11.2

Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:11.2 checked in at Thu Mar 31 01:08:11 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ 11.2/libreoffice-bootstrap/libreoffice-bootstrap.changes 2011-03-18 22:33:42.000000000 +0100 @@ -0,0 +1,2366 @@ +------------------------------------------------------------------- +Fri Mar 18 22:12:32 CET 2011 - pmladek@suse.cz + +- maintenance update (bnc#667421, MaintenanceTracker-38738) + +------------------------------------------------------------------- +Fri Mar 18 15:44:39 CET 2011 - pmladek@suse.cz + +- kde3-fpicker.diff: find KDE3 filepicker helper binary (bnc#680382) + +------------------------------------------------------------------- +Wed Mar 16 16:45:15 UTC 2011 - neptunia@mail.ru + +- enabled KDE3 support (bnc#678998) + +------------------------------------------------------------------- +Wed Feb 23 14:08:35 CET 2011 - pmladek@suse.cz + +- libreoffice-3.3.1.2 == 3.3.1-rc2 == final + +------------------------------------------------------------------- +Wed Feb 23 14:02:28 CET 2011 - pmladek@suse.cz + +- libreoffice-build-slideshow-media-playback-bug.diff: fix audio/video playback + in presentation (deb#612940, bnc#651250) +- vcl-input-methods-in-qt4.diff: non-working input methods in KDE4 (bnc#665112) + +------------------------------------------------------------------- +Tue Feb 22 17:42:08 CET 2011 - pmladek@suse.cz + +- sd-blank-first-slide.diff: fixed occasional blank first slide (fdo#34533) + +------------------------------------------------------------------- +Mon Feb 21 14:23:59 CET 2011 - pmladek@suse.cz + +- canvas-cairo-edge-count-calculation.diff: fixed cairo canvas edge count + calculation (bnc#647959) + +------------------------------------------------------------------- +Fri Feb 18 19:21:03 CET 2011 - pmladek@suse.cz + +- defuzzed piece-packimages.diff to apply cleanly on all distros + +------------------------------------------------------------------- +Thu Feb 17 14:11:53 CET 2011 - pmladek@suse.cz + +- fixed Cairo canvas regression when accessing polygon points outside range; + was visible with the test document from bnc#232232 + +------------------------------------------------------------------- +Wed Feb 16 16:27:04 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.1.2 (3.3.1-rc2): + * l10n + * updated some translations + * libs-core + * crashing oosplash and malformed picture (bnc#652562) + * Byref and declare Basic statement (fdo#33964, i#115716) + * fixed BorderLine(2) conversion to SvxBorderLine (fdo#34226) + * libs-gui + * getEnglishSearchFontName() searches Takao fonts + * sdk + * fix ODK settings.mk to only set STLPORTLIB if needed + * writer + * rtfExport::HackIsWW8OrHigher(): return true (fdo#33478) + * visual editor destroys formulas containing symbols (fdo#32759, fdo#32755) +- enabled KDE4 support for SLED11; LO-3.3.1 fixed the remaining annoying bugs +- fixed EMF+ import (bnc#650049) + +------------------------------------------------------------------- +Tue Feb 8 20:53:59 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.1.1 (3.3.1-rc1): + * artwork + * new MIME type icons for LibreOffice + * bootstrap + * wrong line break with ( (fdo#31271) + * build + * default formula string (n#664516) + * don't version the bundled ct2n extension + * last update of translations from Pootle for 3.3.1 + * calc + * import of cell attributes from Excel documents + * incorrect page number in page preview mode (fdo#33155) + * components + * remove pesky on-line registration menu entry (fdo#33112) + * crash on changing position of drawing object in header (rhbz#673819) + * extras + * start using technical.dic instead of oracle.dic (fdo#31798) + * filters + * pictures DOCX import (bnc#655763) + * parse 'color' property (fdo#33551) + * fix ole object import for writer (DOCX) (fdo#33237) + * help + * OOo -> LibO on Getting Support page (fdo#33249) + * libs-core + * handle css::table::BorderLine + * add preferred Malayalam fonts (fdo#32953) + * fix KDE3 library search order (fdo#32797) + * StarDesktop.terminate macro behaviour (#30879) + * Sun Microsystems -> TDF in desktop file (fdo#31191) + * fixed several crashes around config UNO API (fdo#33994) + * implementation names weren't matching with xcu (fdo#32872) + * improve the check for existence of the localized help (fdo#33258) + * libs-extern + * upgrade libwpd to 0.9.1 + * libs-gui + * painting of axial gradients (116318) + * fix wrong collation for Catalan language + * crash when moving through database types (fdo#32561) + * paint toolbar handle positioned properly (fdo#32558) + * remove the menu when Left Alt Key was pressed; for GTK + * default currency for Estonia should be Euro (fdo#33160) + * year of era in long format for zh_TW by default (fdo#33459) + * writer + * use standard Edit button width of 50 (fdo#32633) + * improve formfield checkbox binary export (bnc#660816) + * infinite loop while exporting some files in DOC/DOCX/RTF + * CTL/Other Default Font (i#25247, i#25561, i#48064, i#92341) +- updated setup_native_packinfo to version 3.3.1.1 + +------------------------------------------------------------------- +Mon Jan 31 20:32:38 CET 2011 - pmladek@suse.cz + +- libreoffice-build-3.3.0.4 == 3.3.0-rc4 == final + +------------------------------------------------------------------- +Wed Jan 19 12:58:21 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.4 (3.3-rc4): + * common: + * remove pesky on-line registration menu entry (fdo#33112) + * artwork: + * fix search toolbar up/down search button icons + * base: + * report builder not shows properties on report fields (fdo#32742) + * report left/right page margin setting ignored on 64-bit (i#116187) + * build: + * updated translations + * calc: + * reverted problematic and dangerous: + * performance of filters with many filtered ranges (i#116164) + * obtain correct data range for external references (i#115906) + * libs-core: + * FMR crasher (fdo#33099) + * backgrounds for polypolygons in metafile (i#116371) + * unopkg crasher on SLED11-SP1 (bnc#655912) + * libs-gui: + * use sane scrollbar sizes when drawing + * painting of axial gradients (i#116318) + * do not mix unrelated X11 Visuals (fdo#33108) + * avoid GetHelpText() call which can be quite heavy + * writer: + * fields fixes: key inputs, 0-length fields import (bnc#657135) + +------------------------------------------------------------------- +Thu Jan 13 14:50:55 CET 2011 - pmladek@suse.cz + +- improved check for available memory and number of parallel jobs + +------------------------------------------------------------------- +Tue Jan 11 23:35:19 CET 2011 - pmladek@suse.cz + +- fixed build with the et and hr localizations + +------------------------------------------------------------------- +Tue Jan 11 16:41:58 CET 2011 - pmladek@suse.cz + +- updated to libreoffice-3.3.0.3 (3.3-rc3): + * build: + * use libreoffice and lo* wrappers; update man pages accordingly + * navigation buttons' patch selection handling (fdo#32380, bnc#649506) + * calc: + * bogus check for numerical sheet names (fdo#32570) + * performance of filters with many filtered ranges (i#116164) + * obtain correct data range for external references (i#115906) + * avoid double-paste when pasting text into cell comment (fdo#32572) + * components: + * fix nsplugin for LibreOffice name + * fixing large OOXML files (i#115944) + * layout breakage for KDE, X11 and (possibly) Mac (fdo#32133) + * extensions: + * patching xpdf to patchlevel 3.02pl5 + * extras: + * creating technical.dic based on src/*.dic + * filters: + * small TGAReader improvement (i#164349) + * PageRange handling in writer PDF export (#116085) + * impress: + * missing font color (rhbz#663857) + * use updated anchor for group shapes (i#115898) + * presentation objects on master pages (i#115993) + * libs-core: + * survive missing window (rhbz#666216) + * better font selection in Japanese locale. + * do not block when launching Firefox (fdo#32427) + * show the license information in a separate dialog (fdo#32563) ++++ 2169 more lines (skipped) ++++ between /dev/null ++++ and 11.2/libreoffice-bootstrap/libreoffice-bootstrap.changes calling whatdependson for 11.2-i586 New: ---- canvas-cairo-edge-count-calculation.diff canvas-polygon-access-out-of-range.diff cli_ure-disable-mono-loader.diff drawinglayer-metadata-decomposition.diff jsr173_1.0_api.jar kde3-fpicker.diff libreoffice-bootstrap-3.3.1.2.tar.bz2 libreoffice-bootstrap-rpmlintrc libreoffice-bootstrap.changes libreoffice-bootstrap.spec libreoffice-build-3.2.99.2-extensions-hack.diff libreoffice-build-3.3.1.1-enable-kde4-support.diff libreoffice-build-3.3.1.1-setup-native.diff libreoffice-build-3.3.1.2.tar.gz libreoffice-build-slideshow-media-playback-bug.diff officecfg-help-in-usr-share.diff ooo-build-3.1.99.2-xulrunner-1.9.1.diff piece-disable-pyuno-registration.diff piece-packimages.diff sal-rtl-compiler-optimization-meego.diff sd-blank-first-slide.diff setup_native_packinfo-3.3.1.1.tar.bz2 solenv-carefull-patching-hack.diff svtools-enable-emfplus.diff vcl-input-methods-in-qt4.diff vcl-use-canvas-bool.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ # # spec file for package libreoffice-bootstrap # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libreoffice-bootstrap # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel mono-devel neon-devel pam-devel patch perl-Archive-Zip perl-Compress-Zlib postgresql-devel python-devel recode unixODBC-devel unzip xml-commons-apis zip ############################ # basic stuff %if 0%{?suse_version} BuildRequires: db-devel krb5 openldap2-devel python-xml xorg-x11 # LO-3.3 fixed all most annoying KDE4-related bugs => time to enable KDE4 support for SLED11 BuildRequires: libkde4-devel %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel BuildRequires: xorg-x11-server-devel BuildRequires: xorg-x11-proto-xproto BuildRequires: xorg-x11-utils BuildRequires: libjpeg-devel libxslt-devel openssl-devel pkgconfig(gl) pkgconfig(glu) pkgconfig(xau) pkgconfig(xaw7) BuildRequires: db4-devel krb5-devel openldap-devel %endif ############################ # KDE3 stuff %if 0%{?suse_version} BuildRequires: kdelibs3-devel %endif ############################ # cppunit stuff %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel %endif ############################ # mysql stuff %if 0%{?suse_version} BuildRequires: libmysqlclient-devel %endif %if 0%{?suse_version} > 01210 # mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlcppconn-devel %endif ############################ # mozilla stuff %if 0%{?suse_version} > 01130 BuildRequires: mozilla-xulrunner192-devel %endif %if 0%{?suse_version} <= 01130 %if 0%{?suse_version} > 01110 || %use_xulrunner191 == yes BuildRequires: mozilla-xulrunner191-devel %endif %endif %if 0%{?suse_version} > 01100 && 0%{?suse_version} <= 01110 && %use_xulrunner191 != yes BuildRequires: mozilla-xulrunner190-devel %endif %if 0%{?suse_version} > 01010 && 0%{?suse_version} <= 01100 BuildRequires: mozilla-xulrunner181-devel %endif %if 0%{?suse_version} > 01000 && 0%{?suse_version} <= 01010 BuildRequires: gecko-sdk mozilla-xulrunner %endif %if 0%{?meego_version} BuildRequires: xulrunner-devel %endif ############################ # expat stuff %if 0%{?suse_version} > 01100 # libexpat-devel is explicitely needed since openSUSE-11.1 BuildRequires: libexpat-devel %endif %if 0%{?meego_version} BuildRequires: expat-devel %endif ############################ # lpsolve stuff %if 0%{?suse_version} > 01100 || 0%{?meego_version} # lpsolve-devel has been available since openSUSE-11.1 BuildRequires: lpsolve-devel %endif ############################ # poppler is needed to build the PDF import extension # the needed version 0.8.0 has been avaiable only since openSUSE-11.0 %if 0%{?suse_version} >= 01100 BuildRequires: libpoppler-devel %endif %if 0%{?meego_version} BuildRequires: poppler-devel %endif ############################ # junit stuff %if %suse_version > 1110 BuildRequires: junit4 %endif ############################ # openSUSE 10.3 features %if 0%{?suse_version} > 01020 || 0%{?meego_version} BuildRequires: libicu-devel %endif ############################ # openSUSE 11.0 features %if 0%{?suse_version} > 01030 || 0%{?meego_version} BuildRequires: hunspell-devel libwpd-devel libwpg-devel libwps-devel %endif ############################ # CODE10 features ############################ %if 0%{?suse_version} > 01000 BuildRequires: gstreamer010-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis %endif %if 0%{?meego_version} BuildRequires: gst-plugins-base-devel sablot-devel xalan-j2 xerces-j2 xml-commons-apis %endif # FIXME: part of the language-dependant stuff is still built here and # put into the -devel package # test_build_langs: 0 = only en-US # 1 = en-US, de, and cs # 2 = all supported languages %define test_build_langs 2 # test_build_binfilters: 0 = no # 1 = yes %define test_build_binfilters 1 # test_build_SDK: 0 = no # 1 = yes (if possible, see below the definition of ooo_build_sdk) %define test_build_sdk 1 # build_module_in_parallel 0 = no # 1 = yes (the number is defined be the number of cpus) # 2,3,4... = yes (force the number of modules to be built in parallel) %define build_module_in_parallel 1 # prepare_build: 0 = no # 1 = yes (just build, install and create packages; without %%prep section and configure) %define prepare_build 1 # %if %test_build_langs == 0 %define ooo_langs "" %else %if %test_build_langs == 1 %define ooo_langs "en-US cs de hu ja" %else %define ooo_langs "en-US af ar be-BY bg br ca cs cy da de el en-GB en-ZA es et fi fr ga gl gu he hi-IN hu hr it ja ka km ko lt mk nb nl nn nr pa-IN pl pt pt-BR ru rw sh sk sl sr ss st sv tg th tr ts uk ve vi xh zh-TW zh-CN zu" %endif %endif %define ooo_poor_help_localizations "af bg be-BY br ca cy el fi ga he hr ka lt mk nb nn nr rw sh sr sk ss st tg th tr th ts uk ve vi xh zu" # sdk stuff enable only on SL 10.2, SLED10 and higher # force no if test_build_sdk is disabled %if %test_build_sdk == 0 %define ooo_build_sdk no %else %if 0%{?suse_version} > 01010 || 0%{?sles_version} == 010 || 0%{?meego_version} %define ooo_build_sdk yes %else %define ooo_build_sdk no %endif %endif # java stuff %define with_java yes %define use_gij no # java target bytecode; should be compatible with the gcj %if 0%{?suse_version} > 01030 || 0%{?meego_version} %define java_target_version 1.5 %else %define java_target_version 1.4 %endif # we would like to support also a non-conflicting OOo2 package %define ooo_bin_suffix no # %define ooo_build_version 3.3.1.2 %define ooo_piece_version 3.3.1.2 %define ooo_build_dir build %define ooo_sourcedirname libreoffice-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice %define ooo_basis_dir basis3.3 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite Version: 3.3.1.2 Release: 2.<RELEASE2> AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed # too high parallelism caused troubles in the Build Service Requires: procps Provides: OpenOffice_org-bootstrap = %version Obsoletes: OpenOffice_org-bootstrap <= %version Summary: LibreOffice Build Bootstrap Url: http://www.documentfoundation.org/ Source0: libreoffice-build-%ooo_build_version.tar.gz Source1: libreoffice-bootstrap-%ooo_piece_version.tar.bz2 # hacked soures from setup_native Source30: setup_native_packinfo-3.3.1.1.tar.bz2 # Hmm, rpmlint complains about devel files in non-devel package # We would like to keep the -bootstrap package name # So we need to disable these rpmlint checks Source100: %name-rpmlintrc # jsr173_1.0_api.jar can't be built with Java-1.4 on SLED10 easily Source150: jsr173_1.0_api.jar # # patches against libreoffice-build # Patch0: libreoffice-build-3.3.0.1-enable-foo.diff # example Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff Patch1: libreoffice-build-3.3.1.1-setup-native.diff Patch2: libreoffice-build-3.3.1.1-enable-kde4-support.diff # fix audio/video playback in presentation (deb#612940, bnc#651250) Patch3: libreoffice-build-slideshow-media-playback-bug.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 Patch900: piece-disable-pyuno-registration.diff # compile sal/rtl/source with -O2 on MeeGo; File/Wizards/Letter crashed when compiled with -Os, see http://bugs.meego.com/show_bug.cgi?id=2652 Patch901: sal-rtl-compiler-optimization-meego.diff # slower patching to debug and hopefully fix parallel build of ct2n extension; always happened only in the Build Service (bnc#595550) Patch902: solenv-carefull-patching-hack.diff # FIXME: make it configurable in integrate into git Patch903: officecfg-help-in-usr-share.diff # FIXME: temporary disable mono-loader build until the dependency on comphelper is removed Patch904: cli_ure-disable-mono-loader.diff # FIXME: defuzzed diff Patch905: piece-packimages.diff # occasional blank first slide in presentation (fdo#34533) Patch906: sd-blank-first-slide.diff # non-working input methods in KDE4 (bnc#665112) Patch907: vcl-input-methods-in-qt4.diff # find KDE3 filepicker helper binary (bnc#680382) Patch908: kde3-fpicker.diff # FIXME: fix EMP+ import (bnc#650049) Patch960: svtools-enable-emfplus.diff Patch961: vcl-use-canvas-bool.diff Patch962: drawinglayer-metadata-decomposition.diff Patch963: canvas-polygon-access-out-of-range.diff Patch964: canvas-cairo-edge-count-calculation.diff # # patches against the upstream sources, must be -p0 # Patch1000: bug-123456-fix-foo.diff # example BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc %description This packages provides the basic tools and framework for building LibreOffice using separate source packages. %prep %if %prepare_build == 0 %setup -D -T -q -n libreoffice-build-%ooo_build_version %else %setup -q -n libreoffice-build-%ooo_build_version # # apply patches against libreoffice-build # %patch0 # example %patch0 %patch1 %patch2 %patch3 install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ %endif %if %use_xulrunner191 == yes # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %patch500 %endif %if 0%{?suse_version} == 01010 # temporary disable registration of python components on SLED10 cp %{P:900} patches/hotfixes %endif %if 0%{?meego_version} # compile sal/rtl/source with -O2 on MeeGo; File/Wizards/Letter crashed when compiled with -Os, see http://bugs.meego.com/show_bug.cgi?id=2652 cp %{P:901} patches/hotfixes %endif cp %{P:902} patches/hotfixes cp %{P:903} patches/hotfixes cp %{P:904} patches/hotfixes cp %{P:905} patches/hotfixes cp %{P:906} patches/hotfixes cp %{P:907} patches/hotfixes cp %{P:908} patches/hotfixes # EMF+ stuff cp %{P:960} patches/hotfixes cp %{P:961} patches/hotfixes cp %{P:962} patches/hotfixes cp %{P:963} patches/hotfixes cp %{P:964} patches/hotfixes %endif %build %if %prepare_build != 0 # # Parallel build settings ... PARALLEL_BUILD= if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="--with-gcc-speedup=icecream --with-max-jobs=%jobs" fi # parallel build of modules; it makes sense on machines with more CPUs if test "%build_module_in_parallel" = "1" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" fi if test "%build_module_in_parallel" -gt "1" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" fi # # Distro settings ... %if 0%{?meego_version} with_distro="SUSE-11.1" %endif %if 0%{?suse_version} && 0%{?suse_version} <= 01110 suse_major_ver=$((%{?suse_version} / 100)) suse_minor_ver=$((%{?suse_version} / 10 - $suse_major_ver * 10)) with_distro="SUSE-$suse_major_ver.$suse_minor_ver" %endif %if 0%{?suse_version} > 01110 && 0%{?suse_version} <= 01120 with_distro="SUSE-11.2" %endif %if 0%{?suse_version} > 01120 with_distro="SUSE" %endif # # run autoreconf to make sure that everything works correctly on current system # also the autoconf stuff might have been patched autoreconf -fi %endif # make sure that JAVA_HOME is set correctly %if 0%{?suse_version} source /etc/profile.d/alljava.sh %endif %if 0%{?meego_version} export JAVA_HOME=%{java_home} %endif # use RPM_OPT_FLAGS, ... export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" # FIXME: genccode from the system icu is in /usr/sbin export PATH="$PATH:/usr/sbin" %if %prepare_build != 0 ./configure $PARALLEL_BUILD \ --with-arch-flags="$ARCH_FLAGS" \ --with-split \ --with-piece=bootstrap \ --libdir=%{_libdir} \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ --sysconfdir=/etc \ --with-docdir=%{_docdir}/%{name} \ --with-binsuffix=%ooo_bin_suffix \ --with-installed-ooo-dirname=%ooo_home \ --with-distro="$with_distro" \ %if 0%{?suse_version} && 0%{?suse_version} <= 01030 --with-intro-bitmaps="%{S:140} %{S:142}" \ --with-about-bitmaps="%{S:141} %{S:143}" \ %endif --with-source-version=%ooo_piece_version \ --without-git \ --without-download \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ --with-mono-gac-root=%{_prefix}/lib \ --with-compat-oowrappers \ %if %test_build_binfilters != 0 --enable-binfilter \ %endif %if %with_java == no --with-java=no \ --with-jdk-home="" \ %else %if %use_gij == yes --with-java=gij \ --with-jdk-home=/usr \ %else --with-java=java \ --with-jdk-home=$JAVA_HOME \ --with-java-target-version=%java_target_version \ %endif %endif %if %ooo_build_sdk == yes --enable-odk \ %endif %if 0%{?suse_version} && 0%{?suse_version} <= 01030 --with-additional-sections="PostgreSQL" \ %endif %if 0%{?meego_version} --with-system-icu \ --disable-kde4 \ %endif %if 0%{?meego_version} --disable-kde \ %endif %if 0%{?suse_version} > 01130 --disable-mono \ %endif %if %suse_version <= 1110 --without-junit \ %endif --disable-access \ --disable-post-install-scripts \ --disable-strip \ --disable-strip-solver \ --enable-openxml \ --disable-report-builder \ --disable-pdfimport \ --disable-presenter-console \ --enable-build-noarch \ --with-ct2n \ --with-numbertext \ %if 0%{?suse_version} --with-system-mysql \ --enable-mysql-connector \ %endif %if 0%{?suse_version} > 01210 --with-system-mysql-cppconn \ %endif %if 0%{?suse_version} > 01030 || 0%{?meego_version} --enable-pdfimport \ %endif --enable-minimizer --enable-presenter-console \ --enable-wiki-publisher --enable-ogltrans --enable-report-builder \ --enable-split-app-modules \ --enable-split-opt-features %endif # FIXME: try to finish build even with the strange random build crash in officecfg make || make || make %install %ifarch x86_64 ppc %if 0%{?suse_version} && 0%{?suse_version} <= 01020 # FIXME: move this to libreoffice-build export JAVA_HOME=/usr %endif %endif # make DESTDIR=$RPM_BUILD_ROOT install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %dir %ooo_prefix/%ooo_home %dir %ooo_prefix/%ooo_home/solver %dir %ooo_prefix/%ooo_home/solenv %dir %ooo_prefix/%ooo_home/build %ooo_prefix/%ooo_home/solver/* %ooo_prefix/%ooo_home/solenv/* %ooo_prefix/%ooo_home/build/* # noarch-related stuff %dir %_datadir/%ooo_home %dir %_datadir/%ooo_home/build %_datadir/%ooo_home/build/* %changelog ++++++ canvas-cairo-edge-count-calculation.diff ++++++ commit faf02acc88bc4d7ead617e8e4999ac717bbce31b Author: Radek Doulik Date: Thu Feb 17 15:55:19 2011 +0100 fix cairo canvas edge count calculation (cherry picked from commit abb5233c0b9b584407b4696f5db2c330ca45b632) Signed-off-by: Thorsten Behrens diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index bb5f6be..29cf38e 100644 --- canvas/source/cairo/cairo_canvashelper.cxx +++ canvas/source/cairo/cairo_canvashelper.cxx @@ -1065,7 +1065,7 @@ namespace cairocanvas if(nPointCount) { - const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount + 1: nPointCount); + const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount: nPointCount - 1); basegfx::B2DPolygon aEdge; aEdge.append(aCandidate.getB2DPoint(0)); aEdge.append(basegfx::B2DPoint(0.0, 0.0)); ++++++ canvas-polygon-access-out-of-range.diff ++++++ commit 74b3688c6a388f077f6dd01dffee63bb872cce5c Author: Radek Doulik Date: Wed Feb 16 18:12:33 2011 +0100 fix cairo canvas regression - do not access polygon points outside range (cherry picked from commit a898a8cb077c05b1085da8254e66f61aa265b7dc) Signed-off-by: Thorsten Behrens diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 0294780..bb5f6be 100644 --- canvas/source/cairo/cairo_canvashelper.cxx +++ canvas/source/cairo/cairo_canvashelper.cxx @@ -1074,7 +1074,7 @@ namespace cairocanvas { const sal_uInt32 nNextIndex((b + 1) % nPointCount); aEdge.setB2DPoint(1, aCandidate.getB2DPoint(nNextIndex)); - aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b)); + aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(b % nPointCount)); aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex)); doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge), ++++++ cli_ure-disable-mono-loader.diff ++++++ --- cli_ure/prj/build.lst.old 2010-10-12 18:43:33.000000000 +0200 +++ cli_ure/prj/build.lst 2010-10-12 18:43:09.000000000 +0200 @@ -10,6 +10,6 @@ ure cli_ure\unotypes nmake - ure cli_ure\source\ure nmake - all ure_source_ure ure_source_bootstrap.u ure_source_version ure_source_source ure_source_basetypes ure_unotypes ure_inc NULL ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes ure_unotypes ure_source_ure ure_inc NULL ure cli_ure\source\mono_bridge nmake - u ure_source_mono_bridge ure_unotypes ure_source_ure ure_inc NULL -ure cli_ure\source\mono_loader nmake - u ure_source_mono_loader ure_unotypes ure_source_ure ure_inc NULL +ure cli_ure\source\mono_loader nmake - - ure_source_mono_loader ure_unotypes ure_source_ure ure_inc NULL ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source ure_source_ure ure_unotypes ure_source_uno_bridge ure_inc NULL #ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure ure_source_native NULL --- scp2/source/ooo/ure.scp.old 2010-10-13 14:48:21.000000000 +0200 +++ scp2/source/ooo/ure.scp 2010-10-13 16:12:39.000000000 +0200 @@ -421,16 +421,6 @@ File gid_File_Dl_LogUnoUno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if ( defined UNX && defined ENABLE_MONO ) // currently we only will build this on unix -File gid_File_Dl_MonoLoader - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = STRING(CONCAT4(mono_loader,DLLPOSTFIX,.uno,UNXSUFFIX)); - Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID); - RegistryID = gid_Starregistry_Services_Rdb_Ure; -End -#endif - #if (defined WNT && defined _MSC) || defined ENABLE_MONO File gid_File_Dl_Cli_Uno TXT_FILE_BODY; ++++++ drawinglayer-metadata-decomposition.diff ++++++ commit 220ca4436d36d4ef4b40b13f38c3863603bbae2d Author: Radek Doulik Date: Tue Feb 15 17:30:45 2011 +0100 restrict metafile decomposition (fixes n#650049) - do not use metafile decomposition on metafiles which need canvas renderer (right now, these containing EMF+) diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index dfa3983..ff8d3f8 100644 --- drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -229,8 +229,10 @@ namespace drawinglayer mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE); } + const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) ); + static bool bTestMetaFilePrimitiveDecomposition(true); - if(bTestMetaFilePrimitiveDecomposition) + if( bTestMetaFilePrimitiveDecomposition && !rMetafilePrimitive.getMetaFile().GetUseCanvas() ) { // use new Metafile decomposition process(rCandidate.get2DDecomposition(getViewInformation2D())); @@ -238,7 +240,7 @@ namespace drawinglayer else { // direct draw of MetaFile - RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); + RenderMetafilePrimitive2D( rMetafilePrimitive ); } if(bForceLineSnap) ++++++ kde3-fpicker.diff ++++++ commit 16b7cf288722a40ad7d847c829c3a4fba570cf0a Author: Luboš Luňák Date: Fri Mar 18 13:18:58 2011 +0100 use full path for kdefilepicker helper binary (bnc#31109) diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx index 8c7cd91..c2756ee 100644 --- a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx +++ b/fpicker/source/unx/kde_unx/UnxFilePicker.cxx @@ -38,8 +38,10 @@ #include #include +#include #include #include +#include #include #include @@ -715,7 +717,11 @@ void UnxFilePicker::initFilePicker() #endif // The executable name - const char *pFname = "kdefilepicker"; + rtl::OUString helperurl( RTL_CONSTASCII_USTRINGPARAM("${ORIGIN}/kdefilepicker")); + rtl::Bootstrap::expandMacros( helperurl ); + rtl::OUString helperpath; + osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath ); + rtl::OString helper( rtl::OUStringToOString( helperpath, osl_getThreadTextEncoding())); // ID of the main window const int nIdLen = 20; @@ -736,7 +742,7 @@ void UnxFilePicker::initFilePicker() } // Execute the fpicker implementation - execlp( pFname, pFname, "--winid", pWinId, NULL ); + execlp( helper.getStr(), helper.getStr(), "--winid", pWinId, NULL ); // Error, finish the child exit( -1 ); ++++++ libreoffice-bootstrap-rpmlintrc ++++++ # FIXME: temporary disabled some lint errors # We must fix them in the upcomming big package split and rework addFilter("files-duplicated-waste") addFilter("devel-file-in-non-devel-package") ++++++ libreoffice-build-3.2.99.2-extensions-hack.diff ++++++ --- patches/dev300/apply +++ patches/dev300/apply @@ -43,7 +43,7 @@ # optional section for NLPSolver extension NLPSolver : NLPSolverBits # special fragmented build patch distro -Piece : PieceBits +Piece : PieceBits, ExtensionFixes, NovellOnlyExtensionFixes #Localize Localize : LocalizeFixes UnstableWP : UnstableLibwpd @@ -2315,6 +2315,10 @@ oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo oox-smartart-import.diff, thorsten +[ PieceBits ] +piece-config-office-extensions.diff + + [ NovellOnlyWin32 ] sled10-splash.diff, i#123456, pmladek openlockedquerybox-alwaysontop.diff, n#656566, tml --- patches/dev300/piece-config-office-extensions.diff +++ patches/dev300/piece-config-office-extensions.diff @@ -0,0 +1,79 @@ +--- configure.in.old 2010-03-05 21:33:20.000000000 +0100 ++++ configure.in 2010-03-05 21:46:39.000000000 +0100 +@@ -4181,12 +4181,6 @@ AC_MSG_CHECKING([whether to build the My + if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_MYSQLC=YES +- AC_MSG_CHECKING([for mysqlc module]) +- if test -d mysqlc; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + BUILD_TYPE="$BUILD_TYPE MYSQLC" + else + AC_MSG_RESULT([no]) +@@ -4280,12 +4280,6 @@ int main(int argc, char **argv) { + + else + AC_MSG_RESULT([internal]) +- AC_MSG_CHECKING([for mysqlcppconn module]) +- if test -d mysqlcppconn; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN" + SYSTEM_MYSQL_CPPCONN=NO + fi +@@ -5985,24 +5985,12 @@ AC_SUBST(POPPLER_CFLAGS) + AC_SUBST(POPPLER_LIBS) + + if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then +- AC_MSG_CHECKING([for sdext module]) +- if test -d ./sdext; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + BUILD_TYPE="$BUILD_TYPE SDEXT" + fi + + AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) + if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then + AC_MSG_RESULT([yes]) +- AC_MSG_CHECKING([for swext module]) +- if test -d ./swext; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + ENABLE_MEDIAWIKI=YES + BUILD_TYPE="$BUILD_TYPE SWEXT" + else +@@ -6034,12 +6022,6 @@ AC_MSG_CHECKING([whether to build the Re + if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_REPORTBUILDER=YES +- AC_MSG_CHECKING([for reportbuilder module]) +- if test -d ./reportbuilder; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + AC_MSG_CHECKING([which jfreereport libs to use]) + if test "$with_system_jfreereport" = "yes"; then + SYSTEM_JFREEREPORT=YES +@@ -6203,12 +6185,6 @@ if test -n "$enable_report_builder" -a " + + else + AC_MSG_RESULT([internal]) +- AC_MSG_CHECKING([for jfreereport module]) +- if test -d ./jfreereport; then +- AC_MSG_RESULT([OK]) +- else +- AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)]) +- fi + SYSTEM_JFREEREPORT=NO + BUILD_TYPE="$BUILD_TYPE JFREEREPORT" + fi ++++++ libreoffice-build-3.3.1.1-enable-kde4-support.diff ++++++ --- distro-configs/SUSE-11.1.conf.in +++ distro-configs/SUSE-11.1.conf.in @@ -1,6 +1,5 @@ --with-vendor=\"Novell, Inc.\" --disable-access ---disable-kde4 --disable-odk --disable-qadevooo --enable-hids ++++++ libreoffice-build-3.3.1.1-setup-native.diff ++++++ --- bin/unpack +++ bin/unpack @@ -289,7 +289,7 @@ fi # ugly hack around odd positioning of this info echo "Unpacking setup_native .txt pieces" - ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.0.2.tar.bz2 | $GNUTAR xf - ) || exit + ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.1.1.tar.bz2 | $GNUTAR xf - ) || exit # hack to patch new files in the root dir if test "z$PIECE" = "zbootstrap" ; then touch $OOBUILDDIR/boost.m4 --- download.in +++ download.in @@ -538,7 +538,7 @@ } if ('@PIECE@' eq 'bootstrap') { - source_file( 'setup_native_packinfo-3.3.0.2.tar.bz2' ); + source_file( 'setup_native_packinfo-3.3.1.1.tar.bz2' ); } if ('@OOOP_FONTS_PACK@' ne '') { ++++++ libreoffice-build-slideshow-media-playback-bug.diff ++++++

From 99f78609e2b81169e1ed4aa9ffa31aeadeb4ca52 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Wed, 23 Feb 2011 07:44:17 +0100 Subject: [PATCH] Temp fix for slideshow media playback bug.

Fixes deb#612940 and n#651250 by disabling the impress media embedding patches. Those don't pass on proper temporary file system urls to avmedia, during slideshow. --- patches/dev300/apply | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/dev300/apply b/patches/dev300/apply index c60565e..4df4ea2 100644 --- patches/dev300/apply +++ patches/dev300/apply @@ -2279,8 +2279,8 @@ transogl-crossplatform.diff, ericb [ Features ] # embed generic media files inside odf docs, plus various related # sound fixes from rodo -impressmedia-features.diff, i#83753, n#515553, thorsten -slideshow-sound.diff, n#515553, rodo +#impressmedia-features.diff, i#83753, n#515553, thorsten +#slideshow-sound.diff, n#515553, rodo [ Fixes ] vcl-gtk-process-events-on-exit.diff, rodo -- 1.6.4.2 ++++++ officecfg-help-in-usr-share.diff ++++++ --- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2008-08-13 11:21:46.000000000 +0200 +++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2008-08-14 17:24:15.000000000 +0200 @@ -1489,7 +1489,7 @@ Dymamic border coloring means that when <author>ABI</author> <desc>Specifies the path to the Office help files.</desc> </info> - <value>$(instpath)/help</value> + <value>/usr/share/libreoffice/basis-link/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string"> <info> @@ -1651,7 +1651,7 @@ Dymamic border coloring means that when <info> <desc>Specifies the default directory where Office help files are located.</desc> </info> - <value>$(instpath)/help</value> + <value>/usr/share/libreoffice/basis-link/help</value> </prop> <prop oor:name="Linguistic" oor:type="xs:string"> <info> --- officecfg/registry/data/org/openoffice/Office/Paths.xcu.old 2008-04-11 15:11:41.000000000 +0200 +++ officecfg/registry/data/org/openoffice/Office/Paths.xcu 2008-08-14 17:25:35.000000000 +0200 @@ -123,7 +123,7 @@ <node oor:name="Help" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(instpath)/help" oor:op="fuse" /> + <node oor:name="/usr/share/libreoffice/basis-link/help" oor:op="fuse" /> </node> </node> ++++++ ooo-build-3.1.99.2-xulrunner-1.9.1.diff ++++++ --- patches/dev300/apply +++ patches/dev300/apply @@ -1087,6 +1087,8 @@ # help is in /usr/share/ooo-2.0/help now # FIXME: this should be configurable via ./configure officecfg-help-in-usr-share.diff +# will use xulrunner191 on sles10-SP1 (bnc#540726) +xulrunner-1.9.1.diff, ccheney # change user config dir name from ~/.openoffice.org3 to ~/.ooo3 scp2-user-config-ooo3.diff, pmladek # Push fonts into the ps stream always ++++++ piece-disable-pyuno-registration.diff ++++++ --- solenv/bin/modules/installer/servicesfile.pm.old 2009-03-05 15:40:56.000000000 +0100 +++ solenv/bin/modules/installer/servicesfile.pm 2009-03-06 16:11:07.000000000 +0100 @@ -448,7 +448,8 @@ sub register_all_components if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents($allvariableshashref, \@unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix); } if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \@javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); } - if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } +# temporary disable on SLED10; it fails there +# if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } ++++++ piece-packimages.diff ++++++ --- packimages/pack/makefile.mk.old 2010-11-11 16:35:27.000000000 +0100 +++ packimages/pack/makefile.mk 2011-02-18 19:17:04.000000000 +0100 @@ -34,18 +34,19 @@ TARGET=packimages RSCCUSTOMIMG*=$(PRJ) .INCLUDE: target.mk +IMGSRC=$(SOLARVER) IMAGES := $(COMMONBIN)$/images.zip SORTED_LIST=$(RES)$/img$/sorted.lst # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially # (Tango fallbacks to Industrial for the missing icons) CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i) -CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango -CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial +CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango +CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial -CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz -OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz -CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz +CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz +OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz +CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip @@ -58,14 +59,14 @@ $(SORTED_LIST) : image-sort.lst $(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST) @@-$(MKDIR) $(RES)$/img #+-$(RM) $@ $@.$(INPATH) - $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) + $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH) $(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@ $(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@ images_% : $(RES)$/img$/commandimagelist.ilst - $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip + $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip # make sure to have one to keep packing happy $(COMMONBIN)$/images_brand.zip: @@ -73,7 +74,7 @@ $(COMMONBIN)$/images_brand.zip: # generate the HiContrast icon set $(MISC)$/hicontrast.flag .PHONY : - $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ + $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@ # unpack the Crystal icon set $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL) ++++++ sal-rtl-compiler-optimization-meego.diff ++++++ --- sal/rtl/source/makefile.mk.old 2010-04-28 11:35:17.000000000 +0200 +++ sal/rtl/source/makefile.mk 2010-06-02 15:11:56.000000000 +0200 @@ -53,6 +53,9 @@ CDEFS+= -DFORCE_SYSALLOC CFLAGS+= $(LFS_CFLAGS) CXXFLAGS+= $(LFS_CFLAGS) +CFLAGS+= -O2 +CXXFLAGS+= -O2 + # --- Files -------------------------------------------------------- # safe that way: gen_makefile doesn't want it, ++++++ sd-blank-first-slide.diff ++++++ commit 89fe9346a5292ddb1ac19ba734034b61e4b628b2 Author: Michael Meeks Date: Tue Feb 22 11:23:46 2011 +0000 fix fdo#34533 - occasional blank first slide in presentation diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 2000ae0..fa293b2 100644 --- sd/source/ui/slideshow/slideshowviewimpl.cxx +++ sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -500,7 +500,17 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp if( pSlideShow ) { ::rtl::Reference< SlideshowImpl > aSLGuard( pSlideShow ); - rGuard.clear(); + + if( mbFirstPaint ) + { + mbFirstPaint = false; + SlideshowImpl* pSlideShow = mpSlideShow; + rGuard.clear(); + if( pSlideShow ) + pSlideShow->onFirstPaint(); + } else + rGuard.clear(); + pSlideShow->startUpdateTimer(); } } ++++++ solenv-carefull-patching-hack.diff ++++++ --- solenv/inc/tg_ext.mk.old 2010-06-15 13:58:56.000000000 +0200 +++ solenv/inc/tg_ext.mk 2010-06-16 12:59:50.000000000 +0200 @@ -192,6 +192,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA @echo no patch needed... $(COMMAND_ECHO)$(TOUCH) $@ .ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" + @echo patches available... .IF "$(GUI)"=="WNT" # hack to make 4nt version 4,01 work and still get propper # errorcodes for versions < 3,00 @@ -202,12 +203,17 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PA #.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300" .ELSE # "$(GUI)"=="WNT" .IF "$(BSCLIENT)"=="TRUE" - $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && echo "patches applied..." + $(DELAY) 2 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE) .ELSE # "$(BSCLIENT)"!="" - $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE) + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && echo "patches applied..." + $(DELAY) 2 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TOUCH) $(PATCH_FLAG_FILE) .ENDIF # "$(BSCLIENT)"!="" .ENDIF # "$(GUI)"=="WNT" .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"=="" + @echo patching finished... .IF "$(T_ADDITIONAL_FILES)"!="" .IF "$(GUI)"=="WNT" # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds ++++++ svtools-enable-emfplus.diff ++++++ --- svtools/source/filter.vcl/wmf/enhwmf.cxx.old 2011-02-15 18:42:33.000000000 +0100 +++ svtools/source/filter.vcl/wmf/enhwmf.cxx 2011-02-15 20:57:50.000000000 +0100 @@ -344,8 +344,12 @@ BOOL EnhWMFReader::ReadEnhWMF() sal_Bool bFlag, bStatus = ReadHeader(); sal_Bool bHaveDC = false; - // disable EMF+ temporarily on all platforms +#ifdef UNX + static sal_Bool bEnableEMFPlus = ( getenv( "EMF_PLUS_DISABLE" ) == NULL ); +#else + // TODO: make it possible to disable emf+ on windows static sal_Bool bEnableEMFPlus = sal_False; +#endif while( bStatus && nRecordCount-- ) { ++++++ vcl-input-methods-in-qt4.diff ++++++ --- vcl/unx/kde4/KDESalDisplay.cxx.old 2010-11-11 16:22:48.000000000 +0100 +++ vcl/unx/kde4/KDESalDisplay.cxx 2011-02-22 19:37:17.000000000 +0100 @@ -41,6 +41,7 @@ SalKDEDisplay::SalKDEDisplay( Display* p { assert( selfptr == NULL ); selfptr = this; + xim_protocol = XInternAtom( pDisp_, "_XIM_PROTOCOL", False ); } SalKDEDisplay::~SalKDEDisplay() @@ -65,7 +66,32 @@ void SalKDEDisplay::Yield() XEvent event; XNextEvent( pDisp_, &event ); + if( checkDirectInputEvent( &event )) + return; qApp->x11ProcessEvent( &event ); } +// HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because +// of XFilterEvent() getting called twice, once by Qt, once by LO (bnc#665112). +// This function is therefore called before any XEvent is passed to Qt event handling +// and if it is a keyboard event and no Qt widget is the active window (i.e. we are +// processing events for some LO window), then feed the event only to LO directly and skip Qt +// completely. Skipped events are KeyPress, KeyRelease and also _XIM_PROTOCOL client message +// (seems to be necessary too, hopefully there are not other internal XIM messages that +// would need this handling). +bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev ) +{ + if( ev->xany.type == XLIB_KeyPress || ev->xany.type == KeyRelease + || ( ev->xany.type == ClientMessage && ev->xclient.message_type == xim_protocol )) + { + if( qApp->activeWindow() == NULL ) + { + Dispatch(ev); + return true; + } + } + return false; +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ --- vcl/unx/kde4/KDESalDisplay.hxx.old 2010-11-11 16:22:48.000000000 +0100 +++ vcl/unx/kde4/KDESalDisplay.hxx 2011-02-22 19:37:17.000000000 +0100 @@ -41,7 +41,9 @@ class SalKDEDisplay : public SalX11Displ inline void EventGuardRelease() { osl_releaseMutex( hEventGuard_ ); } // virtual long Dispatch( XEvent *event ); virtual void Yield(); + bool checkDirectInputEvent( XEvent* ev ); private: + Atom xim_protocol; static SalKDEDisplay* selfptr; }; --- vcl/unx/kde4/KDEXLib.cxx.old 2010-12-14 17:02:02.000000000 +0100 +++ vcl/unx/kde4/KDEXLib.cxx 2011-02-22 19:37:17.000000000 +0100 @@ -205,8 +205,19 @@ static GPollFunc old_gpoll = NULL; static gint gpoll_wrapper( GPollFD*, guint, gint ); #endif +static bool ( *old_qt_event_filter )( void* ); +static bool qt_event_filter( void* m ) +{ + if( old_qt_event_filter != NULL && old_qt_event_filter( m )) + return true; + if( SalKDEDisplay::self() && SalKDEDisplay::self()->checkDirectInputEvent( static_cast< XEvent* >( m ))) + return true; + return false; +} + void KDEXLib::setupEventLoop() { + old_qt_event_filter = QAbstractEventDispatcher::instance()->setEventFilter( qt_event_filter ); #ifdef GLIB_EVENT_LOOP_SUPPORT // Glib is simple, it has g_main_context_set_poll_func() for wrapping the sleep call. // The catch is that Qt has a bug that allows triggering timers even when they should ++++++ vcl-use-canvas-bool.diff ++++++ commit 7de8695f19626c764a4b43cfb30179525d9a5956 Author: Radek Doulik Date: Wed Feb 9 16:02:42 2011 +0100 GDIMetaFile::bUseCanvas related changes (prerequisite for fixing n#650049) - add GetUseCanvas() for read access - update bUseCanvas when playing on metafile commit bb6e3a77426bd8815760f6a46914dfc3568527cb Author: Radek Doulik Date: Tue Feb 15 17:19:24 2011 +0100 clean the code a bit --- vcl/inc/vcl/gdimtf.hxx +++ vcl/inc/vcl/gdimtf.hxx @@ -247,6 +247,7 @@ public: BOOL CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay = NULL, const Rectangle* pOverlayRect = NULL ) const; void UseCanvas( BOOL _bUseCanvas ); + BOOL GetUseCanvas() const { return bUseCanvas; } }; /** Create a special metaaction that delegates rendering to specified --- vcl/source/gdi/gdimtf.cxx +++ vcl/source/gdi/gdimtf.cxx @@ -437,6 +437,8 @@ void GDIMetaFile::Play( GDIMetaFile& rMtf, ULONG nPos ) MetaAction* pAction = GetCurAction(); const ULONG nObjCount = Count(); + rMtf.UseCanvas( rMtf.GetUseCanvas() || bUseCanvas ); + if( nPos > nObjCount ) nPos = nObjCount; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org