rpms/openoffice.org/devel openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch, NONE, 1.1 openoffice.org.spec, 1.1955, 1.1956 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Thu Jul 2 13:04:27 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29977
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch
Removed Files:
openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
Log Message:
track renamed id number
openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch:
--- NEW FILE openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch ---
diff -ru vcl.orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- vcl.orig/unx/gtk/window/gtkframe.cxx 2009-07-02 10:10:48.000000000 +0100
+++ vcl/unx/gtk/window/gtkframe.cxx 2009-07-02 10:13:01.000000000 +0100
@@ -824,7 +824,12 @@
}
if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ) )
{
- eType = GDK_WINDOW_TYPE_HINT_DOCK;
+ //KWin apparently gets very confused with a DOCK hint on such a
+ //full-screen window shown on one monitor of many
+ if (getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("KWin"))
+ eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
+ else
+ eType = GDK_WINDOW_TYPE_HINT_DOCK;
gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1955
retrieving revision 1.1956
diff -u -p -r1.1955 -r1.1956
--- openoffice.org.spec 2 Jul 2009 12:19:00 -0000 1.1955
+++ openoffice.org.spec 2 Jul 2009 13:04:27 -0000 1.1956
@@ -151,7 +151,7 @@ Patch73: openoffice.org-3.1.0.ooo102920.
Patch74: workspace.aw073.patch
Patch75: workspace.cmcfixes60.patch
Patch76: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
-Patch77: openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
+Patch77: openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1660,7 +1660,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch74 -p0 -b .workspace.aw073.patch
%patch75 -p0 -b .workspace.cmcfixes60.patch
%patch76 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
-%patch77 -p0 -b .ooo103277.vcl.kwinworkaround.patch
+%patch77 -p0 -b .ooo103145.vcl.kwinworkaround.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
--- openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch DELETED ---
More information about the fedora-extras-commits
mailing list