cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r562141

Browse Source 
textproc/gtk-doc: update to 1.33.1

- Switch to meson build (thanks to daniel engberg)
- Patch affected ports

PR:		252701
Exp-run by:	antoine
This commit is contained in:
Dima Panov 2021-01-20 15:11:01 +00:00
parent e08ec2b925
commit e4823a4c76
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2021Q1/; revision=562142
14 changed files with 110 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/libdbusmenu/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= libdbusmenu
PORTVERSION= 16.04.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= https://launchpadlibrarian.net/243440794/ \
https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/

13
devel/libdbusmenu/files/patch-docs_libdbusmenu-glib_reference_libdbusmenu-glib-docs.sgml Normal file
View File

@ -0,0 +1,13 @@
--- docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml.orig 2016-02-27 18:58:43 UTC
+++ docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml
@@ -18,10 +18,6 @@
<xi:include href="xml/types.xml"/>
</chapter>
- <chapter id="object-tree">
- <title>Object Hierarchy</title>
- <xi:include href="xml/tree_index.sgml"/>
- </chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

13
devel/libdbusmenu/files/patch-docs_libdbusmenu-gtk_reference_libdbusmenu-gtk-docs.sgml Normal file
View File

@ -0,0 +1,13 @@
--- docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml.orig 2016-02-27 18:58:43 UTC
+++ docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml
@@ -17,10 +17,6 @@
<xi:include href="xml/parser.xml"/>
</chapter>
- <chapter id="object-tree">
- <title>Object Hierarchy</title>
- <xi:include href="xml/tree_index.sgml"/>
- </chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

2
devel/libdbusmenu/pkg-plist
View File

@ -38,7 +38,6 @@ share/gir-1.0/DbusmenuGtk3-%%VERSION%%.gir
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/libdbusmenu-glib-DbusmenuServer.html
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/libdbusmenu-glib-Types.html
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/libdbusmenu-glib.devhelp2
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/object-tree.html
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/right-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/right.png
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-glib/style.css
@ -57,7 +56,6 @@ share/gir-1.0/DbusmenuGtk3-%%VERSION%%.gir
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/libdbusmenu-gtk-menuitem.html
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/libdbusmenu-gtk-parser.html
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/libdbusmenu-gtk.devhelp2
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/object-tree.html
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/right-insensitive.png
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/right.png
%%PORTDOCS%%%%DOCSDIR%%libdbusmenu-gtk/style.css

26
textproc/gtk-doc/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gtk-doc
PORTVERSION= 1.29
PORTREVISION= 1
DISTVERSION= 1.33.1
CATEGORIES= textproc
MASTER_SITES= GNOME
@ -13,22 +12,21 @@ COMMENT= Code documentation system, originally for GTK+
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool \
highlight:textproc/highlight \
BUILD_DEPENDS= ${PY_PYGMENTS} \
docbook-xml>0:textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
itstool:textproc/itstool \
yelp-tools>=0:textproc/yelp-tools
RUN_DEPENDS= ${PY_PYGMENTS} \
docbook-xml>0:textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
RUN_DEPENDS= docbook-xml>0:textproc/docbook-xml \
highlight:textproc/highlight \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
USES= gettext-tools gmake gnome pathfix perl5 pkgconfig \
python:3.4+ tar:xz
USE_GNOME= gnomeprefix libxslt
USES= gettext-tools gnome meson python:3.6+ pkgconfig tar:xz
USE_GNOME= libxml2 libxslt
DOCBOOK_VERSION= 4.1.2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-highlight=highlight \
--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
MESON_ARGS= -Dtests=false
NO_ARCH= yes
post-install:
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \

6
textproc/gtk-doc/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1539028527
SHA256 (gtk-doc-1.29.tar.xz) = 14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1
SIZE (gtk-doc-1.29.tar.xz) = 732376
TIMESTAMP = 1610870812
SHA256 (gtk-doc-1.33.1.tar.xz) = a5cfed2a0b73a09b796fff80ad6d8f040ab2b2655bdc941ac207ffe6d9c10f10
SIZE (gtk-doc-1.33.1.tar.xz) = 768896

21
textproc/gtk-doc/files/patch-help_manual_LINGUAS Normal file
View File

@ -0,0 +1,21 @@
--- help/manual/LINGUAS.orig 2021-01-17 17:54:00 UTC
+++ help/manual/LINGUAS
@@ -0,0 +1,17 @@
+# Please keep this list sorted alphabetically.
+#
+bn_IN
+cs
+de
+el
+en_GB
+es
+fr
+gl
+gu
+pt_BR
+sl
+sv
+ta
+te
+zh_CN
\ No newline at end of file

