Hello community, here is the log from the commit of package fontinfo for openSUSE:Factory checked in at 2014-06-10 14:38:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-24 07:41:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fontinfo.new/fontinfo.changes 2014-06-10 14:38:33.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 30 09:50:32 UTC 2014 - [email protected] + +- updated to version 20140530 + * 1-click-install link even in detailed view + +------------------------------------------------------------------- Old: ---- fontinfo-20140523.tar.bz2 New: ---- fontinfo-20140530.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontinfo.spec ++++++ --- /var/tmp/diff_new_pack.2HSRLS/_old 2014-06-10 14:38:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2HSRLS/_new 2014-06-10 14:38:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: fontinfo -Version: 20140523 +Version: 20140530 Release: 0 Summary: Overview of Installed Fonts License: GPL-2.0+ ++++++ fontinfo-20140523.tar.bz2 -> fontinfo-20140530.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140523/CHANGES new/fontinfo-20140530/CHANGES --- old/fontinfo-20140523/CHANGES 2014-05-23 16:18:23.000000000 +0200 +++ new/fontinfo-20140530/CHANGES 2014-05-30 12:32:30.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri May 30 09:50:32 UTC 2014 - [email protected] + +Version 20140530 + * 1-click-install link even in detailed view + +------------------------------------------------------------------- +Fri May 23 14:20:39 UTC 2014 - [email protected] + +Version 20140523 + * fix sle12 ymp distroversion + * 1-click-install link explicitely visible on Font Card + * 1-click-install link in Family Overview page + +------------------------------------------------------------------- Fri Feb 28 08:21:49 UTC 2014 - [email protected] Version 2014028 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fontinfo-20140523/Makefile new/fontinfo-20140530/Makefile --- old/fontinfo-20140523/Makefile 2014-05-23 16:18:23.000000000 +0200 +++ new/fontinfo-20140530/Makefile 2014-05-30 12:32:30.000000000 +0200 @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. DIRS = languages -VERSION = 20140523 +VERSION = 20140530 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-20140523/bento-style.c new/fontinfo-20140530/bento-style.c --- old/fontinfo-20140523/bento-style.c 2014-05-23 16:18:23.000000000 +0200 +++ new/fontinfo-20140530/bento-style.c 2014-05-30 12:32:30.000000000 +0200 @@ -553,7 +553,7 @@ FcFontSet *fontset = (FcFontSet *)output_arg[0]; int *generate_png_files = (int *)output_arg[1]; int f; - FcChar8 *family, *family2; + FcChar8 *family, *family2, *file; char family_ww[FAMILY_NAME_LEN_MAX]; FcChar32 ucs4_sentence[SENTENCE_NCHARS]; @@ -564,12 +564,16 @@ uinterval_stat_t script_stats[NUMSCRIPTS]; int nscripts, v; + package_info_t pi; + char filename[FILEPATH_MAX]; + assert(fcinfo_get_translated_string(fontset->fonts[0], FC_FAMILY, LANG_EN, &family) == FcResultMatch); assert(fcinfo_get_translated_string(fontset->fonts[fontset->nfont-1], FC_FAMILY, LANG_EN, &family2) == FcResultMatch); + if (family[0] == family2[0]) fprintf(html, " <h1>"FAMILIES_INDEX" in %s - %c</h1>\n", @@ -593,6 +597,10 @@ snprintf(family_ww, FAMILY_NAME_LEN_MAX, "%s", (const char *)family); remove_spaces_and_slashes(family_ww); + assert(FcPatternGetString(fontset->fonts[0], FC_FILE, 0, &file) + == FcResultMatch); + file_from_package((char *)file, &pi); + fprintf(html, " <tr>\n"); fprintf(html, @@ -646,6 +654,19 @@ SPECIMEN_WIDTH_MAX, NULL, NULL); fprintf(html, " </td>\n"); + + if (config.install_type == YMP && pi.name[0]) + { + generate_ymp(config, pi.name, filename); + fprintf(html, + " <td style=\"vertical-align:middle\">\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"); } @@ -916,14 +937,14 @@ SPECIMEN_WIDTH_MAX, NULL, NULL); fprintf(html, " </td>\n"); - if (pi.name[0]) + if (config.install_type == YMP && pi.name[0]) { generate_ymp(config, pi.name, filename); fprintf(html, - " <td>\n"); + " <td style=\"vertical-align:middle\">\n"); fprintf(html, " <a style=\"font-weight:bold;color:#690\"" - " href=../%s>1 Click Install</a>", filename); + " href=../%s>1 Click Install</a>", filename); fprintf(html, " </td>\n"); } @@ -1317,7 +1338,7 @@ generate_ymp(config, pi.name, filename); fprintf(html, "<a style=\"font-weight:bold;color:#690\" href=../%s>" - "1 Click Install</a>", filename); + "1 Click Install</a>", filename); } fprintf(html, "</td></tr>\n"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
