[freetype] Be explicit about required libraries
by mkasik
commit df0e2c41f04210ba09f01f32f80a5d13156ed6d8
Author: Marek Kasik <mkasik(a)redhat.com>
Date: Tue Mar 25 13:51:24 2014 +0100
Be explicit about required libraries
freetype.spec | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index 05a5f1e..4c63eed 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.5.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -99,7 +99,11 @@ popd
%build
-%configure --disable-static
+%configure --disable-static \
+ --with-zlib=yes \
+ --with-bzip2=yes \
+ --with-png=yes \
+ --with-harfbuzz=no
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
make %{?_smp_mflags}
@@ -217,6 +221,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Tue Mar 25 2014 Marek Kasik <mkasik(a)redhat.com> - 2.5.3-5
+- Be explicit about required libraries
+
* Tue Mar 25 2014 Marek Kasik <mkasik(a)redhat.com> - 2.5.3-4
- Don't return flags of privately used libraries when
- calling "freetype-config --libs"
10 years, 1 month
[freetype] Don't return flags of privately used libraries
by mkasik
commit 934384ee442158189adac0e6f5e190bbcf49cf60
Author: Marek Kasik <mkasik(a)redhat.com>
Date: Tue Mar 25 13:40:54 2014 +0100
Don't return flags of privately used libraries
- Don't return flags of privately used libraries when
calling "freetype-config --libs"
- Resolves: #1079302
freetype-2.5.3-freetype-config-libs.patch | 96 +++++++++++++++++++++++++++++
freetype.spec | 15 +++-
2 files changed, 107 insertions(+), 4 deletions(-)
---
diff --git a/freetype-2.5.3-freetype-config-libs.patch b/freetype-2.5.3-freetype-config-libs.patch
new file mode 100644
index 0000000..7f56f4b
--- /dev/null
+++ b/freetype-2.5.3-freetype-config-libs.patch
@@ -0,0 +1,96 @@
+--- a/builds/unix/configure.raw
++++ b/builds/unix/configure.raw
+@@ -937,21 +937,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
+ -e 's/ *$//' \
+ -e 's/ */ /g'`
+
+-LIBS_CONFIG="-lfreetype \
+- $ZLIB_LIBS \
+- $BZIP2_LIBS \
+- $LIBPNG_LIBS \
+- $HARFBUZZ_LIBS \
+- $ft2_extra_libs"
+-# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
+-# on if necessary; also beautify
+-LIBS_CONFIG=`echo "$LIBS_CONFIG" \
+- | sed -e 's|-L */usr/lib64/* | |g' \
+- -e 's|-L */usr/lib/* | |g' \
+- -e 's/^ *//' \
+- -e 's/ *$//' \
+- -e 's/ */ /g'`
+-
+ LIBSSTATIC_CONFIG="-lfreetype \
+ $zlib_libstaticconf \
+ $bzip2_libstaticconf \
+@@ -971,7 +956,6 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \
+ AC_SUBST([ftmac_c])
+ AC_SUBST([REQUIRES_PRIVATE])
+ AC_SUBST([LIBS_PRIVATE])
+-AC_SUBST([LIBS_CONFIG])
+ AC_SUBST([LIBSSTATIC_CONFIG])
+
+ AC_SUBST([hardcode_libdir_flag_spec])
+--- a/builds/unix/freetype-config.in
++++ b/builds/unix/freetype-config.in
+@@ -142,7 +142,7 @@ if test "$echo_cflags" = "yes" ; then
+ fi
+
+ if test "$echo_libs" = "yes" ; then
+- libs="%LIBS_CONFIG%"
++ libs="-lfreetype"
+ staticlibs="%LIBSSTATIC_CONFIG%"
+ if test "$show_static" = "yes" ; then
+ libs="$staticlibs"
+--- a/builds/unix/unix-def.in
++++ b/builds/unix/unix-def.in
+@@ -64,7 +64,6 @@ version_info := @version_info@
+ #
+ REQUIRES_PRIVATE := @REQUIRES_PRIVATE@
+ LIBS_PRIVATE := @LIBS_PRIVATE@
+-LIBS_CONFIG := @LIBS_CONFIG@
+ LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@
+ build_libtool_libs := @build_libtool_libs@
+ ft_version := @ft_version@
+@@ -102,8 +101,7 @@ NO_OUTPUT := 2> /dev/null
+
+ $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in
+ rm -f $@ $@.tmp
+- sed -e 's|%LIBS_CONFIG%|$(LIBS_CONFIG)|' \
+- -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \
++ sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \
+ -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \
+ -e 's|%exec_prefix%|$(exec_prefix)|' \
+ -e 's|%ft_version%|$(ft_version)|' \
+--- a/builds/unix/configure
++++ b/builds/unix/configure
+@@ -639,7 +639,6 @@ build_libtool_libs
+ wl
+ hardcode_libdir_flag_spec
+ LIBSSTATIC_CONFIG
+-LIBS_CONFIG
+ LIBS_PRIVATE
+ REQUIRES_PRIVATE
+ ftmac_c
+@@ -13715,21 +13714,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
+ -e 's/ *$//' \
+ -e 's/ */ /g'`
+
+-LIBS_CONFIG="-lfreetype \
+- $ZLIB_LIBS \
+- $BZIP2_LIBS \
+- $LIBPNG_LIBS \
+- $HARFBUZZ_LIBS \
+- $ft2_extra_libs"
+-# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
+-# on if necessary; also beautify
+-LIBS_CONFIG=`echo "$LIBS_CONFIG" \
+- | sed -e 's|-L */usr/lib64/* | |g' \
+- -e 's|-L */usr/lib/* | |g' \
+- -e 's/^ *//' \
+- -e 's/ *$//' \
+- -e 's/ */ /g'`
+-
+ LIBSSTATIC_CONFIG="-lfreetype \
+ $zlib_libstaticconf \
+ $bzip2_libstaticconf \
+
diff --git a/freetype.spec b/freetype.spec
index 6f1c750..05a5f1e 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -29,6 +29,9 @@ Patch88: freetype-multilib.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=961855
Patch90: freetype-2.4.12-pkgconfig.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1079302
+Patch91: freetype-2.5.3-freetype-config-libs.patch
+
Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel
@@ -92,6 +95,8 @@ popd
%patch90 -p1 -b .pkgconfig
+%patch91 -p1 -b .freetype-config-libs
+
%build
%configure --disable-static
@@ -122,9 +127,6 @@ popd
rm -rf $RPM_BUILD_ROOT
-# HACK - drop private libs from freetype-config --libs option
-sed -i -e 's| -lz -lbz2 -lpng16||' builds/unix/freetype-config
-
%makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
{
@@ -215,6 +217,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/*
%changelog
+* Tue Mar 25 2014 Marek Kasik <mkasik(a)redhat.com> - 2.5.3-4
+- Don't return flags of privately used libraries when
+- calling "freetype-config --libs"
+- Resolves: #1079302
+
* Fri Mar 21 2014 Dan Horák <dan[at]danny.cz> - 2.5.3-3
- drop private libs from freetype-config so it returns the same libs as pkg-config
10 years, 1 month
[Bug 467729] RFE: Add font autoinstallation support
by Bugzilla＠Mozilla
Do not reply to this email. You can add comments to this bug at
https://bugzilla.mozilla.org/show_bug.cgi?id=467729
--- Comment #11 from Frédéric Wang (:fredw) <fred.wang(a)free.fr> 2014-03-24 11:02:28 PDT ---
(In reply to Nicolas Mailhot from comment #10)
> The fontconfig maintainer stated at the time he would be amenable to evolve
> the metadata contents if apps found missing bits once they started using this
Thanks. So for the MATH fonts using "font(latinmodernmath)", "font(stixmath)"
etc will be more reliable.
--
Configure bugmail: https://bugzilla.mozilla.org/userprefs.cgi?tab=email
-------------------------------
Product/Component: Firefox :: General
------- You are receiving this mail because: -------
You are on the CC list for the bug.
10 years, 1 month
[Bug 467729] RFE: Add font autoinstallation support
by Bugzilla＠Mozilla
Do not reply to this email. You can add comments to this bug at
https://bugzilla.mozilla.org/show_bug.cgi?id=467729
--- Comment #10 from Nicolas Mailhot <Nicolas.Mailhot(a)laPoste.net> 2014-03-24 10:53:46 PDT ---
(In reply to Frédéric Wang (:fredw) from comment #8)
> The DBus interface on the packagekit.org WebSite does not seem up-to-date.
> Here is the interface I found for the PackageKit installation methods:
>
> https://github.com/nekohayo/gnome-packagekit/blob/master/src/org.freedesktop.
> PackageKit.xml#L107
>
> So "InstallProvideFiles" seems to be what Nicolas suggests in comment 6.
Yes the actual metadata in Fedora font packages looks like this:
$ rpm -q --provides sil-scheherazade-fonts
config(sil-scheherazade-fonts) = 2.020-1.fc21
font(:lang=aa)
font(:lang=an)
font(:lang=ar)
font(:lang=ay)
font(:lang=az-ir)
font(:lang=bi)
font(:lang=br)
font(:lang=ch)
font(:lang=co)
font(:lang=da)
font(:lang=de)
font(:lang=en)
font(:lang=es)
font(:lang=et)
font(:lang=eu)
font(:lang=fa)
font(:lang=fi)
font(:lang=fil)
font(:lang=fj)
font(:lang=fo)
font(:lang=fr)
font(:lang=fur)
font(:lang=fy)
font(:lang=gd)
font(:lang=gl)
font(:lang=gv)
font(:lang=ho)
font(:lang=ht)
font(:lang=ia)
font(:lang=id)
font(:lang=ie)
font(:lang=io)
font(:lang=is)
font(:lang=it)
font(:lang=jv)
font(:lang=kj)
font(:lang=ks)
font(:lang=ku-iq)
font(:lang=ku-ir)
font(:lang=kwm)
font(:lang=lah)
font(:lang=lb)
font(:lang=li)
font(:lang=mg)
font(:lang=ms)
font(:lang=nb)
font(:lang=nds)
font(:lang=ng)
font(:lang=nl)
font(:lang=nn)
font(:lang=no)
font(:lang=nr)
font(:lang=nso)
font(:lang=oc)
font(:lang=om)
font(:lang=ota)
font(:lang=pa-pk)
font(:lang=pap-an)
font(:lang=pap-aw)
font(:lang=ps-af)
font(:lang=ps-pk)
font(:lang=pt)
font(:lang=rm)
font(:lang=rn)
font(:lang=rw)
font(:lang=sc)
font(:lang=sd)
font(:lang=sg)
font(:lang=sma)
font(:lang=smj)
font(:lang=sn)
font(:lang=so)
font(:lang=sq)
font(:lang=ss)
font(:lang=st)
font(:lang=su)
font(:lang=sv)
font(:lang=sw)
font(:lang=tl)
font(:lang=tn)
font(:lang=ts)
font(:lang=ug)
font(:lang=ur)
font(:lang=uz)
font(:lang=vo)
font(:lang=vot)
font(:lang=wa)
font(:lang=xh)
font(:lang=yap)
font(:lang=za)
font(:lang=zu)
font(scheherazade)
sil-scheherazade-fonts = 2.020-1.fc21
all the font(foo) bits are generated at package build time by fc-query --format
'%{=pkgkit}'
The fontconfig maintainer stated at the time he would be amenable to evolve the
metadata contents if apps found missing bits once they started using this
--
Configure bugmail: https://bugzilla.mozilla.org/userprefs.cgi?tab=email
-------------------------------
Product/Component: Firefox :: General
------- You are receiving this mail because: -------
You are on the CC list for the bug.
10 years, 1 month
[fontconfig] New upstream release.
by Akira TAGOH
commit d6cd6e28242fb5b55f516e3db73d2518ec1324ba
Author: Akira TAGOH <tagoh(a)redhat.com>
Date: Mon Mar 24 15:23:04 2014 +0900
New upstream release.
.gitignore | 1 +
fontconfig.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 63477ee..6526ca4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ fontconfig-2.8.0.tar.gz
/fontconfig-2.10.94.tar.bz2
/fontconfig-2.10.95.tar.bz2
/fontconfig-2.11.0.tar.bz2
+/fontconfig-2.11.1.tar.bz2
diff --git a/fontconfig.spec b/fontconfig.spec
index 3c09ac9..82f82a9 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -2,8 +2,8 @@
Summary: Font configuration and customization library
Name: fontconfig
-Version: 2.11.0
-Release: 2%{?dist}
+Version: 2.11.1
+Release: 1%{?dist}
# src/ftglue.[ch] is in Public Domain
# src/fccache.c contains Public Domain code
# fc-case/CaseFolding.txt is in the UCD
@@ -134,6 +134,9 @@ fi
%doc fontconfig-devel.txt fontconfig-devel
%changelog
+* Mon Mar 24 2014 Akira TAGOH <tagoh(a)redhat.com> - 2.11.1-1
+- New upstream release.
+
* Fri Jan 24 2014 Akira TAGOH <tagoh(a)redhat.com> - 2.11.0-2
- Add Requires: font(:lang=en) (#1025331, #845712)
diff --git a/sources b/sources
index 665ece6..215be07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-000bd4baf7aefa828e03414d0c8c7dc5 fontconfig-2.11.0.tar.bz2
+824d000eb737af6e16c826dd3b2d6c90 fontconfig-2.11.1.tar.bz2
10 years, 1 month
[Bug 467729] RFE: Add font autoinstallation support
by Bugzilla＠Mozilla
Do not reply to this email. You can add comments to this bug at
https://bugzilla.mozilla.org/show_bug.cgi?id=467729
--- Comment #9 from Karl Tomlinson (:karlt) <karlt(a)mozbugz.karlt.net> 2014-03-23 16:20:14 PDT ---
(In reply to Frédéric Wang (:fredw) from comment #7)
> > GIO's GDBus is the new way for GLib/GTK apps such as Gecko apps to use DBus, but Firefox is built against an older GIO which doesn't have GDBus.
>
> Do you know if this is still true?
Yes. Mozilla builds are still against CentOS 6.0 libraries.
There is a project underway to build against GTK+ 3 which will require updating
the build systems. That is at least several months away.
--
Configure bugmail: https://bugzilla.mozilla.org/userprefs.cgi?tab=email
-------------------------------
Product/Component: Firefox :: General
------- You are receiving this mail because: -------
You are on the CC list for the bug.
10 years, 1 month
