[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch, NONE, 1.1 .cvsignore, 1.62, 1.63 openoffice.org.spec, 1.317, 1.318 sources, 1.89, 1.90



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27092

Modified Files:
	.cvsignore openoffice.org.spec sources 
Added Files:
	openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch 
Log Message:
bump to next version

openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch:
 source/window/window.cxx     |    0 
 vcl/source/window/window.cxx |   15 +--------------
 2 files changed, 1 insertion(+), 14 deletions(-)

--- NEW FILE openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.215
diff -u -p -u -r1.215 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx	29 Mar 2005 14:38:07 -0000	1.215
+++ openoffice.org/vcl/source/window/window.cxx	16 Jul 2005 11:34:09 -0000
@@ -349,20 +349,7 @@ void Window::ImplInitAppFontData( Window
 bool Window::ImplCheckUIFont( const Font& rFont )
 {
     ImplInitFontList();
-
-    String aTestText;
-    aTestText.Append( Button::GetStandardText( BUTTON_OK ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_CANCEL ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_YES ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_NO ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_RETRY ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_HELP ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_CLOSE ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_MORE ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_LESS ) );
-    aTestText.Append( Button::GetStandardText( BUTTON_ABORT ) );
-
-    return HasGlyphs( rFont, aTestText ) >= aTestText.Len();
+    return true;
 }
 
 // -----------------------------------------------------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	13 Jul 2005 17:24:37 -0000	1.62
+++ .cvsignore	16 Jul 2005 11:49:05 -0000	1.63
@@ -120,3 +120,4 @@
 SRC680_m115.tar.bz2
 SRC680_m116.tar.bz2
 SRC680_m117.tar.bz2
+SRC680_m118.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- openoffice.org.spec	16 Jul 2005 10:52:06 -0000	1.317
+++ openoffice.org.spec	16 Jul 2005 11:49:05 -0000	1.318
@@ -1,5 +1,5 @@
-%define ooo2ver 117
-%define ooo_rpm_release 2
+%define ooo2ver 118
+%define ooo_rpm_release 1
 %define build_fc4 0
 %define build_fc5 1
 
@@ -162,6 +162,7 @@
 Patch61: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
 Patch62: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
 Patch63: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
+Patch64: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -808,6 +809,9 @@
 %patch61 -p1 -b .ooo51912.nullpointer.wizards.patch
 %patch62 -p1 -b .ooo52023.evoadb2.nognuconst.patch
 %patch63 -p1 -b .ooo52048.inhalt.sw.patch
+%if %{build_fc5}
+%patch64 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
+%endif
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3009,6 +3013,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sat Jul 16 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.118-1
+- add experiemental rh150643.fontconfigalwayssystemfont.vcl.patch
+
 * Fri Jul 15 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-2
 - add openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch to
   fix evoab2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- sources	13 Jul 2005 17:24:37 -0000	1.89
+++ sources	16 Jul 2005 11:49:05 -0000	1.90
@@ -2,4 +2,4 @@
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-0eb3ae8fa889915f1c302e685de43f98  SRC680_m117.tar.bz2
+b7f275c709a63f146514e6511fef0507  SRC680_m118.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]