rpms/openoffice.org/devel workspace.cmcfixes63.patch, NONE, 1.1 openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch, 1.4, 1.5 openoffice.org.spec, 1.2008, 1.2009 openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch, 1.1, NONE openoffice.org-simple-crash_report.sh, 1.14, NONE

Caolan McNamara caolanm at fedoraproject.org
Tue Sep 15 16:13:04 UTC 2009 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7541

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch 
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes63.patch 
Removed Files:
	openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 
	openoffice.org-simple-crash_report.sh 
Log Message:
drop custom crash reporter

workspace.cmcfixes63.patch:
 bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx  |    1 +
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE workspace.cmcfixes63.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.13.64.2
diff -u -r1.13.64.2 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	15 Dec 2008 10:29:47 -0000	1.13.64.2
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	23 Dec 2008 09:24:57 -0000
@@ -102,7 +102,7 @@
 extern "C" {
 #include <npsdk/npupp.h>
 }
-#include <npapi.h>
+#include <npsdk/npapi.h>
 
 #if NP_VERSION_MINOR < 17
 // compatibility hack: compile with older NPN api header, but define
diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
@@ -33,6 +33,7 @@
 #include "precompiled_bridges.hxx"
 
 #include <stdio.h>
+#include <string.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
 #include <hash_map>

openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch:
 sc/source/filter/ftools/ftools.cxx    |    1 +
 soltools/mkdepend/def.h               |    2 +-
 soltools/mkdepend/main.c              |    2 +-
 soltools/mkdepend/parse.c             |    4 ++--
 sw/source/core/doc/docbm.cxx          |    4 ++--
 sw/source/filter/ww8/WW8TableInfo.cxx |    1 +
 6 files changed, 8 insertions(+), 6 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	5 Aug 2009 22:07:27 -0000	1.4
+++ openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch	15 Sep 2009 16:13:04 -0000	1.5
@@ -86,14 +86,3 @@ Index: mkdepend/parse.c
  		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
  		case IF:
  		case IFFALSE:
-diff -ru bridges.orig/source/cpp_uno/gcc3_linux_s390x/except.cxx bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
---- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:02.000000000 +0100
-+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx	2009-08-05 23:04:34.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "precompiled_bridges.hxx"
- 
- #include <stdio.h>
-+#include <string.h>
- #include <dlfcn.h>
- #include <cxxabi.h>
- #include <hash_map>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2008
retrieving revision 1.2009
diff -u -p -r1.2008 -r1.2009
--- openoffice.org.spec	15 Sep 2009 08:24:14 -0000	1.2008
+++ openoffice.org.spec	15 Sep 2009 16:13:04 -0000	1.2009
@@ -70,7 +70,6 @@ BuildRequires:  jakarta-commons-codec, j
 BuildRequires:  jakarta-commons-lang, poppler-devel, fontpackages-devel
 BuildRequires:  pentaho-reporting-flow-engine, libXinerama-devel
 
-Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
 Patch2:  workspace.defaultdoclang.patch
 %if %{gtkprintui}
@@ -108,7 +107,7 @@ Patch30: workspace.calc50.patch
 Patch31: workspace.mav46.patch
 Patch32: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch33: workspace.transogl03redux.patch
-Patch34: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch34: workspace.cmcfixes63.patch
 Patch35: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch36: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
 Patch37: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
@@ -1654,7 +1653,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch31 -p1 -b .workspace.mav46.patch
 %patch32 -p1
 %patch33 -p0 -b .workspace.transogl03redux.patch
-%patch34 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch34 -p1 -b .workspace.cmcfixes63.patch
 %patch35 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch36 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
 %patch37 -p0 -b .ooo98137.filter.redeclared-variables.patch
@@ -2248,13 +2247,6 @@ done
 if [ $pic == 1 ]; then false; fi
 if [ $executable == 1 ]; then false; fi
 
-#add in a simple crash reporter replacement
-cp -f %{PATCH0} $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report
-chmod a+x $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report
-%if %{langpacks}
-cp $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report $RPM_BUILD_ROOT/%{brinstdir}/program/crash_report
-%endif
-
 #make up some /usr/bin scripts
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 
@@ -3134,7 +3126,6 @@ fi
 %doc %{oooinstdir}/THIRDPARTYLICENSEREADME.html
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/about.bmp
-%{oooinstdir}/program/crash_report
 %{oooinstdir}/program/intro.bmp
 %dir %{oooinstdir}/program/resource
 %{oooinstdir}/program/resource/ooo%{UPD}en-US.res
@@ -3198,7 +3189,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/about.bmp
 %{brinstdir}/program/bootstraprc
 %{brinstdir}/program/setuprc
-%{brinstdir}/program/crash_report
 %{brinstdir}/program/intro.bmp
 %dir %{brinstdir}/program/resource
 %{brinstdir}/program/resource/ooo%{UPD}pt-BR.res
@@ -4249,10 +4239,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Sep 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.8-UNBUILT
+* Tue Sep 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - disable NumberFormatRecognition from default writer configuration (caolanm)
 - Resolves: rhbz#522056 - wrong match of fonts (non-)proportional (dtardon)
-- add openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch to go through abrt (caolanm)
+- drop custom crash reporter and add
+  openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch and use abrt (caolanm)
 
 * Mon Sep 14 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.7
 - make oo.o buildable without langpacks again (dtardon)


--- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch DELETED ---


--- openoffice.org-simple-crash_report.sh DELETED ---

More information about the fedora-extras-commits mailing list