[packages/icu-le-hb] up to 1.2.3
atler
atler at pld-linux.org
Wed Feb 15 13:25:48 CET 2023
commit 17d056344e9dce870faf7028d21ffee178a4df14
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Feb 15 13:25:32 2023 +0100
up to 1.2.3
icu-le-hb-link.patch | 10 ---------
icu-le-hb.spec | 22 +++++++++-----------
icu68.patch | 58 ----------------------------------------------------
3 files changed, 10 insertions(+), 80 deletions(-)
---
diff --git a/icu-le-hb.spec b/icu-le-hb.spec
index e1fe8f3..aacf4c7 100644
--- a/icu-le-hb.spec
+++ b/icu-le-hb.spec
@@ -5,23 +5,22 @@
Summary: ICU Layout Engine API on top of HarfBuzz shaping library
Summary(pl.UTF-8): API ICU Layout Engine oparte na bibliotece tworzenia kształtów HarfBuzz
Name: icu-le-hb
-Version: 1.0.3
-Release: 10
+Version: 1.2.3
+Release: 1
License: ICU (MIT-like)
Group: Libraries
-Source0: http://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.gz
-# Source0-md5: e9b6ad05e19597bb90d1aa087c149b23
-Patch0: %{name}-link.patch
-Patch1: icu68.patch
+Source0: https://github.com/harfbuzz/icu-le-hb/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 19db9f9baa15a56db6c1ff54ae6da7cd
URL: http://www.freedesktop.org/wiki/HarfBuzz
BuildRequires: autoconf >= 2.56
+BuildRequires: autoconf-archive
BuildRequires: automake >= 1:1.9
-BuildRequires: harfbuzz-devel >= 1.0.3
+BuildRequires: harfbuzz-devel >= 1.2.3
BuildRequires: libicu-devel
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.8.1
BuildRequires: libtool >= 2:1.5
BuildRequires: pkgconfig
-Requires: harfbuzz >= 1.0.3
+Requires: harfbuzz >= 1.2.3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -42,7 +41,7 @@ Summary: Header files for icu-le-hb library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki icu-le-hb
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: harfbuzz-devel >= 1.0.3
+Requires: harfbuzz-devel >= 1.2.3
Requires: libicu-devel
Requires: libstdc++-devel
@@ -66,8 +65,6 @@ Statyczna biblioteka icu-le-hb.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -75,6 +72,7 @@ Statyczna biblioteka icu-le-hb.
%{__autoconf}
%{__automake}
%configure \
+ --disable-silent-rules \
%{!?with_static_libs:--disable-static}
%{__make}
diff --git a/icu-le-hb-link.patch b/icu-le-hb-link.patch
deleted file mode 100644
index f5deffd..0000000
--- a/icu-le-hb-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- icu-le-hb-1.0.3/src/Makefile.am.orig 2015-11-23 22:32:52.000000000 +0100
-+++ icu-le-hb-1.0.3/src/Makefile.am 2015-11-29 10:26:59.099082085 +0100
-@@ -24,6 +24,7 @@
- $(NULL)
- libicu_le_hb_la_LIBADD = \
- $(HARFBUZZ_LIBS) \
-+ $(ICU_LIBS) \
- $(NULL)
-
- libicu_le_hb_la_SOURCES = \
diff --git a/icu68.patch b/icu68.patch
deleted file mode 100644
index 9aa6958..0000000
--- a/icu68.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c0a0a85833cdcceb636dbe986f39a43ac40f839f Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c at gentoo.org>
-Date: Fri, 30 Oct 2020 15:04:44 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c at gentoo.org>
----
- src/LEFontInstance.cpp | 2 +-
- src/LEGlyphStorage.cpp | 2 +-
- src/LEInsertionList.cpp | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/LEFontInstance.cpp b/src/LEFontInstance.cpp
-index e5595f2..89bc3ed 100644
---- a/src/LEFontInstance.cpp
-+++ b/src/LEFontInstance.cpp
-@@ -79,7 +79,7 @@ void LEFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset,
-
- LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const
- {
-- return mapCharToGlyph(ch, mapper, TRUE);
-+ return mapCharToGlyph(ch, mapper, true);
- }
-
- LEGlyphID LEFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const
-diff --git a/src/LEGlyphStorage.cpp b/src/LEGlyphStorage.cpp
-index bac403a..b537676 100644
---- a/src/LEGlyphStorage.cpp
-+++ b/src/LEGlyphStorage.cpp
-@@ -659,7 +659,7 @@ le_bool LEGlyphStorage::applyInsertion(le_int32 atPosition, le_int32 count, LEGl
- // just got replaced by the insertion
- fSrcIndex -= 1;
-
-- return FALSE;
-+ return false;
- }
-
- U_NAMESPACE_END
-diff --git a/src/LEInsertionList.cpp b/src/LEInsertionList.cpp
-index c64b8a1..3e39952 100644
---- a/src/LEInsertionList.cpp
-+++ b/src/LEInsertionList.cpp
-@@ -86,11 +86,11 @@ le_bool LEInsertionList::applyInsertions(LEInsertionCallback *callback)
- {
- for (InsertionRecord *rec = head; rec != NULL; rec = rec->next) {
- if (callback->applyInsertion(rec->position, rec->count, rec->glyphs)) {
-- return TRUE;
-+ return true;
- }
- }
-
-- return FALSE;
-+ return false;
- }
-
- U_NAMESPACE_END
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icu-le-hb.git/commitdiff/17d056344e9dce870faf7028d21ffee178a4df14
More information about the pld-cvs-commit
mailing list