From nobody Thu Jan 18 21:26:23 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 4TGG5X35qRz572Ts; Thu, 18 Jan 2024 21:26: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 4TGG5X1p9Cz4lj6; Thu, 18 Jan 2024 21:26:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705613184; 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=9+qLabQ6E1h2x2pQS9GOZ0zQHqbjzMV3c21l7wmAghs=; b=AU/fQni49Y8MhP705yf9O5m3O0BIW87cwfrrNumwS5Fy+BZ4LZtXTcooHkAbzL8qWbHHp6 E9Z/ZEEiQQV9EjMmQ/g/1KDZAZWpZlJ8L/n1TuQxoaWC6ZKRQpAqp5/4sArQZTiZ+AwfCC u6avEy1Ks7Q0qCqzL+CJHOsYMNUVZpum+8cJplbVON60fl92Q4kOdbBclpoMl16M3OzRsg msGBuumPFwbgkGKmiKctxQG2JmqL5QSxuuY0rHOaBobAzh5g+laxf7g6XjAgYaEpYRGJ/1 wNXsZeIppG6+l3+y9Q5Q63L/hxwgnl9uymAAIB4uvosG2rTrpb5ApGmveORejA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705613184; 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=9+qLabQ6E1h2x2pQS9GOZ0zQHqbjzMV3c21l7wmAghs=; b=SlSWgpHY20d3o0UxGlk1b78lO0myggk0TQblaGVZF3J+j21SZYOp1rRltObAgg6IRiD6Wu aMlUYApBoUgk67z8tmmZmfdohPKjPtK7SiOsRA3gxInZsLGF9PShpzl2SNJN2VgMx9tFLw OaC+sQ1kxMc3JrvuWCfsVlMsKEmT3h6uGX8V8glouqx81FSpMPmWrjJCNN80bhg2qn14yh 4nXkTE8XQj/IlFh63wmNFoaMEhTFXEr9chpivuI1/JpN2U8JPa+GciVy4KQNBm8kN2e+AY usWdwrUcUgQ2WDeQ6acACYz8T8ibdRJpJcOiWLElZGTroATCTerby8QT5NmDQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705613184; a=rsa-sha256; cv=none; b=w6DDWb2mQBUp5RrJt2FY7AyE81V8VUVIE76snwh2xS+UI8lA0LU4zwCTN1SHBV7Tf/perG PGB0DZED+nxRMbUEVACFhrHyTFAOKy+yjL/W1jbvzknahWZ30tBbvopQsq1eCRlxity3wb CKUZ5MTRw6m9cE56jZTgtD0AFSpaUjpYehmRP1BbkiuN+Q1P7pD564tSDmf6WPQInSDQDv I8DEVIkYVET73Scsh5xV+MEq9beugWqmZiPctlsGweZ+qt62UFMnlKsRL8RB5MsQDyldBv KtUj/lNpnA8HywYfzd58j0mKyWlz4Xgb9b6+q2urtaY1mOy1XBgQNpQDjS8ZTA== 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 4TGG5X0b56zNX4; Thu, 18 Jan 2024 21:26:24 +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 40ILQNwS086691; Thu, 18 Jan 2024 21:26:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40ILQNmM086688; Thu, 18 Jan 2024 21:26:23 GMT (envelope-from git) Date: Thu, 18 Jan 2024 21:26:23 GMT Message-Id: <202401182126.40ILQNmM086688@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: fcc556799e7d - main - graphics/telak: Fix build with graphics/imlib2 1.12.1 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcc556799e7d818af54b9a7433686574e53364a3 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcc556799e7d818af54b9a7433686574e53364a3 commit fcc556799e7d818af54b9a7433686574e53364a3 Author: Nuno Teixeira AuthorDate: 2024-01-18 21:25:38 +0000 Commit: Emanuel Haupt CommitDate: 2024-01-18 21:26:06 +0000 graphics/telak: Fix build with graphics/imlib2 1.12.1 PR: 276435 --- graphics/telak/Makefile | 6 +++--- graphics/telak/files/patch-Makefile | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile index 1485ecbe97dd..4be6d1bcbb56 100644 --- a/graphics/telak/Makefile +++ b/graphics/telak/Makefile @@ -1,7 +1,7 @@ PORTNAME= telak -PORTVERSION= 0.7 -PORTREVISION= 2 DISTVERSIONPREFIX= v +DISTVERSION= 0.7 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= ehaupt@FreeBSD.org @@ -14,7 +14,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libgcrypt.so:security/libgcrypt \ libImlib2.so:graphics/imlib2 -USES= gmake xorg +USES= gmake pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= jd USE_XORG= x11 diff --git a/graphics/telak/files/patch-Makefile b/graphics/telak/files/patch-Makefile index 92b7517734e1..35b08ac3f800 100644 --- a/graphics/telak/files/patch-Makefile +++ b/graphics/telak/files/patch-Makefile @@ -1,13 +1,16 @@ +Add minimal support to `pkg-config imlib2`; imlib2-config has been +dropped since imlib2-1.7.5. + --- Makefile.orig 2021-11-19 07:48:49 UTC +++ Makefile -@@ -1,8 +1,8 @@ +@@ -1,8 +1,8 @@ O = telak.o fetch.o image.o parse.o toon.o VERSION = $(shell grep '^Version' ChangeLog | head -n 1 | cut -d' ' -f2 | tr -d ' ') BIN = telak O = telak.o fetch.o image.o parse.o toon.o -LDFLAGS = $(shell imlib2-config --libs) $(shell curl-config --libs) -lgcrypt -lX11 -CFLAGS = -pg -W -Wall $(shell curl-config --cflags) $(shell imlib2-config --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\"" -g -+LDFLAGS += $(shell imlib2-config --libs) $(shell curl-config --libs) -lgcrypt -lX11 -+CFLAGS += -W -Wall $(shell curl-config --cflags) $(shell imlib2-config --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\"" ++LDFLAGS += $(shell pkg-config imlib2 --libs) $(shell curl-config --libs) -lgcrypt -lX11 ++CFLAGS += -W -Wall $(shell curl-config --cflags) $(shell pkg-config imlib2 --cflags) -DTELAK_USER_AGENT="\"$(BIN) $(VERSION)\"" -DTELAK_VERSION="\"$(VERSION)\"" BINDIR=$(DESTDIR)/usr/bin MANDIR=$(DESTDIR)/usr/share/man/man1