rpms/koffice/F-11 koffice-1.6.3-dejavu_fonts.patch, NONE, 1.1 koffice-1.6.3-no_local_fonts.patch, NONE, 1.1 koffice.spec, 1.102, 1.103
Rex Dieter
rdieter at fedoraproject.org
Tue Jul 28 20:47:34 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29331
Modified Files:
koffice.spec
Added Files:
koffice-1.6.3-dejavu_fonts.patch
koffice-1.6.3-no_local_fonts.patch
Log Message:
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
- -kformula: omit bundled fonts
- koffice kword crash with formulas (#514217)
koffice-1.6.3-dejavu_fonts.patch:
Makefile.am | 2 +-
contextstyle.cc | 2 +-
fontstyle.cc | 8 +++++++-
symboltable.cc | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
--- NEW FILE koffice-1.6.3-dejavu_fonts.patch ---
diff -up koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu koffice-1.6.3/lib/kformula/contextstyle.cc
--- koffice-1.6.3/lib/kformula/contextstyle.cc.dejavu 2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/contextstyle.cc 2009-07-28 15:29:06.420292073 -0500
@@ -106,7 +106,7 @@ void ContextStyle::readConfig( KConfig*
if ( ! FontStyle::missingFonts( init ).isEmpty() ) {
kdWarning( DEBUGID) << "Not all basic fonts found\n";
}
- mathFont.fromString("Arev Sans");
+ mathFont.fromString("DejaVu Sans");
bracketFont.fromString("cmex10");
diff -up koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu koffice-1.6.3/lib/kformula/fontstyle.cc
--- koffice-1.6.3/lib/kformula/fontstyle.cc.dejavu 2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/fontstyle.cc 2009-07-28 15:35:51.457543630 -0500
@@ -102,7 +102,7 @@ QStringList FontStyle::missingFontsInter
QStringList missing;
testFont( missing, "cmex10" );
- testFont( missing, "arev sans");
+ testFont( missing, "dejavu sans");
return missing;
}
@@ -111,9 +111,12 @@ void FontStyle::installFonts()
{
if (m_installed)
return;
+
QStringList missing = missingFontsInternal();
if (!missing.isEmpty())
{
+// don't install local copies of fonts -- Rex
+/*
QStringList urlList;
for (QStringList::iterator it = missing.begin(); it != missing.end(); ++it)
{
@@ -135,6 +138,9 @@ void FontStyle::installFonts()
KIO::copy(urlList, "fonts:/Personal/", false);
KMessageBox::information(qApp->mainWidget(),
i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
+*/
+ KMessageBox::information(qApp->mainWidget(),
+ i18n("Some symbol fonts for formulas was font to be missing"));
}
m_installed = true;
}
diff -up koffice-1.6.3/lib/kformula/Makefile.am.dejavu koffice-1.6.3/lib/kformula/Makefile.am
--- koffice-1.6.3/lib/kformula/Makefile.am.dejavu 2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/Makefile.am 2009-07-28 15:41:35.306393788 -0500
@@ -1,7 +1,7 @@
INCLUDES= $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes)
-SUBDIRS = pics fonts dtd
+SUBDIRS = pics dtd
#######
# We have to name it kformulalib, not just kformula, since that's the name of the kdeinit module for kformula.
diff -up koffice-1.6.3/lib/kformula/symboltable.cc.dejavu koffice-1.6.3/lib/kformula/symboltable.cc
--- koffice-1.6.3/lib/kformula/symboltable.cc.dejavu 2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/symboltable.cc 2009-07-28 15:29:06.421292200 -0500
@@ -101,7 +101,7 @@ QFont SymbolTable::font( QChar symbol, c
if ( fm.inFont( symbol ) ) {
return f;
}
- return QFont("Arev Sans");
+ return QFont("DejaVu Sans");
}
CharClass SymbolTable::charClass( QChar symbol ) const
koffice-1.6.3-no_local_fonts.patch:
fontstyle.cc | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE koffice-1.6.3-no_local_fonts.patch ---
diff -up koffice-1.6.3/lib/kformula/fontstyle.cc.no_local_fonts koffice-1.6.3/lib/kformula/fontstyle.cc
--- koffice-1.6.3/lib/kformula/fontstyle.cc.no_local_fonts 2007-05-30 16:38:26.000000000 -0500
+++ koffice-1.6.3/lib/kformula/fontstyle.cc 2009-07-28 15:14:57.879543856 -0500
@@ -111,6 +111,8 @@ void FontStyle::installFonts()
{
if (m_installed)
return;
+// don't depend on installing fonts locally -- Rex
+/*
QStringList missing = missingFontsInternal();
if (!missing.isEmpty())
{
@@ -136,6 +138,7 @@ void FontStyle::installFonts()
KMessageBox::information(qApp->mainWidget(),
i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
}
+*/
m_installed = true;
}
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-11/koffice.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- koffice.spec 16 Apr 2009 14:51:02 -0000 1.102
+++ koffice.spec 28 Jul 2009 20:47:34 -0000 1.103
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
Name: koffice
Epoch: 2
Version: 1.6.3
-Release: 21.%{svn}svn%{?dist}
+Release: 22.%{svn}svn%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -44,6 +44,9 @@ Patch2: ftp://ftp.kde.org/pub/kde/securi
# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
Patch3: koffice-1.6.3-gcc43.patch
+# drop need/use of local fonts, use dejavu instead of arev
+Patch4: koffice-1.6.3-dejavu_fonts.patch
+
# BuildRequires: world-devel ;)
BuildRequires: %{kdelibs3}-devel
# See http://bugzilla.redhat.com/244091
@@ -231,7 +234,9 @@ Requires: %{name}-core = %{epoch}:
Summary: A powerful formula editor
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
+# for cmex10
Requires: mathml-fonts
+Requires: dejavu-sans-fonts
%description kformula
%{summary}.
@@ -257,11 +262,15 @@ Requires: %{name}-core = %{epoch}
#patch2 -p0 -b .CVE-2007-4352-5392-5393
#patch3 -p1 -b .gcc43
+%patch4 -p1 -b .dejavu
+
%patch50 -p1 -b glibc_strrchr
%patch100 -p1 -b .svn
%patch101 -p1 -b .quint32
+# hack/fix for newer automake
+sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
make -f admin/Makefile.common
@@ -278,7 +287,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
--disable-final
-make %{?_smp_mflags} -k
+make %{?_smp_mflags}
%install
@@ -315,6 +324,9 @@ for desktop_file in %{buildroot}%{_datad
done
## unpackaged files
+# fonts
+rm -rv %{buildroot}%{_datadir}/apps/kformula/fonts/
+# libtool archives
rm -f %{buildroot}%{_libdir}/lib*.la
# shouldn't these be in koffice-l10n?
rm -f %{buildroot}%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
@@ -736,8 +748,12 @@ xdg-desktop-menu forceupdate 2> /dev/nul
%changelog
+* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
+- -kformula: omit bundled fonts
+- koffice kword crash with formulas (#514217)
+
* Thu Apr 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-21.20090306svn
-- -krita: revert/readd dropped Requires: -filters
+- -krita: revert/re-add dropped Requires: -filters
* Tue Mar 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 2:1.6.3-20.20090306svn
- rebuild for new ImageMagick
More information about the fedora-extras-commits
mailing list