Hello community, here is the log from the commit of package gnome-font-viewer for openSUSE:Factory checked in at 2017-03-22 22:59:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-font-viewer (Old) and /work/SRC/openSUSE:Factory/.gnome-font-viewer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-font-viewer" Wed Mar 22 22:59:57 2017 rev:23 rq:461948 version:3.23.91 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-font-viewer/gnome-font-viewer.changes 2016-10-03 09:33:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-font-viewer.new/gnome-font-viewer.changes 2017-03-22 23:00:01.059046084 +0100 @@ -1,0 +2,10 @@ +Thu Mar 2 13:32:11 UTC 2017 - [email protected] + +- Update to version 3.23.91: + + Listen to fontconfig timestamp notifications instead of using + file monitors. + + Only show scalable fonts (bgo#771857). +- Drop gnome-font-viewer-only-show-scalable-fonts.patch: Fixed + upstream. + +------------------------------------------------------------------- Old: ---- gnome-font-viewer-3.22.0.tar.xz gnome-font-viewer-only-show-scalable-fonts.patch New: ---- gnome-font-viewer-3.23.91.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-font-viewer.spec ++++++ --- /var/tmp/diff_new_pack.r0wJGL/_old 2017-03-22 23:00:01.670959341 +0100 +++ /var/tmp/diff_new_pack.r0wJGL/_new 2017-03-22 23:00:01.674958774 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-font-viewer # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: gnome-font-viewer -Version: 3.22.0 +Version: 3.23.91 Release: 0 Summary: A font viewer utility for GNOME License: GPL-2.0+ Group: System/GUI/GNOME Url: http://download.gnome.org/sources/gnome-font-viewer -Source: http://download.gnome.org/sources/gnome-font-viewer/3.22/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnome-font-viewer-only-show-scalable-fonts.patch [email protected] -- Only show fonts that makes sense and modern. -Patch0: gnome-font-viewer-only-show-scalable-fonts.patch +Source: http://download.gnome.org/sources/gnome-font-viewer/3.23/%{name}-%{version}.tar.xz BuildRequires: intltool %if !0%{?is_opensuse} BuildRequires: translation-update-upstream @@ -48,7 +46,6 @@ %lang_package %prep %setup -q -%patch0 -p1 %if !0%{?is_opensuse} translation-update-upstream %endif ++++++ gnome-font-viewer-3.22.0.tar.xz -> gnome-font-viewer-3.23.91.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/Makefile.in new/gnome-font-viewer-3.23.91/Makefile.in --- old/gnome-font-viewer-3.22.0/Makefile.in 2016-09-20 07:29:38.000000000 +0200 +++ new/gnome-font-viewer-3.23.91/Makefile.in 2017-03-02 04:28:09.000000000 +0100 @@ -590,7 +590,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -615,7 +615,7 @@ @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -633,7 +633,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -643,7 +643,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/NEWS new/gnome-font-viewer-3.23.91/NEWS --- old/gnome-font-viewer-3.22.0/NEWS 2016-09-20 07:27:14.000000000 +0200 +++ new/gnome-font-viewer-3.23.91/NEWS 2017-03-02 04:27:27.000000000 +0100 @@ -1,3 +1,9 @@ +GNOME Font Viewer - 3.23.91 +------------------------------------------------------------------------------- + +• Listen to fontconfig timestamp notifications instead of using file monitors +• Only show scalable fonts (#771857, Michael Catanzaro) + GNOME Font Viewer - 3.22.0 ------------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/aclocal.m4 new/gnome-font-viewer-3.23.91/aclocal.m4 --- old/gnome-font-viewer-3.22.0/aclocal.m4 2016-09-20 07:29:37.000000000 +0200 +++ new/gnome-font-viewer-3.23.91/aclocal.m4 2017-03-02 04:28:08.000000000 +0100 @@ -54,7 +54,7 @@ ]) dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) +dnl serial 11 (pkg-config-0.29.1) dnl dnl Copyright © 2004 Scott James Remnant <[email protected]>. dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> @@ -96,7 +96,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.1]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/configure new/gnome-font-viewer-3.23.91/configure --- old/gnome-font-viewer-3.22.0/configure 2016-09-20 07:29:37.000000000 +0200 +++ new/gnome-font-viewer-3.23.91/configure 2017-03-02 04:28:08.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-font-viewer 3.22.0. +# Generated by GNU Autoconf 2.69 for gnome-font-viewer 3.23.91. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-font-viewer>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-font-viewer' PACKAGE_TARNAME='gnome-font-viewer' -PACKAGE_VERSION='3.22.0' -PACKAGE_STRING='gnome-font-viewer 3.22.0' +PACKAGE_VERSION='3.23.91' +PACKAGE_STRING='gnome-font-viewer 3.23.91' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-font-viewer' PACKAGE_URL='http://live.gnome.org/GnomeUtils' @@ -1380,7 +1380,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-font-viewer 3.22.0 to adapt to many kinds of systems. +\`configure' configures gnome-font-viewer 3.23.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-font-viewer 3.22.0:";; + short | recursive ) echo "Configuration of gnome-font-viewer 3.23.91:";; esac cat <<\_ACEOF @@ -1578,7 +1578,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-font-viewer configure 3.22.0 +gnome-font-viewer configure 3.23.91 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1977,7 +1977,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-font-viewer $as_me 3.22.0, which was +It was created by gnome-font-viewer $as_me 3.23.91, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2956,7 +2956,7 @@ # Define the identity of the package. PACKAGE='gnome-font-viewer' - VERSION='3.22.0' + VERSION='3.23.91' cat >>confdefs.h <<_ACEOF @@ -17570,7 +17570,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-font-viewer $as_me 3.22.0, which was +This file was extended by gnome-font-viewer $as_me 3.23.91, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17637,7 +17637,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-font-viewer config.status 3.22.0 +gnome-font-viewer config.status 3.23.91 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/configure.ac new/gnome-font-viewer-3.23.91/configure.ac --- old/gnome-font-viewer-3.22.0/configure.ac 2016-09-20 07:27:23.000000000 +0200 +++ new/gnome-font-viewer-3.23.91/configure.ac 2017-03-02 04:27:35.000000000 +0100 @@ -1,6 +1,6 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.63) -AC_INIT([gnome-font-viewer], [3.22.0], +AC_INIT([gnome-font-viewer], [3.23.91], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-font-viewer], [gnome-font-viewer], [http://live.gnome.org/GnomeUtils]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/po/hr.po new/gnome-font-viewer-3.23.91/po/hr.po --- old/gnome-font-viewer-3.22.0/po/hr.po 2015-01-19 23:01:05.000000000 +0100 +++ new/gnome-font-viewer-3.23.91/po/hr.po 2017-03-02 04:25:27.000000000 +0100 @@ -5,96 +5,141 @@ msgstr "" "Project-Id-Version: gnome-utils 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-06 14:35-0400\n" -"PO-Revision-Date: 2008-04-15 00:46+0000\n" -"Last-Translator: Launchpad Translations Administrators <rosetta@launchpad." -"net>\n" +"POT-Creation-Date: 2016-09-20 16:52+0000\n" +"PO-Revision-Date: 2015-10-14 18:40+0000\n" +"Last-Translator: gogo <[email protected]>\n" "Language-Team: Croatian <[email protected]>\n" -"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2008-05-27 22:39+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2016-09-22 19:56+0000\n" +"X-Generator: Launchpad (build 18204)\n" +"Language: hr\n" -#: ../src/font-thumbnailer.c:267 +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:1 ../src/font-view.c:76 +msgid "GNOME Font Viewer" +msgstr "GNOME preglednik slova" + +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:2 ../src/font-view.c:787 +#: ../src/org.gnome.font-viewer.desktop.in.in.h:2 +msgid "View fonts on your system" +msgstr "Pregledajte slova na vašem sustavu" + +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:3 +msgid "" +"GNOME Font Viewer shows you the fonts installed on your computer for your " +"use as thumbnails. Selecting any thumbnails shows the full view of how the " +"font would look under various sizes." +msgstr "" +"GNOME preglednik slova prikazuje vam slova instalirana na vaše računalo, " +"prikazana kao minijature. Odabir bilo koje minijature prikazuje cjelovit " +"prikaz kako slova izgledaju u različitim veličinama." + +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:4 +msgid "" +"GNOME Font Viewer also supports installing new font files downloaded in the " +".ttf and other formats. Fonts may be installed only for your use or made " +"available to all users on the computer." +msgstr "" +"GNOME preglednik slova isto tako podržava instalaciju datoteka novih slova " +"preuzetih u .ttf i ostalim formatima. Slova možete instalirati samo za " +"vlastitu upotrebu ili ih možete učiniti dostupnim ostalim korisnicima na " +"računalu." + +#: ../src/font-thumbnailer.c:191 msgid "Text to thumbnail (default: Aa)" -msgstr "" +msgstr "Tekst kraj minijature (uobičajeno: Aa)" -#: ../src/font-thumbnailer.c:267 +#: ../src/font-thumbnailer.c:191 msgid "TEXT" -msgstr "" +msgstr "TEKST" -#: ../src/font-thumbnailer.c:269 -msgid "Font size (default: 64)" -msgstr "" +#: ../src/font-thumbnailer.c:193 +msgid "Thumbnail size (default: 128)" +msgstr "Veličina minijature (uobičajeno: 128)" -#: ../src/font-thumbnailer.c:269 +#: ../src/font-thumbnailer.c:193 msgid "SIZE" -msgstr "" +msgstr "VELIČINA" -#: ../src/font-thumbnailer.c:271 +#: ../src/font-thumbnailer.c:195 msgid "FONT-FILE OUTPUT-FILE" -msgstr "" +msgstr "DATOTEKA-SLOVA IZLAZNA-DATOTEKA" -#: ../src/font-view.c:289 -#, fuzzy -msgid "Name:" -msgstr "_Ime" +#: ../src/font-view-app-menu.ui.h:1 +msgid "About" +msgstr "O programu" -#: ../src/font-view.c:292 -msgid "Style:" -msgstr "" +#: ../src/font-view-app-menu.ui.h:2 +msgid "Quit" +msgstr "Zatvori" -#: ../src/font-view.c:304 -#, fuzzy -msgid "Type:" -msgstr "Tip" - -#: ../src/font-view.c:308 -#, fuzzy -msgid "Size:" -msgstr "Veličina" - -#: ../src/font-view.c:352 ../src/font-view.c:365 -#, fuzzy -msgid "Version:" -msgstr "Inačica: " +#: ../src/font-view.c:84 +msgid "Show the application's version" +msgstr "Prikaži inačicu aplikacije" -#: ../src/font-view.c:356 ../src/font-view.c:367 -msgid "Copyright:" -msgstr "" +#: ../src/font-view.c:196 +msgid "Name" +msgstr "Naziv" -#: ../src/font-view.c:360 -#, fuzzy -msgid "Description:" -msgstr "_Pojašnjenje:" +#: ../src/font-view.c:199 +msgid "Style" +msgstr "Stil" -#: ../src/font-view.c:428 -msgid "Installed" -msgstr "" +#: ../src/font-view.c:209 +msgid "Type" +msgstr "Vrsta" + +#: ../src/font-view.c:254 ../src/font-view.c:273 +msgid "Version" +msgstr "Inačica" -#: ../src/font-view.c:430 +#: ../src/font-view.c:259 ../src/font-view.c:279 +msgid "Copyright" +msgstr "Autorsko pravo" + +#: ../src/font-view.c:264 +msgid "Description" +msgstr "Opis" + +#: ../src/font-view.c:295 msgid "Install Failed" -msgstr "" +msgstr "Neuspjela instalacija" -#: ../src/font-view.c:502 -#, c-format -msgid "Usage: %s fontfile\n" -msgstr "" +#: ../src/font-view.c:302 +msgid "Installed" +msgstr "Instalirano" -#: ../src/font-view.c:572 -msgid "I_nstall Font" -msgstr "" +#: ../src/font-view.c:306 ../src/font-view.c:551 +msgid "Install" +msgstr "Instaliraj" -#: ../src/gnome-font-viewer.desktop.in.in.h:1 -#, fuzzy +#: ../src/font-view.c:440 +msgid "This font could not be displayed." +msgstr "Slova ne mogu biti prikazana." + +#: ../src/font-view.c:504 ../src/font-view.c:562 +msgid "Info" +msgstr "Informacije" + +#: ../src/font-view.c:577 +msgid "Back" +msgstr "Natrag" + +#: ../src/font-view.c:668 +msgid "All Fonts" +msgstr "Sva slova" + +#: ../src/font-view.c:786 ../src/org.gnome.font-viewer.desktop.in.in.h:1 msgid "Font Viewer" -msgstr "Preglednik dnevnika" +msgstr "Preglednik slova" + +#: ../src/font-view.c:789 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" gogo https://launchpad.net/~trebelnik-stefina"; -#: ../src/gnome-font-viewer.desktop.in.in.h:2 -#, fuzzy -msgid "Preview fonts" -msgstr "Ispiši ovaj dokument" +#: ../src/org.gnome.font-viewer.desktop.in.in.h:3 +msgid "fonts;fontface;" +msgstr "slova;izgledslova;" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/po/[email protected] new/gnome-font-viewer-3.23.91/po/[email protected] --- old/gnome-font-viewer-3.22.0/po/[email protected] 2015-11-21 22:22:38.000000000 +0100 +++ new/gnome-font-viewer-3.23.91/po/[email protected] 2017-03-02 04:25:27.000000000 +0100 @@ -1,60 +1,71 @@ # Uzbek (Cyrillic) translation for gnome-font-viewer. # Copyright (C) 2012 gnome-font-viewer's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-font-viewer package. -# Bahodir Mansurov <[email protected]>, 2012. +# Bahodir Mansurov <[email protected]>, 2012, 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-font-viewer gnome-3-6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"; "font-viewer&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-10-06 18:54+0000\n" -"PO-Revision-Date: 2014-10-21 23:08-0500\n" -"Last-Translator: Bahodir Mansurov <[email protected]>\n" -"Language-Team: Uzbek (Cyrillic) <uz@[email protected]>\n" +"POT-Creation-Date: 2016-09-22 22:09+0000\n" +"PO-Revision-Date: 2016-10-15 22:59-0400\n" +"Last-Translator: Bahodir Mansurov <[email protected]>\n" +"Language-Team: Uzbek <[email protected]>\n" "Language: uz@cyrillic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.10\n" +"X-Generator: Poedit 1.8.9\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../data/org.gnome.font-viewer.appdata.xml.in.h:1 +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:1 ../src/font-view.c:76 +#| msgid "Font Viewer" +msgid "GNOME Font Viewer" +msgstr "GNOME шрифт кўрувчиси" + +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:2 ../src/font-view.c:787 +#: ../src/org.gnome.font-viewer.desktop.in.in.h:2 +msgid "View fonts on your system" +msgstr "Системадаги шрифтларни кўриш" + +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:3 msgid "" "GNOME Font Viewer shows you the fonts installed on your computer for your " "use as thumbnails. Selecting any thumbnails shows the full view of how the " "font would look under various sizes." msgstr "" -"GNOME шрифт кўрувчи компьютерингизда ўрнатилган шрифтларни сизга миниатура " -"сифатида кўрсатади. Бирор шрифт миниатурасини танласангиз ўша шрифтни ҳар " +"GNOME Шрифт Кўрувчи компьютерингизда ўрнатилган шрифтларни сизга миниатура " +"сифатида кўрсатади. Бирор шрифт миниатурасини танласангиз ўша шрифтни ҳар " "хил ўлчамдаги кўринишларини кўришингиз мумкин." -#: ../data/org.gnome.font-viewer.appdata.xml.in.h:2 +#: ../data/org.gnome.font-viewer.appdata.xml.in.h:4 msgid "" "GNOME Font Viewer also supports installing new font files downloaded in the ." "ttf and other formats. Fonts may be installed only for your use or made " "available to all users on the computer." msgstr "" -"GNOME шрифт кўрувчи .ttf ва бошқа форматларда юклаб олинган шрифтларни " +"GNOME Шрифт Кўрувчи .ttf ва бошқа форматларда юклаб олинган шрифтларни " "ўрнатишни қўллайди. Шрифтларни ушбу фойдаланувчи ёки компьютернинг барча " -"фойдаланувчилари учун ўрнатса бўлади. " +"фойдаланувчилари учун ўрнатса бўлади." -#: ../src/font-thumbnailer.c:189 +#: ../src/font-thumbnailer.c:191 msgid "Text to thumbnail (default: Aa)" msgstr "Миниатюра учун матн (андоза: Аа)" -#: ../src/font-thumbnailer.c:189 +#: ../src/font-thumbnailer.c:191 msgid "TEXT" msgstr "МАТН" -#: ../src/font-thumbnailer.c:191 +#: ../src/font-thumbnailer.c:193 msgid "Thumbnail size (default: 128)" msgstr "Миниатюра ҳажми (андоза: 128)" -#: ../src/font-thumbnailer.c:191 +#: ../src/font-thumbnailer.c:193 msgid "SIZE" msgstr "ҲАЖМИ" -#: ../src/font-thumbnailer.c:193 +#: ../src/font-thumbnailer.c:195 msgid "FONT-FILE OUTPUT-FILE" msgstr "ҲАРФ-ФАЙЛИ ЧИҚИШ-ФАЙЛИ" @@ -66,69 +77,69 @@ msgid "Quit" msgstr "Чиқиш" -#: ../src/font-view.c:176 +#: ../src/font-view.c:84 +msgid "Show the application's version" +msgstr "Дастур версиясини кўрсатиш" + +#: ../src/font-view.c:196 msgid "Name" -msgstr "Ном" +msgstr "Номи" -#: ../src/font-view.c:179 +#: ../src/font-view.c:199 msgid "Style" msgstr "Услуби" -#: ../src/font-view.c:189 +#: ../src/font-view.c:209 msgid "Type" msgstr "Тури" -#: ../src/font-view.c:234 ../src/font-view.c:253 +#: ../src/font-view.c:254 ../src/font-view.c:273 msgid "Version" -msgstr "Талқини" +msgstr "Версияси" -#: ../src/font-view.c:239 ../src/font-view.c:259 +#: ../src/font-view.c:259 ../src/font-view.c:279 msgid "Copyright" msgstr "Авторлик ҳуқуқи" -#: ../src/font-view.c:244 +#: ../src/font-view.c:264 msgid "Description" msgstr "Тавсифи" -#: ../src/font-view.c:272 +#: ../src/font-view.c:295 msgid "Install Failed" -msgstr "Ўрнатиб бўлинмади" +msgstr "Ўрнатиб бўлмади" -#: ../src/font-view.c:278 +#: ../src/font-view.c:302 msgid "Installed" msgstr "Ўрнатилди" -#: ../src/font-view.c:281 ../src/font-view.c:525 +#: ../src/font-view.c:306 ../src/font-view.c:551 msgid "Install" msgstr "Ўрнатиш" -#: ../src/font-view.c:414 +#: ../src/font-view.c:440 msgid "This font could not be displayed." msgstr "Ушбу шрифтни кўрсатиб бўлмади." -#: ../src/font-view.c:478 ../src/font-view.c:536 +#: ../src/font-view.c:504 ../src/font-view.c:562 msgid "Info" msgstr "Маълумот" -#: ../src/font-view.c:553 +#: ../src/font-view.c:577 msgid "Back" msgstr "Орқага" -#: ../src/font-view.c:643 +#: ../src/font-view.c:668 msgid "All Fonts" msgstr "Барча ҳарфлар" -#: ../src/font-view.c:761 ../src/org.gnome.font-viewer.desktop.in.in.h:1 +#: ../src/font-view.c:786 ../src/org.gnome.font-viewer.desktop.in.in.h:1 msgid "Font Viewer" msgstr "Ҳарфларни Кўрувчи дастури" -#: ../src/font-view.c:762 ../src/org.gnome.font-viewer.desktop.in.in.h:2 -msgid "View fonts on your system" -msgstr "Системадаги фонтларни кўриш" - -#: ../src/font-view.c:764 +#: ../src/font-view.c:789 msgid "translator-credits" -msgstr "Баҳодир Мансуров <[email protected]>, 2012" +msgstr "Баҳодир Мансуров <[email protected]>" #: ../src/org.gnome.font-viewer.desktop.in.in.h:3 msgid "fonts;fontface;" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-font-viewer-3.22.0/src/font-model.c new/gnome-font-viewer-3.23.91/src/font-model.c --- old/gnome-font-viewer-3.22.0/src/font-model.c 2016-03-29 17:11:58.000000000 +0200 +++ new/gnome-font-viewer-3.23.91/src/font-model.c 2017-03-02 04:25:27.000000000 +0100 @@ -50,12 +50,12 @@ FT_Library library; - GList *monitors; cairo_surface_t *fallback_icon; GCancellable *cancellable; gint scale_factor; guint font_list_idle_id; + guint fontconfig_update_id; }; enum { @@ -495,6 +495,7 @@ self->priv->font_list = NULL; } + FcPatternAddBool (pat, FC_SCALABLE, FcTrue); self->priv->font_list = FcFontList (NULL, pat, os); g_mutex_unlock (&self->priv->font_list_mutex); @@ -556,47 +557,14 @@ } static void -file_monitor_changed_cb (GFileMonitor *monitor, - GFile *file, - GFile *other_file, - GFileMonitorEvent event, - gpointer user_data) +connect_to_fontconfig_updates (FontViewModel *self) { - FontViewModel *self = user_data; - - if (event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || - event == G_FILE_MONITOR_EVENT_DELETED || - event == G_FILE_MONITOR_EVENT_CREATED) - ensure_font_list (self); -} - -static void -create_file_monitors (FontViewModel *self) -{ - FcConfig *config; - FcStrList *str_list; - FcChar8 *path; - GFile *file; - GFileMonitor *monitor; - - config = FcConfigGetCurrent (); - str_list = FcConfigGetFontDirs (config); + GtkSettings *settings; - while ((path = FcStrListNext (str_list)) != NULL) { - file = g_file_new_for_path ((const gchar *) path); - monitor = g_file_monitor (file, G_FILE_MONITOR_NONE, - NULL, NULL); - - if (monitor != NULL) { - self->priv->monitors = g_list_prepend (self->priv->monitors, monitor); - g_signal_connect (monitor, "changed", - G_CALLBACK (file_monitor_changed_cb), self); - } - - g_object_unref (file); - } - - FcStrListDone (str_list); + settings = gtk_settings_get_default (); + self->priv->fontconfig_update_id = + g_signal_connect_swapped (settings, "notify::gtk-fontconfig-timestamp", + G_CALLBACK (ensure_font_list), self); } static void @@ -624,13 +592,14 @@ NULL, NULL); schedule_update_font_list (self); - create_file_monitors (self); + connect_to_fontconfig_updates (self); } static void font_view_model_finalize (GObject *obj) { FontViewModel *self = FONT_VIEW_MODEL (obj); + GtkSettings *settings; if (self->priv->cancellable) { g_cancellable_cancel (self->priv->cancellable); @@ -652,9 +621,14 @@ self->priv->font_list_idle_id = 0; } + if (self->priv->fontconfig_update_id != 0) { + settings = gtk_settings_get_default (); + g_signal_handler_disconnect (settings, self->priv->fontconfig_update_id); + self->priv->fontconfig_update_id = 0; + } + g_mutex_clear (&self->priv->font_list_mutex); g_clear_pointer (&self->priv->fallback_icon, cairo_surface_destroy); - g_list_free_full (self->priv->monitors, (GDestroyNotify) g_object_unref); G_OBJECT_CLASS (font_view_model_parent_class)->finalize (obj); }
