Hello community, here is the log from the commit of package fontconfig for openSUSE:Factory checked in at 2012-04-17 21:58:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontconfig (Old) and /work/SRC/openSUSE:Factory/.fontconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/fontconfig/fontconfig.changes 2012-01-06 11:43:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontconfig.new/fontconfig.changes 2012-04-17 21:58:26.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Mar 21 14:59:41 UTC 2012 - [email protected] + +- updated to 2.9.0: + * many bugfixes, see NEWS + * removed suse-font-dirs.conf + * changed suse-hinting.conf: use hintslight with autohinter, + hintfull only for BCI [bnc#722427] + * include suse-generic-names.conf again + * added Cantarell into suse-generic-names.conf and suse-post-user.conf + (sans-serif font) + * added STIXGeneral into suse-generic-names.conf and suse-post-user.conf + (serif font) + * turn autohinter on for Liberation Sans (BCI off) + * dropped upstreamed urw-aliases-whitespaces.patch + * dropped upstreamed bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch + * dropped upstreamed bugzilla-179457-fix-font-file-names-for-wine.patch + (https://bugzilla.novell.com/show_bug.cgi?id=179457#c8) + * dropped upstreamed bnc438855-make-FcInitReinitialize-work-again.patch + * dropped AppleRoman-DynaFont.patch + +------------------------------------------------------------------- Old: ---- 10-lcdfilter-lcddefault.conf AppleRoman-DynaFont.patch bnc438855-make-FcInitReinitialize-work-again.patch bugzilla-179457-fix-font-file-names-for-wine.patch bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch conf.patch fontconfig-2.8.0.tar.bz2 fontconfig-doc-2.8.0.tar.bz2 fontconfig-ocloexec.patch fontconfig-visibility.patch suse-font-dirs.conf urw-aliases-whitespaces.patch New: ---- cloexec.patch fontconfig-2.9.0.tar.bz2 fontconfig-doc-2.9.0.tar.bz2 simsun-conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ --- /var/tmp/diff_new_pack.Dm6qpJ/_old 2012-04-17 21:58:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Dm6qpJ/_new 2012-04-17 21:58:28.000000000 +0200 @@ -47,19 +47,12 @@ Obsoletes: fontconfig-64bit %endif Requires: bash -Version: 2.8.0 +Version: 2.9.0 Release: 0 Summary: Library for Font Configuration License: MIT Group: System/Libraries -# CVS can be found here: (CVS is gone, fontconfig uses git now). -# $ cvs -d :pserver:[email protected]:/cvs/fontconfig login -# CVS password: <hit return> -# $ cvs -d :pserver:[email protected]:/cvs/fontconfig co fontconfig -# Source0: http://fontconfig.org/release/%name-%version.tar.bz2 -# oldneededforbuild expat freetype2 freetype2-devel pkgconfig -# # After building with "build_docs" defined to "1" generate the doc tarball with: # tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt Source1: %name-doc-%version.tar.bz2 @@ -71,23 +64,18 @@ Source12: suse-post-user.conf Source13: suse-hinting.conf Source14: suse-bitmaps.conf -Source15: suse-font-dirs.conf Source16: local.conf Source20: local.conf.instsys Source30: 29-liberation-aliases.conf -Source31: 10-lcdfilter-lcddefault.conf -# http://www.kde.gr.jp/~akito/patch/ -# http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.2.1-AppleRoman-DynaFont.patch -Patch5: AppleRoman-DynaFont.patch -Patch10: conf.patch -Patch16: make-check.patch -Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch -Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch -Patch32: usr-share-doc-packages.patch -Patch33: bnc438855-make-FcInitReinitialize-work-again.patch -Patch34: urw-aliases-whitespaces.patch -Patch35: fontconfig-ocloexec.patch -Patch36: fontconfig-visibility.patch +# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703 +Patch0: simsun-conf.patch +# suse specific because freetype2-bitmap-foundry.patch +# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 +Patch1: make-check.patch +# suse specific +Patch2: usr-share-doc-packages.patch +# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705 +Patch3: cloexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -126,34 +114,25 @@ %if %{build_docs} < 1 tar -xvf %{SOURCE1} %endif -%patch5 -p0 -b .dynafont -%patch10 -p1 -b .fonts.conf -%patch16 -p1 -#%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -%patch36 +%patch0 -p1 -b .fonts.conf +%patch1 -p1 +%patch2 -p1 +%patch3 %build autoreconf -fiv %configure --with-pic --with-arch=%_host_cpu \ -%if %suse_version > 1100 --disable-static \ -%endif --with-freetype-lib=%_libdir \ --with-x \ --enable-libxml2=no \ --with-confdir=/etc/fonts \ --with-docdir=%{_defaultdocdir}/%{name} \ --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ - %if %{build_docs} < 1 + %if %{build_docs} == 0 --disable-docs - %else - # -%endif + %endif +# make %{?_smp_mflags} V=1 %check @@ -167,7 +146,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel install -m 644 AUTHORS COPYING ChangeLog README $RPM_SOURCE_DIR/iso639-? \ $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} -#install -m 644 fc-lang/iso639-{1,2} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} install -m 644 doc/*.html $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig install -m 644 doc/fontconfig-user.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig install -m 644 doc/fontconfig-devel/* $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel @@ -187,12 +165,9 @@ install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail -install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail # tune links in conf.d: pushd $RPM_BUILD_ROOT/etc/fonts/conf.d - ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf - ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf rm -f 50-user.conf rm -f 51-local.conf ln -s ../suse-pre-user.conf 50-suse-pre-user.conf @@ -202,9 +177,7 @@ popd # don't package any files in the cache directory, only the directory itself: rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/* -%if %suse_version > 1100 rm -f %{buildroot}%{_libdir}/*.la -%endif %post -p /sbin/ldconfig @@ -218,7 +191,6 @@ %config /etc/fonts/fonts.dtd %config /etc/fonts/fonts.conf %config /etc/fonts/suse-generic-names.conf -%config /etc/fonts/suse-font-dirs.conf %config /etc/fonts/suse-pre-user.conf %config /etc/fonts/suse-post-user.conf %config %verify(not md5 size mtime) /etc/fonts/suse-hinting.conf @@ -240,9 +212,6 @@ %doc %{_defaultdocdir}/%{name}-devel %{_libdir}/pkgconfig/fontconfig.pc %{_libdir}/libfontconfig.so -%if %suse_version <= 1100 -%{_libdir}/libfontconfig.*a -%endif %{_mandir}/man3/Fc* %{_includedir}/fontconfig/ ++++++ cloexec.patch ++++++ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -57,7 +57,9 @@ dnl ==================================== AC_CONFIG_HEADERS(config.h) -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AC_PROG_INSTALL AC_PROG_LN_S AC_LIBTOOL_WIN32_DLL @@ -119,7 +121,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP -AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) +AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r]) # # Checks for iconv Index: src/fcatomic.c =================================================================== --- src/fcatomic.c.orig +++ src/fcatomic.c @@ -107,10 +107,14 @@ FcAtomicLock (FcAtomic *atomic) #ifdef HAVE_LINK strcpy ((char *) atomic->tmp, (char *) atomic->file); strcat ((char *) atomic->tmp, TMP_NAME); +#ifdef HAVE_MKOSTEMP + fd = mkostemp ((char *) atomic->tmp, O_CLOEXEC); +#else fd = mkstemp ((char *) atomic->tmp); +#endif if (fd < 0) return FcFalse; - f = fdopen (fd, "w"); + f = fdopen (fd, "we"); if (!f) { close (fd); Index: src/fccache.c =================================================================== --- src/fccache.c.orig +++ src/fccache.c @@ -216,7 +216,7 @@ FcDirCacheOpenFile (const FcChar8 *cache if (FcStat (cache_file, file_stat) < 0) return -1; #endif - fd = open((char *) cache_file, O_RDONLY | O_BINARY); + fd = open((char *) cache_file, O_RDONLY | O_BINARY | O_CLOEXEC); if (fd < 0) return fd; #ifndef _WIN32 @@ -963,7 +963,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi if (!FcAtomicLock (atomic)) goto bail3; - fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666); + fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY | O_CLOEXEC, 0666); if (fd == -1) goto bail4; ++++++ fontconfig-2.8.0.tar.bz2 -> fontconfig-2.9.0.tar.bz2 ++++++ ++++ 186544 lines of diff (skipped) ++++++ fontconfig-doc-2.8.0.tar.bz2 -> fontconfig-doc-2.9.0.tar.bz2 ++++++ ++++ 20726 lines of diff (skipped) ++++++ simsun-conf.patch ++++++ Index: fontconfig-2.9.0/conf.d/40-nonlatin.conf =================================================================== --- fontconfig-2.9.0.orig/conf.d/40-nonlatin.conf +++ fontconfig-2.9.0/conf.d/40-nonlatin.conf @@ -89,6 +89,10 @@ <family>FreeSerif</family> <default><family>serif</family></default> </alias> + <alias> + <family>SimSun</family> + <default><family>serif</family></default> + </alias> <!-- Sans-serif faces --> @@ -153,10 +157,6 @@ <default><family>sans-serif</family></default> </alias> <alias> - <family>SimSun</family> - <default><family>sans-serif</family></default> - </alias> - <alias> <family>MgOpen Modata</family> <default><family>sans-serif</family></default> </alias> ++++++ suse-generic-names.conf ++++++ --- /var/tmp/diff_new_pack.Dm6qpJ/_old 2012-04-17 21:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Dm6qpJ/_new 2012-04-17 21:58:29.000000000 +0200 @@ -27,6 +27,7 @@ <family>IPAMincho</family> <family>IPAPMincho</family> <family>Sazanami Mincho</family> + <family>STIXGeneral</family> <default><family>serif</family></default> </alias> <!-- @@ -40,6 +41,7 @@ <family>SUSE Sans</family> <family>FreeSans</family> <family>Liberation Sans</family> + <family>Cantarell</family> <family>HGGothicB</family> <family>HGPGothicB</family> <family>HGGothicE</family> ++++++ suse-hinting.conf ++++++ --- /var/tmp/diff_new_pack.Dm6qpJ/_old 2012-04-17 21:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Dm6qpJ/_new 2012-04-17 21:58:29.000000000 +0200 @@ -24,9 +24,6 @@ <edit name="hinting"> <bool>true</bool> </edit> - <edit name="hintstyle"> - <const>hintfull</const> - </edit> <edit name="antialias"> <bool>true</bool> </edit> @@ -109,6 +106,7 @@ <string>TrueType</string> </test> <test name="family"> + <string>Liberation Sans</string> <string>MS Gothic</string> <string>MS PGothic</string> <string>MS UI Gothic</string> @@ -307,5 +305,33 @@ </edit> </match> +<!-- +bug#722427 +general advice: use hintfull for BCI, hintlight for autohinter +exceptions will follow +--> + <match target="font"> + <test name="autohint"> + <bool>false</bool> + </test> + <edit name="hintstyle"> + <const>hintfull</const> + </edit> + </match> + + <match target="font"> + <test name="autohint"> + <bool>true</bool> + </test> + <edit name="hintstyle"> + <const>hintslight</const> + </edit> + </match> + +<!-- +exceptions: +--> + +<!-- none here so far --> </fontconfig> ++++++ suse-post-user.conf ++++++ --- /var/tmp/diff_new_pack.Dm6qpJ/_old 2012-04-17 21:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Dm6qpJ/_new 2012-04-17 21:58:29.000000000 +0200 @@ -52,6 +52,7 @@ <family>SimSun</family> <family>HanyiSong</family> <family>ZYSong18030</family> + <family>STIXGeneral</family> </prefer> </alias> <alias> @@ -62,6 +63,7 @@ <family>Verdana</family> <family>DejaVu Sans</family> <family>Liberation Sans</family> + <family>Cantarell</family> <family>SUSE Sans</family> <family>Bitstream Vera Sans</family> <family>Nimbus Sans L</family> ++++++ suse-pre-user.conf ++++++ --- /var/tmp/diff_new_pack.Dm6qpJ/_old 2012-04-17 21:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Dm6qpJ/_new 2012-04-17 21:58:29.000000000 +0200 @@ -328,5 +328,11 @@ <include ignore_missing="yes">/etc/fonts/suse-bitmaps.conf</include> +<!-- ************************************************************ --> +<!-- assigning families to generic names --> +<!-- ************************************************************ --> + + <include ignore_missing="yes">/etc/fonts/suse-generic-names.conf</include> + </fontconfig> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
