From 0fcaac21e786bd7911b1e8f436cd885c5e2f6437 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 27 Oct 2023 08:42:41 +0100 Subject: gentoo auto-resync : 27:10:2023 - 08:42:41 --- dev-util/geany-plugins/Manifest | 6 +- .../files/geany-plugins-2.0-webkit2gtk-4.1.patch | 33 ++++++ .../geany-plugins/geany-plugins-1.38-r5.ebuild | 129 --------------------- dev-util/geany-plugins/geany-plugins-2.0.ebuild | 124 ++++++++++++++++++++ dev-util/geany-plugins/metadata.xml | 2 +- 5 files changed, 162 insertions(+), 132 deletions(-) create mode 100644 dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch delete mode 100644 dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild create mode 100644 dev-util/geany-plugins/geany-plugins-2.0.ebuild (limited to 'dev-util/geany-plugins') diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest index 84d92549c496..b5f0f2bf0f25 100644 --- a/dev-util/geany-plugins/Manifest +++ b/dev-util/geany-plugins/Manifest @@ -1,6 +1,8 @@ AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977 AUX geany-plugins-1.38-webkit2gtk-4.1.patch 811 BLAKE2B 1c682cd813350cc61d53fe72609aac7ef212bb4710f0925bc55f5da6f9241c3709d7183d25478024ac8883633ff3605b5b4e5e5c90005a09eb653c701059909a SHA512 4b02c9a13e57ded452d52ff10c0f81ddc56bc193e0301c0805ef154792125fe9f9b6a5c35e81d9535407a67b12a268f5e1eb122b24580c6cf5ad92b0de2b1479 +AUX geany-plugins-2.0-webkit2gtk-4.1.patch 1341 BLAKE2B 33613eee4f4f547d5eeecb13872e1fef85e934d25c74c93fa52915aaa14f02baac9e941215f617d5a29230a4eb68169d6b655444044f1b89d85371ba06000b6a SHA512 8cf132a9eb7d0054645a50aec9be847e743a888aa3fc5f349272c64aa158c3f1ab811e2d814aa8aa0e1f4b34d074c9095f18acf343005deee5356291a4347ec3 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339 +DIST geany-plugins-2.0.tar.bz2 3181264 BLAKE2B 6175f91a3a7effa081393e9397336e0f5f59846fdadd0e31584f237c14863016cc4ab1b17745e1e2804ad88161dc7e43aef97a2332a5c18a7f1baf10d2ea42ba SHA512 48d575459e5c9f905b8809796ea89a05f6e082a1bb1d29c9f44dd5de607a64ad65a27d18348312702d25cfbb80ea0348b9e806f8c0fe649ea558b5b4ccd84818 EBUILD geany-plugins-1.38-r410.ebuild 3208 BLAKE2B 752378c5eeb13bf3f4ed0d62d6d63c931a42c2da707c4fa86f85b6a65652ad0ecf9217d113c7b91f4656839034a41beddfb991134c2a14bd5d160cef0cecb70f SHA512 b07aaa0c2669e5d40ac599a9efee6cdbb94e7c66c3e627b155647bd35e632b927992078790bd2a20288f97b3c97affc201684c44bffd280e82de9eb150b9158a -EBUILD geany-plugins-1.38-r5.ebuild 3175 BLAKE2B fe5ff1db7c4186578dc23a45153df0baa490f6448727ebd11fc841ccdea3009253a698997332633bf739cd7289fa1bef00c190d842b752336a655eab986cb7c5 SHA512 c0e1e867c78d8be62ab26fb9d6287f8d393ce98b01038f7212c8c468e98cb4524b607bf2c386cbc6a285af7d8309362029dcddb61bf88c4d667ef550e46a5abd -MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a +EBUILD geany-plugins-2.0.ebuild 2872 BLAKE2B c9b23e7a8a3080637f844768769a9c83172906ff5f208e4a6cedcfd0179e1edf3d981a697a7753f0dc45e8b403a814a869cb7dec6b425d87f74848238613e0fe SHA512 dd7dbc8a6110600793d6a9bd86ce16bf9a1071a99fb96e7787707361a42035ed2a3cd5c71b4b7536e6fb4aa370bc458ca9949740b6395e05ba6fb6d690682abc +MISC metadata.xml 1143 BLAKE2B dc494d485e5c1aa77a9a6a7a69a5bded4fdb9a9dbc237765b26deaad5e23ced2681a6e32eeaeddb8dde438044e85801ad35692920f8a3b9a91d7b80d47bdd512 SHA512 0986c7bc90242bdc5f21e28328efcbbd075c556d162b663bb0eb01068860e2faabe25b151b7b1c5837d246b17ff1ee8d0bdee2068284f1c66a678b6e00e3e298 diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch new file mode 100644 index 000000000000..91015aa1a619 --- /dev/null +++ b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch @@ -0,0 +1,33 @@ +diff --git a/build/markdown.m4 b/build/markdown.m4 +index 6c1f53a6..39bea2a6 100644 +--- a/build/markdown.m4 ++++ b/build/markdown.m4 +@@ -49,13 +49,13 @@ AC_DEFUN([GP_CHECK_MARKDOWN], + GTK_VERSION=2.16 + WEBKIT_VERSION=1.1.13 + +- GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], ++ GP_CHECK_GTK3([webkit_package=webkit2gtk-4.1], + [webkit_package=webkit-1.0]) + GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], + [$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} + gthread-2.0]) +- AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0]) ++ AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.1]) + + GP_COMMIT_PLUGIN_STATUS([Markdown]) + +diff --git a/build/webhelper.m4 b/build/webhelper.m4 +index eacef95c..2325a65f 100644 +--- a/build/webhelper.m4 ++++ b/build/webhelper.m4 +@@ -25,7 +25,7 @@ AC_DEFUN([GP_CHECK_WEBHELPER], + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} +- webkit2gtk-4.0 >= ${WEBKIT_VERSION} ++ webkit2gtk-4.1 >= ${WEBKIT_VERSION} + gthread-2.0]) + + diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild deleted file mode 100644 index 7f84f12c63f3..000000000000 --- a/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 ) -LUA_REQ_USE="deprecated" - -inherit flag-o-matic lua-single - -DESCRIPTION="A collection of different plugins for Geany" -HOMEPAGE="https://plugins.geany.org" -SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86" - -IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -DEPEND=" - dev-libs/glib:2 - >=dev-util/geany-1.37[-gtk2(-)] - x11-libs/gtk+:3 - ctags? ( dev-util/ctags ) - debugger? ( x11-libs/vte:2.91 ) - enchant? ( app-text/enchant:= ) - git? ( dev-libs/libgit2:= ) - gpg? ( app-crypt/gpgme:= ) - gtkspell? ( app-text/gtkspell:3= ) - lua? ( ${LUA_DEPS} ) - markdown? ( - app-text/discount:= - net-libs/webkit-gtk:4 - ) - pretty-printer? ( dev-libs/libxml2:2 ) - scope? ( x11-libs/vte:2.91 ) - soup? ( net-libs/libsoup:2.4 ) - workbench? ( dev-libs/libgit2:= ) -" -RDEPEND="${DEPEND} - scope? ( sys-devel/gdb ) -" -BDEPEND="virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( "${FILESDIR}/${P}-libgit2-1.4.patch" ) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_configure() { - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#878529) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 - - local myeconfargs=( - --disable-cppcheck - --disable-extra-c-warnings - $(use_enable nls) - --enable-utilslib - # Plugins - --enable-addons - --enable-autoclose - --enable-automark - --enable-codenav - --enable-commander - --enable-defineformat - --enable-geanydoc - --enable-geanyextrasel - --enable-geanyinsertnum - --enable-geanymacro - --enable-geanyminiscript - --enable-geanynumberedbookmarks - --enable-geanyprj - --enable-geanyvc $(use_enable gtkspell) - --enable-keyrecord - --enable-latex - --enable-lineoperations - --enable-lipsum - --enable-overview - --enable-pairtaghighlighter - --enable-pohelper - --enable-projectorganizer - --enable-sendmail - --enable-shiftcolumn - --enable-tableconvert - --enable-treebrowser - --enable-vimode - --enable-xmlsnippets - $(use_enable debugger) - $(use_enable ctags geanyctags) - $(use_enable lua geanylua) - $(use_enable gpg geanypg) - $(use_enable soup geniuspaste) - $(use_enable git gitchangebar) - $(use_enable markdown) --disable-peg-markdown # using app-text/discount instead - $(use_enable pretty-printer) - $(use_enable scope) - $(use_enable enchant spellcheck) - # Having updatechecker… when you’re using a package manager? - $(use_enable soup updatechecker) - $(use_enable workbench) - # GeanyGenDoc requires ctpl which isn’t yet in portage - --disable-geanygendoc - # Require obsolete and vulnerable webkit-gtk versions - --disable-devhelp - --disable-webhelper - # GTK 2 only - --disable-geanypy - --disable-multiterm - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die - - # make installs all translations if LINGUAS is empty - if [[ -z "${LINGUAS-x}" ]]; then - rm -r "${ED}/usr/share/locale/" || die - fi -} diff --git a/dev-util/geany-plugins/geany-plugins-2.0.ebuild b/dev-util/geany-plugins/geany-plugins-2.0.ebuild new file mode 100644 index 000000000000..d1ffb9d1c929 --- /dev/null +++ b/dev-util/geany-plugins/geany-plugins-2.0.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 ) + +inherit autotools lua-single + +DESCRIPTION="A collection of different plugins for Geany" +HOMEPAGE="https://plugins.geany.org" +SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86" + +IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope webhelper workbench" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +DEPEND=" + dev-libs/glib:2 + >=dev-util/geany-2.0 + x11-libs/gtk+:3 + ctags? ( dev-util/ctags ) + debugger? ( x11-libs/vte:2.91 ) + enchant? ( app-text/enchant:= ) + git? ( dev-libs/libgit2:= ) + gpg? ( app-crypt/gpgme:= ) + gtkspell? ( app-text/gtkspell:3= ) + lua? ( ${LUA_DEPS} ) + markdown? ( + app-text/discount:= + net-libs/webkit-gtk:4.1 + ) + pretty-printer? ( dev-libs/libxml2:2 ) + scope? ( x11-libs/vte:2.91 ) + webhelper? ( net-libs/webkit-gtk:4.1 ) + workbench? ( dev-libs/libgit2:= ) +" +RDEPEND="${DEPEND} + scope? ( sys-devel/gdb ) +" +BDEPEND="virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( "${FILESDIR}/${P}-webkit2gtk-4.1.patch" ) + +pkg_setup() { + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-cppcheck + --disable-extra-c-warnings + $(use_enable nls) + --enable-utilslib + # Plugins + --enable-addons + --enable-autoclose + --enable-automark + --enable-codenav + --enable-commander + --enable-defineformat + --enable-geanydoc + --enable-geanyextrasel + --enable-geanyinsertnum + --enable-geanymacro + --enable-geanyminiscript + --enable-geanynumberedbookmarks + --enable-geanyprj + --enable-geanyvc $(use_enable gtkspell) + --enable-keyrecord + --enable-latex + --enable-lineoperations + --enable-lipsum + --enable-overview + --enable-pairtaghighlighter + --enable-pohelper + --enable-projectorganizer + --enable-sendmail + --enable-shiftcolumn + --enable-tableconvert + --enable-treebrowser + --enable-vimode + --enable-xmlsnippets + $(use_enable debugger) + $(use_enable ctags geanyctags) + $(use_enable lua geanylua) + $(use_enable gpg geanypg) + $(use_enable git gitchangebar) + $(use_enable markdown) --disable-peg-markdown # using app-text/discount instead + $(use_enable pretty-printer) + $(use_enable scope) + $(use_enable enchant spellcheck) + $(use_enable webhelper) + $(use_enable workbench) + # GeanyGenDoc requires ctpl which isn’t yet in portage + --disable-geanygendoc + # Require libsoup-2.4 which conflicts with webkit2gtk-4.1 + --disable-geniuspaste + --disable-updatechecker + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${D}" -name '*.la' -delete || die + + # make installs all translations if LINGUAS is empty + if [[ -z "${LINGUAS-x}" ]]; then + rm -r "${ED}/usr/share/locale/" || die + fi +} diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml index 5ed0076a04d4..9e62141c276a 100644 --- a/dev-util/geany-plugins/metadata.xml +++ b/dev-util/geany-plugins/metadata.xml @@ -18,7 +18,7 @@ Enable the markdown plugin Enable pretty-printer plugin Enable the scope plugin which is a graphical GDB front-end - Enable updatechecker and geniuspaste plugins which require net-libs/libsoup + Enable webhelper plugin Enable workbench plugin -- cgit v1.2.3