20
textproc/gtk-doc/files/patch-meson.build Normal file
View File

@ -0,0 +1,20 @@
--- meson.build.orig 2020-11-17 13:56:44 UTC
+++ meson.build
@@ -7,7 +7,7 @@ project('gtk-doc', 'c',
gnome = import('gnome')
python = import('python') # Meson new Python module https://mesonbuild.com/Python-module.html
-python3 = python.find_installation('python3')
+python3 = python.find_installation()
version = meson.project_version()
package_name = meson.project_name()
@@ -163,7 +163,7 @@ configure_file(
output: 'gtk-doc.pc',
configuration: gtkdoc_pc,
install: true,
- install_dir: pkgconfigdir,
+ install_dir: join_paths(libdir, 'pkgconfig'),
)
subdir('help')

8
textproc/gtk-doc/pkg-plist
View File

@ -19,6 +19,8 @@ share/aclocal/gtk-doc.m4
%%DATADIR%%/data/devhelp2.xsl
%%DATADIR%%/data/gtk-doc.flat.make
%%DATADIR%%/data/gtk-doc.make
%%DATADIR%%/data/gtk-doc.no-xslt-flat.make
%%DATADIR%%/data/gtk-doc.no-xslt.make
%%DATADIR%%/data/gtk-doc.xsl
%%DATADIR%%/data/home.png
%%DATADIR%%/data/left-insensitive.png
@ -38,8 +40,12 @@ share/aclocal/gtk-doc.m4
%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.pyc
%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@ -61,7 +67,9 @@ share/aclocal/gtk-doc.m4
%%DATADIR%%/python/gtkdoc/check.py
%%DATADIR%%/python/gtkdoc/common.py
%%DATADIR%%/python/gtkdoc/config.py
%%DATADIR%%/python/gtkdoc/config_data.py
%%DATADIR%%/python/gtkdoc/fixxref.py
%%DATADIR%%/python/gtkdoc/highlight.py
%%DATADIR%%/python/gtkdoc/md_to_db.py
%%DATADIR%%/python/gtkdoc/mkdb.py
%%DATADIR%%/python/gtkdoc/mkhtml.py

1
x11/cinnamon/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= cinnamon
PORTVERSION= 4.8.4
PORTREVISION= 1
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome

8
x11/cinnamon/pkg-plist
View File

@ -593,14 +593,14 @@ share/desktop-directories/cinnamon-utility.directory
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StScrollable.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTable.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTextureCache.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTheme.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StThemeContext.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StThemeNode.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StWidget.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StWidgetAccessible.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/annotation-glossary.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/api-index-full.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/base.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme-context.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme-node.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st-st-theme.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st.devhelp2
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/containers.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/deprecated-api-index.html
@ -647,6 +647,7 @@ share/desktop-directories/cinnamon-utility.directory
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGenericContainer.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGlobal.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGtkEmbed.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonRecorder.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonSlicer.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonStack.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonTrayIcon.html
@ -661,7 +662,6 @@ share/desktop-directories/cinnamon-utility.directory
%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch04.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch05.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch06.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-recorder.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html
%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon.devhelp2
%%PORTDOCS%%share/gtk-doc/html/cinnamon/deprecated-api-index.html

2
x11/keybinder/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= keybinder
PORTVERSION= 0.3.1
PORTREVISION= 4
PORTREVISION= 5
DISTVERSIONPREFIX= v
CATEGORIES= x11

13
x11/keybinder/files/patch-docs_keybinder-docs.sgml Normal file
View File

@ -0,0 +1,13 @@
--- docs/keybinder-docs.sgml.orig 2015-11-06 15:08:46 UTC
+++ docs/keybinder-docs.sgml
@@ -21,10 +21,6 @@
<xi:include href="xml/keybinder.xml"/>
</chapter>
- <chapter id="object-tree">
- <title>Object Hierarchy</title>
- <xi:include href="xml/tree_index.sgml"/>
- </chapter>
<index id="api-index-full">
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

1
x11/keybinder/pkg-plist
View File

@ -25,7 +25,6 @@ share/gir-1.0/Keybinder-0.0.gir
%%PORTDOCS%%share/gtk-doc/html/keybinder/keybinder.devhelp2
%%PORTDOCS%%share/gtk-doc/html/keybinder/left-insensitive.png
%%PORTDOCS%%share/gtk-doc/html/keybinder/left.png
%%PORTDOCS%%share/gtk-doc/html/keybinder/object-tree.html
%%PORTDOCS%%share/gtk-doc/html/keybinder/right-insensitive.png
%%PORTDOCS%%share/gtk-doc/html/keybinder/right.png
%%PORTDOCS%%share/gtk-doc/html/keybinder/style.css