From nobody Thu Mar 21 10:24:40 2024 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 4V0hQx24bgz5Fm5P; Thu, 21 Mar 2024 10:24:41 +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 4V0hQx1DjTz48l9; Thu, 21 Mar 2024 10:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016681; 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=xEZdTvgtzmbrZ/N1MYt0yRAFyByJKeObrX598YUSGyk=; b=BtsNez2fEweKd39axN8VyfGI9F4Jz67+wDGcBrLslenXFDXbCFk8MdrYqQRIXbR0LlKzhV jgO/qb+nmMtwzzKaKD92umMxbYRUcSDnM2MCXPHBSjXu7Ekr9cDKcUTg15++0FHOtHsKlD busWwwv0g9E6NW421IXJi1wiY4yUsZ6K5+Y8ahkTg91xEWJdsSStxGx4hB7vXBTt8lPPz2 ctqjkfzBM5K3t91ekae6cbs59Ek5PbMNUYIu09sBU0T7l9FjbiiDtDw8tJ5u4RfvlClwAK hZv67AT7mXS2aD4jRgnVtE75bd7/lORR4MG4agKwao+8tbrTeNuak7HTlVboKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711016681; a=rsa-sha256; cv=none; b=dU3oeLY1u5waDvM1Stshdzh0AJBnYCpZgDTIJPCtZiEZcpNuqVfAQdes/L9UyAQ9envayC 54wMYxGG6qZxWNjci8BDmuZz6/CywAgdp7UbSI6YAq6WX+HD1yfkgFtsSW13QCD1OSK121 TNjBi+U7B91eF2fzpbR5KQdHt8nVUzOnMGP4sVTpGtzkctSrLZO01vDjuJqa2vyL+5WTY4 veDC0DrH3e0tcoxWOE69QvI+ec47BVXnhcz/+AmBpzIouMcTMKtES7qHPToaSxYydwRuzm 8IiqfTLt7YjN2NwAJijamMSdEscVz/uqDcH/0ZbAV+j399Sel5Mg4T/VfhhNsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711016681; 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=xEZdTvgtzmbrZ/N1MYt0yRAFyByJKeObrX598YUSGyk=; b=cgnWNEPsh9+lgWmvAN+1Qm1WbSadnGoIdr+N/uYqPync8tERfQU8gdb7j1uDPyU+nWoPGj 0oTpgFsG1Gte1tUoBMvStQRmKVYSsSDCp+AsW3UEuBB2Mf0Urvygrs6lDJfjP4y5eXWlyP L3ZmYPKb3eRFKMECX28Tgq+hfJumsH/3PLpyC0n/izMjFIvNqU2NS090emqhbZyg/5TFh/ SaFdaWGgrmuFYp5T8OtqmH70C7WjY4pRDKu7jLt6IAAPEMcionUmQhWdTmHN2tzIvUQv80 BQc+2ckuwYg4qdsqqhDAUd8zXpuEIuZt1XSabfF/b961szHeuN/FkcH3vKsXbw== 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 4V0hQx0jT4zXPg; Thu, 21 Mar 2024 10:24:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42LAOeeZ048998; Thu, 21 Mar 2024 10:24:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LAOefK048995; Thu, 21 Mar 2024 10:24:40 GMT (envelope-from git) Date: Thu, 21 Mar 2024 10:24:40 GMT Message-Id: <202403211024.42LAOefK048995@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: eca5aa49bdb0 - main - x11/gromit: revert/redo naive and actually incorrect previous build "fix" 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eca5aa49bdb0e8ec11402678bf5994666c4289c4 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=eca5aa49bdb0e8ec11402678bf5994666c4289c4 commit eca5aa49bdb0e8ec11402678bf5994666c4289c4 Author: Alexey Dokuchaev AuthorDate: 2024-03-21 10:23:56 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-03-21 10:23:56 +0000 x11/gromit: revert/redo naive and actually incorrect previous build "fix" I've noticed that the program started to crash after commit 363f2d568101 due to missing function prototypes (guarded with GDK_DISABLE_DEPRECATED). While I'm here, add EXAMPLES option and assume the port's maintainership. --- x11/gromit/Makefile | 20 ++++++++------------ x11/gromit/files/patch-Makefile | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile index 8fb2f1302595..98d08a80a227 100644 --- a/x11/gromit/Makefile +++ b/x11/gromit/Makefile @@ -1,10 +1,10 @@ PORTNAME= gromit PORTVERSION= 20041213 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 MASTER_SITES= http://www.home.unix-ag.org/simon/gromit/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= GRaphics Over Miscellaneous Objects (Gromit) WWW= https://www.home.unix-ag.org/simon/gromit/ @@ -12,8 +12,8 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libharfbuzz.so:print/harfbuzz + libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz USES= gnome pkgconfig xorg USE_GNOME= cairo gdkpixbuf2 gtk20 @@ -21,16 +21,12 @@ USE_XORG= x11 DOCS= AUTHORS ChangeLog README -OPTIONS_DEFINE= DOCS - -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=int-conversion -.endif +OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gromit ${STAGEDIR}${PREFIX}/bin + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/gromitrc ${STAGEDIR}${EXAMPLESDIR} @@ -38,4 +34,4 @@ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/x11/gromit/files/patch-Makefile b/x11/gromit/files/patch-Makefile index aa8153a5752e..e841a3bc1168 100644 --- a/x11/gromit/files/patch-Makefile +++ b/x11/gromit/files/patch-Makefile @@ -5,4 +5,4 @@ gromit: gromit.c Makefile - gcc -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c -Wall `pkg-config --libs --cflags gtk+-2.0` -+ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0 x11` -lm ++ ${CC} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -o gromit gromit.c ${CFLAGS} `pkg-config --libs --cflags gtk+-2.0 x11` -lm