From 957cb67d2aaf2e09c0ec96dee43233c3a1203e66a55625c0964e0fde0a109592 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 4 Sep 2015 11:29:41 +0000 Subject: [PATCH 1/3] Accepting request 328982 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/328982 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=139 --- README.SUSE | 32 -------------- baselibs.conf | 22 ---------- macros.pango | 20 +++------ pango-1.36.8.tar.xz | 3 -- pango-1.37.4.tar.xz | 3 ++ pango.changes | 52 +++++++++++++++++++++++ pango.spec | 100 ++------------------------------------------ 7 files changed, 65 insertions(+), 167 deletions(-) delete mode 100644 README.SUSE delete mode 100644 pango-1.36.8.tar.xz create mode 100644 pango-1.37.4.tar.xz diff --git a/README.SUSE b/README.SUSE deleted file mode 100644 index b1f1f11..0000000 --- a/README.SUSE +++ /dev/null @@ -1,32 +0,0 @@ -README for bi-architecture 64 bit platforms users -================================================= - -Current version of Pango has a problem running 32 and 64 version on -single machine. See http://bugzilla.gnome.org/show_bug.cgi?id=129534 for -more information. - -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 - -This can cause problems during self-compilation of packages. - -To work-around these problems (introduced by this work-around), you -should: - -Either: - -- Make a patch of package (please do not send it to package -developers, it's temporary solution). - -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 --update-cache -fi -if [ -x /usr/bin/pango-querymodules-64 ] ; then - /usr/bin/pango-querymodules-64 --update-cache -fi diff --git a/baselibs.conf b/baselibs.conf index 17673d6..49ad050 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,30 +2,8 @@ libpango-1_0-0 prereq "pango-tools- >= 1.31.1" provides "pango- = " obsoletes "pango- < " - post "%if "%_lib" == "lib64"" - 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 --update-cache; fi" - post "%endif" pango-devel requires -pango- requires "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.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 --update-cache; fi; fi" - post "%endif" -pango-module-thai-lang - requires "pango-" - post "%if "%_lib" == "lib64"" - post "%{_bindir}/pango-querymodules-64 --update-cache" - post "%else" - post "%{_bindir}/pango-querymodules --update-cache" - post "%endif" - postun "%if "%_lib" == "lib64"" - postun "%{_bindir}/pango-querymodules-64 --update-cache" - postun "%else" - postun "%{_bindir}/pango-querymodules --update-cache" - postun "%endif" diff --git a/macros.pango b/macros.pango index 12892e7..155bb36 100644 --- a/macros.pango +++ b/macros.pango @@ -11,25 +11,17 @@ # ### +# Since pango 1.37.0, the macros are just there for compatibility, but no longer perform any action +# Pango no loner has config and module support + %pango_module_requires \ -Requires(post): pango-tools \ -Requires(postun): pango-tools +%nil # On install, update the cache %pango_module_post \ -%if "%_lib" == "lib64" \ - %{_bindir}/pango-querymodules-64 --update-cache \ -%else \ - %{_bindir}/pango-querymodules --update-cache \ -%endif +%nil # On uninstall, update the cache. Note: we ignore upgrades (already # handled in %post of the new package). %pango_module_postun \ -if [ $1 -eq 0 ]; then \ - %if "%_lib" == "lib64" \ - %{_bindir}/pango-querymodules-64 --update-cache \ - %else \ - %{_bindir}/pango-querymodules --update-cache \ - %endif \ -fi +%nil diff --git a/pango-1.36.8.tar.xz b/pango-1.36.8.tar.xz deleted file mode 100644 index 1ce810e..0000000 --- a/pango-1.36.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 -size 1033528 diff --git a/pango-1.37.4.tar.xz b/pango-1.37.4.tar.xz new file mode 100644 index 0000000..3288f39 --- /dev/null +++ b/pango-1.37.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae2446f1c23c81d78e935054a37530336818c214f54bed2351bdd4ad0acebcbe +size 1045876 diff --git a/pango.changes b/pango.changes index 589f934..518c4be 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Wed Sep 2 08:22:41 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.37.4: + + Use grapheme boundaries in justification. + + Support coloring marks and bases independently (bgo#541608). + + Fix a crash (bgo#753167). + + Make Thai and Arabic support thread-safe. + + Fix justification. + +------------------------------------------------------------------- +Sat Aug 15 14:00:43 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.37.3: + + Fix pango_glyph_item_iter_prev. + + Add alpha attributes. + + Add support for alpha in markup. + +------------------------------------------------------------------- +Wed Jul 22 19:36:37 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.37.2: + + Don't use hb_glib_get_unicode_funcs. + + Warning fixes. + +------------------------------------------------------------------- +Wed Jun 24 12:14:41 UTC 2015 - zaitor@opensuse.org + +- Update to version 1.37.1: + + Add attributes for OpenType font features (bgo#738505). + + CoreText: locale handling improvements (bgo#750017). + + Fix ellipsization with line space (bgo#750383). + + Fix issues with hex boxes (bgo#750463). + +------------------------------------------------------------------- +Thu May 28 08:40:40 UTC 2015 - dimstar@opensuse.org + +- Update to version 1.37.0: + + Pango modules, engines, and config have been removed + (bgo#733882). + + Added pango_fc_font_map_config_changed() (bgo#748767). + + Added pango_fc_font_map_[sg]et_config() (bgo#547671). + + Added pango_matrix_get_font_scale_factors. + + Lot of API has been deprecated. + + Fix CoreText font fallback. + + General build fixes. + + Win32 build fixes. +- Clean up scriptlets: as modules support no longer exist, there + is no need for querymodules anymore. Change the existing macros + in macros.pango to be dummy placeholders (to not break other + packages referencing them). + ------------------------------------------------------------------- Sun Nov 09 21:03:00 UTC 2014 - Led diff --git a/pango.spec b/pango.spec index e30c43e..64310e2 100644 --- a/pango.spec +++ b/pango.spec @@ -1,7 +1,7 @@ # # spec file for package pango # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -20,14 +20,13 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.36.8 +Version: 1.37.4 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.36/%{name}-%{version}.tar.xz -Source1: README.SUSE +Source: http://download.gnome.org/sources/pango/1.37/%{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf BuildRequires: gcc-c++ @@ -96,20 +95,6 @@ is needed. 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 -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 -on internationalization. It can be used anywhere that text layout -is needed. - -Pango forms the core of text and font handling for GTK+. - %package devel Summary: Library for Layout and Rendering of Text -- Development Files Group: Development/Libraries/GNOME @@ -134,9 +119,6 @@ to develop applications that require these. %prep %setup -q -%if "%{_lib}" == "lib64" -cp -a %{SOURCE1} . -%endif %build %configure --disable-static --with-pic --with-cairo @@ -145,84 +127,18 @@ make %{?_smp_mflags} %install %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}/modules.cache -%if "%{_lib}" == "lib64" -mv %{buildroot}%{_bindir}/pango-querymodules %{buildroot}%{_bindir}/pango-querymodules-64 -%endif # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm -########################################################################### -# Note: when updating scriptlets, don't forget to also update baselibs.conf -########################################################################### - -# Convenient %%define for the scriplets -%if "%{_lib}" == "lib64" -%define _pango_querymodules %{_bindir}/pango-querymodules-64 -%else -%define _pango_querymodules %{_bindir}/pango-querymodules -%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. -%endif -if test -f %{_pango_querymodules}; then - %{_pango_querymodules_update_cache} -fi - -%if 0 -# No need to call pango-querymodules in postun: -# - if it's an upgrade, it will have been called in post -# - if it's an uninstall, we don't care about this anymore -%endif +%post -n libpango-1_0-0 -p /sbin/ldconfig %postun -n libpango-1_0-0 -p /sbin/ldconfig -%post module-thai-lang -%{_pango_querymodules_update_cache} - -%postun module-thai-lang -%{_pango_querymodules_update_cache} - -%post tools -%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 -# pango-querymodules couldn't run there. -%endif -if [ $1 = 1 ]; then - test -f %{_libdir}/libpango-1.0.so.0 - if test $? -eq 0; then - %{_pango_querymodules_update_cache} - fi -fi - %files -n libpango-1_0-0 %defattr(-,root,root) -%if "%{_lib}" == "lib64" -%doc README AUTHORS COPYING ChangeLog README.SUSE -%else %doc README AUTHORS COPYING ChangeLog -%endif -%dir %{_libdir}/pango -%dir %{_libdir}/pango/%{pango_binary_version} -%ghost %{_libdir}/pango/%{pango_binary_version}/modules.cache -%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 -%config %ghost %{_sysconfdir}/pango/pango.modules %files -n typelib-1_0-Pango-1_0 %defattr(-,root,root) @@ -233,17 +149,9 @@ fi %files tools %defattr(-, root, root) -%{_bindir}/pango-querymodules* %{_bindir}/pango-view -%doc %{_mandir}/man1/pango-querymodules.1* %doc %{_mandir}/man1/pango-view.1* -# We have this module in a subpackage because it requires additional libraries. - -%files module-thai-lang -%defattr(-, root, root) -%{_libdir}/pango/%{pango_binary_version}/modules/pango-thai-lang.so - %files devel %defattr(-, root, root) %{_libdir}/lib*.so From a815202bcf4a0e3a9f5308d6d868416cfda88086f56a22c79dd1060b08a5f9c5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 Sep 2015 12:44:56 +0000 Subject: [PATCH 2/3] Accepting request 331426 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/331426 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=140 --- pango-1.37.4.tar.xz | 3 --- pango-1.37.5.tar.xz | 3 +++ pango.changes | 6 ++++++ pango.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 pango-1.37.4.tar.xz create mode 100644 pango-1.37.5.tar.xz diff --git a/pango-1.37.4.tar.xz b/pango-1.37.4.tar.xz deleted file mode 100644 index 3288f39..0000000 --- a/pango-1.37.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae2446f1c23c81d78e935054a37530336818c214f54bed2351bdd4ad0acebcbe -size 1045876 diff --git a/pango-1.37.5.tar.xz b/pango-1.37.5.tar.xz new file mode 100644 index 0000000..124a78e --- /dev/null +++ b/pango-1.37.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebd7cf2b93cf9a8161c7ab883889917b1650c70f989e3188b8eab00eedd83ac4 +size 1046612 diff --git a/pango.changes b/pango.changes index 518c4be..24b461b 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 16 07:19:11 UTC 2015 - dimstar@opensuse.org + +- Update to version 1.37.5: + + Small optimizations. + ------------------------------------------------------------------- Wed Sep 2 08:22:41 UTC 2015 - zaitor@opensuse.org diff --git a/pango.spec b/pango.spec index 64310e2..ddc6795 100644 --- a/pango.spec +++ b/pango.spec @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.37.4 +Version: 1.37.5 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ From 1b8b4d4ec95f3197119d7dad402c2565fc47f370de6d56c5b5664918aa2c5596 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Sep 2015 15:11:13 +0000 Subject: [PATCH 3/3] Accepting request 332697 from GNOME:Next Update to 1.38.0 OBS-URL: https://build.opensuse.org/request/show/332697 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=141 --- pango-1.37.5.tar.xz | 3 --- pango-1.38.0.tar.xz | 3 +++ pango.changes | 6 ++++++ pango.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 pango-1.37.5.tar.xz create mode 100644 pango-1.38.0.tar.xz diff --git a/pango-1.37.5.tar.xz b/pango-1.37.5.tar.xz deleted file mode 100644 index 124a78e..0000000 --- a/pango-1.37.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebd7cf2b93cf9a8161c7ab883889917b1650c70f989e3188b8eab00eedd83ac4 -size 1046612 diff --git a/pango-1.38.0.tar.xz b/pango-1.38.0.tar.xz new file mode 100644 index 0000000..f263ff1 --- /dev/null +++ b/pango-1.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d4e75974bad853ee9ac5fc5caee5e7ab235abbd945d51d01f3806e04e7c226c +size 1046788 diff --git a/pango.changes b/pango.changes index 24b461b..88955f5 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 21 14:26:27 UTC 2015 - dimstar@opensuse.org + +- Update to version 1.38.0: + + No changes. + ------------------------------------------------------------------- Wed Sep 16 07:19:11 UTC 2015 - dimstar@opensuse.org diff --git a/pango.spec b/pango.spec index ddc6795..550343b 100644 --- a/pango.spec +++ b/pango.spec @@ -20,13 +20,13 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.37.5 +Version: 1.38.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.37/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/pango/1.38/%{name}-%{version}.tar.xz Source2: macros.pango Source99: baselibs.conf BuildRequires: gcc-c++