* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/files/, x11-libs/gtksourceview/
@ 2017-01-26 10:56 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2017-01-26 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 29f7dc737ae54bff438b6aeaef8233765a7d3bc5
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 10:45:03 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 10:55:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f7dc73
x11-libs/gtksourceview: Remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-libs/gtksourceview/Manifest | 3 --
x11-libs/gtksourceview/files/gentoo.lang | 59 --------------------
x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild | 61 ---------------------
x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild | 62 ----------------------
x11-libs/gtksourceview/gtksourceview-3.22.1.ebuild | 59 --------------------
5 files changed, 244 deletions(-)
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 962096b..0a2cf16 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,6 +1,3 @@
DIST gtksourceview-2.10.5.tar.bz2 1253321 SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d WHIRLPOOL 4bd2589d4e06bb5e5c4dc8c55af25c52fd2c2c318a1240d7a430c8cb442cc785b7048f0116d9df714f93c6c1cb87628459239a80ae317d8eb73d27e4c021281a
-DIST gtksourceview-3.16.1.tar.xz 1272152 SHA256 669e9846ca744ec4d04ce61377e85df7ca909ad476329922a6abf4da423f1b0c SHA512 8bae196d923d08e58c8f02d7612b32aa7caec8457c2ff35c2bb2322a3013a8f1fe52cbc62540f9d83054811ee517088d4e880b82733b2a73e7724a206b2ad911 WHIRLPOOL c51a0dd6ccad2262b289509f8dfa85675ba90cf4f0242358ca2d1ad857cf06e33ad0495560b726430738d827f9204c2eb63a90209171194a7c8eb163e46a1471
-DIST gtksourceview-3.18.2.tar.xz 1317804 SHA256 60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2 SHA512 75e502264d7d9f63f9a2c9c884072cfc2d323c7cc49383b9b53916321ce20ef695e7a2dd0f6db67a4daf70ba84a3a907dfc6d9407ba5982adb976210e0589328 WHIRLPOOL 4143a624a0582a5d92de707b5167bc9805a5b484906977c4b0d195703d7bd113ebd677829f6e6c2c2d8d10cdae2041db99e8294e18e7114d53e15da6f233ad80
DIST gtksourceview-3.20.4.tar.xz 1582240 SHA256 7a0e6ac95ff3862bd8ef77a40e95a942939e73cb407f2eb67af600d7ce533d01 SHA512 4b69759e77acd120da24683e9cacd994e5bcef4c7b6404bad2df930b228a39f99f9391e137583fadb4939189f66f088bd386192b4d23bc232d718804156db941 WHIRLPOOL 7fb3895b3eeb56375ead63b709d4e0b0b02a33fdfed745a9a714af2e72f80c548228201702d317519cc0fb655c8c2e39c60333275889d323a59efb22556b28a1
-DIST gtksourceview-3.22.1.tar.xz 1596868 SHA256 a05b3f8bc866db4abad16528fc166ee31e9a2c90a933a99476bc474086a3b6af SHA512 98d9396f98e2f3f0e20d10b37a0d32fa4147ae442e39146829d56d17886df4519676483d4d862afae317b9cb79fdde1f4c95eff34224291a569207cd2febcea4 WHIRLPOOL 461bd4f2267390c32c2be45e53312eb24e04fe0474ee44f9157f6f921aa80e0179115b1ab365c4ea936602aec03a0c903d24e7004e497d1ce9e75587934e3474
DIST gtksourceview-3.22.2.tar.xz 1596384 SHA256 6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e SHA512 1d51a975471172835cd9af64828ba93eb1b45e26fae91b1778c5963a8578404bbbdf1fe7f2c92953dff436bf2dac2d9e01a5188216d2a60a705e4635f0c91b81 WHIRLPOOL 76f333a55d868f6e56bdf8ead44b541c78083a5a64d5b19ae2423a9b22cb8cf17e2fe063dd1a569baab192597c34dde42c6f104c27c13d40b364a81f71e8a183
diff --git a/x11-libs/gtksourceview/files/gentoo.lang b/x11-libs/gtksourceview/files/gentoo.lang
deleted file mode 100644
index bfca7b2..00000000
--- a/x11-libs/gtksourceview/files/gentoo.lang
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-
-<!--
- GtkSourceView syntax highlight for Gentoo-specific files
- Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
- Distributed under the same license(s) as gtksourceview.
-
- This .lang file should provide almost the same behaviour of
- gentoo.nanorc. The exceptions are the line-comment and string elements.
- If you get little
-
- TODO:
- - some styles don't get automatic colors, why?
- - add syntax for /etc/portage/*
--->
-
-<language _name="Gentoo" version="1.0" _section="Scripts" mimetypes="text/plain">
-
- <escape-char>\</escape-char>
-
- <line-comment _name="Line Comment" style="Comment">
- <start-regex>#</start-regex>
- </line-comment>
-
- <string _name="String" style="String" end-at-line-end="false">
- <start-regex>"</start-regex>
- <end-regex>"</end-regex>
- </string>
-
- <pattern-item _name="Bash syntax" style="Operator">
- <regex>(\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\b|(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|>|%lt;|!|=|&|\|)|-(e|d|f|r|g|u|w|x|L)\b|-(eq|ne|gt|lt|ge|le|s|n|z)\b)</regex>
- </pattern-item>
-
- <pattern-item _name="Bash variables" style="Others">
- <regex>\$\{?[a-zA-Z_0-9]+\}?</regex>
- </pattern-item>
-
- <pattern-item _name="Bash commands" style="Others 2">
- <regex>(\bmake\b|\b(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\b)</regex>
- </pattern-item>
-
- <pattern-item _name="Portage variables" style="Keyword">
- <regex>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</regex>
- </pattern-item>
-
- <pattern-item _name="Portage commands" style="Data Type">
- <regex>\b(e(begin|end|conf|install|make|warn|infon?|error|patch|log|javac|ant)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</regex>
- </pattern-item>
-
- <pattern-item _name="Portage functions" style="Function">
- <regex>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</regex>
- </pattern-item>
-
- <pattern-item _name="Inherits and USE flags" style="Specials">
- <regex>(\buse(_(with|enable))?\b [\!a-zA-Z0-9_+ -]*|inherit*$)</regex>
- </pattern-item>
-
-</language>
diff --git a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
deleted file mode 100644
index 91d7768..00000000
--- a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3.0/3"
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-# Note: has native OSX support, prefix teams, attack!
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/libxml2-2.6:2
- >=x11-libs/gtk+-3.16:3[introspection?]
- glade? ( >=dev-util/glade-3.9:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-1.42 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.18
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-deprecations \
- --enable-providers \
- $(use_enable glade glade-catalog) \
- $(use_enable introspection) \
- $(use_enable vala)
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
- gnome2_src_install
-
- insinto /usr/share/${PN}-3.0/language-specs
- doins "${FILESDIR}"/2.0/gentoo.lang
-}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
deleted file mode 100644
index 43b9e2f..00000000
--- a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.24"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3.0/3"
-
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/libxml2-2.6:2
- >=x11-libs/gtk+-3.16:3[introspection?]
- glade? ( >=dev-util/glade-3.9:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.24
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-deprecations \
- --enable-providers \
- $(use_enable glade glade-catalog) \
- $(use_enable introspection) \
- $(use_enable vala)
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
- gnome2_src_install
-
- insinto /usr/share/${PN}-3.0/language-specs
- doins "${FILESDIR}"/2.0/gentoo.lang
-}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.22.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.22.1.ebuild
deleted file mode 100644
index 9b2b002..00000000
--- a/x11-libs/gtksourceview/gtksourceview-3.22.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-VALA_MIN_API_VERSION="0.24"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3.0/3"
-
-IUSE="glade +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
- >=dev-libs/glib-2.48:2
- >=dev-libs/libxml2-2.6:2
- >=x11-libs/gtk+-3.20:3[introspection?]
- glade? ( >=dev-util/glade-3.9:3.10 )
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.25
- >=sys-devel/gettext-0.19.4
- dev-util/itstool
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-deprecations \
- $(use_enable glade glade-catalog) \
- $(use_enable introspection) \
- $(use_enable vala)
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- insinto /usr/share/${PN}-3.0/language-specs
- doins "${FILESDIR}"/2.0/gentoo.lang
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/files/, x11-libs/gtksourceview/
@ 2020-08-31 7:00 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-08-31 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 06334c394e4dc5827778387e5086813af9527b39
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 06:54:10 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 06:54:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06334c39
x11-libs/gtksourceview: quick-fix gentoo syntax highlighting
This makes it not error and restore some basic highlighting for
ebuild and eclass files, though still does not update to all the
other changes in gtksourceview - for example not all built-in
commands might be updated, as the bare minimum was done, while
a full recheck against upstream sh.lang is really needed.
Bug: https://bugs.gentoo.org/730766
Package-Manager: Portage-2.3.103, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
x11-libs/gtksourceview/files/4.6-gentoo.lang | 111 +++++++++++++++++++++
.../gtksourceview/gtksourceview-4.6.1-r1.ebuild | 68 +++++++++++++
2 files changed, 179 insertions(+)
diff --git a/x11-libs/gtksourceview/files/4.6-gentoo.lang b/x11-libs/gtksourceview/files/4.6-gentoo.lang
new file mode 100644
index 00000000000..8d539a8a9f3
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.6-gentoo.lang
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ GtkSourceView syntax highlight for Gentoo-specific files
+
+ Originally written for gtksourceview-1.x by:
+ Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
+ Rewritten for gtksourceview-2 by:
+ Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
+
+ Distributed under the same license(s) as gtksourceview.
+
+ TODO:
+ - do not highlight "enable" in the configure options
+ - perhaps highlight portage variables and portage functions different
+
+-->
+
+<language name="gentoo" id="gentoo" version="2.0" _section="Scripts">
+ <metadata>
+ <property name="globs">*.ebuild;*.eclass</property>
+ <property name="line-comment-start">#</property>
+ </metadata>
+
+ <styles>
+ <style id="variable" _name="Portage variables" map-to="def:builtin" />
+ <style id="command" _name="Portage command" map-to="def:type" />
+ <style id="function" _name="Portage function" map-to="def:function" />
+ <style id="string" _name="String" map-to="def:string" />
+ </styles>
+
+ <definitions>
+
+ <!-- rewrite shell string to show highlighted variables -->
+ <context id="string" style-ref="def:string">
+ <start>"</start>
+ <end>"</end>
+ <include>
+ <context ref="def:escape"/>
+ <context ref="def:line-continue"/>
+ <context ref="sh:variable"/>
+ </include>
+ </context>
+
+ <context id="string-2" style-ref="def:string">
+ <start>'</start>
+ <end>'</end>
+ <include>
+ <context ref="def:escape"/>
+ <context ref="def:line-continue"/>
+ <context ref="sh:variable"/>
+ </include>
+ </context>
+
+ <!-- subprograms:
+ - $(..) is not supported currently in the normal sh.lang
+ - `...` is interpreted as string - I think the subshell behavior is more acurate -->
+ <context id="subprogram">
+ <start>\$\(</start>
+ <end>\)</end>
+ <include>
+ <context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+ <context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+ <context ref="gentoo"/>
+ </include>
+ </context>
+
+ <context id="subprogram-2">
+ <start>`</start>
+ <end>`</end>
+ <include>
+ <context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+ <context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+ <context ref="gentoo"/>
+ </include>
+ </context>
+
+ <!-- portage variables - currently unused -->
+ <context id="portvars" style-ref="variable">
+ <match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match>
+ </context>
+
+ <!-- portage functions - currently unused -->
+ <context id="portfuncs" style-ref="function">
+ <match>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</match>
+ </context>
+
+ <!-- extra portage commands -->
+ <context id="portcmds" style-ref="command">
+ <match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+ </context>
+
+ <context id="built-in-command">
+ <include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
+ <context ref="sh:reserved-word" />
+ <context ref="sh:let-command" />
+ <context ref="portcmds" />
+ </include>
+ </context>
+
+ <!-- gentoo is just a shell with the replacements -->
+ <replace id="sh:built-in-command" ref="built-in-command" />
+ <replace id="sh:backtick-subshell" ref="subprogram-2" />
+ <context id="gentoo">
+ <include>
+ <context ref="subprogram"/>
+ <context ref="sh:sh"/>
+ </include>
+ </context>
+ </definitions>
+</language>
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
new file mode 100644
index 00000000000..7c079aebd96
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.48:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=dev-libs/libxml2-2.6:2
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+ >=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use glade glade_catalog)
+ -Dinstall_tests=false
+ $(meson_use introspection gir)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc gtk_doc)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ insinto /usr/share/${PN}-4/language-specs
+ newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
+
+ # Avoid conflict with gtksourceview:3.0 glade-catalog
+ # TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+ if use glade; then
+ mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/files/, x11-libs/gtksourceview/
@ 2021-04-30 16:18 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2021-04-30 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 85608326ec157e60fd7a01ea032fb38e87e12ffc
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 16:17:41 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 16:18:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85608326
x11-libs/gtksourceview: Add patch to avoid build race
Closes: https://bugs.gentoo.org/787146
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...sure-access-to-resources-in-corelib-build.patch | 57 ++++++++++++++++++++++
x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild | 1 +
2 files changed, 58 insertions(+)
diff --git a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
new file mode 100644
index 00000000000..3fde96b1485
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
@@ -0,0 +1,57 @@
+From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Sun, 7 Mar 2021 08:54:15 -0800
+Subject: [PATCH] build: ensure access to resources in corelib build
+
+This should help with some transient build failures in dependent projects.
+---
+ gtksourceview/meson.build | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
+index fd080a9c..b6192604 100644
+--- a/gtksourceview/meson.build
++++ b/gtksourceview/meson.build
+@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file(
+ install_dir: join_paths(pkgincludedir, 'gtksourceview'),
+ )
+
++gtksource_res = gnome.compile_resources(
++ 'gtksourceview-gresources',
++ 'gtksourceview.gresource.xml'
++)
++
+ core_sources = [
+ core_public_c,
+ core_private_c,
+ core_enums,
+ gtksourceversion_h,
+ core_marshallers,
++ gtksource_res,
+ ]
+
+ install_headers(
+@@ -216,11 +222,6 @@ extra_public_sources = []
+
+ subdir('completion-providers')
+
+-gtksource_res = gnome.compile_resources(
+- 'gtksourceview-gresources',
+- 'gtksourceview.gresource.xml'
+-)
+-
+
+ # We can't use the static libs on Visual Studio builds
+ # to form our DLL here directly, so we must use
+@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs
+ gtksource_objs += int_lib.extract_all_objects()
+ endforeach
+
+-gtksource_lib = shared_library(package_string, gtksource_res,
++gtksource_lib = shared_library(package_string,
+ version: lib_version,
+ darwin_versions: lib_osx_version,
+ include_directories: gtksourceview_include_dirs,
+--
+2.26.3
+
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
index ea3909535ab..8a04ceac09f 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
+ "${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/files/, x11-libs/gtksourceview/
@ 2024-09-15 12:25 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2024-09-15 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 4f79cdcc9f9f1d131994a0764d0dc3e1d9a5fbad
Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Thu Sep 12 14:07:13 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 12:24:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f79cdcc
x11-libs/gtksourceview: fix compilation of 2.10.5 with gcc-14
Also use consistent patch names.
Closes: https://bugs.gentoo.org/937626
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/38579
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
...NST_RETURN.patch => 2.10.5-G_CONST_RETURN.patch} | 0
x11-libs/gtksourceview/files/2.10.5-gcc14.patch | 21 +++++++++++++++++++++
.../gtksourceview/gtksourceview-2.10.5-r3.ebuild | 5 ++++-
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch b/x11-libs/gtksourceview/files/2.10.5-G_CONST_RETURN.patch
similarity index 100%
rename from x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch
rename to x11-libs/gtksourceview/files/2.10.5-G_CONST_RETURN.patch
diff --git a/x11-libs/gtksourceview/files/2.10.5-gcc14.patch b/x11-libs/gtksourceview/files/2.10.5-gcc14.patch
new file mode 100644
index 000000000000..e86cfbc7d60f
--- /dev/null
+++ b/x11-libs/gtksourceview/files/2.10.5-gcc14.patch
@@ -0,0 +1,21 @@
+
+Fix build with gcc-14.
+
+Backported version of patch from:
+https://gitlab.gnome.org/GNOME/gtksourceview/-/commit/b25e71c57fc934a7ce36e51826af9fa7c2cf9a80
+
+Bug: https://bugs.gentoo.org/937626
+
+Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
+
+--- gtksourceview-2.10.5/gtksourceview/gtksourceview.c 2010-08-22 13:45:05.000000000 +0200
++++ gtksourceview-2.10.5-gcc14/gtksourceview/gtksourceview.c 2024-08-09 16:11:37.319493797 +0200
+@@ -1766,7 +1766,7 @@ set_source_buffer (GtkSourceView *view,
+
+ if (buffer && GTK_IS_SOURCE_BUFFER (buffer))
+ {
+- view->priv->source_buffer = g_object_ref (buffer);
++ view->priv->source_buffer = g_object_ref (GTK_SOURCE_BUFFER (buffer));
+
+ g_signal_connect (buffer,
+ "highlight_updated",
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
index c238975c90d7..5dc42f20caa8 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -31,7 +31,10 @@ BDEPEND="
DOCS=( AUTHORS ChangeLog HACKING MAINTAINERS NEWS README )
# Patch from 3.x for bug #394925
-PATCHES=( "${FILESDIR}/${P}-G_CONST_RETURN.patch" )
+PATCHES=(
+ "${FILESDIR}/2.10.5-G_CONST_RETURN.patch"
+ "${FILESDIR}/2.10.5-gcc14.patch"
+)
src_prepare() {
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-15 12:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-31 7:00 [gentoo-commits] repo/gentoo:master commit in: x11-libs/gtksourceview/files/, x11-libs/gtksourceview/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-09-15 12:25 Pacho Ramos
2021-04-30 16:18 Matt Turner
2017-01-26 10:56 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox