rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.8, 1.9 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.28, 1.29 openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch, 1.1, 1.2 openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.2, 1.3 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.21, 1.22 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.48, 1.49 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, 1.3, 1.4 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.10, 1.11 openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch, 1.1, 1.2 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.2, 1.3 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.1, 1.2 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.2, 1.3 openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch, 1.1, 1.2 openoffice.org.spec, 1.1632, 1.1633 workspace.cmcfixes49.patch, 1.4, 1.5
Caolan McNamara
caolanm at fedoraproject.org
Mon Sep 1 12:09:40 UTC 2008
- Previous message (by thread): rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, NONE, 1.1 cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff, NONE, 1.1 .cvsignore, 1.11, 1.12 cyrus-imapd.spec, 1.41, 1.42 sources, 1.13, 1.14 cyrus-imapd-2.2.10-groupcache.patch, 1.1, NONE cyrus-imapd-2.3.11-autocreate-0.10-0.diff, 1.1, NONE cyrus-imapd-2.3.11-autosieve-0.6.0.diff, 1.1, NONE cyrus-imapd-2.3.7.tar.gz.sig, 1.1, NONE
- Next message (by thread): rpms/bzip2/devel bzip2.spec,1.40,1.41
- 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-serv16534
Modified Files:
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
openoffice.org.spec workspace.cmcfixes49.patch
Log Message:
defuzz
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 27 Mar 2008 15:13:50 -0000 1.8
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 1 Sep 2008 12:09:07 -0000 1.9
@@ -1,8 +1,8 @@
--- SRC680_m123/desktop/scripts/soffice.sh.orig 2005-08-15 20:17:35.000000000 +0100
+++ SRC680_m123/desktop/scripts/soffice.sh 2005-08-15 20:19:36.000000000 +0100
-@@ -92,23 +92,22 @@
- # uncomment line below to disable anti aliasing of fonts
- # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
+@@ -91,23 +91,22 @@
+ # uncomment line below if you encounter problems starting soffice on your system
+ # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-# pagein
for sd_arg in ${1+"$@"} ; do
@@ -28,7 +28,7 @@
break;
;;
*)
-@@ -121,10 +120,6 @@
+@@ -120,10 +119,6 @@
. /etc/adabasrc
fi
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 21 Jul 2008 13:10:14 -0000 1.28
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 1 Sep 2008 12:09:07 -0000 1.29
@@ -210,8 +210,8 @@
diff -u -p -u -r1.68 dbwizres.src
--- openoffice.org.orig/wizards/source/formwizard/dbwizres.src 3 May 2005 14:24:05 -0000 1.68
+++ openoffice.org/wizards/source/formwizard/dbwizres.src 13 Jul 2005 11:23:24 -0000
-@@ -2515,6 +2515,17 @@ String RID_LETTERWIZARDLANGUAGE_START +
- Text [ en-US] = "Croatian";
+@@ -2080,6 +2080,17 @@
+ Text [ en-US] = "Name and location";
};
+String RID_LETTERWIZARDLANGUAGE_START + 17
@@ -671,9 +671,9 @@
diff -u -r1.36.16.1 localedatawrapper.cxx
--- openoffice.org.orig/unotools/source/i18n/localedatawrapper.cxx 19 Jan 2007 15:30:09 -0000 1.36.16.1
+++ openoffice.org/unotools/source/i18n/localedatawrapper.cxx 28 Jun 2007 13:55:46 -0000
-@@ -1989,3 +1989,96 @@
- else
+@@ -2008,3 +2008,96 @@
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+ }
}
+
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
@@ -801,15 +801,15 @@
diff -u -r1.35.34.1 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 24 Jan 2007 13:35:35 -0000 1.35.34.1
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 28 Jun 2007 14:02:41 -0000
-@@ -57,6 +57,7 @@
- #include <saldisp.hxx>
- #endif
+@@ -59,6 +59,7 @@
+ {
+ }
+#include <unotools/localedatawrapper.hxx>
- // initialize statics
- BOOL GtkSalGraphics::bThemeChanged = TRUE;
-@@ -3103,7 +3104,18 @@
+ using namespace rtl;
+
+@@ -3267,7 +3268,18 @@
#endif
// match font to e.g. resolve "Sans"
@@ -828,7 +828,7 @@
+ psp::PrintFontManager::get().matchFont( aInfo, aLocale );
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
+ std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
Index: ./bin/modules/installer/worker.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/worker.pm,v
openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch:
Index: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch 22 May 2008 19:28:03 -0000 1.1
+++ openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch 1 Sep 2008 12:09:07 -0000 1.2
@@ -5,7 +5,7 @@
diff -u -p -u -r1.72 javavm.cxx
--- openoffice.org.orig/stoc/source/javavm/javavm.cxx 3 Jan 2006 12:44:05 -0000 1.72
+++ openoffice.org/stoc/source/javavm/javavm.cxx 30 Jan 2006 10:12:21 -0000
-@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+@@ -860,6 +860,7 @@
{
case JFW_E_NONE: bStarted = true; break;
case JFW_E_NO_SELECT:
@@ -13,15 +13,15 @@
{
// No Java configured. We silenty run the java configuration
// Java.
-@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+@@ -923,6 +924,7 @@
+ return css::uno::Any();
continue;
- break;
}
+#if 0
case JFW_E_VM_CREATION_FAILED:
{
//Error:
-@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+@@ -939,6 +941,7 @@
askForRetry(css::uno::makeAny(exc));
return css::uno::Any();
}
openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch:
Index: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 11 Jul 2008 11:55:15 -0000 1.2
+++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 1 Sep 2008 12:09:07 -0000 1.3
@@ -1,36 +1,35 @@
--- openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu.orig 2005-04-18 20:39:35.000000000 +0530
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu 2005-05-10 17:30:14.000000000 +0530
-@@ -74,6 +74,33 @@
- <value xml:lang="en-US" oor:separator=";">To whom it may concern,;Dear Friends,;Dear Sir or Madam,;Hello,</value>
- <value xml:lang="de" oor:separator=";">Sehr geehrte Damen und Herren,;Liebe Freunde,;Liebe Vereinsmitglieder,;Hallo,</value>
+@@ -43,6 +43,32 @@
+ <prop oor:name="IsHideEmptyParagraphs" >
+ <value>true</value>
</prop>
-+ <node oor:name="DataSource">
-+ <prop oor:name="DataSourceName" oor:type="xs:string">
-+ <value>EvolutionLocal</value>
-+ </prop>
-+ <prop oor:name="DataTableName" oor:type="xs:string">
-+ <value>Personal</value>
-+ </prop>
-+ </node>
++ <node oor:name="DataSource">
++ <prop oor:name="DataSourceName" oor:type="xs:string">
++ <value>EvolutionLocal</value>
++ </prop>
++ <prop oor:name="DataTableName" oor:type="xs:string">
++ <value>Personal</value>
++ </prop>
++ </node>
+ <node oor:name="AddressDataAssignments">
-+ <node oor:name="_0" oor:op="replace">
-+ <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
-+ <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
-+ </prop>
-+ <node oor:name="DataSource">
-+ <prop oor:name="DataCommandType" oor:type="xs:short">
-+ <value>0</value>
-+ </prop>
-+ <prop oor:name="DataSourceName" oor:type="xs:string">
-+ <value>EvolutionLocal</value>
-+ </prop>
-+ <prop oor:name="DataTableName" oor:type="xs:string">
-+ <value>Personal</value>
-+ </prop>
-+ </node>
-+ </node>
-+</node>
-+
++ <node oor:name="_0" oor:op="replace">
++ <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
++ <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
++ </prop>
++ <node oor:name="DataSource">
++ <prop oor:name="DataCommandType" oor:type="xs:short">
++ <value>0</value>
++ </prop>
++ <prop oor:name="DataSourceName" oor:type="xs:string">
++ <value>EvolutionLocal</value>
++ </prop>
++ <prop oor:name="DataTableName" oor:type="xs:string">
++ <value>Personal</value>
++ </prop>
++ </node>
++ </node>
++ </node>
<prop oor:name="EMailSupported" install:module="javamail">
<value>true</value>
</prop>
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 2 Jul 2008 14:25:19 -0000 1.21
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 1 Sep 2008 12:09:07 -0000 1.22
@@ -513,7 +513,7 @@
diff -u -r1.6 outdev.hxx
--- openoffice.org.orig/vcl/inc/vcl/outdev.hxx 11 Apr 2008 07:47:31 -0000 1.6
+++ openoffice.org/vcl/inc/vcl/outdev.hxx 30 May 2008 09:28:33 -0000
-@@ -76,6 +76,8 @@
+@@ -77,6 +77,8 @@
class FontCharMap;
class SalLayout;
class ImplLayoutArgs;
@@ -521,8 +521,8 @@
+class ImplFontAttributes;
class VirtualDevice;
- namespace basegfx {
-@@ -537,6 +539,7 @@
+ namespace com {
+@@ -549,6 +551,7 @@
SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont );
SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& );
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 2 Jul 2008 14:25:19 -0000 1.48
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 1 Sep 2008 12:09:08 -0000 1.49
@@ -353,15 +353,15 @@
diff -u -r1.9 jobset.cxx
--- openoffice.org.orig/vcl/source/gdi/jobset.cxx 9 Sep 2005 12:03:24 -0000 1.9
+++ openoffice.org/vcl/source/gdi/jobset.cxx 19 May 2006 13:17:00 -0000
-@@ -53,6 +53,7 @@
- #include <vcl/jobset.h>
- #endif
+@@ -66,6 +66,7 @@
+ SVBT32 nPaperHeight;
+ };
+#include <psprint/printerinfomanager.hxx>
// =======================================================================
- DBG_NAME( JobSetup )
-@@ -246,6 +247,237 @@
+ ImplJobSetup::ImplJobSetup()
+@@ -231,6 +232,237 @@
mpData->maValueMap[ rKey ] = rValue;
}
@@ -606,7 +606,7 @@
diff -u -p -u -r1.12 cupsmgr.cxx
--- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12
+++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000
-@@ -409,10 +409,15 @@
+@@ -407,10 +407,15 @@
m_pDests( NULL ),
m_bNewDests( false )
{
@@ -623,7 +623,7 @@
{
if( m_aDestThread )
{
-@@ -424,6 +429,11 @@
+@@ -422,6 +427,11 @@
if( m_nDests && m_pDests )
m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
@@ -635,7 +635,7 @@
delete m_pCUPSWrapper;
}
-@@ -477,9 +487,10 @@
+@@ -519,9 +529,10 @@
// clear old stuff
m_aCUPSDestMap.clear();
@@ -645,9 +645,9 @@
return;
+#endif
- // check for CUPS server(?) > 1.2
- // since there is no API to query, check for options that were
-@@ -487,9 +498,9 @@
+ if( isCUPSDisabled() )
+ return;
+@@ -532,9 +543,9 @@
// this is needed to check for %%IncludeFeature support
// (#i65684#, #i65491#)
cups_dest_t* pDest = ((cups_dest_t*)m_pDests);
@@ -659,7 +659,7 @@
if( pOpt )
m_bUseIncludeFeature = true;
-@@ -569,6 +580,10 @@
+@@ -614,6 +625,10 @@
if( it->second.m_aInfo.m_aFeatures.getLength() > 0 )
continue;
@@ -670,7 +670,7 @@
aRemovePrinters.push_back( it->first );
}
while( aRemovePrinters.begin() != aRemovePrinters.end() )
-@@ -579,6 +594,7 @@
+@@ -624,6 +639,7 @@
m_pCUPSWrapper->cupsSetPasswordCB( setPasswordCallback );
#endif // ENABLE_CUPS
@@ -678,7 +678,7 @@
}
#ifdef ENABLE_CUPS
-@@ -837,6 +853,13 @@
+@@ -882,6 +898,13 @@
rNumOptions = m_pCUPSWrapper->cupsAddOption( aKey.getStr(), aValue.getStr(), rNumOptions, (cups_option_t**)rOptions );
}
}
@@ -733,7 +733,7 @@
diff -u -r1.9 printdlg.hxx
--- openoffice.org.orig/svtools/inc/svtools/printdlg.hxx 8 Sep 2005 10:06:06 -0000 1.9
+++ openoffice.org/svtools/inc/svtools/printdlg.hxx 16 Nov 2006 14:14:18 -0000
-@@ -140,6 +140,9 @@
+@@ -154,6 +154,9 @@
Link maOKHdlLink; // Link zum OK-Handler
String maAllFilterStr;
@@ -741,9 +741,9 @@
+ String maOrientationStr;
+ unsigned long mnNativeHandle;
- SVT_DLLPRIVATE void ImplCheckOK();
- SVT_DLLPRIVATE void ImplInitControls();
-@@ -211,6 +214,8 @@
+ SVT_DLLPRIVATE void ImplCheckOK();
+ SVT_DLLPRIVATE void ImplInitControls();
+@@ -232,6 +235,8 @@
virtual short Execute();
void DisableHelp();
@@ -751,7 +751,7 @@
+ virtual unsigned long GetNativeHandle() const;
};
-
+ inline void PrintDialog::EnableRange( PrintDialogRange eRange )
Index: source/dialogs/printdlg.cxx
===================================================================
RCS file: /cvs/util/svtools/source/dialogs/printdlg.cxx,v
@@ -1528,7 +1528,7 @@
diff -u -r1.30 salframe.hxx
--- openoffice.org.orig/vcl/inc/vcl/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30
+++ openoffice.org/vcl/inc/vcl/salframe.hxx 1 May 2007 12:21:25 -0000
-@@ -302,6 +302,9 @@
+@@ -284,6 +284,9 @@
// (e.g. input methods, printer update handlers).
long CallCallback( USHORT nEvent, const void* pEvent ) const
{ return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
@@ -1537,7 +1537,7 @@
+ virtual void SetNativeParent(unsigned long ) {}
};
- #endif // __cplusplus
+
Index: inc/window.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/Attic/window.hxx,v
@@ -1586,8 +1586,8 @@
diff -u -r1.59 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 21 Dec 2006 12:04:26 -0000 1.59
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 1 May 2007 12:22:00 -0000
-@@ -759,6 +762,17 @@
- return pWindow->GetAccessible( bCreate );
+@@ -719,6 +719,17 @@
+ return (GtkSalFrame *) g_object_get_data( G_OBJECT( pWindow ), "SalFrame" );
}
+unsigned long GtkSalFrame::GetNativeHandle() const
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
Index: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 15 May 2008 13:03:09 -0000 1.3
+++ openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch 1 Sep 2008 12:09:08 -0000 1.4
@@ -5,8 +5,8 @@
diff -u -r1.62.2.3 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm 24 Jan 2007 16:34:05 -0000 1.62.2.3
+++ openoffice.org/solenv/bin/modules/installer/globals.pm 27 Feb 2007 17:25:53 -0000
-@@ -224,7 +224,7 @@
- $nopatchfilecollector = "";
+@@ -305,7 +305,7 @@
+ %moduledestination = ();
$unomaxservices = 25;
- $javamaxservices = 15;
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Aug 2008 15:36:14 -0000 1.10
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 1 Sep 2008 12:09:08 -0000 1.11
@@ -260,20 +260,20 @@
--- config_office-orig/set_soenv.in 2006-08-17 10:43:11.000000000 +0200
+++ config_office/set_soenv.in 2006-08-17 11:05:37.000000000 +0200
-@@ -1495,6 +1495,7 @@
- ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
- ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
+@@ -1733,6 +1733,7 @@
+ ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
+ ToFile( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" );
ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
+ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
+ ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
- ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
diff -rup scp2-orig/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
--- scp2-orig/source/ooo/file_library_ooo.scp 2006-08-17 16:08:34.000000000 +0200
+++ scp2/source/ooo/file_library_ooo.scp 2006-08-17 16:11:26.000000000 +0200
-@@ -2464,6 +2464,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Mdb2_Impl
+@@ -1587,6 +1587,9 @@
// AVMedia
- STD_LIB_FILE_PATCH( gid_File_Lib_AVMedia, avmedia )
+ STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
+#ifdef GSTREAMER
+SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
@@ -281,8 +281,8 @@
#if defined UNX
#ifdef SOLAR_JAVA
UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
-@@ -2473,6 +2476,7 @@ UNO_JAR_FILE( gid_File_Jar_AVmedia, avme
- SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaWin, avmediawin )
+@@ -1596,6 +1599,7 @@
+ SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
#endif
#endif
+#endif
@@ -732,8 +732,8 @@
diff -rup svtools-orig/source/misc1/mediatyp.src svtools/source/misc1/mediatyp.src
--- svtools-orig/source/misc1/mediatyp.src 2006-09-21 11:40:26.000000000 +0200
+++ svtools/source/misc1/mediatyp.src 2006-09-21 11:45:57.000000000 +0200
-@@ -148,6 +148,87 @@ String STR_SVT_MIMETYPE_AUDIO_MIDI
- Text [ x-comment ] = " ";
+@@ -113,6 +113,87 @@
+ Text [ en-US ] = "Audio file" ;
};
+String STR_SVT_MIMETYPE_AUDIO_VORBIS
@@ -819,9 +819,9 @@
+
String STR_SVT_MIMETYPE_AUDIO_WAV
{
- Text [ de ] = "Audio-Datei" ;
-@@ -211,6 +292,87 @@ String STR_SVT_MIMETYPE_TEXT_VCARD
- Text [ x-comment ] = " ";
+ Text [ en-US ] = "Audio file" ;
+@@ -158,6 +239,87 @@
+ Text [ en-US ] = "vCard file" ;
};
+String STR_SVT_MIMETYPE_VIDEO_THEORA
@@ -907,7 +907,7 @@
+
String STR_SVT_MIMETYPE_VIDEO_VDO
{
- Text [ de ] = "Video-Datei" ;
+ Text [ en-US ] = "Video file" ;
Index: vcl/inc/salobj.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/salobj.hxx,v
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch:
Index: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 10 Jun 2008 07:48:56 -0000 1.1
+++ openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 1 Sep 2008 12:09:08 -0000 1.2
@@ -248,7 +248,7 @@
diff -u -r1.12 makefile.mk
--- openoffice.org.orig/sw/source/ui/misc/makefile.mk 9 Sep 2005 10:35:47 -0000 1.12
+++ openoffice.org/sw/source/ui/misc/makefile.mk 10 Jul 2007 13:09:42 -0000
-@@ -60,7 +60,8 @@
+@@ -56,7 +56,8 @@
pgfnote.src \
pggrid.src \
redlndlg.src \
@@ -256,9 +256,9 @@
+ srtdlg.src \
+ titlepage.src
- SLOFILES = \
- $(SLO)$/bookmark.obj \
-@@ -72,6 +73,7 @@
+ EXCEPTIONSFILES = \
+ $(SLO)$/glossary.obj \
+@@ -76,6 +77,7 @@
$(SLO)$/insfnote.obj \
$(SLO)$/insrule.obj \
$(SLO)$/linenum.obj \
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:
Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 27 Mar 2008 15:13:50 -0000 1.2
+++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 1 Sep 2008 12:09:08 -0000 1.3
@@ -55,8 +55,8 @@
diff -ruN sd.orig/source/ui/app/strings.src sd/source/ui/app/strings.src
--- openoffice.org.orig/sd/source/ui/app/strings.src 2006-10-06 12:37:22.000000000 +0200
+++ openoffice.org/sd/source/ui/app/strings.src 2007-07-27 15:12:40.000000000 +0200
-@@ -544,6 +544,10 @@
- Text [ de ] = "Nur Titel" ;
+@@ -177,6 +177,10 @@
+ {
Text [ en-US ] = "Title Only" ;
};
+String STR_AUTOLAYOUT_ONLY_TEXT
@@ -65,7 +65,7 @@
+};
String STR_AUTOLAYOUT_TITLE
{
- Text [ de ] = "Titelfolie" ;
+ Text [ en-US ] = "Title Slide" ;
diff -ruN sd.orig/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
--- openoffice.org.orig/sd/source/ui/inc/res_bmp.hrc 2005-09-09 07:51:35.000000000 +0200
+++ openoffice.org/sd/source/ui/inc/res_bmp.hrc 2007-07-27 15:15:48.000000000 +0200
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch:
Index: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 10 Jan 2008 18:03:23 -0000 1.1
+++ openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 1 Sep 2008 12:09:08 -0000 1.2
@@ -5,7 +5,7 @@
diff -u -r1.24 salplug.cxx
--- openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx 15 Oct 2007 13:07:38 -0000 1.24
+++ openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx 10 Jan 2008 18:00:21 -0000
-@@ -429,7 +429,7 @@
+@@ -444,7 +444,7 @@
else if( desktop == desktop_strings[DESKTOP_KDE] )
pRet = "kde";
else
@@ -13,8 +13,8 @@
+ pRet = "gtk";
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "plugin autodetection: %s\n", pRet );
-@@ -468,7 +468,7 @@
+ std::fprintf( stderr, "plugin autodetection: %s\n", pRet );
+@@ -496,7 +496,7 @@
// fallback to gen
if( ! pInst )
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:
Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 2 Jul 2008 14:25:19 -0000 1.2
+++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 1 Sep 2008 12:09:08 -0000 1.3
@@ -57,15 +57,15 @@
diff -ru vcl/source/window/winproc.cxx vcl/source/window/winproc.cxx
--- openoffice.org.orig/vcl/source/window/winproc.cxx 2008-04-15 08:44:34.000000000 +0100
+++ openoffice.org/vcl/source/window/winproc.cxx 2008-04-15 16:40:53.000000000 +0100
-@@ -121,6 +121,7 @@
- #ifndef _SV_MENU_HXX
- #include <vcl/menu.hxx>
+@@ -78,6 +78,7 @@
+ extern void MyOutputDebugString( char *s);
+ #endif
#endif
+#include <vcl/glyphcache.hxx>
- #include <dndlcon.hxx>
-@@ -2255,9 +2256,14 @@
+ //#define USE_NEW_RTL_IMPLEMENTATION
+@@ -2225,9 +2226,14 @@
nType = DATACHANGED_DISPLAY;
break;
case SALEVENT_FONTCHANGED:
openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch:
Index: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch 23 Jul 2008 09:51:27 -0000 1.1
+++ openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch 1 Sep 2008 12:09:08 -0000 1.2
@@ -5,14 +5,14 @@
diff -u -r1.2.182.1 ConfigurationController.cxx
--- openoffice.org.orig/sd/source/ui/framework/configuration/ConfigurationController.cxx 18 Jan 2008 11:26:35 -0000 1.2.182.1
+++ openoffice.org/sd/source/ui/framework/configuration/ConfigurationController.cxx 23 Jul 2008 09:45:04 -0000
-@@ -259,7 +259,9 @@
- throw (RuntimeException)
- {
+@@ -289,7 +289,9 @@
+ OSL_ASSERT(mpImplementation->mpConfigurationUpdater.get()!=NULL);
+
::osl::MutexGuard aGuard (maMutex);
- ThrowIfDisposed();
+
+ if (rBHelper.bDisposed ) //i.e. allow unlocking if disposing, but not disposed
+ ThrowIfDisposed();
- OSL_ASSERT(mnLockCount>0);
- --mnLockCount;
+
+ ++mpImplementation->mnLockCount;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1632
retrieving revision 1.1633
diff -u -r1.1632 -r1.1633
--- openoffice.org.spec 1 Sep 2008 07:52:21 -0000 1.1632
+++ openoffice.org.spec 1 Sep 2008 12:09:08 -0000 1.1633
@@ -32,8 +32,6 @@
%define ooo_base_name %{oootag}_m%{ooomilestone}
-%define _default_patch_fuzz 2
-
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 3.0.0
@@ -3647,6 +3645,7 @@
%changelog
* Mon Sep 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.2
- Resolves: rhbz#460755 TryExec oowriter on brwriter.desktop etc
+- defuzz patches
* Fri Aug 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-4.1
- next milestone
workspace.cmcfixes49.patch:
Index: workspace.cmcfixes49.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes49.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.cmcfixes49.patch 30 Aug 2008 10:57:57 -0000 1.4
+++ workspace.cmcfixes49.patch 1 Sep 2008 12:09:08 -0000 1.5
@@ -56,8 +56,8 @@
AC_MSG_CHECKING([for sdext module])
--- config_office/set_soenv.in 31 Jul 2008 13:53:05 -0000 1.196
+++ config_office/set_soenv.in 19 Aug 2008 13:33:05 -0000
-@@ -1998,6 +1998,9 @@
- ToFile( "SYSTEM_FREETYPE", "@SYSTEM_FREETYPE@", "e" );
+@@ -2000,6 +2000,9 @@
+ ToFile( "SYSTEM_JPEG", "@SYSTEM_JPEG@", "e" );
ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" );
ToFile( "FREETYPE_LIBS", "@FREETYPE_LIBS@", "e" );
+ToFile( "SYSTEM_POPPLER", "@SYSTEM_POPPLER@", "e" );
@@ -70,7 +70,7 @@
+++ sdext/prj/build.lst 19 Aug 2008 15:13:19 -0000
@@ -7,10 +7,12 @@
dx sdext\source\minimizer\registry\data\org\openoffice\Office nmake - all sdext_minimizer_rdooo NULL
- dx sdext\source\presenter nmake - all sdext_presenter NULL
+ dx sdext\source\presenter nmake - all sdext_presenter sdext_inc NULL
dx sdext\inc nmake - all sdext_inc NULL
+dx sdext\source\pdfimport\xpdfwrapper nmake - all dx_xpdfwrap NULL
+dx sdext\source\pdfimport\xpdftest nmake - all dx_parsetest dx_xpdfwrap NULL
- Previous message (by thread): rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-autocreate-0.10-0.diff, NONE, 1.1 cyrus-imapd-2.3.12p2-autosieve-0.6.0.diff, NONE, 1.1 .cvsignore, 1.11, 1.12 cyrus-imapd.spec, 1.41, 1.42 sources, 1.13, 1.14 cyrus-imapd-2.2.10-groupcache.patch, 1.1, NONE cyrus-imapd-2.3.11-autocreate-0.10-0.diff, 1.1, NONE cyrus-imapd-2.3.11-autosieve-0.6.0.diff, 1.1, NONE cyrus-imapd-2.3.7.tar.gz.sig, 1.1, NONE
- Next message (by thread): rpms/bzip2/devel bzip2.spec,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list