commit: 92315de7c98a8bdd1a7d5f290624c2787342859d Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> AuthorDate: Tue Mar 25 22:39:10 2014 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Tue Mar 25 22:40:03 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=92315de7
media-gfx/font-manager: 0.5.7-r2 (fix build, Debian patches, python-r1, strip fix) --- .../files/font-manager-0.5.7-gcc47.patch | 18 ++++++ .../font-manager-0.5.7-nonexistent-cache.patch | 71 ++++++++++++++++++++++ ...r-0.5.7.ebuild => font-manager-0.5.7-r1.ebuild} | 24 ++++++-- 3 files changed, 108 insertions(+), 5 deletions(-) diff --git a/media-gfx/font-manager/files/font-manager-0.5.7-gcc47.patch b/media-gfx/font-manager/files/font-manager-0.5.7-gcc47.patch new file mode 100644 index 0000000..1563c71 --- /dev/null +++ b/media-gfx/font-manager/files/font-manager-0.5.7-gcc47.patch @@ -0,0 +1,18 @@ +Description: Fix missing #includes to prevent FTBFS with GCC 4.7. +Author: Alessio Treglia <ales...@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672043 +Forwarded: http://code.google.com/p/font-manager/issues/detail?id=71 +--- + src/lib/fm-fontutils.c | 1 + + 1 file changed, 1 insertion(+) + +--- font-manager.orig/src/lib/fm-fontutils.c ++++ font-manager/src/lib/fm-fontutils.c +@@ -21,6 +21,7 @@ + * Boston, MA 02110-1301, USA + */ + ++#include <unistd.h> + #include <glib.h> + #include <glib/gprintf.h> + #include <glib/gstdio.h> diff --git a/media-gfx/font-manager/files/font-manager-0.5.7-nonexistent-cache.patch b/media-gfx/font-manager/files/font-manager-0.5.7-nonexistent-cache.patch new file mode 100644 index 0000000..effd893 --- /dev/null +++ b/media-gfx/font-manager/files/font-manager-0.5.7-nonexistent-cache.patch @@ -0,0 +1,71 @@ +Description: Don't remove cache dir if non-existent. +Origin: upstream, http://code.google.com/p/font-manager/source/detail?r=261 +Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=658328 +--- + src/lib/fm-fontutils.c | 16 ++++++++-------- + src/ui/fontconfig.py | 8 +++++--- + 2 files changed, 13 insertions(+), 11 deletions(-) + +--- font-manager.orig/src/lib/fm-fontutils.c ++++ font-manager/src/lib/fm-fontutils.c +@@ -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"}, +--- font-manager.orig/src/ui/fontconfig.py ++++ font-manager/src/ui/fontconfig.py +@@ -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/media-gfx/font-manager/font-manager-0.5.7.ebuild b/media-gfx/font-manager/font-manager-0.5.7-r1.ebuild similarity index 60% rename from media-gfx/font-manager/font-manager-0.5.7.ebuild rename to media-gfx/font-manager/font-manager-0.5.7-r1.ebuild index 22fff1e..187326e 100644 --- a/media-gfx/font-manager/font-manager-0.5.7.ebuild +++ b/media-gfx/font-manager/font-manager-0.5.7-r1.ebuild @@ -2,7 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=2 +EAPI=5 + +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE=sqlite + +inherit eutils python-single-r1 DESCRIPTION="A font management application for the GNOME desktop" HOMEPAGE="http://code.google.com/p/font-manager"; @@ -13,16 +18,25 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=dev-lang/python-2.6[sqlite]" +DEPEND="${PYTHON_DEPS}" RDEPEND="${DEPEND} - dev-python/pygtk - dev-python/pygobject - dev-python/pycairo + dev-python/pygtk[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] dev-libs/libxml2[python] media-libs/fontconfig >=media-libs/freetype-2.3.11 dev-db/sqlite:3" +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc47.patch + epatch "${FILESDIR}"/${P}-nonexistent-cache.patch +} + +src_compile() { + emake STRIP_LIB= +} + src_install() { emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog INSTALL NEWS README TODO || die
