[libreoffice] Related: rhbz#610103 make this even more robust

[Caolan McNamara]

commit da86271983dfa1416e989b39988789de64dd3c24
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 12:17:25 2011 +0000

    Related: rhbz#610103 make this even more robust

 ...z-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch |   45 ++++++++++++++++++++
 libreoffice-gcc4.6.0.patch                         |   12 -----
 libreoffice.spec                                   |    7 +++-
 3 files changed, 51 insertions(+), 13 deletions(-)
---
diff --git a/0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch b/0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
new file mode 100644
index 0000000..3c2b128
--- /dev/null
+++ b/0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
@@ -0,0 +1,45 @@
+From f167cafd5edfcac674a556fa2f813ce0dec34303 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 27 Jan 2011 12:14:17 +0000
+Subject: [PATCH] Related: rhbz#610103 more woes on rpm upgrade vs rpm erase
+
+---
+ sfx2/source/appl/shutdowniconunx.cxx |   18 +++++++++++++++---
+ 1 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
+index 5618e73..cfbf974 100644
+--- a/sfx2/source/appl/shutdowniconunx.cxx
++++ b/sfx2/source/appl/shutdowniconunx.cxx
+@@ -333,13 +333,25 @@ static gboolean display_menu_cb( GtkWidget *,
+  * upgraded, then the old quickstarter is still running, but is now unreliable
+  * as the old install has been deleted. A fairly intractable problem but we
+  * can avoid much of the pain if we turn off the quickstarter if we detect
+- * that it has been physically deleted.
++ * that it has been physically deleted or overwritten
+ */
+ static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
+     GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
+ {
+-    if (event_type == G_FILE_MONITOR_EVENT_DELETED)
+-        exit_quickstarter_cb(NULL);
++    //Shutdown the quick starter if anything has happened to make it unsafe
++    //to remain running, e.g. rpm --erased and all libs deleted, or
++    //rpm --upgrade and libs being overwritten
++    switch (event_type)
++    {
++        case G_FILE_MONITOR_EVENT_DELETED:
++        case G_FILE_MONITOR_EVENT_CREATED:
++        case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
++        case G_FILE_MONITOR_EVENT_UNMOUNTED:
++            exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
++            break;
++        default:
++            break;
++    }
+ }
+ #endif
+ 
+-- 
+1.7.3.5
+
diff --git a/libreoffice-gcc4.6.0.patch b/libreoffice-gcc4.6.0.patch
index 7a42069..f5a2ce5 100644
--- a/libreoffice-gcc4.6.0.patch
+++ b/libreoffice-gcc4.6.0.patch
@@ -11,18 +11,6 @@ index f88069b..4e578a9 100644
      const basegfx::B2DVector& getPrevVector() const 
      { 
          return maPrevVector; 
-diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
-index 978f31e..674003f 100644
---- a/basegfx/source/range/b2drangeclipper.cxx
-+++ b/basegfx/source/range/b2drangeclipper.cxx
-@@ -600,7 +600,6 @@ namespace basegfx
-             std::vector<B2DRange>::const_reverse_iterator aCurrRectR=rRanges.rbegin();
-             std::vector<B2VectorOrientation>::const_reverse_iterator aCurrOrientationR=rOrientations.rbegin();
-             const std::vector<B2DRange>::const_reverse_iterator aEndR=rRanges.rend();
--            const std::vector<B2VectorOrientation>::const_reverse_iterator aEndOrientationR=rOrientations.rend();
-             while( aCurrRectR != aEndR )
-             {
-
 diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
 index 7f5ed07..51b8740 100644
 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
diff --git a/libreoffice.spec b/libreoffice.spec
index 147b4bc..e56b23a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -28,7 +28,7 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Version:        3.3.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -106,6 +106,7 @@ Patch18: 0001-Removed-suspect-hack.-Cursor-on-post-it-now-scrolls-.patch
 Patch19: libreoffice-fdo31271.icu.patch
 Patch20: libreoffice-gcc4.6.0.patch
 Patch21: libreoffice-fdo32561.comphelper.patch
+Patch22: 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -730,6 +731,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch19 -p1 -b .fdo31271.icu.patch
 %patch20 -p1 -b .libreoffice-gcc4.6.0.patch
 %patch21 -p1 -b .fdo32561.comphelper.patch
+%patch22 -p1 -b .rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -2072,6 +2074,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Thu Jan 27 2011 Caolán McNamara <caolanm at redhat.com> 3.3.0.4-3
+- Related: rhbz#610103 make this even more robust
+
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com> 3.3.0.4-2
 - Resolves: rhbz#671540 fix lonely )