git: dc1885926d4a - main - graphics/xviewer: eliminate gtk-doc dependency
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 May 2022 09:55:06 UTC
The branch main has been updated by tijl:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dc1885926d4ab78d37303aac1d18f27058b7b313
commit dc1885926d4ab78d37303aac1d18f27058b7b313
Author: Tijl Coosemans <tijl@FreeBSD.org>
AuthorDate: 2022-05-24 13:51:52 +0000
Commit: Tijl Coosemans <tijl@FreeBSD.org>
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