[font-manager] Update to 0.5.7
Jean-Francois Saucier
jfsaucier at fedoraproject.org
Sun Jan 2 20:14:00 UTC 2011
commit 1a6f54826fccb42d6d979256741805791bb74da7
Author: Jean-Francois Saucier <jsaucier at gmail.com>
Date: Sun Jan 2 15:13:59 2011 -0500
Update to 0.5.7
.gitignore | 1 +
font-manager.spec | 14 ++++++--
font-manager_bug_658328.patch | 65 +++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 77 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d0bb154..5585b82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
font-manager-0.5.5-4.tar.bz2
/font-manager-0.5.6.tar.bz2
+/font-manager-0.5.7.tar.bz2
diff --git a/font-manager.spec b/font-manager.spec
index 74492b9..e93c508 100644
--- a/font-manager.spec
+++ b/font-manager.spec
@@ -1,17 +1,19 @@
Name: font-manager
-Version: 0.5.6
-Release: 2%{?dist}
+Version: 0.5.7
+Release: 1%{?dist}
Summary: A font management application for the GNOME desktop environment
Group: Applications/Publishing
License: GPLv3+
URL: http://code.google.com/p/font-manager
Source0: http://font-manager.googlecode.com/files/%{name}-%{version}.tar.bz2
+Patch0: font-manager_bug_658328.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# Explicit dependencies required because there is no automatic dependencies
# resolution for the python modules.
-Requires: fontconfig libxml2-python pygtk2 freetype
+Requires: fontconfig libxml2-python pygtk2 freetype sqlite
BuildRequires: python desktop-file-utils fontconfig-devel glib2-devel python-devel pango-devel
+BuildRequires: sqlite-devel
%description
Font Manager is an application that allows users to easily manage fonts
@@ -23,6 +25,7 @@ Enlightenment, and even KDE.
%prep
%setup -q
+%patch0 -p1
%build
%configure --enable-debuginfo
@@ -35,7 +38,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/font-manager.deskt
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/font-sampler.desktop
# Make file executable to be picked up by find-debuginfo.sh
-chmod +x $RPM_BUILD_ROOT%{_libdir}/font-manager/_fontutils.so
+chmod +x $RPM_BUILD_ROOT%{_libdir}/font-manager/fontutils.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -50,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/
%changelog
+* Sun Jan 2 2011 Jean-Francois Saucier <jsaucier at gmail.com> - 0.5.7-1
+- Update to the new upstream version
+
* Wed Sep 29 2010 jkeating - 0.5.6-2
- Rebuilt for gcc bug 634757
diff --git a/font-manager_bug_658328.patch b/font-manager_bug_658328.patch
new file mode 100644
index 0000000..8ec0b1c
--- /dev/null
+++ b/font-manager_bug_658328.patch
@@ -0,0 +1,65 @@
+diff -up font-manager-0.5.7/src/lib/fm-fontutils.c.orig font-manager-0.5.7/src/lib/fm-fontutils.c
+--- font-manager-0.5.7/src/lib/fm-fontutils.c.orig 2010-12-23 22:48:30.000000000 -0500
++++ font-manager-0.5.7/src/lib/fm-fontutils.c 2011-01-02 14:43:39.150396001 -0500
+@@ -72,8 +72,8 @@ FcListFiles()
+ {
+ FcChar8 *file;
+
+- FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &file);
+- filelist = g_slist_prepend(filelist, g_strdup((const gchar *) file));
++ if (FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &file) == FcResultMatch)
++ filelist = g_slist_prepend(filelist, g_strdup((const gchar *) file));
+ }
+
+ if (objectset)
+@@ -272,7 +272,7 @@ _get_base_font_info(FontInfo *fontinfo,
+ PangoFontDescription *descr;
+
+ /* Need to add this font to the configuration, it may not be there in the
+- * case where this the font is not installed yet or possibly just installed
++ * case where this font is not installed yet or possibly just installed
+ */
+ FcConfigAppFontAddFile(FcConfigGetCurrent(), filepath);
+
+@@ -287,10 +287,10 @@ _get_base_font_info(FontInfo *fontinfo,
+ FcChar8 *family,
+ *style;
+
+- FcPatternGetString(fontset->fonts[i], FC_FAMILY, 0, &family);
+- FcPatternGetString(fontset->fonts[i], FC_STYLE, 0, &style);
+- ADD_PROP(fontinfo->family, family);
+- ADD_PROP(fontinfo->style, style);
++ if (FcPatternGetString(fontset->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
++ ADD_PROP(fontinfo->family, family);
++ if (FcPatternGetString(fontset->fonts[i], FC_STYLE, 0, &style) == FcResultMatch)
++ ADD_PROP(fontinfo->style, style);
+ }
+
+ descr = pango_fc_font_description_from_pattern(pattern, FALSE);
+@@ -539,7 +539,7 @@ static const struct
+ }
+ NoticeData[] =
+ {
+- {"Bigelow", "B&H"},
++ {"Bigelow", "Bigelow & Holmes"},
+ {"Adobe", "Adobe"},
+ {"Bitstream", "Bitstream"},
+ {"Monotype", "Monotype"},
+diff -up font-manager-0.5.7/src/ui/fontconfig.py.orig font-manager-0.5.7/src/ui/fontconfig.py
+--- font-manager-0.5.7/src/ui/fontconfig.py.orig 2010-12-15 21:50:37.000000000 -0500
++++ font-manager-0.5.7/src/ui/fontconfig.py 2011-01-02 14:42:51.858396000 -0500
+@@ -376,9 +376,11 @@ class ConfigEdit(gtk.Window):
+ for name in self.cache.iterkeys():
+ discard_fontconfig_settings(self.cache[name])
+ self.save_settings(None)
+- os.unlink(join(CACHE_DIR, CACHED_SETTINGS))
+- os.unlink(join(USER_FONT_CONFIG_DIR,
+- '25-{0}.conf'.format(self.selected_family.get_name())))
++ cache = join(CACHE_DIR, CACHED_SETTINGS)
++ not exists(cache) or os.unlink(cache)
++ cache = join(USER_FONT_CONFIG_DIR,
++ '25-{0}.conf'.format(self.selected_family.get_name()))
++ not exists(cache) or os.unlink(cache)
+ return
+
+ def save_cache(self):
diff --git a/sources b/sources
index 28f120b..c87e136 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cda59dadf2d47ad6f5e07d3d6d25e04 font-manager-0.5.6.tar.bz2
+7cd3b635eaddcb84a8b31509880510ed font-manager-0.5.7.tar.bz2
More information about the scm-commits
mailing list