rpms/openoffice.org/devel workspace.cmcfixes50.patch, NONE, 1.1 openoffice.org.spec, 1.1639, 1.1640 openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch, 1.1, NONE openoffice.org-3.0.0.oooXXXXX.filter.latex.patch, 1.1, NONE openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Fri Sep 5 15:04:37 UTC 2008
- Previous message: rpms/openoffice.org/devel .cvsignore, 1.185, 1.186 sources, 1.314, 1.315
- Next message: rpms/gtk-vnc/devel .cvsignore, 1.6, 1.7 gtk-vnc.spec, 1.20, 1.21 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19548
Modified Files:
openoffice.org.spec
Added Files:
workspace.cmcfixes50.patch
Removed Files:
openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
Log Message:
merge to workspace
workspace.cmcfixes50.patch:
--- NEW FILE workspace.cmcfixes50.patch ---
Index: source/config/fragments/fcfg_writer.mk
===================================================================
RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
retrieving revision 1.14.20.1
diff -u -r1.14.20.1 fcfg_writer.mk
--- openoffice.org.orig/filter/source/config/fragments/fcfg_writer.mk 15 Aug 2008 10:33:45 -0000 1.14.20.1
+++ openoffice.org/filter/source/config/fragments/fcfg_writer.mk 3 Sep 2008 14:16:49 -0000
@@ -29,9 +29,13 @@
writer_MS_Word_2003_XML \
writer_MS_Word_2007_XML \
writer_MS_Word_2007_XML_Template \
- MediaWiki_File \
+ MediaWiki_File
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+T4_WRITER += \
LaTeX \
BibTeX
+.ENDIF
# -----------------------------------------------
# count = 39
@@ -63,9 +67,13 @@
writer_web_MediaWiki_File \
MS_Word_2003_XML \
MS_Word_2007_XML \
- MS_Word_2007_XML_Template \
+ MS_Word_2007_XML_Template
+
+.IF "$(WITH_WRITER2LATEX)" != "NO"
+F4_WRITER += \
LaTeX_Writer \
BibTeX_Writer
+.ENDIF
# -----------------------------------------------
# count = 14
--- OOO300_m1.orig/helpcontent2/settings.pmk 2008-08-05 18:54:10.000000000 +0100
+++ OOO300_m1/helpcontent2/settings.pmk 2008-08-05 18:54:36.000000000 +0100
@@ -2,7 +2,7 @@
my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
.IF "$(SYSTEM_LUCENE)" == "YES"
-my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
.ELSE
my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
.ENDIF
Index: source/dialog/filedlghelper.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/filedlghelper.cxx,v
retrieving revision 1.144
diff -u -r1.144 filedlghelper.cxx
--- openoffiec.org.orig/sfx2/source/dialog/filedlghelper.cxx 4 Jun 2008 09:53:08 -0000 1.144
+++ openoffice.org/sfx2/source/dialog/filedlghelper.cxx 2 Sep 2008 08:24:03 -0000
@@ -1325,8 +1325,10 @@
sal_Int16 nRet = ExecutableDialogResults::CANCEL;
-#if !(defined(MACOSX) && defined(QUARTZ))
//On MacOSX the native file picker has to run in the primordial thread because of drawing issues
+//On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same
+//primordial thread as the ucb gnome-vfs2 provider was initialized in.
+#ifdef WNT
if ( mbSystemPicker )
{
PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg );
diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2008-09-02 09:20:51.000000000 +0100
@@ -999,13 +999,13 @@
uno::Reference< awt::XExtendedToolkit > xToolkit(
m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
- RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
- uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
+ RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
+ uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
while( GTK_RESPONSE_NO == btn )
{
btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save.
- gint nStatus = pRunInMain->runandwaitforresult();
+ gint nStatus = pRunDialog->run();
switch( nStatus )
{
case GTK_RESPONSE_ACCEPT:
@@ -1032,9 +1032,9 @@
OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
RTL_TEXTENCODING_UTF8 ).getStr() );
- RunDialog* pAnotherRunInMain = new RunDialog(dlg, xToolkit);
- uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherRunInMain);
- btn = pAnotherRunInMain->runandwaitforresult();
+ RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit);
+ uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog);
+ btn = pAnotherDialog->run();
gtk_widget_destroy( dlg );
}
diff -ru fpicker.orig/source/unx/gnome/SalGtkFolderPicker.cxx fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx 2008-09-02 09:20:53.000000000 +0100
@@ -176,9 +176,9 @@
uno::Reference< awt::XExtendedToolkit > xToolkit(
m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY);
- RunDialog* pRunInMain = new RunDialog(m_pDialog, xToolkit);
- uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunInMain);
- gint nStatus = pRunInMain->runandwaitforresult();
+ RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
+ uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
+ gint nStatus = pRunDialog->run();
switch( nStatus )
{
case GTK_RESPONSE_ACCEPT:
diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.cxx 2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.cxx 2008-09-02 09:20:22.000000000 +0100
@@ -124,7 +124,7 @@
RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
cppu::WeakComponentImplHelper1< awt::XTopWindowListener >( maLock ),
- mbFinished(false), mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
+ mpDialog(pDialog), mpCreatedParent(NULL), mxToolkit(rToolkit)
{
awt::SystemDependentXWindow aWindowHandle;
@@ -178,39 +178,20 @@
gtk_widget_hide( mpDialog );
}
-void RunDialog::run()
+gint RunDialog::run()
{
if (mxToolkit.is())
mxToolkit->addTopWindowListener(this);
- mnStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) );
+ gint nStatus = gtk_dialog_run( GTK_DIALOG( mpDialog ) );
if (mxToolkit.is())
mxToolkit->removeTopWindowListener(this);
-
- if (mnStatus != 1) //PLAY
+ if (nStatus != 1) //PLAY
gtk_widget_hide( mpDialog );
- maLock.acquire();
- mbFinished = true;
- maLock.release();
-
- Application::EndYield();
-}
-
-gint RunDialog::runandwaitforresult()
-{
- g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, (GSourceFunc)rundialog, this, NULL);
- while (1)
- {
- maLock.acquire();
- if (mbFinished)
- break;
- maLock.release();
- Application::Yield();
- }
- return mnStatus;
+ return nStatus;
}
SalGtkPicker::~SalGtkPicker()
diff -ru fpicker.orig/source/unx/gnome/SalGtkPicker.hxx fpicker/source/unx/gnome/SalGtkPicker.hxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkPicker.hxx 2008-09-02 09:16:04.000000000 +0100
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkPicker.hxx 2008-09-02 09:16:49.000000000 +0100
@@ -74,8 +74,7 @@
static rtl::OString unicodetouri(const rtl::OUString &rURL);
};
-//Run the Gtk Dialog in the "Main Thread" for us to avoid threading conflict and
-//report back to this thread. Watch for any "new windows" created while we're
+//Run the Gtk Dialog. Watch for any "new windows" created while we're
//executing and consider that a CANCEL event to avoid e.g. "file cannot be opened"
//modal dialogs and this one getting locked if some other API call causes this
//to happen while we're opened waiting for user input, e.g.
@@ -84,9 +83,7 @@
public cppu::WeakComponentImplHelper1< ::com::sun::star::awt::XTopWindowListener >
{
private:
- bool mbFinished;
osl::Mutex maLock;
- gint mnStatus;
GtkWidget *mpDialog;
GdkWindow *mpCreatedParent;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit> mxToolkit;
@@ -111,8 +108,7 @@
throw (::com::sun::star::uno::RuntimeException) {}
public:
RunDialog(GtkWidget *pDialog, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XExtendedToolkit > &rToolkit);
- gint runandwaitforresult();
- void run();
+ gint run();
void cancel();
~RunDialog();
};
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1639
retrieving revision 1.1640
diff -u -r1.1639 -r1.1640
--- openoffice.org.spec 5 Sep 2008 11:57:24 -0000 1.1639
+++ openoffice.org.spec 5 Sep 2008 15:04:06 -0000 1.1640
@@ -1,6 +1,6 @@
%define oootag OOO300
-%define ooomilestone 4
-%define rh_rpm_release 2
+%define ooomilestone 5
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -104,15 +104,13 @@
Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
Patch35: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
Patch36: workspace.dba301a.patch
-Patch37: openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch
-Patch38: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
-Patch39: workspace.fpicker8.patch
-Patch40: workspace.cmcfixes49.patch
-Patch41: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch42: openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch
-Patch43: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
-Patch44: openoffice.org-3.0.0.oooXXXXX.filter.latex.patch
-Patch45: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch37: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
+Patch38: workspace.fpicker8.patch
+Patch39: workspace.cmcfixes49.patch
+Patch40: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch41: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
+Patch42: workspace.cmcfixes50.patch
+Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1288,15 +1286,13 @@
%patch34 -p1 -b .ooo86142.serbiannumbering.patch
%patch35 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
%patch36 -p1 -b .workspace.dba301a.patch
-%patch37 -p1 -b .oooXXXXX.helpcontent2.fixlucene.patch
-%patch38 -p1 -b .ooo91904.sd.wrongindex.patch
-%patch39 -p1 -b .workspace.fpicker8.patch
-%patch40 -p0 -b .workspace.cmcfixes49.patch
-%patch41 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch42 -p1 -b .ooo93366.fpicker_in_main.patch
-%patch43 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
-%patch44 -p1 -b .oooXXXXX.filter.latex.patch
-%patch45 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch37 -p1 -b .ooo91904.sd.wrongindex.patch
+%patch38 -p1 -b .workspace.fpicker8.patch
+%patch39 -p0 -b .workspace.cmcfixes49.patch
+%patch40 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch41 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
+%patch42 -p1 -b .workspace.cmcfixes50.patch
+%patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3652,6 +3648,9 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Fri Sep 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
+- next candidate
+
* Thu Sep 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
- Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
- Resolves: rhbz#460883 openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
--- openoffice.org-3.0.0.ooo93366.fpicker_in_main.patch DELETED ---
--- openoffice.org-3.0.0.oooXXXXX.filter.latex.patch DELETED ---
--- openoffice.org-3.0.0.oooXXXXX.helpcontent2.fixlucene.patch DELETED ---
- Previous message: rpms/openoffice.org/devel .cvsignore, 1.185, 1.186 sources, 1.314, 1.315
- Next message: rpms/gtk-vnc/devel .cvsignore, 1.6, 1.7 gtk-vnc.spec, 1.20, 1.21 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list