Attachment 235621 Details for Bug 265558 – updated patch - Adding option and patch file for glade catalog support; updating docs option

[patch] updated patch - Adding option and patch file for glade catalog support; updating docs option

x11-toolkits_gtksourceview3-glade+docs.diff (text/plain), 6.96 KB, created by Sean Champ on 2022-08-01 23:55:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Champ

Created: 2022-08-01 23:55:14 UTC

Size: 6.96 KB

patch

obsolete

>diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
>index 69f9bab18506..b42f8e9767de 100644
>--- a/x11-toolkits/gtksourceview3/Makefile
>+++ b/x11-toolkits/gtksourceview3/Makefile
>@@ -28,12 +28,24 @@ USE_GNOME=	cairo gdkpixbuf2 gnomeprefix gtk30 \
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> CONFIGURE_ARGS=	--enable-compile-warnings=no \
>-		--enable-glade-catalog=no \
> 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
> 		--enable-introspection
> INSTALL_TARGET=	install-strip
> 
>-OPTIONS_DEFINE=	DOCS
>+OPTIONS_DEFINE=	DOCS GLADE
>+
>+DOCS_CONFIGURE_ENABLE=	gtk-doc
>+DOCS_BUILD_DEPENDS=	gtkdoc-mkhtml:textproc/gtk-doc
>+
>+GLADE_DESC=		Install Glade catalog
>+GLADE_CONFIGURE_ON=	--enable-glade-catalog=yes
>+GLADE_CONFIGURE_OFF=	--enable-glade-catalog=no
>+GLADE_BUILD_DEPENDS=	glade>0:devel/glade
>+
>+OPTIONS_SUB=		yes
>+
>+GNOME_HTML_DIR=	${PREFIX}/share/gtk-doc/html
>+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|tests testsuite||g' \
>@@ -41,4 +53,16 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|--warn-all||g' \
> 		${WRKSRC}/gtksourceview/Makefile.in
> 
>+post-stage-GLADE-on:
>+	${MV} ${STAGEDIR}${PREFIX}/share/glade/catalogs/${PORTNAME}.xml \
>+	 ${STAGEDIR}${PREFIX}/share/glade/catalogs/${PORTNAME}-${PKGNAMESUFFIX}.xml
>+
>+post-stage-DOCS-on:
>+	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_MAN} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
>+
>+add-plist-docs: ${STAGE_COOKIE}
>+	cd ${STAGEDIR}; ${FIND} ${GNOME_HTML_DIR:C@^/@@} -type f | \
>+		${SED} -e 's|${PREFIX:C@^/@@}/||' >> ${TMPPLIST}
>+
> .include <bsd.port.mk>
>diff --git a/x11-toolkits/gtksourceview3/files/patch-data_glade_gtksourceview.xml.in b/x11-toolkits/gtksourceview3/files/patch-data_glade_gtksourceview.xml.in
>new file mode 100644
>index 000000000000..bce9a8c6846a
>--- /dev/null
>+++ b/x11-toolkits/gtksourceview3/files/patch-data_glade_gtksourceview.xml.in
>@@ -0,0 +1,20 @@
>+--- data/glade/gtksourceview.xml.in.orig	2019-03-21 21:55:02.000000000 +0000
>++++ data/glade/gtksourceview.xml.in	2022-08-01 23:46:24.725361000 +0000
>+@@ -1,7 +1,7 @@
>+ <?xml version="1.0" encoding="UTF-8"?>
>+ <glade-catalog version="3.0"
>+                supports="gtkbuilder"
>+-               name="gtksourceview"
>++               name="gtksourceview-@GSV_API_VERSION@"
>+                library="gtksourceview-@GSV_API_VERSION@"
>+                domain="gtksourceview-@GSV_API_VERSION@"
>+                depends="gtk+"
>+@@ -49,7 +49,7 @@
>+     </glade-widget-class>
>+   </glade-widget-classes>
>+ 
>+-  <glade-widget-group name="GtkSourceView" title="GtkSourceView">
>++  <glade-widget-group name="GtkSourceView" title="GtkSourceView @GSV_API_VERSION@">
>+     <glade-widget-class-ref name="GtkSourceView" />
>+     <glade-widget-class-ref name="GtkSourceMap" />
>+     <glade-widget-class-ref name="GtkSourceStyleSchemeChooserWidget" />
>diff --git a/x11-toolkits/gtksourceview3/pkg-plist b/x11-toolkits/gtksourceview3/pkg-plist
>index c50b423e5650..539bd5f39cd9 100644
>--- a/x11-toolkits/gtksourceview3/pkg-plist
>+++ b/x11-toolkits/gtksourceview3/pkg-plist
>@@ -45,73 +45,8 @@ lib/libgtksourceview-3.0.so
> lib/libgtksourceview-3.0.so.1
> lib/libgtksourceview-3.0.so.1.8.0
> libdata/pkgconfig/gtksourceview-3.0.pc
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceBuffer.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletion.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletionContext.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletionInfo.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletionItem.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletionProposal.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletionProvider.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceCompletionWords.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceEncoding.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceFile.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceFileLoader.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceFileSaver.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceGutter.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceGutterRenderer.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceGutterRendererPixbuf.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceGutterRendererText.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceLanguage.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceLanguageManager.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceMap.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceMark.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceMarkAttributes.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourcePrintCompositor.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceRegion.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceSearchContext.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceSearchSettings.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceSpaceDrawer.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyle.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleScheme.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeChooser.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeChooserButton.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeChooserWidget.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceStyleSchemeManager.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceTag.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceUndoManager.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/GtkSourceView.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/annotation-glossary.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/api-index-full.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch01.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch02.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch03.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch04.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch05.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch06.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch07.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch08.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/ch09.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/gtksourceview-3.0-GtkSourceUtils.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/gtksourceview-3.0-Version-Information.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/gtksourceview-3.0.devhelp2
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/home.png
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/index.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/lang-reference.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/lang-tutorial.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/left-insensitive.png
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/left.png
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/object-tree.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/pt01.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/pt02.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/pt03.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/pt04.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/right-insensitive.png
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/right.png
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/style-reference.html
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/style.css
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/up-insensitive.png
>-%%PORTDOCS%%%%DOCSDIR%%-3.0/up.png
> share/gir-1.0/GtkSource-3.0.gir
>+%%GLADE%%share/glade/catalogs/gtksourceview-3.xml
> %%DATADIR%%-3.0/language-specs/R.lang
> %%DATADIR%%-3.0/language-specs/abnf.lang
> %%DATADIR%%-3.0/language-specs/actionscript.lang
>@@ -257,6 +192,7 @@ share/gir-1.0/GtkSource-3.0.gir
> %%DATADIR%%-3.0/styles/solarized-light.xml
> %%DATADIR%%-3.0/styles/styles.rng
> %%DATADIR%%-3.0/styles/tango.xml
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
> share/locale/ar/LC_MESSAGES/gtksourceview-3.0.mo
> share/locale/as/LC_MESSAGES/gtksourceview-3.0.mo
> share/locale/ast/LC_MESSAGES/gtksourceview-3.0.mo

Actions: View | Diff

Attachments on bug 265558: 235615 | 235621