Hello community, here is the log from the commit of package pango for openSUSE:Factory checked in at 2014-07-08 16:58:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pango (Old) and /work/SRC/openSUSE:Factory/.pango.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pango" Changes: -------- --- /work/SRC/openSUSE:Factory/pango/pango.changes 2014-03-31 20:43:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pango.new/pango.changes 2014-07-08 16:58:58.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 1 14:30:36 UTC 2014 - [email protected] + +- Update to version 1.36.5: + + Lower the harfbuzz requirement. +- Changes from version 1.36.4: + + Improve thread-safety on Windows (bgo#695913). + + Add missing annotations (bgo#729840). + + Update PangoWeight documentation. + + Require harfbuzz 0.9.29. + +------------------------------------------------------------------- Old: ---- pango-1.36.3.tar.xz New: ---- pango-1.36.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.Hqilzc/_old 2014-07-08 16:59:00.000000000 +0200 +++ /var/tmp/diff_new_pack.Hqilzc/_new 2014-07-08 16:59:00.000000000 +0200 @@ -20,7 +20,7 @@ %define pango_binary_version 1.8.0 Name: pango -Version: 1.36.3 +Version: 1.36.5 Release: 0 Summary: Library for Layout and Rendering of Text License: LGPL-2.1+ ++++++ pango-1.36.3.tar.xz -> pango-1.36.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/ChangeLog new/pango-1.36.5/ChangeLog --- old/pango-1.36.3/ChangeLog 2014-03-18 02:15:44.000000000 +0100 +++ new/pango-1.36.5/ChangeLog 2014-06-24 19:37:34.000000000 +0200 @@ -1,3 +1,230 @@ +commit 41b2e15167bf3a6ef2d682ccaf8530a4ba44f061 +Author: Matthias Clasen <[email protected]> +Date: Tue Jun 24 13:29:00 2014 -0400 + + 1.36.5 + + NEWS | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 858704140e35058ee074f2929d7d06a3c2bb1951 +Author: Behdad Esfahbod <[email protected]> +Date: Tue Jun 24 10:26:37 2014 -0600 + + Revert "build: Require Harfbuzz 0.9.29" + + This reverts commit e728c4c3659cc0ead406344b4cf98c0676cb769e. + + See previous commit for explanation. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 394b2789c7a4f7c6071f4e5b83e3cf9876d50608 +Author: Behdad Esfahbod <[email protected]> +Date: Tue Jun 24 10:26:08 2014 -0600 + + Revert "ot-info: Update after API break in HarfBuzz" + + This reverts commit 4901fb74b3c1137d13a6b7e4e8784577c1816e47. + + The removed API was added back to HarfBuzz. So, no need for this. + + pango/pango-ot-info.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit a788c729989f4f116ecd6742895d06da1a75c80c +Author: Matthias Clasen <[email protected]> +Date: Mon Jun 23 14:05:51 2014 -0400 + + Bump version + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 64113b70adff816d1d7885500abfb99461e40838 +Author: Matthias Clasen <[email protected]> +Date: Mon Jun 23 13:35:22 2014 -0400 + + 1.36.4 + + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 4901fb74b3c1137d13a6b7e4e8784577c1816e47 +Author: Emmanuele Bassi <[email protected]> +Date: Fri Jun 20 11:39:15 2014 +0100 + + ot-info: Update after API break in HarfBuzz + + pango/pango-ot-info.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit e728c4c3659cc0ead406344b4cf98c0676cb769e +Author: Emmanuele Bassi <[email protected]> +Date: Fri Jun 20 11:38:19 2014 +0100 + + build: Require Harfbuzz 0.9.29 + + There has been an API change in HB: + + -hb_ot_layout_language_get_required_feature_index + +hb_ot_layout_language_get_required_feature + + Commit: da132937989acb4d8ca9bd41c79f98750e7dda30 + + So we need to bump the dependency. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 715ed720eced19967a88871c9712d8e4e4de03b9 +Author: Emmanuele Bassi <[email protected]> +Date: Fri Jun 20 11:26:33 2014 +0100 + + Fix introspection annotation + + Missing colon broke the g-ir-scanner. + + pango/shape.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aee1d73950792744af73d7cec5cb867906c225af +Author: Matthias Clasen <[email protected]> +Date: Tue Jun 10 19:46:55 2014 -0400 + + Update PangoWeight documentation + + A while ago, we added a weight of 1000 to the enumeration, but + neglected to update the allowed values in the documentation. + Fix that. + + pango/pango-font.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 809246a62d5ca91f7321f8239db50b77eaaef021 +Author: Chun-wei Fan <[email protected]> +Date: Mon Jun 9 10:49:53 2014 +0800 + + MSVC 2010+ Projects: Update "Installation" Process + + Currently, due to the way that Visual Studio 2010+ projects are + handled, + the "install" project does not re-build upon changes to the sources, + as it + does not believe that its dependencies have changed, although + the changed + sources are automatically recompiled. This means that if a part + or more + of the solution does not build, or if the sources need some other + fixes + or enhancements, the up-to-date build is not copied automatically, + which + can be misleading. + + Improve on the situation by forcing the "install" project to + trigger its + rebuild, so that the updated binaries can be copied. This does + trigger an + MSBuild warning, but having that warning is way better than not + having an + up-to-date build, especially during testing and development. + + build/win32/vs10/install.vcxproj | 52 + +++++++++++++++++--------------- + build/win32/vs10/pango-install-bin.props | 2 +- + build/win32/vs10/pango-install.propsin | 14 ++++++++- + 3 files changed, 42 insertions(+), 26 deletions(-) + +commit 35fbbe32ae49cb80130be4d0cd7d375dfef6d2ad +Author: Matthias Clasen <[email protected]> +Date: Sat May 31 00:19:57 2014 -0400 + + testsuite: put installed tests in the right place + + Follow the prevailing practice and put the installed tests + into $libdir/installed-tests/$PACKAGE instead of + $pkglibdir/installed-tests. + + tests/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c039b91c429383826ca4becbcb4c87e9d7c983b4 +Author: Behdad Esfahbod <[email protected]> +Date: Thu May 8 17:13:52 2014 -0400 + + Typo + + Oops + + pango/pango-renderer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17fc3aad5a0084ac8c31b09807bf8e03a01569b5 +Author: Behdad Esfahbod <[email protected]> +Date: Thu May 8 17:00:30 2014 -0400 + + Bug 729840 - Missing annotation for get_color + + pango/pango-renderer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6a7834465b3e188744673f8e335737464e4d15de +Author: Behdad Esfahbod <[email protected]> +Date: Wed Apr 9 20:50:50 2014 -0700 + + [win32] Fixup previous commit + + pango/pangowin32-fontmap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b75a1c26e3436c58b6ce2b56e31768ad115b6bed +Author: Behdad Esfahbod <[email protected]> +Date: Wed Apr 9 16:55:12 2014 -0700 + + [win32] Improve threadsafety + + Based on patch from Chun-wei Fan. Original patch comments: + + Improve the thread-safety situation on Windows by only allowing the + pango_aliases_ht GHashTable be populated once. + + Pango on Windows is not yet thread-safe, but with the thread safety + patch on Cairo-Win32-Font[1], it does seem that the test program + test-pangocairo-threads does not crash randomly anymore, which seems + to be an improvement. + + [1]: https://bugs.freedesktop.org/show_bug.cgi?id=73012 + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=695913 + + pango/pangowin32-fontmap.c | 46 + +++++++++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 21 deletions(-) + +commit 124a3728b5b73a6204bdea66cc502916e0847e69 +Author: Chun-wei Fan <[email protected]> +Date: Wed Apr 2 11:52:01 2014 +0800 + + MSVC Builds: Fix "Installation" for MSVC 2010 and Later + + We need to create $(prefix)\etc\pango before trying to create + a default + pango.aliases file, otherwise it wouldn't work. + + build/win32/vs10/pango-install.propsin | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2432e6a180a18933d45de91f03f4abcc9eae8e8c +Author: Matthias Clasen <[email protected]> +Date: Mon Mar 17 21:17:12 2014 -0400 + + Bump version + + NEWS | 7 +++++++ + configure.ac | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + commit f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd Author: Matthias Clasen <[email protected]> Date: Mon Mar 17 20:47:36 2014 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/NEWS new/pango-1.36.5/NEWS --- old/pango-1.36.3/NEWS 2014-03-18 02:01:37.000000000 +0100 +++ new/pango-1.36.5/NEWS 2014-06-24 19:28:57.000000000 +0200 @@ -1,3 +1,14 @@ +Overview of changes between 1.36.4 and 1.36.5 +============================================= +- Lower the harfbuzz requirement + +Overview of changes between 1.36.3 and 1.36.4 +============================================= +- Improve thread-safety on Windows (#695913) +- Add missing annotations (#729840) +- Update PangoWeight documentation +- Require harfbuzz 0.9.29 + Overview of changes between 1.36.2 and 1.36.3 ============================================= - Fix builddir != srdir builds diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/build/win32/vs10/install.vcxproj new/pango-1.36.5/build/win32/vs10/install.vcxproj --- old/pango-1.36.3/build/win32/vs10/install.vcxproj 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/build/win32/vs10/install.vcxproj 2014-06-11 01:48:21.000000000 +0200 @@ -139,46 +139,50 @@ <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <PreBuildEvent> - <Command>$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> - </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> + <CustomBuild Include="..\..\..\config.h.win32"> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">$(InstalledDlls);$(InstalledFCDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">$(InstalledDlls);$(InstalledFCDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">$(InstalledDlls);$(InstalledFCDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);%(Outputs)</Outputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">Installing Build Results...</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">$(PangoDoInstallBin) $(PangoInstallHeadersData)</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">$(InstalledDlls);$(InstalledFCDlls);%(Outputs)</Outputs> + </CustomBuild> + </ItemGroup> + <ItemGroup> <ProjectReference Include="pango.vcxproj"> <Project>{68cc80b9-7225-4fb5-b9ab-9c1df50b6c72}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/build/win32/vs10/pango-install-bin.props new/pango-1.36.5/build/win32/vs10/pango-install-bin.props --- old/pango-1.36.3/build/win32/vs10/pango-install-bin.props 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/build/win32/vs10/pango-install-bin.props 2014-06-11 01:48:21.000000000 +0200 @@ -62,4 +62,4 @@ <Value>$(PangoDoInstallBin)</Value> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/build/win32/vs10/pango-install.props new/pango-1.36.5/build/win32/vs10/pango-install.props --- old/pango-1.36.3/build/win32/vs10/pango-install.props 2014-03-18 02:15:49.000000000 +0100 +++ new/pango-1.36.5/build/win32/vs10/pango-install.props 2014-06-24 19:37:38.000000000 +0200 @@ -4,6 +4,9 @@ <Import Project="pango-install-bin.props" /> </ImportGroup> <PropertyGroup Label="UserMacros"> + <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir> + <InstalledDlls>$(BinDir)\$(PangoDllPrefix)pango(PangoDllSuffix).dll;$(BinDir)\$(PangoDllPrefix)pangowin32(PangoDllSuffix).dll;$(BinDir)\$(PangoDllPrefix)pangocairo(PangoDllSuffix).dll</InstalledDlls> + <InstalledFCDlls>$(BinDir)\$(PangoDllPrefix)pangoft2(PangoDllSuffix).dll</InstalledFCDlls> <PangoInstallHeadersData> mkdir $(CopyDir)\include\pango-$(PangoApiVersion)\pango copy ..\..\..\pango\pango.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango @@ -43,6 +46,7 @@ copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango :DO_CREATE_PANGO_ALIASES if exist $(CopyDir)\etc\pango\pango.aliases goto END +if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > $(CopyDir)\etc\pango\pango.aliases echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases echo serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases @@ -56,6 +60,15 @@ <ItemDefinitionGroup> </ItemDefinitionGroup> <ItemGroup> + <BuildMacro Include="BinDir"> + <Value>$(BinDir)</Value> + </BuildMacro> + <BuildMacro Include="InstalledDlls"> + <Value>$(InstalledDlls)</Value> + </BuildMacro> + <BuildMacro Include="InstalledFCDlls"> + <Value>$(InstalledFCDlls)</Value> + </BuildMacro> <BuildMacro Include="PangoInstallHeadersData"> <Value>$(PangoInstallHeadersData)</Value> </BuildMacro> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/build/win32/vs10/pango-install.propsin new/pango-1.36.5/build/win32/vs10/pango-install.propsin --- old/pango-1.36.3/build/win32/vs10/pango-install.propsin 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/build/win32/vs10/pango-install.propsin 2014-06-11 01:48:21.000000000 +0200 @@ -4,6 +4,9 @@ <Import Project="pango-install-bin.props" /> </ImportGroup> <PropertyGroup Label="UserMacros"> + <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir> + <InstalledDlls>$(BinDir)\$(PangoDllPrefix)pango(PangoDllSuffix).dll;$(BinDir)\$(PangoDllPrefix)pangowin32(PangoDllSuffix).dll;$(BinDir)\$(PangoDllPrefix)pangocairo(PangoDllSuffix).dll</InstalledDlls> + <InstalledFCDlls>$(BinDir)\$(PangoDllPrefix)pangoft2(PangoDllSuffix).dll</InstalledFCDlls> <PangoInstallHeadersData> #include "pango.vs10.headers" @@ -36,6 +39,8 @@ if exist $(CopyDir)\etc\pango\pango.aliases goto END +if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango + echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > $(CopyDir)\etc\pango\pango.aliases echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases @@ -53,8 +58,17 @@ <ItemDefinitionGroup> </ItemDefinitionGroup> <ItemGroup> + <BuildMacro Include="BinDir"> + <Value>$(BinDir)</Value> + </BuildMacro> + <BuildMacro Include="InstalledDlls"> + <Value>$(InstalledDlls)</Value> + </BuildMacro> + <BuildMacro Include="InstalledFCDlls"> + <Value>$(InstalledFCDlls)</Value> + </BuildMacro> <BuildMacro Include="PangoInstallHeadersData"> <Value>$(PangoInstallHeadersData)</Value> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/config.h.win32 new/pango-1.36.5/config.h.win32 --- old/pango-1.36.3/config.h.win32 2014-03-18 02:02:44.000000000 +0100 +++ new/pango-1.36.5/config.h.win32 2014-06-24 19:31:53.000000000 +0200 @@ -118,7 +118,7 @@ #define PACKAGE_NAME "pango" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pango 1.36.3" +#define PACKAGE_STRING "pango 1.36.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pango" @@ -127,19 +127,19 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.36.3" +#define PACKAGE_VERSION "1.36.5" /* PANGO binary age */ -#define PANGO_BINARY_AGE 3603 +#define PANGO_BINARY_AGE 3605 /* PANGO interface age */ -#define PANGO_INTERFACE_AGE 3 +#define PANGO_INTERFACE_AGE 5 /* PANGO major version */ #define PANGO_VERSION_MAJOR 1 /* PANGO micro version */ -#define PANGO_VERSION_MICRO 3 +#define PANGO_VERSION_MICRO 5 /* PANGO minor version */ #define PANGO_VERSION_MINOR 36 @@ -151,4 +151,4 @@ /* #undef USE_LA_MODULES */ /* Version number of package */ -#define VERSION "1.36.3" +#define VERSION "1.36.5" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/configure new/pango-1.36.5/configure --- old/pango-1.36.3/configure 2014-03-18 02:02:17.000000000 +0100 +++ new/pango-1.36.5/configure 2014-06-24 19:31:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pango 1.36.3. +# Generated by GNU Autoconf 2.69 for pango 1.36.5. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pango>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='pango' PACKAGE_TARNAME='pango' -PACKAGE_VERSION='1.36.3' -PACKAGE_STRING='pango 1.36.3' +PACKAGE_VERSION='1.36.5' +PACKAGE_STRING='pango 1.36.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pango' PACKAGE_URL='' @@ -1505,7 +1505,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pango 1.36.3 to adapt to many kinds of systems. +\`configure' configures pango 1.36.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1575,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pango 1.36.3:";; + short | recursive ) echo "Configuration of pango 1.36.5:";; esac cat <<\_ACEOF @@ -1741,7 +1741,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pango configure 1.36.3 +pango configure 1.36.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2231,7 +2231,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pango $as_me 1.36.3, which was +It was created by pango $as_me 1.36.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3097,7 +3097,7 @@ # Define the identity of the package. PACKAGE='pango' - VERSION='1.36.3' + VERSION='1.36.5' cat >>confdefs.h <<_ACEOF @@ -3234,11 +3234,11 @@ PANGO_VERSION_MAJOR=1 PANGO_VERSION_MINOR=36 -PANGO_VERSION_MICRO=3 -PANGO_VERSION=1.36.3 +PANGO_VERSION_MICRO=5 +PANGO_VERSION=1.36.5 PANGO_API_VERSION=1.0 -PANGO_INTERFACE_AGE=3 -PANGO_BINARY_AGE=3603 +PANGO_INTERFACE_AGE=5 +PANGO_BINARY_AGE=3605 PANGO_MODULE_VERSION=1.8.0 @@ -3254,10 +3254,10 @@ $as_echo "#define MODULE_VERSION \"1.8.0\"" >>confdefs.h -$as_echo "#define PANGO_BINARY_AGE 3603" >>confdefs.h +$as_echo "#define PANGO_BINARY_AGE 3605" >>confdefs.h -$as_echo "#define PANGO_INTERFACE_AGE 3" >>confdefs.h +$as_echo "#define PANGO_INTERFACE_AGE 5" >>confdefs.h $as_echo "#define PANGO_VERSION_MAJOR 1" >>confdefs.h @@ -3266,13 +3266,13 @@ $as_echo "#define PANGO_VERSION_MINOR 36" >>confdefs.h -$as_echo "#define PANGO_VERSION_MICRO 3" >>confdefs.h +$as_echo "#define PANGO_VERSION_MICRO 5" >>confdefs.h -VERSION_INFO="3600:3:3600" +VERSION_INFO="3600:5:3600" PANGO_CURRENT_MINUS_AGE=0 @@ -16416,7 +16416,7 @@ Report bugs to <[email protected]>." lt_cl_version="\ -pango config.lt 1.36.3 +pango config.lt 1.36.5 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -20888,7 +20888,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pango $as_me 1.36.3, which was +This file was extended by pango $as_me 1.36.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20954,7 +20954,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pango config.status 1.36.3 +pango config.status 1.36.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/configure.ac new/pango-1.36.5/configure.ac --- old/pango-1.36.3/configure.ac 2014-03-18 01:59:32.000000000 +0100 +++ new/pango-1.36.5/configure.ac 2014-06-24 19:27:53.000000000 +0200 @@ -22,7 +22,7 @@ dnl The triplet m4_define([pango_version_major], [1]) m4_define([pango_version_minor], [36]) -m4_define([pango_version_micro], [3]) +m4_define([pango_version_micro], [5]) m4_define([pango_version], [pango_version_major.pango_version_minor.pango_version_micro]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/PangoRenderer.html new/pango-1.36.5/docs/html/PangoRenderer.html --- old/pango-1.36.3/docs/html/PangoRenderer.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/PangoRenderer.html 2014-06-24 19:37:37.000000000 +0200 @@ -843,10 +843,10 @@ </div> <div class="refsect3"> <a name="id-1.4.2.7.15.6"></a><h4>Returns</h4> -<p> the color for the specified part, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> -if it hasn't been set and should be inherited from the -environment.</p> -<p></p> +<p> the color for the specified part, or +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if it hasn't been set and should be inherited from the +environment. </p> +<p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> <p class="since">Since 1.8</p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/api-index-full.html new/pango-1.36.5/docs/html/api-index-full.html --- old/pango-1.36.3/docs/html/api-index-full.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/api-index-full.html 2014-06-24 19:37:37.000000000 +0200 @@ -871,11 +871,11 @@ </dt> <dd></dd> <dt> -<a class="link" href="pango-Fonts.html#PANGO-FONT:CAPS" title="PANGO_FONT()">PANGO_FONT</a>, macro in <a class="link" href="pango-Fonts.html" title="Fonts">Fonts</a> +<a class="link" href="pango-Fonts.html#PangoFont-struct" title="PangoFont">PangoFont</a>, struct in <a class="link" href="pango-Fonts.html" title="Fonts">Fonts</a> </dt> <dd></dd> <dt> -<a class="link" href="pango-Fonts.html#PangoFont-struct" title="PangoFont">PangoFont</a>, struct in <a class="link" href="pango-Fonts.html" title="Fonts">Fonts</a> +<a class="link" href="pango-Fonts.html#PANGO-FONT:CAPS" title="PANGO_FONT()">PANGO_FONT</a>, macro in <a class="link" href="pango-Fonts.html" title="Fonts">Fonts</a> </dt> <dd></dd> <dt> @@ -2703,11 +2703,11 @@ </dt> <dd></dd> <dt> -<a class="link" href="pango-Version-Checking.html#pango-version" title="pango_version ()">pango_version</a>, function in <a class="link" href="pango-Version-Checking.html" title="Version Checking">Version Checking</a> +<a class="link" href="pango-Version-Checking.html#PANGO-VERSION:CAPS" title="PANGO_VERSION">PANGO_VERSION</a>, macro in <a class="link" href="pango-Version-Checking.html" title="Version Checking">Version Checking</a> </dt> <dd></dd> <dt> -<a class="link" href="pango-Version-Checking.html#PANGO-VERSION:CAPS" title="PANGO_VERSION">PANGO_VERSION</a>, macro in <a class="link" href="pango-Version-Checking.html" title="Version Checking">Version Checking</a> +<a class="link" href="pango-Version-Checking.html#pango-version" title="pango_version ()">pango_version</a>, function in <a class="link" href="pango-Version-Checking.html" title="Version Checking">Version Checking</a> </dt> <dd></dd> <dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/index.html new/pango-1.36.5/docs/html/index.html --- old/pango-1.36.3/docs/html/index.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/index.html 2014-06-24 19:37:37.000000000 +0200 @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Pango Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for Pango 1.36.3 +<div><p class="releaseinfo">for Pango 1.36.5 </p></div> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/pango-Fonts.html new/pango-1.36.5/docs/html/pango-Fonts.html --- old/pango-1.36.3/docs/html/pango-Fonts.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/pango-Fonts.html 2014-06-24 19:37:37.000000000 +0200 @@ -3640,7 +3640,7 @@ <div class="refsect2"> <a name="PangoWeight"></a><h3>enum PangoWeight</h3> <p>An enumeration specifying the weight (boldness) of a font. This is a numerical -value ranging from 100 to 900, but there are some predefined values:</p> +value ranging from 100 to 1000, but there are some predefined values:</p> <div class="refsect3"> <a name="id-1.2.4.17.4.4"></a><h4>Members</h4> <div class="informaltable"><table width="100%" border="0"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/pango-Scripts-and-Languages.html new/pango-1.36.5/docs/html/pango-Scripts-and-Languages.html --- old/pango-1.36.3/docs/html/pango-Scripts-and-Languages.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/pango-Scripts-and-Languages.html 2014-06-24 19:37:37.000000000 +0200 @@ -694,7 +694,7 @@ either said environment variables or the thread's current locale.</p> <p>Your application should call <code class="literal">setlocale(LC_ALL, "");</code> for the user settings to take effect. Gtk+ does this in its initialization -functions automatically (by calling <code class="function">gtk_set_locale()</code>). +functions automatically (by calling <a href="http://library.gnome.org/devel/gtk3/gtk2-General.html#gtk-set-locale";><code class="function">gtk_set_locale()</code></a>). See <code class="literal">man setlocale</code> for more details.</p> <div class="refsect3"> <a name="id-1.2.9.8.15.8"></a><h4>Returns</h4> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/pango-Text-Processing.html new/pango-1.36.5/docs/html/pango-Text-Processing.html --- old/pango-1.36.3/docs/html/pango-Text-Processing.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/pango-Text-Processing.html 2014-06-24 19:37:37.000000000 +0200 @@ -1774,8 +1774,8 @@ </tr> <tr> <td class="parameter_name"><p>paragraph_text</p></td> -<td class="parameter_description"><p>(allow-none) text of the paragraph (see details). May be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a>.</p></td> -<td class="parameter_annotations"> </td> +<td class="parameter_description"><p> text of the paragraph (see details). May be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a>. </p></td> +<td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> <tr> <td class="parameter_name"><p>paragraph_length</p></td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/html/pango-Version-Checking.html new/pango-1.36.5/docs/html/pango-Version-Checking.html --- old/pango-1.36.3/docs/html/pango-Version-Checking.html 2014-03-18 02:15:48.000000000 +0100 +++ new/pango-1.36.5/docs/html/pango-Version-Checking.html 2014-06-24 19:37:37.000000000 +0200 @@ -305,14 +305,14 @@ <hr> <div class="refsect2"> <a name="PANGO-VERSION-MICRO:CAPS"></a><h3>PANGO_VERSION_MICRO</h3> -<pre class="programlisting">#define PANGO_VERSION_MICRO 3 +<pre class="programlisting">#define PANGO_VERSION_MICRO 5 </pre> <p>The micro component of the version of Pango available at compile-time.</p> </div> <hr> <div class="refsect2"> <a name="PANGO-VERSION-STRING:CAPS"></a><h3>PANGO_VERSION_STRING</h3> -<pre class="programlisting">#define PANGO_VERSION_STRING "1.36.3" +<pre class="programlisting">#define PANGO_VERSION_STRING "1.36.5" </pre> <p>A string literal containing the version of Pango available at compile-time.</p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/pango-querymodules.1 new/pango-1.36.5/docs/pango-querymodules.1 --- old/pango-1.36.3/docs/pango-querymodules.1 2014-03-18 02:15:15.000000000 +0100 +++ new/pango-1.36.5/docs/pango-querymodules.1 2014-06-24 19:35:34.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: pango-querymodules .\" Author: Owen Taylor .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 03/17/2014 +.\" Date: 06/24/2014 .\" Manual: User Commands .\" Source: Pango .\" Language: English .\" -.TH "PANGO\-QUERYMODULES" "1" "03/17/2014" "Pango" "User Commands" +.TH "PANGO\-QUERYMODULES" "1" "06/24/2014" "Pango" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/docs/version.xml new/pango-1.36.5/docs/version.xml --- old/pango-1.36.3/docs/version.xml 2014-03-18 02:02:43.000000000 +0100 +++ new/pango-1.36.5/docs/version.xml 2014-06-24 19:31:52.000000000 +0200 @@ -1 +1 @@ -1.36.3 +1.36.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pango-features.h new/pango-1.36.5/pango/pango-features.h --- old/pango-1.36.3/pango/pango-features.h 2014-03-18 02:02:49.000000000 +0100 +++ new/pango-1.36.5/pango/pango-features.h 2014-06-24 19:31:55.000000000 +0200 @@ -4,9 +4,9 @@ #define PANGO_VERSION_MAJOR 1 #define PANGO_VERSION_MINOR 36 -#define PANGO_VERSION_MICRO 3 +#define PANGO_VERSION_MICRO 5 -#define PANGO_VERSION_STRING "1.36.3" +#define PANGO_VERSION_STRING "1.36.5" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pango-font.h new/pango-1.36.5/pango/pango-font.h --- old/pango-1.36.3/pango/pango-font.h 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/pango/pango-font.h 2014-06-11 01:48:21.000000000 +0200 @@ -91,7 +91,7 @@ * @PANGO_WEIGHT_ULTRAHEAVY: the ultraheavy weight (= 1000; Since: 1.24) * * An enumeration specifying the weight (boldness) of a font. This is a numerical - * value ranging from 100 to 900, but there are some predefined values: + * value ranging from 100 to 1000, but there are some predefined values: */ typedef enum { PANGO_WEIGHT_THIN = 100, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pango-renderer.c new/pango-1.36.5/pango/pango-renderer.c --- old/pango-1.36.3/pango/pango-renderer.c 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/pango/pango-renderer.c 2014-05-31 06:18:22.000000000 +0200 @@ -1181,8 +1181,8 @@ * * Gets the current rendering color for the specified part. * - * Return value: the color for the specified part, or %NULL - * if it hasn't been set and should be inherited from the + * Return value: (transfer none): the color for the specified part, or + * %NULL if it hasn't been set and should be inherited from the * environment. * * Since: 1.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pango.rc new/pango-1.36.5/pango/pango.rc --- old/pango-1.36.3/pango/pango.rc 2014-03-18 02:02:42.000000000 +0100 +++ new/pango-1.36.5/pango/pango.rc 2014-06-24 19:31:51.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,36,3,0 - PRODUCTVERSION 1,36,3,0 + FILEVERSION 1,36,5,0 + PRODUCTVERSION 1,36,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pango" - VALUE "FileVersion", "1.36.3.0" + VALUE "FileVersion", "1.36.5.0" VALUE "InternalName", "pango-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software." VALUE "OriginalFilename", "pango-1.0-0.dll" VALUE "ProductName", "Pango" - VALUE "ProductVersion", "1.36.3" + VALUE "ProductVersion", "1.36.5" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pangocairo.rc new/pango-1.36.5/pango/pangocairo.rc --- old/pango-1.36.3/pango/pangocairo.rc 2014-03-18 02:02:43.000000000 +0100 +++ new/pango-1.36.5/pango/pangocairo.rc 2014-06-24 19:31:51.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,36,3,0 - PRODUCTVERSION 1,36,3,0 + FILEVERSION 1,36,5,0 + PRODUCTVERSION 1,36,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoCairo" - VALUE "FileVersion", "1.36.3.0" + VALUE "FileVersion", "1.36.5.0" VALUE "InternalName", "pangocairo-1.0-0" VALUE "LegalCopyright", "Copyright � 2010 Red Hat Software." VALUE "OriginalFilename", "pangocairo-1.0-0.dll" VALUE "ProductName", "PangoCairo" - VALUE "ProductVersion", "1.36.3" + VALUE "ProductVersion", "1.36.5" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pangoft2.rc new/pango-1.36.5/pango/pangoft2.rc --- old/pango-1.36.3/pango/pangoft2.rc 2014-03-18 02:02:42.000000000 +0100 +++ new/pango-1.36.5/pango/pangoft2.rc 2014-06-24 19:31:51.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,36,3,0 - PRODUCTVERSION 1,36,3,0 + FILEVERSION 1,36,5,0 + PRODUCTVERSION 1,36,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoFT2" - VALUE "FileVersion", "1.36.3.0" + VALUE "FileVersion", "1.36.5.0" VALUE "InternalName", "pangoft2-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software. Copyright � 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangoft2-1.0-0.dll" VALUE "ProductName", "PangoFT2" - VALUE "ProductVersion", "1.36.3" + VALUE "ProductVersion", "1.36.5" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pangowin32-fontmap.c new/pango-1.36.5/pango/pangowin32-fontmap.c --- old/pango-1.36.3/pango/pangowin32-fontmap.c 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/pango/pangowin32-fontmap.c 2014-05-02 18:47:13.000000000 +0200 @@ -320,8 +320,6 @@ gboolean visible; /* Do we want/need this? */ }; -static GHashTable *pango_aliases_ht = NULL; /* MT-unsafe */ - static guint alias_hash (struct PangoAlias *alias) { @@ -351,8 +349,9 @@ } static void -handle_alias_line (GString *line_buffer, - char **errstring) +handle_alias_line (GString *line_buffer, + char **errstring, + GHashTable *ht_aliases) { GString *tmp_buffer1; GString *tmp_buffer2; @@ -404,14 +403,14 @@ alias_key.alias = g_ascii_strdown (tmp_buffer1->str, -1); /* Remove any existing values */ - alias = g_hash_table_lookup (pango_aliases_ht, &alias_key); + alias = g_hash_table_lookup (ht_aliases, &alias_key); if (!alias) { alias = g_slice_new0 (struct PangoAlias); alias->alias = alias_key.alias; - g_hash_table_insert (pango_aliases_ht, alias, alias); + g_hash_table_insert (ht_aliases, alias, alias); } else g_free (alias_key.alias); @@ -468,7 +467,7 @@ }; static void -read_builtin_aliases (void) +read_builtin_aliases (GHashTable *ht_aliases) { GString *line_buffer; @@ -480,7 +479,7 @@ for (line = 0; line < G_N_ELEMENTS (builtin_aliases) && errstring == NULL; line++) { g_string_assign (line_buffer, builtin_aliases[line]); - handle_alias_line (line_buffer, &errstring); + handle_alias_line (line_buffer, &errstring, ht_aliases); } if (errstring) @@ -495,7 +494,7 @@ static void -read_alias_file (const char *filename) +read_alias_file (const char *filename, GHashTable *ht_aliases) { FILE *file; @@ -513,7 +512,7 @@ errstring == NULL) { line++; - handle_alias_line (line_buffer, &errstring); + handle_alias_line (line_buffer, &errstring, ht_aliases); } if (errstring == NULL && ferror (file)) @@ -530,25 +529,25 @@ fclose (file); } -static void +static GHashTable * load_aliases (void) { char *filename; const char *home; - pango_aliases_ht = g_hash_table_new_full ((GHashFunc)alias_hash, - (GEqualFunc)alias_equal, - (GDestroyNotify)alias_free, - NULL); + GHashTable *ht_aliases = g_hash_table_new_full ((GHashFunc)alias_hash, + (GEqualFunc)alias_equal, + (GDestroyNotify)alias_free, + NULL); #ifdef HAVE_CAIRO_WIN32 - read_builtin_aliases (); + read_builtin_aliases (ht_aliases); #endif filename = g_strconcat (pango_get_sysconf_subdirectory (), G_DIR_SEPARATOR_S "pango.aliases", NULL); - read_alias_file (filename); + read_alias_file (filename, ht_aliases); g_free (filename); home = g_get_home_dir (); @@ -557,9 +556,10 @@ filename = g_strconcat (home, G_DIR_SEPARATOR_S ".pango.aliases", NULL); - read_alias_file (filename); + read_alias_file (filename, ht_aliases); g_free (filename); } + return ht_aliases; } static void @@ -567,14 +567,18 @@ char ***families, int *n_families) { + static GHashTable *aliases_ht = NULL; /* MT-safe */ + struct PangoAlias alias_key; struct PangoAlias *alias; - if (pango_aliases_ht == NULL) - load_aliases (); + if (g_once_init_enter (&aliases_ht)) + { + g_once_init_leave (&aliases_ht, load_aliases ()); + } alias_key.alias = g_ascii_strdown (fontname, -1); - alias = g_hash_table_lookup (pango_aliases_ht, &alias_key); + alias = g_hash_table_lookup (aliases_ht, &alias_key); g_free (alias_key.alias); if (alias) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pangowin32.rc new/pango-1.36.5/pango/pangowin32.rc --- old/pango-1.36.3/pango/pangowin32.rc 2014-03-18 02:02:42.000000000 +0100 +++ new/pango-1.36.5/pango/pangowin32.rc 2014-06-24 19:31:51.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,36,3,0 - PRODUCTVERSION 1,36,3,0 + FILEVERSION 1,36,5,0 + PRODUCTVERSION 1,36,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "PangoWin32" - VALUE "FileVersion", "1.36.3.0" + VALUE "FileVersion", "1.36.5.0" VALUE "InternalName", "pangowin32-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software. Copyright � 2000 Tor Lillqvist" VALUE "OriginalFilename", "pangowin32-1.0-0.dll" VALUE "ProductName", "PangoWin32" - VALUE "ProductVersion", "1.36.3" + VALUE "ProductVersion", "1.36.5" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/pangoxft.rc new/pango-1.36.5/pango/pangoxft.rc --- old/pango-1.36.3/pango/pangoxft.rc 2014-03-18 02:02:43.000000000 +0100 +++ new/pango-1.36.5/pango/pangoxft.rc 2014-06-24 19:31:51.000000000 +0200 @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,36,3,0 - PRODUCTVERSION 1,36,3,0 + FILEVERSION 1,36,5,0 + PRODUCTVERSION 1,36,5,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ BEGIN VALUE "CompanyName", "Red Hat Software" VALUE "FileDescription", "Pangoxft" - VALUE "FileVersion", "1.36.3.0" + VALUE "FileVersion", "1.36.5.0" VALUE "InternalName", "pangoxft-1.0-0" VALUE "LegalCopyright", "Copyright � 1999 Red Hat Software." VALUE "OriginalFilename", "pangoxft-1.0-0.dll" VALUE "ProductName", "Pangoxft" - VALUE "ProductVersion", "1.36.3" + VALUE "ProductVersion", "1.36.5" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/pango/shape.c new/pango-1.36.5/pango/shape.c --- old/pango-1.36.3/pango/shape.c 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/pango/shape.c 2014-06-23 19:30:09.000000000 +0200 @@ -66,7 +66,7 @@ * pango_shape_full: * @item_text: valid UTF-8 text to shape. * @item_length: the length (in bytes) of @item_text. -1 means nul-terminated text. - * @paragraph_text: (allow-none) text of the paragraph (see details). May be %NULL. + * @paragraph_text: (allow-none): text of the paragraph (see details). May be %NULL. * @paragraph_length: the length (in bytes) of @paragraph_text. -1 means nul-terminated text. * @analysis: #PangoAnalysis structure from pango_itemize(). * @glyphs: glyph string in which to store results. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/tests/Makefile.am new/pango-1.36.5/tests/Makefile.am --- old/pango-1.36.3/tests/Makefile.am 2014-03-06 05:33:55.000000000 +0100 +++ new/pango-1.36.5/tests/Makefile.am 2014-05-31 06:19:17.000000000 +0200 @@ -82,7 +82,7 @@ noinst_PROGRAMS = $(check_PROGRAMS) gen-all-unicode dump-boundaries if BUILDOPT_INSTALL_TESTS -insttestdir=$(pkglibexecdir)/installed-tests +insttestdir=$(libexecdir)/installed-tests/$(PACKAGE) insttest_PROGRAMS = $(check_PROGRAMS) testdatadir = $(insttestdir) @@ -97,7 +97,7 @@ %.test: %$(EXEEXT) Makefile $(AM_V_GEN) (echo '[Test]' > [email protected]; \ echo 'Type=session' >> [email protected]; \ - echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> [email protected]; \ + echo 'Exec=$(libexecdir)/installed-tests/$(PACKAGE)/$<' >> [email protected]; \ mv [email protected] $@) endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pango-1.36.3/tests/Makefile.in new/pango-1.36.5/tests/Makefile.in --- old/pango-1.36.3/tests/Makefile.in 2014-03-18 02:02:21.000000000 +0100 +++ new/pango-1.36.5/tests/Makefile.in 2014-06-24 19:31:37.000000000 +0200 @@ -646,7 +646,7 @@ test_pangocairo_threads_LDADD = $(TEST_PANGOCAIRO_LIBS) $(CAIRO_LIBS) $(GLIB_LIBS) dump_boundaries_LDADD = $(TEST_PANGO_LIBS) $(GLIB_LIBS) cxx_test_SOURCES = cxx-test.C -@BUILDOPT_INSTALL_TESTS_TRUE@insttestdir = $(pkglibexecdir)/installed-tests +@BUILDOPT_INSTALL_TESTS_TRUE@insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) @BUILDOPT_INSTALL_TESTS_TRUE@insttest_PROGRAMS = $(check_PROGRAMS) @BUILDOPT_INSTALL_TESTS_TRUE@testdatadir = $(insttestdir) @BUILDOPT_INSTALL_TESTS_TRUE@testdata_DATA = \ @@ -1364,7 +1364,7 @@ @BUILDOPT_INSTALL_TESTS_TRUE@%.test: %$(EXEEXT) Makefile @BUILDOPT_INSTALL_TESTS_TRUE@ $(AM_V_GEN) (echo '[Test]' > [email protected]; \ @BUILDOPT_INSTALL_TESTS_TRUE@ echo 'Type=session' >> [email protected]; \ -@BUILDOPT_INSTALL_TESTS_TRUE@ echo 'Exec=$(pkglibexecdir)/installed-tests/$<' >> [email protected]; \ +@BUILDOPT_INSTALL_TESTS_TRUE@ echo 'Exec=$(libexecdir)/installed-tests/$(PACKAGE)/$<' >> [email protected]; \ @BUILDOPT_INSTALL_TESTS_TRUE@ mv [email protected] $@) -include $(top_srcdir)/git.mk -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
