rpms/openoffice.org/devel openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch, NONE, 1.1 openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch, NONE, 1.1 .cvsignore, 1.109, 1.110 openoffice.org.spec, 1.723, 1.724 sources, 1.177, 1.178
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 23 12:10:30 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16618
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
Log Message:
2.0.3
openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch:
psprint/inc/psprint/fontmanager.hxx | 17 ++++++++++++-
psprint/source/fontmanager/fontconfig.cxx | 38 ++++++++++++++++++++++++++++--
psprint/source/fontmanager/makefile.mk | 3 ++
psprint/util/makefile.mk | 1
vcl/inc/impfont.hxx | 11 ++++++--
vcl/inc/vclenum.hxx | 8 ++++++
vcl/source/glyphs/gcach_ftyp.cxx | 16 ++++++++++++
vcl/unx/source/gdi/salgdi3.cxx | 23 ++++++++++++++++++
8 files changed, 111 insertions(+), 6 deletions(-)
--- NEW FILE openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch ---
diff -ru vcl/inc/impfont.hxx vcl/inc/impfont.hxx
--- openoffice.org.orig/vcl/inc/impfont.hxx 2006-05-22 13:59:55.000000000 +0100
+++ openoffice.org/vcl/inc/impfont.hxx 2006-05-23 12:26:20.000000000 +0100
@@ -167,24 +167,29 @@
FontAutoHint meAutoHint; // whether the font should be autohinted
FontHinting meHinting; // whether the font should be hinted
FontHintStyle meHintStyle; // type of font hinting to be used
+ FontSubPixel meSubPixel; // type of subpixel font hinting to be used
public:
ImplFontHints() :
meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW),
meAntiAlias(ANTIALIAS_DONTKNOW),
meAutoHint(AUTOHINT_DONTKNOW),
meHinting(HINTING_DONTKNOW),
- meHintStyle(HINT_FULL)
+ meHintStyle(HINT_FULL),
+ meSubPixel(SUBPIXEL_UNKNOWN)
{}
ImplFontHints(FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias,
- FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle) :
+ FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle,
+ FontSubPixel eSubPixel) :
meEmbeddedBitmap(eEmbeddedBitmap),
meAntiAlias(eAntiAlias),
meAutoHint(eAutoHint),
meHinting(eHinting),
- meHintStyle(eHintStyle)
+ meHintStyle(eHintStyle),
+ meSubPixel(eSubPixel)
{}
FontAutoHint GetUseAutoHint() const { return meAutoHint; }
FontHintStyle GetHintStyle() const { return meHintStyle; }
+ FontSubPixel GetSubPixel() const { return meSubPixel; }
bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; }
bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
diff -ru vcl/inc/vclenum.hxx vcl/inc/vclenum.hxx
--- openoffice.org.orig/vcl/inc/vclenum.hxx 2006-05-22 13:59:55.000000000 +0100
+++ openoffice.org/vcl/inc/vclenum.hxx 2006-05-22 14:14:49.000000000 +0100
@@ -310,6 +310,14 @@
#endif
+#ifndef ENUM_FONTSUBPIXEL_DECLARED
+#define ENUM_FONTSUBPIXEL_DECLARED
+
+enum FontSubPixel { SUBPIXEL_UNKNOWN, SUBPIXEL_RGB, SUBPIXEL_BGR, SUBPIXEL_VRGB, SUBPIXEL_VBGR, SUBPIXEL_NONE};
+
+#endif
+
+
// ------------------------------------------------------------
#ifndef ENUM_KEYFUNCTYPE_DECLARED
diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 2006-05-23 12:35:49.000000000 +0100
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 2006-05-23 12:46:15.000000000 +0100
@@ -870,6 +870,22 @@
}
#endif
+ switch (aHints.GetSubPixel())
+ {
+ default:
+ case SUBPIXEL_UNKNOWN:
+ case SUBPIXEL_NONE:
+ break;
+ case SUBPIXEL_RGB:
+ case SUBPIXEL_BGR:
+ mnLoadFlags |= FT_LOAD_TARGET_LCD;
+ break;
+ case SUBPIXEL_VRGB:
+ case SUBPIXEL_VBGR:
+ mnLoadFlags |= FT_LOAD_TARGET_LCD_V;
+ break;
+ }
+
if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
mnLoadFlags |= FT_LOAD_NO_BITMAP;
}
diff -ru vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx 2006-05-22 13:59:52.000000000 +0100
+++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx 2006-05-23 12:29:33.000000000 +0100
@@ -1531,6 +1531,29 @@
rFontHints.meHintStyle = HINT_FULL;
break;
}
+
+ switch (aHints.m_eSubPixel)
+ {
+ default:
+ case psp::fcsubpixel::Unknown:
+ rFontHints.meSubPixel = SUBPIXEL_UNKNOWN;
+ break;
+ case psp::fcsubpixel::RGB:
+ rFontHints.meSubPixel = SUBPIXEL_RGB;
+ break;
+ case psp::fcsubpixel::BGR:
+ rFontHints.meSubPixel = SUBPIXEL_BGR;
+ break;
+ case psp::fcsubpixel::VRGB:
+ rFontHints.meSubPixel = SUBPIXEL_VRGB;
+ break;
+ case psp::fcsubpixel::VBGR:
+ rFontHints.meSubPixel = SUBPIXEL_VBGR;
+ break;
+ case psp::fcsubpixel::NONE:
+ rFontHints.meSubPixel = SUBPIXEL_NONE;
+ break;
+ }
}
// ----------------------------------------------------------------------------
diff -ru psprint/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
--- openoffice.org.orig/psprint/inc/psprint/fontmanager.hxx 2006-05-22 13:59:50.000000000 +0100
+++ openoffice.org/psprint/inc/psprint/fontmanager.hxx 2006-05-22 15:28:40.000000000 +0100
@@ -165,6 +165,19 @@
};
}
+namespace fcsubpixel
+{
+enum type {
+ Unknown = 0,
+ RGB = 1,
+ BGR = 2,
+ VRGB = 3,
+ VBGR = 4,
+ NONE = 5
+};
+}
+
+
struct FontConfigHints
{
fcstatus::type m_eEmbeddedbitmap;
@@ -172,13 +185,15 @@
fcstatus::type m_eAutoHint;
fcstatus::type m_eHinting;
fchint::type m_eHintStyle;
+ fcsubpixel::type m_eSubPixel;
FontConfigHints() :
m_eEmbeddedbitmap( fcstatus::isunset ),
m_eAntialias( fcstatus::isunset ),
m_eAutoHint( fcstatus::isunset ),
m_eHinting( fcstatus::isunset ),
- m_eHintStyle( fchint::Full )
+ m_eHintStyle( fchint::Medium ),
+ m_eSubPixel( fcsubpixel::Unknown )
{}
};
diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2006-05-22 13:59:49.000000000 +0100
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2006-05-23 12:23:55.000000000 +0100
@@ -36,6 +36,8 @@
#ifdef ENABLE_FONTCONFIG
#include <fontconfig/fontconfig.h>
// be compatible with fontconfig 2.2.0 release
+#include <cairo-ft.h>
+#include <gdk/gdkscreen.h>
#ifndef FC_WEIGHT_BOOK
#define FC_WEIGHT_BOOK 75
#endif
@@ -151,7 +153,7 @@
void FcPatternDestroy( FcPattern* pPattern )
{ m_pFcPatternDestroy( pPattern ); }
-
+
FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
{ return m_pFcFontList( pConfig, pPattern, pSet ); }
@@ -187,6 +189,7 @@
FcResult FcPatternGetBool( const FcPattern* pPattern, const char* object, int n, FcBool* s )
{ return m_pFcPatternGetBool( pPattern, object, n, s ); }
+
void FcDefaultSubstitute( FcPattern* pPattern )
{ m_pFcDefaultSubstitute( pPattern ); }
FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult )
@@ -774,14 +777,18 @@
rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
- int hintstyle = FC_HINT_FULL;
+ int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
+ if (const cairo_font_options_t *pOptions = gdk_screen_get_font_options(gdk_screen_get_default()))
+ cairo_ft_font_options_substitute(pOptions, pPattern);
rWrapper.FcDefaultSubstitute( pPattern );
FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
FcResult eAntialias = rWrapper.FcPatternGetBool( pPattern, FC_ANTIALIAS, 0, &antialias );
FcResult eAutoHint = rWrapper.FcPatternGetBool( pPattern, FC_AUTOHINT, 0, &autohint );
+ FcResult eSubPixel = rWrapper.FcPatternGetInteger( pPattern, FC_RGBA, 0, &rgba);
FcResult eHinting = rWrapper.FcPatternGetBool( pPattern, FC_HINTING, 0, &hinting );
+
FcResult eHintStyle = rWrapper.FcPatternGetInteger( pPattern, FC_HINT_STYLE, 0, &hintstyle );
if( eEmbeddedBitmap == FcResultMatch )
@@ -813,6 +820,33 @@
break;
}
}
+ if (eSubPixel != FcResultMatch)
+ aHints.m_eSubPixel = fcsubpixel::Unknown;
+ else
+ {
+ switch (rgba)
+ {
+ default:
+ case FC_RGBA_UNKNOWN:
+ break;
+ aHints.m_eSubPixel = fcsubpixel::Unknown;
+ case FC_RGBA_RGB:
+ aHints.m_eSubPixel = fcsubpixel::RGB;
+ break;
+ case FC_RGBA_BGR:
+ aHints.m_eSubPixel = fcsubpixel::BGR;
+ break;
+ case FC_RGBA_VRGB:
+ aHints.m_eSubPixel = fcsubpixel::VRGB;
+ break;
+ case FC_RGBA_VBGR:
+ aHints.m_eSubPixel = fcsubpixel::VBGR;
+ break;
+ case FC_RGBA_NONE:
+ aHints.m_eSubPixel = fcsubpixel::NONE;
+ break;
+ }
+ }
#endif
return aHints;
}
diff -ru psprint/source/fontmanager/makefile.mk psprint/source/fontmanager/makefile.mk
--- openoffice.org.orig/psprint/source/fontmanager/makefile.mk 2006-05-22 13:59:49.000000000 +0100
+++ openoffice.org/psprint/source/fontmanager/makefile.mk 2006-05-23 09:59:14.000000000 +0100
@@ -49,6 +49,9 @@
CDEFS += -DENABLE_FONTCONFIG
.ENDIF
+PKGCONFIG_MODULES=gdk-2.0 freetype2
+.INCLUDE: pkg_config.mk
+
# --- Files --------------------------------------------------------
SLOFILES=\
diff -ru psprint/util/makefile.mk psprint/util/makefile.mk
--- openoffice.org.orig/psprint/util/makefile.mk 2006-05-22 13:59:49.000000000 +0100
+++ openoffice.org/psprint/util/makefile.mk 2006-05-23 10:00:18.000000000 +0100
@@ -90,6 +90,7 @@
# --- Targets ------------------------------------------------------------
+PKGCONFIG_MODULES=gdk-2.0 freetype2
.INCLUDE: pkg_config.mk
SHL1STDLIBS+=$(PKGCONFIG_LIBS)
openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch:
VCL.xcu | 5 +++++
1 files changed, 5 insertions(+)
--- NEW FILE openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch ---
Index: officecfg/registry/data/org/openoffice/VCL.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
retrieving revision 1.42
diff -u -p -u -r1.42 VCL.xcu
--- openoffice.org.orig/officecfg/registry/data/org/openoffice/VCL.xcu 21 Jul 2005 14:22:30 -0000 1.42
+++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 10:29:42 -0000
@@ -62,6 +62,11 @@
<!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
<oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="Settings">
+ <node oor:name="Canvas" oor:op="replace">
+ <prop oor:name="PreferredServices" oor:type="xs:string" oor:op="replace">
+ <value>com.sun.star.rendering.VCLCanvas</value>
+ </prop>
+ </node>
<node oor:name="Accessibility" oor:op="replace">
<prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
<value>false</value>
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- .cvsignore 19 May 2006 10:46:14 -0000 1.109
+++ .cvsignore 23 May 2006 12:10:12 -0000 1.110
@@ -173,3 +173,4 @@
SRC680_m169.tar.bz2
OOC680_m1.tar.bz2
OOC680_m2.tar.bz2
+OOC680_m3.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.723
retrieving revision 1.724
diff -u -r1.723 -r1.724
--- openoffice.org.spec 20 May 2006 08:48:14 -0000 1.723
+++ openoffice.org.spec 23 May 2006 12:10:12 -0000 1.724
@@ -1,5 +1,5 @@
%define oootag OOC680
-%define ooomilestone 2
+%define ooomilestone 3
%define rh_rpm_release 1
# gcc#19664#
@@ -101,6 +101,8 @@
Patch35: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
Patch36: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
Patch37: openoffice.org-2.0.3.oooXXXXX.vcl.removemenukey.patch
+Patch38: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+Patch39: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -829,6 +831,8 @@
%patch35 -p1 -b .oooXXXXX.atkbroken.vcl.patch
%patch36 -p1 -b .oooXXXXX.selinux.bridges.patch
%patch37 -p1 -b .oooXXXXX.vcl.removemenukey.patch
+%patch38 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
+%patch39 -p1 -b .rh192588.officecfg.defaultcairooff.patch
tar xzf %{SOURCE1}
@@ -846,7 +850,7 @@
fi
cd config_office
autoconf
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-atkbridge --enable-evolution2 --enable-xsltproc --enable-cairo --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
+%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-atkbridge --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-agg --with-system-python --with-system-mozilla --with-system-boost --with-system-libwpd --with-system-icu --with-system-xmlsec --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -3303,6 +3307,11 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue May 23 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-3.1
+- 2.0.3 RC3
+- rh#191650# add openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
+- rh#192588# don't use the cairo canvas by default
+
* Fri May 19 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-2.1
- 2.0.3 RC2
- drop rvpapi module
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- sources 19 May 2006 10:46:14 -0000 1.177
+++ sources 23 May 2006 12:10:13 -0000 1.178
@@ -10,4 +10,4 @@
5a7c718e63d09f42fd40017b28dffd10 AutoSaveCommon.xcu
d57f21d70ba34ddb20f40a4d08427722 AutoSaveRecovery.xcu
44c065f3fa55a63225aacb6d2a1e097d openoffice.org-simple-crash_report.sh
-a73f30a095e2ca2f4162803ce03a8883 OOC680_m2.tar.bz2
+fa5d4640d0bdc9e7eb58e6dc76ae8c7b OOC680_m3.tar.bz2
More information about the fedora-cvs-commits
mailing list