From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 1/3] pango: Update to version 1.49.0 Date: Wed, 01 Sep 2021 11:33:49 +0100 Message-ID: In-Reply-To: <90de0d4b-8b1f-c5b0-bc71-b9146f9eb344@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7359082176586500574==" List-Id: --===============7359082176586500574== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, Should we not add this to all places where we call ninja in one large patch? -Michael > On 1 Sep 2021, at 09:03, Adolf Belka wrote: >=20 > Hi Michael, >=20 > On 31/08/2021 11:54, Michael Tremer wrote: >> Hello, >> Reviewed-by: Michael Tremer >> Please see below... >>> On 25 Aug 2021, at 16:51, Adolf Belka wrote: >>>=20 >>> - Update from 1.30.1 (2012) to 1.49.0 (2021) >>> - Update of rootfile - Pango modules, engines, and config have been remov= ed (#733882) in >>> version 1.37.0 in 2014. >>> - pango now has dependencies of harfbuzz and fribidi so patches for these= two are >>> included in the following two patches for this series. >>> - Changelog is too large to show here but the details can be found in the= NEWS file in >>> the source tarball. >>>=20 >>> Signed-off-by: Adolf Belka >>> --- >>> config/rootfiles/common/pango | 111 ++++------------------------------ >>> lfs/pango | 10 +-- >>> make.sh | 2 + >>> 3 files changed, 18 insertions(+), 105 deletions(-) >>>=20 >>> diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango >>> index 286aa35e0..8f420c60c 100644 >>> --- a/config/rootfiles/common/pango >>> +++ b/config/rootfiles/common/pango >>> @@ -1,14 +1,15 @@ >>> -etc/pango >>> -etc/pango/pango.modules >>> -usr/bin/pango-querymodules >>> +usr/bin/pango-list >>> +usr/bin/pango-segmentation >>> usr/bin/pango-view >>> #usr/include/pango-1.0 >>> #usr/include/pango-1.0/pango >>> #usr/include/pango-1.0/pango/pango-attributes.h >>> #usr/include/pango-1.0/pango/pango-bidi-type.h >>> #usr/include/pango-1.0/pango/pango-break.h >>> +#usr/include/pango-1.0/pango/pango-color.h >>> #usr/include/pango-1.0/pango/pango-context.h >>> #usr/include/pango-1.0/pango/pango-coverage.h >>> +#usr/include/pango-1.0/pango/pango-direction.h >>> #usr/include/pango-1.0/pango/pango-engine.h >>> #usr/include/pango-1.0/pango/pango-enum-types.h >>> #usr/include/pango-1.0/pango/pango-features.h >>> @@ -21,6 +22,7 @@ usr/bin/pango-view >>> #usr/include/pango-1.0/pango/pango-item.h >>> #usr/include/pango-1.0/pango/pango-language.h >>> #usr/include/pango-1.0/pango/pango-layout.h >>> +#usr/include/pango-1.0/pango/pango-markup.h >>> #usr/include/pango-1.0/pango/pango-matrix.h >>> #usr/include/pango-1.0/pango/pango-modules.h >>> #usr/include/pango-1.0/pango/pango-ot.h >>> @@ -29,115 +31,24 @@ usr/bin/pango-view >>> #usr/include/pango-1.0/pango/pango-tabs.h >>> #usr/include/pango-1.0/pango/pango-types.h >>> #usr/include/pango-1.0/pango/pango-utils.h >>> +#usr/include/pango-1.0/pango/pango-version-macros.h >>> #usr/include/pango-1.0/pango/pango.h >>> #usr/include/pango-1.0/pango/pangocairo.h >>> #usr/include/pango-1.0/pango/pangofc-decoder.h >>> #usr/include/pango-1.0/pango/pangofc-font.h >>> #usr/include/pango-1.0/pango/pangofc-fontmap.h >>> #usr/include/pango-1.0/pango/pangoft2.h >>> -#usr/lib/libpango-1.0.la >>> #usr/lib/libpango-1.0.so >>> usr/lib/libpango-1.0.so.0 >>> -usr/lib/libpango-1.0.so.0.3000.1 >>> -#usr/lib/libpangocairo-1.0.la >>> +usr/lib/libpango-1.0.so.0.4900.0 >>> #usr/lib/libpangocairo-1.0.so >>> usr/lib/libpangocairo-1.0.so.0 >>> -usr/lib/libpangocairo-1.0.so.0.3000.1 >>> -#usr/lib/libpangoft2-1.0.la >>> +usr/lib/libpangocairo-1.0.so.0.4900.0 >>> #usr/lib/libpangoft2-1.0.so >>> usr/lib/libpangoft2-1.0.so.0 >>> -usr/lib/libpangoft2-1.0.so.0.3000.1 >>> -usr/lib/pango >>> -usr/lib/pango/1.6.0 >>> -usr/lib/pango/1.6.0/modules >>> -#usr/lib/pango/1.6.0/modules/pango-arabic-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-arabic-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-arabic-lang.la >>> -usr/lib/pango/1.6.0/modules/pango-arabic-lang.so >>> -#usr/lib/pango/1.6.0/modules/pango-basic-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-basic-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-hangul-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-hangul-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-hebrew-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-indic-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-indic-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-indic-lang.la >>> -usr/lib/pango/1.6.0/modules/pango-indic-lang.so >>> -#usr/lib/pango/1.6.0/modules/pango-khmer-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-khmer-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-syriac-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-syriac-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-thai-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-thai-fc.so >>> -#usr/lib/pango/1.6.0/modules/pango-tibetan-fc.la >>> -usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so >>> +usr/lib/libpangoft2-1.0.so.0.4900.0 >>> #usr/lib/pkgconfig/pango.pc >>> #usr/lib/pkgconfig/pangocairo.pc >>> +#usr/lib/pkgconfig/pangofc.pc >>> #usr/lib/pkgconfig/pangoft2.pc >>> -#usr/share/gtk-doc/html/pango >>> -#usr/share/gtk-doc/html/pango/PangoEngineLang.html >>> -#usr/share/gtk-doc/html/pango/PangoEngineShape.html >>> -#usr/share/gtk-doc/html/pango/PangoFcDecoder.html >>> -#usr/share/gtk-doc/html/pango/PangoFcFont.html >>> -#usr/share/gtk-doc/html/pango/PangoFcFontMap.html >>> -#usr/share/gtk-doc/html/pango/PangoMarkupFormat.html >>> -#usr/share/gtk-doc/html/pango/annotation-glossary.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-10.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-12.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-14.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-16.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-18.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-2.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-20.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-22.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-24.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-26.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-28.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-30.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-4.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-6.html >>> -#usr/share/gtk-doc/html/pango/api-index-1-8.html >>> -#usr/share/gtk-doc/html/pango/api-index-deprecated.html >>> -#usr/share/gtk-doc/html/pango/api-index-full.html >>> -#usr/share/gtk-doc/html/pango/home.png >>> -#usr/share/gtk-doc/html/pango/index.html >>> -#usr/share/gtk-doc/html/pango/index.sgml >>> -#usr/share/gtk-doc/html/pango/layout.gif >>> -#usr/share/gtk-doc/html/pango/left.png >>> -#usr/share/gtk-doc/html/pango/lowlevel.html >>> -#usr/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html >>> -#usr/share/gtk-doc/html/pango/pango-Bidirectional-Text.html >>> -#usr/share/gtk-doc/html/pango/pango-Cairo-Rendering.html >>> -#usr/share/gtk-doc/html/pango/pango-CoreText-Fonts.html >>> -#usr/share/gtk-doc/html/pango/pango-Coverage-Maps.html >>> -#usr/share/gtk-doc/html/pango/pango-Engines.html >>> -#usr/share/gtk-doc/html/pango/pango-Fonts.html >>> -#usr/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html >>> -#usr/share/gtk-doc/html/pango/pango-Glyph-Storage.html >>> -#usr/share/gtk-doc/html/pango/pango-Layout-Objects.html >>> -#usr/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html >>> -#usr/share/gtk-doc/html/pango/pango-Modules.html >>> -#usr/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html >>> -#usr/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html >>> -#usr/share/gtk-doc/html/pango/pango-Tab-Stops.html >>> -#usr/share/gtk-doc/html/pango/pango-Text-Attributes.html >>> -#usr/share/gtk-doc/html/pango/pango-Text-Processing.html >>> -#usr/share/gtk-doc/html/pango/pango-Version-Checking.html >>> -#usr/share/gtk-doc/html/pango/pango-Vertical-Text.html >>> -#usr/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html >>> -#usr/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html >>> -#usr/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html >>> -#usr/share/gtk-doc/html/pango/pango-hierarchy.html >>> -#usr/share/gtk-doc/html/pango/pango-pango-renderer.html >>> -#usr/share/gtk-doc/html/pango/pango-querymodules.html >>> -#usr/share/gtk-doc/html/pango/pango.devhelp2 >>> -#usr/share/gtk-doc/html/pango/pango.html >>> -#usr/share/gtk-doc/html/pango/rendering.html >>> -#usr/share/gtk-doc/html/pango/right.png >>> -#usr/share/gtk-doc/html/pango/rotated-text.png >>> -#usr/share/gtk-doc/html/pango/style.css >>> -#usr/share/gtk-doc/html/pango/tools.html >>> -#usr/share/gtk-doc/html/pango/up.png >>> -#usr/share/man/man1/pango-querymodules.1 >>> -#usr/share/man/man1/pango-view.1 >>> +#usr/lib/pkgconfig/pangoot.pc >>> diff --git a/lfs/pango b/lfs/pango >>> index cd6287e67..314e05e39 100644 >>> --- a/lfs/pango >>> +++ b/lfs/pango >>> @@ -24,7 +24,7 @@ >>>=20 >>> include Config >>>=20 >>> -VER =3D 1.30.1 >>> +VER =3D 1.49.0 >>>=20 >>> THISAPP =3D pango-$(VER) >>> DL_FILE =3D $(THISAPP).tar.xz >>> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) >>>=20 >>> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >>>=20 >>> -$(DL_FILE)_MD5 =3D ec3c1f236ee9bd4a982a5f46fcaff7b9 >>> +$(DL_FILE)_MD5 =3D 307181e0868a1f3903f8d9e4107f73c2 >>>=20 >>> install : $(TARGET) >>>=20 >>> @@ -71,8 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>> @$(PREBUILD) >>> @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) >>> $(UPDATE_AUTOMAKE) >>> - cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc >>> - cd $(DIR_APP) && make $(MAKETUNING) >>> - cd $(DIR_APP) && make install >>> + cd $(DIR_APP) && meson --prefix=3D/usr --sysconfdir=3D/etc builddir/ >>> + cd $(DIR_APP) && ninja -C builddir/ >>> + cd $(DIR_APP) && ninja -C builddir/ install >> We have this MAKETUNING variable which configures how many CPU cores shoul= d be used by make. It always contains something like =E2=80=9C-jN=E2=80=9D wh= ere N is the number of processors. We used to have a different function to de= termine N, but we recently changed it. >> Ninja should honour that in the same way I think. It automatically default= s to all CPU cores, but it should be the same as with make, right? > Yes, ninja takes the same -jN command. I didn't add it as I read that Ninja= defaults to taking all the cores available. >> So should we add MAKETUNING to the ninja command line, too? I think that s= hould solve it very easily and would allow people to configure a custom value= for N. > I will add this variable on and redo the patch set. >=20 > Regards, > Adolf. >>> @rm -rf $(DIR_APP) >>> @$(POSTBUILD) >>> diff --git a/make.sh b/make.sh >>> index 0baf2050d..dedabcb11 100755 >>> --- a/make.sh >>> +++ b/make.sh >>> @@ -1347,6 +1347,8 @@ buildipfire() { >>> lfsmake2 freefont >>> lfsmake2 pixman >>> lfsmake2 cairo >>> + lfsmake2 harfbuzz >>> + lfsmake2 fribidi >>> lfsmake2 pango >>> lfsmake2 rrdtool >>> lfsmake2 setup >>> --=20 >>> 2.33.0 --===============7359082176586500574==--