From nobody Fri May 27 09:55:06 2022 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 2E3B21B4AEC3; Fri, 27 May 2022 09:55:08 +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 4L8gCH2LdTz4Z8D; Fri, 27 May 2022 09:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653645307; 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=O/9ZT7vAoKWzlwmLSHz5aXmK3SakkldIa8rKDDxNsC0=; b=iFytP84qLsGBzbnCm/eBlmgxw8smDZsr8oVDGvbBf8eWSCdy4XWrP4dvFrPSI3O05a6j2r 3k3xFStVGPkPrSN6NjFvJTZKgY9oIhhrIOqsqt07ZeTJuiX1GK2pprCA8Edtzqq2JAYoM/ pN4r+4BpIgo2+nIbXgwMo2fG8tmk3v57WRS2Jpojf9f2jS7nHH+e3a9urGKOXE/CjHZn0/ DNv8K3aSrIeb+wIxqL57p4EBDXkfmJ+SrzWi4XZiZ+H9qGlhp5s0kj03zZd7ThxAVextgH 5VLsL/1fTGR7hNxoANQFpXl4YNsVnUu726zqVPl68Wfnt+7q98uzmM9TSF74bg== 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 CBDCF1FEDA; Fri, 27 May 2022 09:55:06 +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 24R9t6WF069648; Fri, 27 May 2022 09:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24R9t6VM069647; Fri, 27 May 2022 09:55:06 GMT (envelope-from git) Date: Fri, 27 May 2022 09:55:06 GMT Message-Id: <202205270955.24R9t6VM069647@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: dc1885926d4a - main - graphics/xviewer: eliminate gtk-doc dependency 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc1885926d4ab78d37303aac1d18f27058b7b313 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653645307; 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=O/9ZT7vAoKWzlwmLSHz5aXmK3SakkldIa8rKDDxNsC0=; b=hnb882RFvyPZNSnLH07tWvfP8bdz6fdgA5e3vSgX6exneqc0Tb8YZBNdrWTT5jkPskuWpv vJfgIeEKLdgyISJZHlujk6uWkX2rEdhFVbpEQ41Alxod/22kZsq8b0Bii8rKQA3HbD0nlM Cvye2Phc1SpprBL0vtrYJ68jnqaNviO0fI8WE9p6tV6dj3zWqoGT6ALI9iXf5e+67L2TTX OWUeZKo53qKcn725NO/9lDc8gKD5zBb00xqeRtVNy0nll5FwAuPcMWKKOG9OqPQBMPjDc9 N0JUeYt1WF3GMMiQqkCSjr7jOZYa3Zph4rPKoB/SIOEN102sh4ui4fpVxUFKlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653645307; a=rsa-sha256; cv=none; b=sWWEr1on6uq+As/N8oGkJFEaA2HZ8fNSYCZnciS7qVqW3DHbFdf1GLq9YYn2vPd9UEELF3 WmO7qT5GIYCat162m4CJztYtTOL41fQBdCPBFXh29rlOPf2XHo7VO6T0CvltMdGWc1WPhs i4iXST+N/8zpszbQ9jOqCY/yRoKaoMGWD6xSgvTt9DqnYW2fdQZ/IVN9sg1FnXxsNypqaM Cnfb0cBVkTOIHfh/SIK575QCXcCsPRuYHZuXV5jSNbEKGvHXtQgDeF74zaimF6mfbZwAYZ c3X1R7aH7MVGH2oVlHZUAsH77mKsksLwQ/X4Y82h57D7ZdTA3xIoO8LGpl626Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc1885926d4ab78d37303aac1d18f27058b7b313 commit dc1885926d4ab78d37303aac1d18f27058b7b313 Author: Tijl Coosemans AuthorDate: 2022-05-24 13:51:52 +0000 Commit: Tijl Coosemans CommitDate: 2022-05-27 09:11:04 +0000 graphics/xviewer: eliminate gtk-doc dependency It was only needed for autoreconf. The documentation was never installed. PR: 263970 --- graphics/xviewer/Makefile | 6 ++---- graphics/xviewer/files/patch-Makefile.am | 11 +++++++++++ graphics/xviewer/files/patch-configure.ac | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/graphics/xviewer/Makefile b/graphics/xviewer/Makefile index 8e172fb4fad2..a892d4354992 100644 --- a/graphics/xviewer/Makefile +++ b/graphics/xviewer/Makefile @@ -12,9 +12,7 @@ LICENSE= GPLv2+ PORTSCOUT= limit:^[0-9.]+$$ # ignore non-numeric tags -BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/gtk-doc.m4:textproc/gtk-doc \ - intltool-update:textproc/intltool \ - itstool:textproc/itstool \ +BUILD_DEPENDS= itstool:textproc/itstool \ ${LOCALBASE}/share/aclocal/yelp.m4:textproc/yelp-tools LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \ libxapp.so:x11/xapp \ @@ -26,7 +24,7 @@ USES= autoreconf compiler:c++11-lang desktop-file-utils gettext-tools \ GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_GNOME= atk cairo gdkpixbuf2 gtk30 introspection pango +USE_GNOME= atk cairo gdkpixbuf2 gtk30 intltool introspection pango USE_XORG= x11 GLIB_SCHEMAS= org.x.viewer.enums.xml org.x.viewer.gschema.xml diff --git a/graphics/xviewer/files/patch-Makefile.am b/graphics/xviewer/files/patch-Makefile.am new file mode 100644 index 000000000000..22ce638adbaf --- /dev/null +++ b/graphics/xviewer/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2021-12-31 13:12:10 UTC ++++ Makefile.am +@@ -2,7 +2,7 @@ endif + jpeg_DIRS = jpegutils + endif + +-SUBDIRS = $(jpeg_DIRS) cut-n-paste src po help data doc ++SUBDIRS = $(jpeg_DIRS) cut-n-paste src po help data + + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + diff --git a/graphics/xviewer/files/patch-configure.ac b/graphics/xviewer/files/patch-configure.ac new file mode 100644 index 000000000000..609e581c4666 --- /dev/null +++ b/graphics/xviewer/files/patch-configure.ac @@ -0,0 +1,21 @@ +--- configure.ac.orig 2021-12-31 13:12:10 UTC ++++ configure.ac +@@ -43,7 +43,6 @@ PKG_PROG_PKG_CONFIG + + PKG_PROG_PKG_CONFIG + +-GTK_DOC_CHECK(1.16) + + AC_CHECK_FUNCS(strptime) + +@@ -350,10 +349,6 @@ data/icons/scalable/Makefile + data/icons/32x32/Makefile + data/icons/48x48/Makefile + data/icons/scalable/Makefile +-doc/Makefile +-doc/reference/Makefile +-doc/reference/version.xml +-doc/reference/xviewer-docs.xml + ]) + + AC_OUTPUT