From nobody Fri Apr 7 10:30:24 2023 X-Original-To: dev-commits-ports-main@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 4PtF4c5YMPz44SjM; Fri, 7 Apr 2023 10:30:24 +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 4PtF4c4wr5z3rCx; Fri, 7 Apr 2023 10:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680863424; 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=uFm+D2uP45KNYrGX1Ub//+5q/l0XsfnYCl5i1Zkpmms=; b=CVUQJiD7AF6TRAOPAduNgTDWooGYWIz/TvaWi0/n8mY4Q2kUHoW1cS5H3FV5ADgoezhc6J l+/fa5smHBUWVSfvRcuD9Oij/Vr4p/NBF4YFB9TvB1RlHSptvhmjhhfLBI8QeSlaxbe/Y7 e0U0bZxKSpAVmBvpWGBpB6wD9dUyz3TAFLr0L1nVOgrRlJhR27gIVSHyNt4lmI8eesjWop dbVK04onRjMbArAgm8x9dv3bAv/19qThkFMvndHeyiaSi9CHwMk8cu86RMvOKYKA1Sgs/C eP9RgCper8VDrvTfg2dESUnC7O6l0aT225i6xswBDU16FD6VYhIuJbSwsQ32MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680863424; 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=uFm+D2uP45KNYrGX1Ub//+5q/l0XsfnYCl5i1Zkpmms=; b=wnGVAFWpyldVxj/wWPkgT793wob0APxYiisp2GzDYTtzfrQ2HXLUJeV3gv7RL3brIB+7+f vnb68PVBSn53Z1qfF9XmpOntZ4otkAlhdCQ8TevAzPqKPQSovXDB1hq2FkbK6XJ08wKVId +oV/PoVjw9d1hc6RSUMr78JoC6FY7a9O8bDSD3Oz4vcQZAqV9v7QszDhFbXq5SsGvilWUb ChJApCNHiE7n1t/mTM9EpvDkPsucFkLBzDelpKeTiWuYBAN0W0l/9vm1YFr+oCQhVKBMk8 gWLZ4DWm1aFYlEw/MwTPBmP1zSASdIKL2ihRj/owhVuYnxx2rSCEUjLQzYC1XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680863424; a=rsa-sha256; cv=none; b=sjTYtJHE7hpiCCpv8JqfSQNCkOi9xnnaMpAWfIKeVQcGHJBLGjZwG7u/HyEe0CBRWYND5A j6IUbA6nylyXAEEEIf2ztE1i601ZGeVrVCCkVp7YRvBb3xfMRBGZYjgF8xojMMLpJ87Uq0 rxcADZmGohpy/N3upIqi6ZGk4ihuoFvhz4iRFQKvvJfmGM5RCGoZGSuuuBb7KumOVaol/d OjomeEZzQlETGOMOWVEn2BPmW7Lds6sNj9sQEnuaJ+T4nc0fj2ZjZ911bOeVTdnmcmO9uV 0zM6ZhbPrM7o+XzQdeDBQlRMlyv7ZzHAG++ld9LXBJ9j6wsux+tYpGQQl7c9Wg== 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 4PtF4c1QZhzhrY; Fri, 7 Apr 2023 10:30:24 +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 337AUOdQ028116; Fri, 7 Apr 2023 10:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 337AUOXD028115; Fri, 7 Apr 2023 10:30:24 GMT (envelope-from git) Date: Fri, 7 Apr 2023 10:30:24 GMT Message-Id: <202304071030.337AUOXD028115@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 7af59ff13b92 - main - x11-toolkits/gtkdatabox: Adopt/Update to 1.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7af59ff13b921b9a91f29924229d276dccb68e0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7af59ff13b921b9a91f29924229d276dccb68e0f commit 7af59ff13b921b9a91f29924229d276dccb68e0f Author: Nuno Teixeira AuthorDate: 2023-04-07 10:10:54 +0000 Commit: Nuno Teixeira CommitDate: 2023-04-07 10:30:09 +0000 x11-toolkits/gtkdatabox: Adopt/Update to 1.0.0 - Switch to DISTVERSION - Switch to GTK3 (upstream requirement) - Remove libglade support, as it's based on GTK2 ChangeLog: https://sourceforge.net/projects/gtkdatabox/files/gtkdatabox-1/ --- x11-toolkits/gtkdatabox/Makefile | 32 ++++++++-------------- x11-toolkits/gtkdatabox/distinfo | 6 ++-- .../gtkdatabox/files/patch-gtk_gtkdatabox.c | 14 ---------- .../gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c | 14 ---------- x11-toolkits/gtkdatabox/pkg-plist | 14 +++++----- 5 files changed, 22 insertions(+), 58 deletions(-) diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile index b662d7db9ac3..edd427468647 100644 --- a/x11-toolkits/gtkdatabox/Makefile +++ b/x11-toolkits/gtkdatabox/Makefile @@ -1,22 +1,20 @@ PORTNAME= gtkdatabox -PORTVERSION= 0.9.3.1 -PORTREVISION= 1 +DISTVERSION= 1.0.0 CATEGORIES= x11-toolkits -MASTER_SITES= SF -DIST_SUBDIR= gnome2 - -MAINTAINER= ports@FreeBSD.org -COMMENT= GTK+2 widget to display large amounts of numerical data +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1 +MAINTAINER= eduardo@FreeBSD.org +COMMENT= GTK+3 widget to display large amounts of numerical data WWW= https://sourceforge.net/projects/gtkdatabox/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz USES= gnome libtool pathfix pkgconfig -USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -27,29 +25,23 @@ INSTALL_TARGET= install-strip PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES GLADE OPTIONS_SUB= yes -GLADE_DESC= Enable libglade2 support -GLADE_USE= GNOME=libglade2 -GLADE_CONFIGURE_ENABLE= libglade -GLADEUI_DESC= Enable glade3 support -GLADEUI_LIB_DEPENDS= libgladeui-1.so:devel/glade3 -GLADEUI_CONFIGURE_ENABLE= glade +GLADE_LIB_DEPENDS= libgladeui-2.so:devel/glade +GLADE_CONFIGURE_ENABLE= glade post-patch: @${REINPLACE_CMD} -e \ '/^SUBDIR/s|examples||' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e \ + 's|DOC_MODULE_VERSION = 1|#DOC_MODULE_VERSION = 1|' ${WRKSRC}/doc/Makefile.in .for dir in examples gtk @${REINPLACE_CMD} -e \ '/-O2/d ; \ /DISABLE_DEPRECATED/d' ${WRKSRC}/${dir}/Makefile.in .endfor -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} api ${STAGEDIR}${DOCSDIR}) - post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11-toolkits/gtkdatabox/distinfo b/x11-toolkits/gtkdatabox/distinfo index 8f5c7d9b828b..4a4fe5db62e4 100644 --- a/x11-toolkits/gtkdatabox/distinfo +++ b/x11-toolkits/gtkdatabox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546007506 -SHA256 (gnome2/gtkdatabox-0.9.3.1.tar.gz) = d04938d969d5458bd0df1b4fa22f647fb2eeeef75555a71f967e6c039fb4bde5 -SIZE (gnome2/gtkdatabox-0.9.3.1.tar.gz) = 3680148 +TIMESTAMP = 1680789108 +SHA256 (gtkdatabox-1.0.0.tar.gz) = 8bee70206494a422ecfec9a88d32d914c50bb7a0c0e8fedc4512f5154aa9d3e3 +SIZE (gtkdatabox-1.0.0.tar.gz) = 520992 diff --git a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c deleted file mode 100644 index f39e86aaf6dc..000000000000 --- a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk/gtkdatabox.c.orig 2018-11-02 17:08:28 UTC -+++ gtk/gtkdatabox.c -@@ -23,6 +23,11 @@ - #include - #include - -+#include -+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - - static gint gtk_databox_button_press (GtkWidget * widget, - GdkEventButton * event); diff --git a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c b/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c deleted file mode 100644 index f00bda605f88..000000000000 --- a/x11-toolkits/gtkdatabox/files/patch-gtk_gtkdatabox__ruler.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk/gtkdatabox_ruler.c.orig 2018-06-29 20:20:11 UTC -+++ gtk/gtkdatabox_ruler.c -@@ -34,6 +34,11 @@ - - #include - -+#include -+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) -+#define log2(x) (log(x) / log(2)) -+#endif -+ - #define RULER_SIZE 14 - - #define ROUND(x) ((int) ((x) + 0.5)) diff --git a/x11-toolkits/gtkdatabox/pkg-plist b/x11-toolkits/gtkdatabox/pkg-plist index efe14d4b68be..86d78ed6fd8d 100644 --- a/x11-toolkits/gtkdatabox/pkg-plist +++ b/x11-toolkits/gtkdatabox/pkg-plist @@ -14,13 +14,13 @@ include/gtkdatabox/gtkdatabox_scale.h include/gtkdatabox/gtkdatabox_typedefs.h include/gtkdatabox/gtkdatabox_xyc_graph.h include/gtkdatabox/gtkdatabox_xyyc_graph.h -%%GLADEUI%%lib/glade3/modules/libgladedatabox.a -%%GLADEUI%%lib/glade3/modules/libgladedatabox.so -%%GLADE%%lib/libglade/2.0/libdatabox.a -%%GLADE%%lib/libglade/2.0/libdatabox.so -lib/libgtkdatabox-0.9.3.so.1 -lib/libgtkdatabox-0.9.3.so.1.0.0 +%%GLADE%%lib/glade/modules/libgladedatabox.a +%%GLADE%%lib/glade/modules/libgladedatabox.so lib/libgtkdatabox.a lib/libgtkdatabox.so +lib/libgtkdatabox.so.1 +lib/libgtkdatabox.so.1.0.0 libdata/pkgconfig/gtkdatabox.pc -%%GLADEUI%%share/glade3/catalogs/gtkdatabox.xml +%%GLADE%%share/glade/catalogs/gtkdatabox.xml +%%GLADE%%share/icons/hicolor/scalable/apps/widget-gladedatabox-gtk_databox.svg +%%GLADE%%share/icons/hicolor/scalable/apps/widget-gladedatabox-gtk_databox_ruler.svg