Date: Tue, 11 May 2021 16:58:03 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0ac1997e2f6f - main - print/libraqm: upgrade to v0.7.1 Message-ID: <202105111658.14BGw32h095563@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ac1997e2f6fdda0e8442a2deef01dadf0089da1 commit 0ac1997e2f6fdda0e8442a2deef01dadf0089da1 Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2021-04-24 09:55:49 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2021-05-11 16:57:41 +0000 print/libraqm: upgrade to v0.7.1 Release notes at <https://github.com/HOST-Oman/libraqm/releases/tag/v0.7.1>. Since I´m there, add a test target (all tests pass). PR: 255360 Approved by: maintainer´s time-out --- print/libraqm/Makefile | 23 ++++- print/libraqm/distinfo | 6 +- print/libraqm/files/patch-src_raqm.c | 194 ----------------------------------- print/libraqm/pkg-plist | 37 ++++--- 4 files changed, 43 insertions(+), 217 deletions(-) diff --git a/print/libraqm/Makefile b/print/libraqm/Makefile index 28ac20183310..686ce490ebb0 100644 --- a/print/libraqm/Makefile +++ b/print/libraqm/Makefile @@ -1,8 +1,9 @@ +# oiho a + PORTNAME= libraqm -PORTVERSION= 0.6.0 +PORTVERSION= 0.7.1 +DISTVERSIONPREFIX= v CATEGORIES= print -MASTER_SITES= https://github.com/HOST-Oman/libraqm/releases/download/v${PORTVERSION}/ -DISTNAME= raqm-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org COMMENT= Library that encapsulates complex text layout logic @@ -13,10 +14,24 @@ LIB_DEPENDS= libfribidi.so:converters/fribidi \ libharfbuzz.so:print/harfbuzz \ libfreetype.so:print/freetype2 -USES= gmake libtool pkgconfig +USES= autoreconf:build gmake libtool pkgconfig python:test + +USE_GITHUB= yes +GH_ACCOUNT= HOST-Oman GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip +TEST_TARGET= check + +OPTIONS_DEFINE= DOCS +DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc +DOCS_CONFIGURE_ENABLE= gtk-doc +DOCS_CONFIGURE_ON= --with-html-dir=${DOCSDIR} + +pre-configure: + ${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' \ + ${WRKSRC}/tests/Makefile.am + cd ${WRKSRC} && ./autogen.sh .include <bsd.port.mk> diff --git a/print/libraqm/distinfo b/print/libraqm/distinfo index bb41094a91ed..cfefffceaa25 100644 --- a/print/libraqm/distinfo +++ b/print/libraqm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1557777780 -SHA256 (raqm-0.6.0.tar.gz) = 37ccb06bcedd2e1340137086841ca8929fd728627bd1d707daba448d5c7b111a -SIZE (raqm-0.6.0.tar.gz) = 678695 +TIMESTAMP = 1619197119 +SHA256 (HOST-Oman-libraqm-v0.7.1_GH0.tar.gz) = 3a80118fde37b8c07d35b0d40465e68190bdbd6e984ca6fe5c8192c521bb076d +SIZE (HOST-Oman-libraqm-v0.7.1_GH0.tar.gz) = 305259 diff --git a/print/libraqm/files/patch-src_raqm.c b/print/libraqm/files/patch-src_raqm.c deleted file mode 100644 index 8fcc7cb66935..000000000000 --- a/print/libraqm/files/patch-src_raqm.c +++ /dev/null @@ -1,194 +0,0 @@ ---- src/raqm.c.orig 2019-05-05 20:05:08 UTC -+++ src/raqm.c -@@ -1599,14 +1599,14 @@ _raqm_shape (raqm_t *rq) - /* Convert index from UTF-32 to UTF-8 */ - static uint32_t - _raqm_u32_to_u8_index (raqm_t *rq, -- uint32_t index) -+ uint32_t raqm_index) - { - FriBidiStrIndex length; -- char *output = malloc ((sizeof (char) * 4 * index) + 1); -+ char *output = malloc ((sizeof (char) * 4 * raqm_index) + 1); - - length = fribidi_unicode_to_charset (FRIBIDI_CHAR_SET_UTF8, - rq->text, -- index, -+ raqm_index, - output); - - free (output); -@@ -1616,14 +1616,14 @@ _raqm_u32_to_u8_index (raqm_t *rq, - /* Convert index from UTF-8 to UTF-32 */ - static uint32_t - _raqm_u8_to_u32_index (raqm_t *rq, -- uint32_t index) -+ uint32_t raqm_index) - { - FriBidiStrIndex length; -- uint32_t *output = malloc (sizeof (uint32_t) * (index + 1)); -+ uint32_t *output = malloc (sizeof (uint32_t) * (raqm_index + 1)); - - length = fribidi_charset_to_unicode (FRIBIDI_CHAR_SET_UTF8, - rq->text_utf8, -- index, -+ raqm_index, - output); - - free (output); -@@ -1655,7 +1655,7 @@ _raqm_in_hangul_syllable (hb_codepoint_t ch); - */ - bool - raqm_index_to_position (raqm_t *rq, -- size_t *index, -+ size_t *raqm_index, - int *x, - int *y) - { -@@ -1667,19 +1667,19 @@ raqm_index_to_position (raqm_t *rq, - return false; - - if (rq->flags & RAQM_FLAG_UTF8) -- *index = _raqm_u8_to_u32_index (rq, *index); -+ *raqm_index = _raqm_u8_to_u32_index (rq, *raqm_index); - -- if (*index >= rq->text_len) -+ if (*raqm_index >= rq->text_len) - return false; - - RAQM_TEST ("\n"); - -- while (*index < rq->text_len) -+ while (*raqm_index < rq->text_len) - { -- if (_raqm_allowed_grapheme_boundary (rq->text[*index], rq->text[*index + 1])) -+ if (_raqm_allowed_grapheme_boundary (rq->text[*raqm_index], rq->text[*raqm_index + 1])) - break; - -- ++*index; -+ ++*raqm_index; - } - - for (raqm_run_t *run = rq->runs; run != NULL; run = run->next) -@@ -1712,11 +1712,11 @@ raqm_index_to_position (raqm_t *rq, - if (next_cluster == curr_cluster) - next_cluster = run->pos + run->len; - -- if (*index < next_cluster && *index >= curr_cluster) -+ if (*raqm_index < next_cluster && *raqm_index >= curr_cluster) - { - if (run->direction == HB_DIRECTION_RTL) - *x -= position[i].x_advance; -- *index = curr_cluster; -+ *raqm_index = curr_cluster; - goto found; - } - } -@@ -1724,8 +1724,8 @@ raqm_index_to_position (raqm_t *rq, - - found: - if (rq->flags & RAQM_FLAG_UTF8) -- *index = _raqm_u32_to_u8_index (rq, *index); -- RAQM_TEST ("The position is %d at index %zu\n",*x ,*index); -+ *raqm_index = _raqm_u32_to_u8_index (rq, *raqm_index); -+ RAQM_TEST ("The position is %d at index %zu\n",*x ,*raqm_index); - return true; - } - -@@ -1749,7 +1749,7 @@ bool - raqm_position_to_index (raqm_t *rq, - int x, - int y, -- size_t *index) -+ size_t *raqm_index) - { - int delta_x = 0, current_x = 0; - (void)y; -@@ -1760,9 +1760,9 @@ raqm_position_to_index (raqm_t *rq, - if (x < 0) /* Get leftmost index */ - { - if (rq->resolved_dir == RAQM_DIRECTION_RTL) -- *index = rq->text_len; -+ *raqm_index = rq->text_len; - else -- *index = 0; -+ *raqm_index = 0; - return true; - } - -@@ -1789,7 +1789,7 @@ raqm_position_to_index (raqm_t *rq, - before = (x > current_x + (delta_x / 2)); - - if (before) -- *index = info[i].cluster; -+ *raqm_index = info[i].cluster; - else - { - uint32_t curr_cluster = info[i].cluster; -@@ -1805,25 +1805,25 @@ raqm_position_to_index (raqm_t *rq, - if (next_cluster == curr_cluster) - next_cluster = run->pos + run->len; - -- *index = next_cluster; -+ *raqm_index = next_cluster; - } -- if (_raqm_allowed_grapheme_boundary (rq->text[*index],rq->text[*index + 1])) -+ if (_raqm_allowed_grapheme_boundary (rq->text[*raqm_index],rq->text[*raqm_index + 1])) - { -- RAQM_TEST ("The start-index is %zu at position %d \n", *index, x); -+ RAQM_TEST ("The start-index is %zu at position %d \n", *raqm_index, x); - return true; - } - -- while (*index < (unsigned)run->pos + run->len) -+ while (*raqm_index < (unsigned)run->pos + run->len) - { -- if (_raqm_allowed_grapheme_boundary (rq->text[*index], -- rq->text[*index + 1])) -+ if (_raqm_allowed_grapheme_boundary (rq->text[*raqm_index], -+ rq->text[*raqm_index + 1])) - { -- *index += 1; -+ *raqm_index += 1; - break; - } -- *index += 1; -+ *raqm_index += 1; - } -- RAQM_TEST ("The start-index is %zu at position %d \n", *index, x); -+ RAQM_TEST ("The start-index is %zu at position %d \n", *raqm_index, x); - return true; - } - else -@@ -1833,11 +1833,11 @@ raqm_position_to_index (raqm_t *rq, - - /* Get rightmost index*/ - if (rq->resolved_dir == RAQM_DIRECTION_RTL) -- *index = 0; -+ *raqm_index = 0; - else -- *index = rq->text_len; -+ *raqm_index = rq->text_len; - -- RAQM_TEST ("The start-index is %zu at position %d \n", *index, x); -+ RAQM_TEST ("The start-index is %zu at position %d \n", *raqm_index, x); - - return true; - } -@@ -1931,11 +1931,11 @@ _raqm_get_grapheme_break (hb_codepoint_t ch, - case HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK: - case HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK: - case HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK: -- if (ch != 0x102B || ch != 0x102C || ch != 0x1038 || -- (ch <= 0x1062 && ch >= 0x1064) || (ch <= 0x1067 && ch >= 0x106D) || -- ch != 0x1083 || (ch <= 0x1087 && ch >= 0x108C) || ch != 0x108F || -- (ch <= 0x109A && ch >= 0x109C) || ch != 0x1A61 || ch != 0x1A63 || -- ch != 0x1A64 || ch != 0xAA7B || ch != 0xAA70 || ch != 0x11720 || -+ if (ch != 0x102B && ch != 0x102C && ch != 0x1038 && -+ (ch < 0x1062 || ch > 0x1064) && (ch < 0x1067 || ch > 0x106D) && -+ ch != 0x1083 && (ch < 0x1087 || ch > 0x108C) && ch != 0x108F && -+ (ch < 0x109A || ch > 0x109C) && ch != 0x1A61 && ch != 0x1A63 && -+ ch != 0x1A64 && ch != 0xAA7B && ch != 0xAA70 && ch != 0x11720 && - ch != 0x11721) /**/ - gb_type = RAQM_GRAPHEM_SPACING_MARK; - diff --git a/print/libraqm/pkg-plist b/print/libraqm/pkg-plist index 53619f120ce4..576e2ad950a0 100644 --- a/print/libraqm/pkg-plist +++ b/print/libraqm/pkg-plist @@ -1,21 +1,26 @@ +include/raqm-version.h include/raqm.h lib/libraqm.a lib/libraqm.so lib/libraqm.so.0 -lib/libraqm.so.0.600.0 +lib/libraqm.so.0.700.1 libdata/pkgconfig/raqm.pc -share/gtk-doc/html/raqm/annotation-glossary.html -share/gtk-doc/html/raqm/api-index-full.html -share/gtk-doc/html/raqm/ch01.html -share/gtk-doc/html/raqm/home.png -share/gtk-doc/html/raqm/index.html -share/gtk-doc/html/raqm/left-insensitive.png -share/gtk-doc/html/raqm/left.png -share/gtk-doc/html/raqm/object-tree.html -share/gtk-doc/html/raqm/raqm-Raqm.html -share/gtk-doc/html/raqm/raqm.devhelp2 -share/gtk-doc/html/raqm/right-insensitive.png -share/gtk-doc/html/raqm/right.png -share/gtk-doc/html/raqm/style.css -share/gtk-doc/html/raqm/up-insensitive.png -share/gtk-doc/html/raqm/up.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/annotation-glossary.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/api-index-0-1.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/api-index-0-2.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/api-index-0-3.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/api-index-0-6.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/api-index-0-7.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/api-index-full.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/ch01.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/home.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/index.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/left-insensitive.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/left.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/raqm-Raqm.html +%%PORTDOCS%%%%DOCSDIR%%/raqm/raqm.devhelp2 +%%PORTDOCS%%%%DOCSDIR%%/raqm/right-insensitive.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/right.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/style.css +%%PORTDOCS%%%%DOCSDIR%%/raqm/up-insensitive.png +%%PORTDOCS%%%%DOCSDIR%%/raqm/up.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105111658.14BGw32h095563>