From c8360d290551c944ec16317d568833f77793d7a65e0a8ba13754849647d6fdb9 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 17:02:21 +0000 Subject: [PATCH 1/7] Accepting request 132788 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132788 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=81 --- baselibs.conf | 4 ++-- pango-1.30.1.tar.xz | 3 --- pango-1.31.0.tar.xz | 3 +++ pango-implicit.patch | 13 ------------ pango.changes | 15 ++++++++++++++ pango.spec | 49 +++++++++++++++++--------------------------- 6 files changed, 39 insertions(+), 48 deletions(-) delete mode 100644 pango-1.30.1.tar.xz create mode 100644 pango-1.31.0.tar.xz delete mode 100644 pango-implicit.patch diff --git a/baselibs.conf b/baselibs.conf index 07aa049..ad6c969 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -11,9 +11,9 @@ libpango-1_0-0 pango-tools +/usr/bin/pango-querymodules(-64)? post "%if "%_lib" == "lib64"" - post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.6.0; if test $? -eq 0; then %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules; fi; fi" + post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.8.0; if test $? -eq 0; then %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules; fi; fi" post "%else" - post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.6.0; if test $? -eq 0; then %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules; fi; fi" + post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.8.0; if test $? -eq 0; then %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules; fi; fi" post "%endif" pango-module-thai-lang requires "pango-" diff --git a/pango-1.30.1.tar.xz b/pango-1.30.1.tar.xz deleted file mode 100644 index 695cead..0000000 --- a/pango-1.30.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe -size 1162828 diff --git a/pango-1.31.0.tar.xz b/pango-1.31.0.tar.xz new file mode 100644 index 0000000..9c80561 --- /dev/null +++ b/pango-1.31.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bac8eec76710150a6f7a40b565d8c7b0cfb946fa2879a19fae8f7563b551eb96 +size 1022764 diff --git a/pango-implicit.patch b/pango-implicit.patch deleted file mode 100644 index 7cb3bad..0000000 --- a/pango-implicit.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pango-1.30.1/pango/pango-utils.h -=================================================================== ---- pango-1.30.1.orig/pango/pango-utils.h -+++ pango-1.30.1/pango/pango-utils.h -@@ -48,6 +48,8 @@ void pango_lookup_aliases (const cha - int *n_families); - #endif /* PANGO_ENABLE_BACKEND */ - -+char * pango_config_key_get_system (const char *key); -+ - gboolean pango_parse_enum (GType type, - const char *str, - int *value, diff --git a/pango.changes b/pango.changes index 619749e..401f906 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org + +- Update to version 1.31.0: + + Port to harfbuzz 0.9.x, use external harfbuzz + + Remove Arabic, Syriac, Hangul Hebrew, Khmer, Tibetan and Thai + shapers (replaced by harfbuzz) + + Remove Indic module (replaced by harfbuzz) + + Remove Atsui support (superseded by CoreText) + + Remove PangoX + + Bugs fixed: bgo#679654, bgo#680965, bgo#681423. +- Drop pango-implicit.patch: fixed upstream. +- Add pkgconfig(harfbuzz) BuildRequires: new dependency. +- Bump pango_binary_version defines to 1.8.0 (baselibs.conf too). + ------------------------------------------------------------------- Wed Jun 6 19:30:03 UTC 2012 - dimstar@opensuse.org diff --git a/pango.spec b/pango.spec index 382a18c..5196b6b 100644 --- a/pango.spec +++ b/pango.spec @@ -17,23 +17,21 @@ # When updating the binary version, do not forget to also update baselibs.conf -%define pango_binary_version 1.6.0 +%define pango_binary_version 1.8.0 Name: pango -Version: 1.30.1 +Version: 1.31.0 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ Group: System/Libraries Url: http://www.pango.org/ -Source: http://download.gnome.org/sources/pango/1.30/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pango/1.31/%{name}-%{version}.tar.xz Source1: README.SuSE Source2: macros.pango Source99: baselibs.conf # PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream. Patch0: pango64.patch -# PATCH-FIX-UPSTREAM pango-implicit.patch bgo#677627 dimstar@opensuse.org -- Add missing function prototype -Patch1: pango-implicit.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: pkg-config @@ -42,6 +40,7 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libthai) >= 0.1.9 BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xrender) @@ -57,9 +56,9 @@ Pango forms the core of text and font handling for GTK+. %package -n libpango-1_0-0 Summary: Library for Layout and Rendering of Text Group: System/Libraries -Requires(post): %{name}-tools Provides: %{name} = %{version} Obsoletes: %{name} < %{version} +Requires(post): %{name}-tools # bug437293 %ifarch ppc64 Obsoletes: pango-64bit @@ -100,9 +99,9 @@ Pango forms the core of text and font handling for GTK+. %package module-thai-lang Summary: Library for Layout and Rendering of Text -- Module for the Thai Language Group: System/Libraries +Provides: locale(pango:th_TH) Requires(post): %{name}-tools Requires(postun): %{name}-tools -Provides: locale(pango:th_TH) %description module-thai-lang Pango is a library for layout and rendering of text, with an emphasis @@ -112,13 +111,13 @@ is needed. Pango forms the core of text and font handling for GTK+. %package devel -Requires: libpango-1_0-0 = %{version} -Requires: typelib-1_0-Pango-1_0 = %{version} Summary: Library for Layout and Rendering of Text -- Development Files Group: Development/Libraries/GNOME +Requires: libpango-1_0-0 = %{version} +Requires: typelib-1_0-Pango-1_0 = %{version} # bug437293 %ifarch ppc64 -Obsoletes: pango-devel-64bit +Obsoletes: pkgconfig(pango)-64bit %endif Provides: pango-doc = %{version} Obsoletes: pango-doc < %{version} @@ -135,27 +134,27 @@ to develop applications that require these. %prep %setup -q -%if "%_lib" == "lib64" -cp -a %{S:1} . +%if "%{_lib}" == "lib64" +cp -a %{SOURCE1} . %patch0 -p0 %endif -%patch1 -p1 %build %configure --disable-static --with-pic -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +mkdir -p %{buildroot}%{_sysconfdir}/pango/ touch %{buildroot}%{_sysconfdir}/pango/pango.modules -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64 mv %{buildroot}%{_sysconfdir}/pango/pango.modules %{buildroot}%{_sysconfdir}/pango/pango64.modules %endif # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{S:2} %{buildroot}%{_sysconfdir}/rpm +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm %clean rm -rf %{buildroot} @@ -165,7 +164,7 @@ rm -rf %{buildroot} ########################################################################### # Convenient %define for the scriplets -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" %define _pango_querymodules %{_bindir}/pango-querymodules-64 %define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango64.modules %else @@ -214,7 +213,7 @@ fi %files -n libpango-1_0-0 %defattr(-,root,root) -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" %doc README AUTHORS COPYING ChangeLog README.SuSE %else %doc README AUTHORS COPYING ChangeLog @@ -222,22 +221,12 @@ fi %dir %{_libdir}/pango %dir %{_libdir}/pango/%{pango_binary_version} %dir %{_libdir}/pango/%{pango_binary_version}/modules -%{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-fc.so %{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-lang.so %{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-fc.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-x.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-hangul-fc.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-hebrew-fc.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-fc.so %{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-lang.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-khmer-fc.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-syriac-fc.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-thai-fc.so -%{_libdir}/pango/%{pango_binary_version}/modules/pango-tibetan-fc.so %{_libdir}/lib*.so.* %dir %{_sysconfdir}/pango -%{_sysconfdir}/pango/pangox.aliases -%if "%_lib" == "lib64" +%if "%{_lib}" == "lib64" %ghost %{_sysconfdir}/pango/pango64.modules %else %ghost %{_sysconfdir}/pango/pango.modules From b2dfc9636346a9f7541c71b5a0424cb08a26f1335786bbeb2b737bcd38336e83 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 17:04:36 +0000 Subject: [PATCH 2/7] Accepting request 133290 from home:vuntz:branches:GNOME:Factory suggested tweak OBS-URL: https://build.opensuse.org/request/show/133290 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=82 --- pango.changes | 5 +++-- pango.spec | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pango.changes b/pango.changes index 401f906..cb067cd 100644 --- a/pango.changes +++ b/pango.changes @@ -3,7 +3,7 @@ Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org - Update to version 1.31.0: + Port to harfbuzz 0.9.x, use external harfbuzz - + Remove Arabic, Syriac, Hangul Hebrew, Khmer, Tibetan and Thai + + Remove Arabic, Hangul, Hebrew, Khmer, Syriac, Tibetan and Thai shapers (replaced by harfbuzz) + Remove Indic module (replaced by harfbuzz) + Remove Atsui support (superseded by CoreText) @@ -11,7 +11,8 @@ Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org + Bugs fixed: bgo#679654, bgo#680965, bgo#681423. - Drop pango-implicit.patch: fixed upstream. - Add pkgconfig(harfbuzz) BuildRequires: new dependency. -- Bump pango_binary_version defines to 1.8.0 (baselibs.conf too). +- Bump pango_binary_version defines to 1.8.0 (in baselibs.conf + too). ------------------------------------------------------------------- Wed Jun 6 19:30:03 UTC 2012 - dimstar@opensuse.org diff --git a/pango.spec b/pango.spec index 5196b6b..954120f 100644 --- a/pango.spec +++ b/pango.spec @@ -40,7 +40,7 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(harfbuzz) >= 0.9 BuildRequires: pkgconfig(libthai) >= 0.1.9 BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xrender) @@ -56,9 +56,9 @@ Pango forms the core of text and font handling for GTK+. %package -n libpango-1_0-0 Summary: Library for Layout and Rendering of Text Group: System/Libraries +Requires(post): %{name}-tools Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -Requires(post): %{name}-tools # bug437293 %ifarch ppc64 Obsoletes: pango-64bit @@ -99,9 +99,9 @@ Pango forms the core of text and font handling for GTK+. %package module-thai-lang Summary: Library for Layout and Rendering of Text -- Module for the Thai Language Group: System/Libraries -Provides: locale(pango:th_TH) Requires(post): %{name}-tools Requires(postun): %{name}-tools +Provides: locale(pango:th_TH) %description module-thai-lang Pango is a library for layout and rendering of text, with an emphasis @@ -117,7 +117,7 @@ Requires: libpango-1_0-0 = %{version} Requires: typelib-1_0-Pango-1_0 = %{version} # bug437293 %ifarch ppc64 -Obsoletes: pkgconfig(pango)-64bit +Obsoletes: pango-devel-64bit %endif Provides: pango-doc = %{version} Obsoletes: pango-doc < %{version} From bbe68167732beaaf1b6bf4b7fda9d233654f849213894e41f90e71f8fae6c72c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 10 Sep 2012 11:09:23 +0000 Subject: [PATCH 3/7] Accepting request 133414 from home:Zaitor:branches:GNOME:Factory Update to ver 1.31.1, builds for G:N, should it be SR'd there too/instead? OBS-URL: https://build.opensuse.org/request/show/133414 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=83 --- pango-1.31.0.tar.xz | 3 --- pango-1.31.1.tar.xz | 3 +++ pango.changes | 13 +++++++++++++ pango.spec | 2 +- pango64.patch | 16 ++++++++-------- 5 files changed, 25 insertions(+), 12 deletions(-) delete mode 100644 pango-1.31.0.tar.xz create mode 100644 pango-1.31.1.tar.xz diff --git a/pango-1.31.0.tar.xz b/pango-1.31.0.tar.xz deleted file mode 100644 index 9c80561..0000000 --- a/pango-1.31.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bac8eec76710150a6f7a40b565d8c7b0cfb946fa2879a19fae8f7563b551eb96 -size 1022764 diff --git a/pango-1.31.1.tar.xz b/pango-1.31.1.tar.xz new file mode 100644 index 0000000..631c860 --- /dev/null +++ b/pango-1.31.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81 +size 1031940 diff --git a/pango.changes b/pango.changes index cb067cd..265c47d 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Sep 9 19:54:00 UTC 2012 - zaitor@opensuse.org + +- Update to version 1.31.1: + + The module cache file can now be located in libdir. + + Initial work towards making pango thread-safe. + + Update to Unicode 6.1. + + Bugs fixed: bgo#682421, bgo#678721, bgo#678997, bgo#653347, + bgo#682952. + + Deprecate pango-ot.h, pango_fc_font_kern_glyphs and + pango_lookup_aliases +- Rebased pango64.patch. + ------------------------------------------------------------------- Tue Aug 21 15:28:34 UTC 2012 - dimstar@opensuse.org diff --git a/pango.spec b/pango.spec index 954120f..b436ae0 100644 --- a/pango.spec +++ b/pango.spec @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.31.0 +Version: 1.31.1 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ diff --git a/pango64.patch b/pango64.patch index 2b63a19..ecf40a0 100644 --- a/pango64.patch +++ b/pango64.patch @@ -38,15 +38,15 @@ Index: pango/modules.c * such a package contains paths from the package * builder's machine. Replace the path with the real * one on this machine. */ -@@ -509,7 +509,7 @@ read_modules (void) +@@ -537,7 +537,7 @@ + files = g_new (char *, 3); - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango64.modules", - NULL); - - files = pango_split_file_list (file_str); + files[0] = g_build_filename (pango_get_sysconf_subdirectory (), +- "pango.modules", ++ "pango64.modules", + NULL); + files[1] = g_build_filename (pango_get_lib_subdirectory (), + MODULE_VERSION, @@ -620,7 +620,7 @@ build_map (PangoMapInfo *info) if (!no_module_warning) { From 51db18a45c95bf6cb7f127082a2b277e5b426f32c9763d7efea03a2a648de3b7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Sep 2012 19:40:45 +0000 Subject: [PATCH 4/7] Accepting request 133467 from home:vuntz:branches:GNOME:Factory Drop pango64.patch OBS-URL: https://build.opensuse.org/request/show/133467 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=84 --- README.SuSE | 7 ++--- baselibs.conf | 17 ++++++------ macros.pango | 8 +++--- pango.changes | 20 ++++++++++++-- pango.spec | 25 ++++++----------- pango64.patch | 75 --------------------------------------------------- 6 files changed, 40 insertions(+), 112 deletions(-) delete mode 100644 pango64.patch diff --git a/README.SuSE b/README.SuSE index 9b04e17..0b0a893 100644 --- a/README.SuSE +++ b/README.SuSE @@ -9,7 +9,6 @@ To work around this problem, 64 bit version for SuSE Linux uses special names for following files: /usr/bin/pango-querymodules: /usr/bin/pango-querymodules-64 -/etc/pango/pango.modules: /etc/pango/pango.modules64 This can cause problems during self-compilation of packages. @@ -26,10 +25,8 @@ Or: - Install 32 bit version of Pango. - After installation, you must run following commands: if [ -x /usr/bin/pango-querymodules ] ; then - /usr/bin/pango-querymodules \ - > /etc/pango/pango.modules + /usr/bin/pango-querymodules --update-cache fi if [ -x /usr/bin/pango-querymodules-64 ] ; then - /usr/bin/pango-querymodules-64 \ - > /etc/pango/pango64.modules + /usr/bin/pango-querymodules-64 --update-cache fi diff --git a/baselibs.conf b/baselibs.conf index ad6c969..4342afc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,31 +1,30 @@ libpango-1_0-0 - +/etc/pango/pango(64)?.modules requires "pango-tools-" provides "pango- = " obsoletes "pango- < " post "%if "%_lib" == "lib64"" - post "if test -f %{_bindir}/pango-querymodules-64; then %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules; fi" + post "if test -f %{_bindir}/pango-querymodules-64; then %{_bindir}/pango-querymodules-64 --update-cache; fi" post "%else" - post "if test -f %{_bindir}/pango-querymodules; then %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules; fi" + post "if test -f %{_bindir}/pango-querymodules; then %{_bindir}/pango-querymodules --update-cache; fi" post "%endif" pango-tools +/usr/bin/pango-querymodules(-64)? post "%if "%_lib" == "lib64"" - post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.8.0; if test $? -eq 0; then %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules; fi; fi" + post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.8.0; if test $? -eq 0; then %{_bindir}/pango-querymodules-64 --update-cache; fi; fi" post "%else" - post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.8.0; if test $? -eq 0; then %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules; fi; fi" + post "if [ $1 == 1 ]; then test -d %{_libdir}/pango/1.8.0; if test $? -eq 0; then %{_bindir}/pango-querymodules --update-cache; fi; fi" post "%endif" pango-module-thai-lang requires "pango-" post "%if "%_lib" == "lib64"" - post "%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules" + post "%{_bindir}/pango-querymodules-64 --update-cache" post "%else" - post "%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules" + post "%{_bindir}/pango-querymodules --update-cache" post "%endif" postun "%if "%_lib" == "lib64"" - postun "%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules" + postun "%{_bindir}/pango-querymodules-64 --update-cache" postun "%else" - postun "%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules" + postun "%{_bindir}/pango-querymodules --update-cache" postun "%endif" arch ppc package pango-devel arch sparcv9 package pango-devel diff --git a/macros.pango b/macros.pango index 614f461..12892e7 100644 --- a/macros.pango +++ b/macros.pango @@ -18,9 +18,9 @@ Requires(postun): pango-tools # On install, update the cache %pango_module_post \ %if "%_lib" == "lib64" \ - %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules \ + %{_bindir}/pango-querymodules-64 --update-cache \ %else \ - %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules \ + %{_bindir}/pango-querymodules --update-cache \ %endif # On uninstall, update the cache. Note: we ignore upgrades (already @@ -28,8 +28,8 @@ Requires(postun): pango-tools %pango_module_postun \ if [ $1 -eq 0 ]; then \ %if "%_lib" == "lib64" \ - %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/pango64.modules \ + %{_bindir}/pango-querymodules-64 --update-cache \ %else \ - %{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules \ + %{_bindir}/pango-querymodules --update-cache \ %endif \ fi diff --git a/pango.changes b/pango.changes index 265c47d..060b163 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Sep 10 11:10:04 UTC 2012 - vuntz@opensuse.org + +- Drop pango64.patch: + + pango-querymodules now has a --update-cache option that will + update a pango.modules file under %{_libdir}. This means we no + longer need to differentiate the 64bit file since it's by + definition in a different directory. + + Use this --update-cache option instead of redirecting the + output of pango-querymodules in the scriplets, in the macros we + define in macros.pango, and in baselibs.conf. + + Touch %{_libdir}/pango/%{pango_binary_version}/pango.modules in + %install instead of %{_sysconfdir}/pango/pango.modules: this is + the new file listing the modules. + + Update README.SuSE accordingly. + + As a side-effect, this fixes bnc#346210. + ------------------------------------------------------------------- Sun Sep 9 19:54:00 UTC 2012 - zaitor@opensuse.org @@ -5,10 +22,9 @@ Sun Sep 9 19:54:00 UTC 2012 - zaitor@opensuse.org + The module cache file can now be located in libdir. + Initial work towards making pango thread-safe. + Update to Unicode 6.1. + + Deprecate a few API. + Bugs fixed: bgo#682421, bgo#678721, bgo#678997, bgo#653347, bgo#682952. - + Deprecate pango-ot.h, pango_fc_font_kern_glyphs and - pango_lookup_aliases - Rebased pango64.patch. ------------------------------------------------------------------- diff --git a/pango.spec b/pango.spec index b436ae0..800c00f 100644 --- a/pango.spec +++ b/pango.spec @@ -30,17 +30,15 @@ Source: http://download.gnome.org/sources/pango/1.31/%{name}-%{version}. Source1: README.SuSE Source2: macros.pango Source99: baselibs.conf -# PATCH-FIX-UPSTREAM pango64.patch bgo129534 -- needed for biarch. Unfortunately, this is not good enough for usptream. -Patch0: pango64.patch BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: pkg-config BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(harfbuzz) >= 0.9 +BuildRequires: pkgconfig(harfbuzz) >= 0.9.3 BuildRequires: pkgconfig(libthai) >= 0.1.9 BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xrender) @@ -136,7 +134,6 @@ to develop applications that require these. %setup -q %if "%{_lib}" == "lib64" cp -a %{SOURCE1} . -%patch0 -p0 %endif %build @@ -147,10 +144,9 @@ make %{?_smp_mflags} %make_install find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print mkdir -p %{buildroot}%{_sysconfdir}/pango/ -touch %{buildroot}%{_sysconfdir}/pango/pango.modules +touch %{buildroot}%{_libdir}/pango/%{pango_binary_version}/pango.modules %if "%{_lib}" == "lib64" mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64 -mv %{buildroot}%{_sysconfdir}/pango/pango.modules %{buildroot}%{_sysconfdir}/pango/pango64.modules %endif # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm @@ -163,21 +159,20 @@ rm -rf %{buildroot} # Note: when updating scriptlets, don't forget to also update baselibs.conf ########################################################################### -# Convenient %define for the scriplets +# Convenient %%define for the scriplets %if "%{_lib}" == "lib64" %define _pango_querymodules %{_bindir}/pango-querymodules-64 -%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango64.modules %else %define _pango_querymodules %{_bindir}/pango-querymodules -%define _pango_querymodules_update_cache %{_pango_querymodules} > %{_sysconfdir}/pango/pango.modules %endif +%define _pango_querymodules_update_cache %{_pango_querymodules} --update-cache %post -n libpango-1_0-0 /sbin/ldconfig %if 0 # In case libpango-1_0-0 gets installed before pango-tools, we don't want to # fail. So we make the call to pango-querymodules dependent on the existence of -# the binary. This is why we also have a %post for pango-tools. +# the binary. This is why we also have a %%post for pango-tools. %endif if test -f %{_pango_querymodules}; then %{_pango_querymodules_update_cache} @@ -201,7 +196,7 @@ fi %if 0 # If we install pango-tools for the first time, then we should run it in case # libpango-1_0-0 was installed first (ie, if -# %{_libdir}/pango/%{pango_binary_version} already exists) which means +# %%{_libdir}/pango/%%{pango_binary_version} already exists) which means # pango-querymodules couldn't run there. %endif if [ $1 == 1 ]; then @@ -220,17 +215,13 @@ fi %endif %dir %{_libdir}/pango %dir %{_libdir}/pango/%{pango_binary_version} +%ghost %{_libdir}/pango/%{pango_binary_version}/pango.modules %dir %{_libdir}/pango/%{pango_binary_version}/modules %{_libdir}/pango/%{pango_binary_version}/modules/pango-arabic-lang.so %{_libdir}/pango/%{pango_binary_version}/modules/pango-basic-fc.so %{_libdir}/pango/%{pango_binary_version}/modules/pango-indic-lang.so %{_libdir}/lib*.so.* %dir %{_sysconfdir}/pango -%if "%{_lib}" == "lib64" -%ghost %{_sysconfdir}/pango/pango64.modules -%else -%ghost %{_sysconfdir}/pango/pango.modules -%endif %files -n typelib-1_0-Pango-1_0 %defattr(-,root,root) diff --git a/pango64.patch b/pango64.patch deleted file mode 100644 index ecf40a0..0000000 --- a/pango64.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: modules/Makefile.am -=================================================================== ---- modules/Makefile.am.orig -+++ modules/Makefile.am -@@ -30,10 +30,10 @@ install-data-local: $(top_builddir)/pang - @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ -- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ -+ \> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ -- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ -+ > $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \ - else \ - echo "***" ; \ - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ -Index: modules/pangorc -=================================================================== ---- modules/pangorc.orig -+++ modules/pangorc -@@ -5,4 +5,4 @@ - # - - [Pango] --ModuleFiles = ../modules/pango.modules -+ModuleFiles = ../modules/pango64.modules -Index: pango/modules.c -=================================================================== ---- pango/modules.c.orig -+++ pango/modules.c -@@ -328,7 +328,7 @@ find_or_create_module (const char *raw_p - /* This is an entry put there by make install on the - * packager's system. On Windows a prebuilt Pango - * package can be installed in a random -- * location. The pango.modules file distributed in -+ * location. The pango64.modules file distributed in - * such a package contains paths from the package - * builder's machine. Replace the path with the real - * one on this machine. */ -@@ -537,7 +537,7 @@ - files = g_new (char *, 3); - - files[0] = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango64.modules", - NULL); - files[1] = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, -@@ -620,7 +620,7 @@ build_map (PangoMapInfo *info) - if (!no_module_warning) - { - gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango64.modules", - NULL); - g_critical ("No modules found:\n" - "No builtin or dynamically loaded modules were found.\n" -Index: modules/Makefile.in -=================================================================== ---- modules/Makefile.in.orig -+++ modules/Makefile.in -@@ -572,10 +572,10 @@ install-data-local: $(top_builddir)/pang - @if $(RUN_QUERY_MODULES_TEST) && test -z "$(DESTDIR)" ; then \ - echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ -- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ -+ \> $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \ - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ - $(top_builddir)/pango/pango-querymodules$(EXEEXT) \ -- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ -+ > $(DESTDIR)$(sysconfdir)/pango/pango64.modules ; \ - else \ - echo "***" ; \ - echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \ From 01b967894dcb66ef9aac8b534f12f83eaace7bb743e35bbb3f89789bda789708 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 23 Sep 2012 17:23:42 +0000 Subject: [PATCH 5/7] Accepting request 135466 from home:dimstar:branches:GNOME:Factory Resubmit post review OBS-URL: https://build.opensuse.org/request/show/135466 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=85 --- pango-1.31.1.tar.xz | 3 --- pango-1.31.2.tar.xz | 3 +++ pango.changes | 8 ++++++++ pango.spec | 5 +++-- 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 pango-1.31.1.tar.xz create mode 100644 pango-1.31.2.tar.xz diff --git a/pango-1.31.1.tar.xz b/pango-1.31.1.tar.xz deleted file mode 100644 index 631c860..0000000 --- a/pango-1.31.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81 -size 1031940 diff --git a/pango-1.31.2.tar.xz b/pango-1.31.2.tar.xz new file mode 100644 index 0000000..0081fe3 --- /dev/null +++ b/pango-1.31.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e473998006e6b04f6055882d00bc5a84e4fc5232523d79216ebed906353787be +size 1031740 diff --git a/pango.changes b/pango.changes index 060b163..d370d06 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 22 13:59:48 UTC 2012 - dimstar@opensuse.org + +- Update to version 1.31.2: + + More work done towards thread-safety. + + Build fixes on OS. +- Add pkgconfig(glib-2.0) BuildRequires so it can be versioned. + ------------------------------------------------------------------- Mon Sep 10 11:10:04 UTC 2012 - vuntz@opensuse.org diff --git a/pango.spec b/pango.spec index 800c00f..b999f30 100644 --- a/pango.spec +++ b/pango.spec @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.31.1 +Version: 1.31.2 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ @@ -36,7 +36,8 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.33.12 +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.3 BuildRequires: pkgconfig(libthai) >= 0.1.9 From ba9a6dc7f43485a1497c1e0d3e4bc7678cbd460c10e4911a9366cad145298a6f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 27 Sep 2012 15:08:43 +0000 Subject: [PATCH 6/7] Accepting request 136139 from home:Zaitor:branches:GNOME:Factory Update to ver 1.32.0 OBS-URL: https://build.opensuse.org/request/show/136139 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=86 --- pango-1.31.2.tar.xz | 3 --- pango-1.32.0.tar.xz | 3 +++ pango.changes | 7 +++++++ pango.spec | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 pango-1.31.2.tar.xz create mode 100644 pango-1.32.0.tar.xz diff --git a/pango-1.31.2.tar.xz b/pango-1.31.2.tar.xz deleted file mode 100644 index 0081fe3..0000000 --- a/pango-1.31.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e473998006e6b04f6055882d00bc5a84e4fc5232523d79216ebed906353787be -size 1031740 diff --git a/pango-1.32.0.tar.xz b/pango-1.32.0.tar.xz new file mode 100644 index 0000000..5ecdb0e --- /dev/null +++ b/pango-1.32.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab41fa088fdec2cb34e9afb59357795fe7b72a0319487e8dc710c542589c9e82 +size 1035296 diff --git a/pango.changes b/pango.changes index d370d06..6fb6267 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 26 21:37:07 UTC 2012 - zaitor@opensuse.org + +- Update to version 1.32.0: + + Add a --without-xfg configure option. + + Add pango_shape_full(). + ------------------------------------------------------------------- Sat Sep 22 13:59:48 UTC 2012 - dimstar@opensuse.org diff --git a/pango.spec b/pango.spec index b999f30..e9a967b 100644 --- a/pango.spec +++ b/pango.spec @@ -20,13 +20,13 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.31.2 +Version: 1.32.0 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ Group: System/Libraries Url: http://www.pango.org/ -Source: http://download.gnome.org/sources/pango/1.31/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pango/1.32/%{name}-%{version}.tar.xz Source1: README.SuSE Source2: macros.pango Source99: baselibs.conf @@ -41,7 +41,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.3 BuildRequires: pkgconfig(libthai) >= 0.1.9 -BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xft) >= 2.0.0 BuildRequires: pkgconfig(xrender) BuildRoot: %{_tmppath}/%{name}-%{version}-build From c69af1711b1164731a9c3beb5f0fa3dbb7c6608d32f656f08023a00cc0f365cf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 28 Sep 2012 07:46:54 +0000 Subject: [PATCH 7/7] Accepting request 136309 from home:vuntz:branches:GNOME:Factory Update to 1.32.1 OBS-URL: https://build.opensuse.org/request/show/136309 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=87 --- pango-1.32.0.tar.xz | 3 --- pango-1.32.1.tar.xz | 3 +++ pango.changes | 6 ++++++ pango.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 pango-1.32.0.tar.xz create mode 100644 pango-1.32.1.tar.xz diff --git a/pango-1.32.0.tar.xz b/pango-1.32.0.tar.xz deleted file mode 100644 index 5ecdb0e..0000000 --- a/pango-1.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab41fa088fdec2cb34e9afb59357795fe7b72a0319487e8dc710c542589c9e82 -size 1035296 diff --git a/pango-1.32.1.tar.xz b/pango-1.32.1.tar.xz new file mode 100644 index 0000000..8210268 --- /dev/null +++ b/pango-1.32.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82 +size 1035924 diff --git a/pango.changes b/pango.changes index 6fb6267..f4c506e 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 28 07:22:19 UTC 2012 - vuntz@opensuse.org + +- Update to version 1.32.1: + + Fixup grapheme clusters, cause of crashes (bgo#684959) + ------------------------------------------------------------------- Wed Sep 26 21:37:07 UTC 2012 - zaitor@opensuse.org diff --git a/pango.spec b/pango.spec index e9a967b..68556a9 100644 --- a/pango.spec +++ b/pango.spec @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.32.0 +Version: 1.32.1 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+