From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v3 1/3] pango: Update to version 1.50.0
Date: Mon, 06 Dec 2021 18:02:03 +0100 [thread overview]
Message-ID: <20211206170205.1596565-1-adolf.belka@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9160 bytes --]
- v3 version has updated pango version
- Update from 1.30.1 (2012) to 1.50.0 (2021)
- Update of rootfile - Pango modules, engines, and config have been removed (#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.
- make.sh modified to include
build of these two packages before pango is built
- Build is done via meson/ninja now
- Changelog is too large to show here but the details can be found in the NEWS file in
the source tarball.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/pango | 111 ++++------------------------------
lfs/pango | 10 +--
make.sh | 2 +
3 files changed, 18 insertions(+), 105 deletions(-)
diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango
index 286aa35e0..b9146ecdd 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.5000.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.5000.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.5000.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..fce1b120c 100644
--- a/lfs/pango
+++ b/lfs/pango
@@ -24,7 +24,7 @@
include Config
-VER = 1.30.1
+VER = 1.50.0
THISAPP = pango-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ec3c1f236ee9bd4a982a5f46fcaff7b9
+$(DL_FILE)_MD5 = 726a7c7b6faf34006d2b5aa0dd8dc1d5
install : $(TARGET)
@@ -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=/usr --sysconfdir=/etc
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
+ cd $(DIR_APP) && meson --prefix=/usr --sysconfdir=/etc builddir/
+ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+ cd $(DIR_APP) && ninja -C builddir/ install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index e6f948ba0..232b863d0 100755
--- a/make.sh
+++ b/make.sh
@@ -1350,6 +1350,8 @@ buildipfire() {
lfsmake2 freefont
lfsmake2 pixman
lfsmake2 cairo
+ lfsmake2 harfbuzz
+ lfsmake2 fribidi
lfsmake2 pango
lfsmake2 rrdtool
lfsmake2 setup
--
2.34.1
next reply other threads:[~2021-12-06 17:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 17:02 Adolf Belka [this message]
2021-12-06 17:02 ` [PATCH v3 2/3] harfbuzz: New dependency for pango Adolf Belka
2021-12-07 12:16 ` Michael Tremer
2021-12-06 17:02 ` [PATCH v3 3/3] fribidi: " Adolf Belka
2021-12-07 12:16 ` Michael Tremer
2021-12-07 12:16 ` [PATCH v3 1/3] pango: Update to version 1.50.0 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211206170205.1596565-1-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox