Hello community, here is the log from the commit of package fontinfo for openSUSE:Factory checked in at 2014-05-24 07:40:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontinfo (Old) and /work/SRC/openSUSE:Factory/.fontinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/fontinfo/fontinfo.changes 2014-02-28 16:26:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontinfo.new/fontinfo.changes 2014-05-24 07:41:00.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 23 14:20:39 UTC 2014 - [email protected] + +- updated to version 20140523 + * fix sle12 ymp distroversion + * 1-click-install link explicitely visible on Font Card + * 1-click-install link in Family Overview page + +------------------------------------------------------------------- Old: ---- fontinfo-20140228.tar.bz2 New: ---- fontinfo-20140523.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontinfo.spec ++++++ --- /var/tmp/diff_new_pack.v6z6Ai/_old 2014-05-24 07:41:01.000000000 +0200 +++ /var/tmp/diff_new_pack.v6z6Ai/_new 2014-05-24 07:41:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: fontinfo -Version: 20140228 +Version: 20140523 Release: 0 Summary: Overview of Installed Fonts License: GPL-2.0+ ++++++ fontinfo-20140228.tar.bz2 -> fontinfo-20140523.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140228/Makefile new/fontinfo-20140523/Makefile --- old/fontinfo-20140228/Makefile 2014-02-28 09:26:28.000000000 +0100 +++ new/fontinfo-20140523/Makefile 2014-05-23 16:18:23.000000000 +0200 @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. DIRS = languages -VERSION = 20140228 +VERSION = 20140523 PKGMAN_CFLAGS = $(shell sh ./package-manager.sh --cflags) PKGMAN_LIBS = $(shell sh ./package-manager.sh --libs) LIBPNG_CFLAGS = $(shell pkg-config --cflags libpng) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140228/bento-style.c new/fontinfo-20140523/bento-style.c --- old/fontinfo-20140228/bento-style.c 2014-02-28 09:26:27.000000000 +0100 +++ new/fontinfo-20140523/bento-style.c 2014-05-23 16:18:23.000000000 +0200 @@ -797,7 +797,7 @@ FcFontSet *styleset = (FcFontSet *)output_arg[0]; family_info_t *fi = (family_info_t *)output_arg[1]; - FcChar8 *family, *style; + FcChar8 *family, *style, *file; FcCharSet *charset; char style_ww[STYLE_NAME_LEN_MAX]; char family_ww[FAMILY_NAME_LEN_MAX]; @@ -812,6 +812,9 @@ uinterval_stat_t script_stats[NUMSCRIPTS]; int nscripts, v; + char filename[FILEPATH_MAX]; + package_info_t pi; + assert(fcinfo_get_translated_string(styleset->fonts[0], FC_FAMILY, LANG_EN, &family) == FcResultMatch); @@ -856,6 +859,10 @@ snprintf(style_ww, STYLE_NAME_LEN_MAX, "%s", (char *)style); remove_spaces_and_slashes(style_ww); + assert(FcPatternGetString(styleset->fonts[s], FC_FILE, 0, &file) + == FcResultMatch); + file_from_package((char *)file, &pi); + fprintf(html, " <tr>\n"); fprintf(html, @@ -909,6 +916,17 @@ SPECIMEN_WIDTH_MAX, NULL, NULL); fprintf(html, " </td>\n"); + if (pi.name[0]) + { + generate_ymp(config, pi.name, filename); + fprintf(html, + " <td>\n"); + fprintf(html, + " <a style=\"font-weight:bold;color:#690\"" + " href=../%s>1 Click Install</a>", filename); + fprintf(html, + " </td>\n"); + } fprintf(html, " </tr>\n"); } @@ -1293,38 +1311,37 @@ if (pi.name[0]) { fprintf(html, - " <tr><td><b>Name:</b></td><td>"); + " <tr><td><b>Name:</b></td><td>%s</td><td>", pi.name); if (config.install_type == YMP) { generate_ymp(config, pi.name, filename); fprintf(html, - "<a href=\"../%s\">", filename); + "<a style=\"font-weight:bold;color:#690\" href=../%s>" + "1 Click Install</a>", filename); } fprintf(html, - "%s", pi.name); - if (config.install_type == YMP) - fprintf(html, - "</a>"); - fprintf(html, "</td></tr>\n"); } if (pi.version[0]) fprintf(html, - " <tr><td><b>Version:</b></td><td>%s</td></tr>\n", - pi.version); + " <tr><td><b>Version:</b></td>" + "<td colspan=\"%d\">%s</td></tr>\n", + config.install_type == YMP ? 2 : 1, pi.version); if (pi.url[0]) fprintf(html, " <tr><td><b>Url:</b></td>" - "<td><a href=\"%s\">%s</a></td></tr>\n", - pi.url, pi.url); + "<td colspan=\"%d\"><a href=\"%s\">%s</a></td></tr>\n", + config.install_type == YMP ? 2 : 1, pi.url, pi.url); if (pi.license[0]) fprintf(html, - " <tr><td><b>License:</b></td><td>%s</td></tr>\n", - pi.license); + " <tr><td><b>License:</b></td>" + "<td colspan=\"%d\">%s</td></tr>\n", + config.install_type == YMP ? 2 : 1, pi.license); if (pi.description[0]) fprintf(html, - " <tr><td><b>Description:</b></td><td>%s</td></tr>\n", - pi.description); + " <tr><td><b>Description:</b></td>" + "<td colspan=\"%d\">%s</td></tr>\n", + config.install_type == YMP ? 2 : 1, pi.description); if (config.install_type == REPO) { fprintf(html, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140228/fontinfo-suse.sh new/fontinfo-20140523/fontinfo-suse.sh --- old/fontinfo-20140228/fontinfo-suse.sh 2014-02-28 09:26:28.000000000 +0100 +++ new/fontinfo-20140523/fontinfo-suse.sh 2014-05-23 16:18:23.000000000 +0200 @@ -22,8 +22,8 @@ -n ymp \ -g \ -r 'openSUSE 13.2,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ - -r 'SLES 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ - -r 'SLED 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ + -r 'SUSE Linux Enterprise Server 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ + -r 'SUSE Linux Enterprise Desktop 12,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_Factory' \ -r 'openSUSE 13.1,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_13.1' \ -r 'openSUSE 12.3,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_12.3' \ -r 'openSUSE 12.2,http://download.opensuse.org/repositories/M17N:/fonts/openSUSE_12.2' \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
