From nobody Wed Jul 20 20:38:32 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lp6wm58s8z4WvFH; Wed, 20 Jul 2022 20:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lp6wm4fzFz3Yhh; Wed, 20 Jul 2022 20:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658349512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7yvB6dS2tDR3onZDgU1UsA8p57qeMERf8QIy+LmsFI=; b=khxo3LfrjyiBVU0VOw6H9JmekbL4UmrbxlOSnQK9CfqqxxRANn4f6fMk82V6oISWRU2L4J A11U5SnxrRevRE3tZFG6jQMnBuBtjDnWQoM5iVIpAFl6whY6tRs6pXq5XFUBbwYKJ8PjwM InWkDM0Qg/gqMrJGIRmTqhsdlcPnCrN4QU4q/+unDeOi/mAbZJEvCeQaLVMFwjNnJqjjXE TMNwcI1rI/VYVPnn6li7Wng5NoNcr+ebyYqBdFKfFjrQm6ysBQReRsssBXr8ey6k38FqEe YpDTG9oSp9GRLTD2h8Vqyk+yr25YODKMcZ/vzwRRNFc30ynbduFu/BBWdB71Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lp6wm3JwNz19dV; Wed, 20 Jul 2022 20:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26KKcWXk008657; Wed, 20 Jul 2022 20:38:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26KKcWWQ008656; Wed, 20 Jul 2022 20:38:32 GMT (envelope-from git) Date: Wed, 20 Jul 2022 20:38:32 GMT Message-Id: <202207202038.26KKcWWQ008656@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 2cca79c47733 - main - cad/librnd: update to 3.2.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cca79c47733ee05a2021788cd5b5e7e1a3eddde Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658349512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7yvB6dS2tDR3onZDgU1UsA8p57qeMERf8QIy+LmsFI=; b=rCwqHFz+s2Qw5K+X1xxHQWFUPLPdFZXaMFzJ15Upa2pXZYEALppgXYmBefe0pSeR9qDKtn OhBknDWStvwNfRQ4MUtiglPGXO5K7wKET+QH6g8xTsC+1r73GlcW/eGdPJB5iYOI8co2q6 Ny3h4u+gnRkKg+ZrYLS1vpyBhSrPxCobXo1mKg8f4736vFGIsykE/dB28zpoU3HVifC2J8 P1Eb4a9ubSk/YU0j0FIZ0PtPkx5SxpPJOm/G3tPfMU7X9CDuC7WGvo0VDGwrD5Uc3jyaUw HYGC6pUpxAnpMH7aIpH6HZuYRIJJqtp345JGgJ6zKEc1lalQBPQVl6IPPDRZjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658349512; a=rsa-sha256; cv=none; b=Tncx1TBgh+WUF6MkS8WlF2brXwFHlmBf2taDPWlsCMxiIvPqB3ssCWGtQ4UZS3+dJNj3s+ G5juSmhxhnUF6zMyBcw3/KsJZwsD05JegprelFGIXkac/Hpf8gX3BC9fL6E6UTZFKp3waC bXTWP/A3Uwtug4AZmZuuveh6Qot7iGkCRxFxkww9ucVOZ19EJ55Kcm8W58bu0m2sNF1HSv ZMab1zDId4lGrLCoMZF7pPNmgNMoa6UDHrq2WFJijXae4mrJSYtR9lgQbBvGg/NXQMLDCx XF0BYskeu87PMwJNkdxTyStPe67+AG6aJ57bC5pklYAYzVLQQnoS8TTjJs88tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=2cca79c47733ee05a2021788cd5b5e7e1a3eddde commit 2cca79c47733ee05a2021788cd5b5e7e1a3eddde Author: Robert Clausecker AuthorDate: 2022-07-20 20:34:51 +0000 Commit: Fernando Apesteguía CommitDate: 2022-07-20 20:34:51 +0000 cad/librnd: update to 3.2.0 Previous patch in PR was incomplete. This one properly updates the port to 3.2.0. Fixes: 89b6b25d78b0 --- cad/librnd/Makefile | 2 +- cad/librnd/distinfo | 6 ++-- cad/librnd/files/patch-tests_librnd_librnd__test.c | 20 ++++---------- cad/librnd/pkg-plist | 32 ++++++++++++++++++++-- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile index 9988eafb1178..9c8fe968d0c4 100644 --- a/cad/librnd/Makefile +++ b/cad/librnd/Makefile @@ -1,5 +1,5 @@ PORTNAME= librnd -DISTVERSION= 3.1.2 +DISTVERSION= 3.2.0 CATEGORIES= cad MASTER_SITES= http://repo.hu/projects/${PORTNAME}/releases/ diff --git a/cad/librnd/distinfo b/cad/librnd/distinfo index 04e9345c89e2..b22e9e57dc30 100644 --- a/cad/librnd/distinfo +++ b/cad/librnd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653657927 -SHA256 (librnd-3.1.2.tar.bz2) = 8510d434e63fad66c599cae40a01c291a8b94e2473fa9472d76c8de8a31c4e1b -SIZE (librnd-3.1.2.tar.bz2) = 1238925 +TIMESTAMP = 1657765911 +SHA256 (librnd-3.2.0.tar.bz2) = 4192dae3a5eb1f2da9311b7b9ce8a9cf8f78a7d7dd667ee74403d1a424e5fbc8 +SIZE (librnd-3.2.0.tar.bz2) = 1314225 diff --git a/cad/librnd/files/patch-tests_librnd_librnd__test.c b/cad/librnd/files/patch-tests_librnd_librnd__test.c index 1e362113a5fc..b200117b866c 100644 --- a/cad/librnd/files/patch-tests_librnd_librnd__test.c +++ b/cad/librnd/files/patch-tests_librnd_librnd__test.c @@ -1,10 +1,10 @@ Index: tests/librnd/librnd_test.c =================================================================== ---- tests/librnd/librnd_test.c.orig 2021-06-11 15:14:52 UTC +--- tests/librnd/librnd_test.c.orig 2022-05-11 07:25:34 UTC +++ tests/librnd/librnd_test.c -@@ -22,12 +22,23 @@ static void poly_test() - rnd_poly_valid(&pa); - } +@@ -15,6 +15,15 @@ + + /*** init test ***/ +/* workaround for symbols missing out because of the static linking done with + the test app. Won't ever happen to real apps as they don't static link */ @@ -15,14 +15,6 @@ Index: tests/librnd/librnd_test.c + workaround_fn = rnd_pixmap_reg_import; +} + - int main(int argc, char *argv[]) + static void poly_test() { - int n; - rnd_main_args_t ga; - - rnd_app.default_embedded_menu = ""; -+ -+ librnd_test_symbol_workaround(); - - rnd_fix_locale_and_env(); - + rnd_polyarea_t pa; diff --git a/cad/librnd/pkg-plist b/cad/librnd/pkg-plist index e2913de4764b..a647f29d1486 100644 --- a/cad/librnd/pkg-plist +++ b/cad/librnd/pkg-plist @@ -13,6 +13,7 @@ include/librnd/core/compat_lrealpath.h include/librnd/core/compat_misc.h include/librnd/core/conf.h include/librnd/core/conf_hid.h +include/librnd/core/conf_multi_temp.h include/librnd/core/config.h include/librnd/core/error.h include/librnd/core/event.h @@ -54,8 +55,15 @@ include/librnd/core/safe_fs_dir.h include/librnd/core/tool.h include/librnd/core/unit.h include/librnd/core/vtc0.h +include/librnd/plugins/lib_exp_pixmap/draw_pixmap.h +include/librnd/plugins/lib_exp_text/draw_eps.h +include/librnd/plugins/lib_exp_text/draw_ps.h +include/librnd/plugins/lib_exp_text/draw_svg.h +include/librnd/plugins/lib_exp_text/lpr_hid.h +include/librnd/plugins/lib_exp_text/media.h include/librnd/plugins/lib_hid_common/dialogs_conf.h include/librnd/plugins/lib_hid_common/dlg_comm_m.h +include/librnd/plugins/lib_hid_common/dlg_export.h include/librnd/plugins/lib_hid_common/dlg_pref.h include/librnd/plugins/lib_hid_common/place.h include/librnd/plugins/lib_hid_common/toolbar.h @@ -119,6 +127,16 @@ include/librnd/src_3rd/liblihata/hash_str.h include/librnd/src_3rd/liblihata/lihata.h include/librnd/src_3rd/liblihata/parser.h include/librnd/src_3rd/liblihata/tree.h +include/librnd/src_3rd/libualloc/acache_impl.h +include/librnd/src_3rd/libualloc/buddy_debug.h +include/librnd/src_3rd/libualloc/buddy_impl.h +include/librnd/src_3rd/libualloc/libualloc.h +include/librnd/src_3rd/libualloc/mcache_impl.h +include/librnd/src_3rd/libualloc/slab_impl.h +include/librnd/src_3rd/libualloc/slabap_impl.h +include/librnd/src_3rd/libualloc/stackd_impl.h +include/librnd/src_3rd/libualloc/stackdnp_impl.h +include/librnd/src_3rd/libualloc/stacks_impl.h include/librnd/src_3rd/libulzw/libulzw.h include/librnd/src_3rd/puplug/config.h include/librnd/src_3rd/puplug/error.h @@ -133,15 +151,15 @@ include/librnd/src_3rd/ureglex/exec.h lib/librnd-3rd.a lib/librnd-3rd.so lib/librnd-3rd.so.3 -lib/librnd-3rd.so.3.1.2 +lib/librnd-3rd.so.3.2.0 lib/librnd-hid.a lib/librnd-hid.so lib/librnd-hid.so.3 -lib/librnd-hid.so.3.1.2 +lib/librnd-hid.so.3.2.0 lib/librnd-poly.a lib/librnd-poly.so lib/librnd-poly.so.3 -lib/librnd-poly.so.3.1.2 +lib/librnd-poly.so.3.2.0 lib/librnd3/plugins/diag_rnd.pup lib/librnd3/plugins/diag_rnd.so lib/librnd3/plugins/hid_batch.pup @@ -156,8 +174,16 @@ lib/librnd3/plugins/hid_batch.so %%MOTIF%%lib/librnd3/plugins/hid_lesstif.so lib/librnd3/plugins/hid_remote.pup lib/librnd3/plugins/hid_remote.so +%%GD%%lib/librnd3/plugins/import_pixmap_gd.pup +%%GD%%lib/librnd3/plugins/import_pixmap_gd.so +lib/librnd3/plugins/import_pixmap_pnm.pup +lib/librnd3/plugins/import_pixmap_pnm.so lib/librnd3/plugins/irc.pup lib/librnd3/plugins/irc.so +%%GD%%lib/librnd3/plugins/lib_exp_pixmap.pup +%%GD%%lib/librnd3/plugins/lib_exp_pixmap.so +lib/librnd3/plugins/lib_exp_text.pup +lib/librnd3/plugins/lib_exp_text.so lib/librnd3/plugins/lib_gensexpr.pup lib/librnd3/plugins/lib_gensexpr.so %%GTK2%%lib/librnd3/plugins/lib_gtk2_common.pup