From 47b9757ceb0c544f77d04c7f887da59ed0c1b392 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:41:45 +0000 Subject: import pango-1.36.8-2.el7 --- diff --git a/.gitignore b/.gitignore index 6a4a54a..31fc5ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pango-1.34.1.tar.xz +SOURCES/pango-1.36.8.tar.xz diff --git a/.pango.metadata b/.pango.metadata index 29e5877..b88165c 100644 --- a/.pango.metadata +++ b/.pango.metadata @@ -1 +1 @@ -a6c224424eb3f0dcc231a8000591c05a85df689c SOURCES/pango-1.34.1.tar.xz +c6ba02ee8f9d8b22b7cfd74c4b6ae170bebc8d2b SOURCES/pango-1.36.8.tar.xz diff --git a/SOURCES/pango-fix-strict-aliasing-warning.patch b/SOURCES/pango-fix-strict-aliasing-warning.patch deleted file mode 100644 index e081266..0000000 --- a/SOURCES/pango-fix-strict-aliasing-warning.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 14b0697a59f51dd017038ca2bb79ba2c2f4034df Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Fri, 30 Aug 2013 14:14:22 -0400 -Subject: [PATCH] Bug 703995 - Compiler warnings about strict aliasing - -Patch from Akira TAGOH. ---- - pango/pango-context.c | 4 ++-- - pango/pango-engine.c | 4 ++-- - pango/pango-utils.c | 12 ++++++------ - pango/pangocairo-fcfont.c | 4 ++-- - pango/pangofc-fontmap.c | 4 ++-- - pango/pangoft2-fontmap.c | 4 ++-- - 6 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/pango/pango-context.c b/pango/pango-context.c -index 8e96713..8bb6a86 100644 ---- a/pango/pango-context.c -+++ b/pango/pango-context.c -@@ -1412,8 +1412,8 @@ string_from_script (PangoScript script) - { - static GEnumClass *class = NULL; /* MT-safe */ - GEnumValue *value; -- if (g_once_init_enter ((gsize*)&class)) -- g_once_init_leave((gsize*)&class, (gsize)g_type_class_ref (PANGO_TYPE_SCRIPT)); -+ if (g_once_init_enter (&class)) -+ g_once_init_leave(&class, (gpointer)g_type_class_ref (PANGO_TYPE_SCRIPT)); - - value = g_enum_get_value (class, script); - if (!value) -diff --git a/pango/pango-engine.c b/pango/pango-engine.c -index 994c722..04de3df 100644 ---- a/pango/pango-engine.c -+++ b/pango/pango-engine.c -@@ -205,8 +205,8 @@ PangoEngineShape * - _pango_get_fallback_shaper (void) - { - static PangoEngineShape *fallback_shaper = NULL; /* MT-safe */ -- if (g_once_init_enter ((gsize*)&fallback_shaper)) -- g_once_init_leave((gsize*)&fallback_shaper, (gsize)g_object_new (pango_fallback_engine_get_type (), NULL)); -+ if (g_once_init_enter (&fallback_shaper)) -+ g_once_init_leave(&fallback_shaper, g_object_new (pango_fallback_engine_get_type (), NULL)); - - return fallback_shaper; - } -diff --git a/pango/pango-utils.c b/pango/pango-utils.c -index 18ffa26..1ca2de6 100644 ---- a/pango/pango-utils.c -+++ b/pango/pango-utils.c -@@ -616,7 +616,7 @@ read_config (void) - { - static GHashTable *config_hash = NULL; - -- if (g_once_init_enter ((gsize*)&config_hash)) -+ if (g_once_init_enter (&config_hash)) - { - GHashTable *tmp_hash; - char *filename; -@@ -635,7 +635,7 @@ read_config (void) - if (envvar) - read_config_file (envvar, TRUE, tmp_hash); - -- g_once_init_leave ((gsize*)&config_hash, (gsize)tmp_hash); -+ g_once_init_leave (&config_hash, tmp_hash); - } - - return config_hash; -@@ -728,7 +728,7 @@ pango_get_sysconf_subdirectory (void) - { - static const gchar *result = NULL; /* MT-safe */ - -- if (g_once_init_enter ((gsize*)&result)) -+ if (g_once_init_enter (&result)) - { - const char *tmp_result = NULL; - #ifdef G_OS_WIN32 -@@ -742,7 +742,7 @@ pango_get_sysconf_subdirectory (void) - else - tmp_result = SYSCONFDIR "/pango"; - #endif -- g_once_init_leave((gsize*)&result, (gsize)tmp_result); -+ g_once_init_leave(&result, tmp_result); - } - return result; - } -@@ -763,7 +763,7 @@ pango_get_lib_subdirectory (void) - { - static const gchar *result = NULL; /* MT-safe */ - -- if (g_once_init_enter ((gsize*)&result)) -+ if (g_once_init_enter (&result)) - { - const gchar *tmp_result = NULL; - #ifdef G_OS_WIN32 -@@ -783,7 +783,7 @@ pango_get_lib_subdirectory (void) - else - tmp_result = LIBDIR "/pango"; - #endif -- g_once_init_leave((gsize*)&result, (gsize)tmp_result); -+ g_once_init_leave(&result, tmp_result); - } - return result; - } -diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c -index ee82675..7dde713 100644 ---- a/pango/pangocairo-fcfont.c -+++ b/pango/pangocairo-fcfont.c -@@ -187,8 +187,8 @@ get_gravity_class (void) - { - static GEnumClass *class = NULL; /* MT-safe */ - -- if (g_once_init_enter ((gsize*)&class)) -- g_once_init_leave((gsize*)&class, (gsize)g_type_class_ref (PANGO_TYPE_GRAVITY)); -+ if (g_once_init_enter (&class)) -+ g_once_init_leave(&class, (gpointer)g_type_class_ref (PANGO_TYPE_GRAVITY)); - - return class; - } -diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c -index 992de4e..05fed2d 100644 ---- a/pango/pangofc-fontmap.c -+++ b/pango/pangofc-fontmap.c -@@ -239,8 +239,8 @@ get_gravity_class (void) - { - static GEnumClass *class = NULL; /* MT-safe */ - -- if (g_once_init_enter ((gsize*)&class)) -- g_once_init_leave ((gsize*)&class, (gsize)g_type_class_ref (PANGO_TYPE_GRAVITY)); -+ if (g_once_init_enter (&class)) -+ g_once_init_leave (&class, (gpointer)g_type_class_ref (PANGO_TYPE_GRAVITY)); - - return class; - } -diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c -index aed5a23..3b43fbd 100644 ---- a/pango/pangoft2-fontmap.c -+++ b/pango/pangoft2-fontmap.c -@@ -305,8 +305,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS - PangoFontMap * - pango_ft2_font_map_for_display (void) - { -- if (g_once_init_enter ((gsize*)&pango_ft2_global_fontmap)) -- g_once_init_leave((gsize*)&pango_ft2_global_fontmap, (gsize)pango_ft2_font_map_new ()); -+ if (g_once_init_enter (&pango_ft2_global_fontmap)) -+ g_once_init_leave(&pango_ft2_global_fontmap, PANGO_FT2_FONT_MAP (pango_ft2_font_map_new ())); - - return PANGO_FONT_MAP (pango_ft2_global_fontmap); - } --- -1.8.3.1 - diff --git a/SPECS/pango.spec b/SPECS/pango.spec index 3b13e8d..0d63a48 100644 --- a/SPECS/pango.spec +++ b/SPECS/pango.spec @@ -9,20 +9,14 @@ Summary: System for layout and rendering of internationalized text Name: pango -Version: 1.34.1 -Release: 5%{?dist} +Version: 1.36.8 +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries #VCS: git:git://git.gnome.org/pango -Source: http://download.gnome.org/sources/pango/1.34/pango-%{version}.tar.xz +Source: http://download.gnome.org/sources/pango/1.36/pango-%{version}.tar.xz URL: http://www.pango.org -Patch0: %{name}-fix-strict-aliasing-warning.patch -Requires: glib2 >= %{glib2_version} -Requires: freetype >= %{freetype_version} -Requires: freetype >= %{freetype_version} -Requires: cairo >= %{cairo_version} -Requires: libthai >= %{libthai_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pkgconfig >= %{pkgconfig_version} BuildRequires: freetype-devel >= %{freetype_version} @@ -35,6 +29,13 @@ BuildRequires: gobject-introspection-devel BuildRequires: cairo-gobject-devel # Bootstrap requirements BuildRequires: gnome-common intltool gtk-doc +BuildRequires: help2man + +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: freetype%{?_isa} >= %{freetype_version} +Requires: fontconfig%{?_isa} >= %{fontconfig_version} +Requires: cairo%{?_isa} >= %{cairo_version} +Requires: libthai%{?_isa} >= %{libthai_version} %description Pango is a library for laying out and rendering of text, with an emphasis @@ -52,26 +53,40 @@ quality text handling and graphics rendering. Summary: Development files for pango Group: Development/Libraries Requires: pango%{?_isa} = %{version}-%{release} -Requires: glib2-devel >= %{glib2_version} -Requires: freetype-devel >= %{freetype_version} -Requires: fontconfig-devel >= %{fontconfig_version} -Requires: cairo-devel >= %{cairo_version} +Requires: glib2-devel%{?_isa} >= %{glib2_version} +Requires: freetype-devel%{?_isa} >= %{freetype_version} +Requires: fontconfig-devel%{?_isa} >= %{fontconfig_version} +Requires: cairo-devel%{?_isa} >= %{cairo_version} %description devel The pango-devel package includes the header files and developer documentation for the pango package. +%package tests +Summary: Tests for the %{name} package +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +The %{name}-tests package contains tests that can be used to verify +the functionality of the installed %{name} package. + + %prep %setup -q -n pango-%{version} -%patch0 -p1 -b .0-gcc-warn %build +# Force regeneration of the man page +rm pango-view/pango-view.1.in + # We try hard to not link to libstdc++ (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; %configure $CONFIGFLAGS \ --enable-doc-cross-references \ - --with-included-modules=basic-fc ) + --with-included-modules=basic-fc \ + --enable-installed-tests +) make %{?_smp_mflags} V=1 @@ -139,7 +154,20 @@ fi %{_datadir}/gir-1.0/PangoXft-1.0.gir +%files tests +%{_libexecdir}/installed-tests/%{name} +%{_datadir}/installed-tests + + %changelog +* Thu May 14 2015 Matthias Clasen - 1.36.8-2 +- Regenerate man page for pango-view +- Related: #1174436 + +* Mon Sep 22 2014 Kalev Lember - 1.36.8-1 +- Update to 1.36.8 +- Resolves: #1174436 + * Fri Jan 24 2014 Daniel Mach - 1.34.1-5 - Mass rebuild 2014-01-24