From 662f71ae67cd775d7fbb79b5091676c0e07a992b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 May 2023 15:17:30 +0100 Subject: gentoo auto-resync : 29:05:2023 - 15:17:30 --- app-editors/Manifest.gz | Bin 13916 -> 13914 bytes app-editors/scite/Manifest | 9 +- .../files/scite-5.3.5-gcc-13-fix-bgo892431.patch | 40 +++++++++ app-editors/scite/scite-5.1.3.ebuild | 97 --------------------- app-editors/scite/scite-5.2.4.ebuild | 97 --------------------- app-editors/scite/scite-5.3.0.ebuild | 97 --------------------- app-editors/scite/scite-5.3.5.ebuild | 4 +- 7 files changed, 45 insertions(+), 299 deletions(-) create mode 100644 app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch delete mode 100644 app-editors/scite/scite-5.1.3.ebuild delete mode 100644 app-editors/scite/scite-5.2.4.ebuild delete mode 100644 app-editors/scite/scite-5.3.0.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index fa80af9d8cd6..323b5a0cce07 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest index 6e3e1294bf09..5f124b966079 100644 --- a/app-editors/scite/Manifest +++ b/app-editors/scite/Manifest @@ -1,9 +1,4 @@ -DIST scite-5.1.3.tgz 3427245 BLAKE2B ca765b61cb1fa96934c1e28d76a97cd7086a6c692ae33bb57591dfbc8637ffc94c4a3f20f9c6b55d11da8a76664f1d521f7e393bf6f31db55cbe02e0bf5052ba SHA512 ef86a18f739062598d3c7bf19bcd2f38ca012e890b9b4685c1f1b809e928762ab60d24c33a1f45ca33133ce5007e3a22a76e80222b121c9a4089d3c57aa0bc4c -DIST scite-5.2.4.tgz 3440615 BLAKE2B a98028774837f7c19a73d3ceef0e7cf945674b0b0d21eec7af4874a1fab1dcbfdad9255adcfb9d458dfc6549baeb27dee3fab207f0145b6c722794a9a96ec284 SHA512 ac3f25fbfe654f4b249c55b2bf97d5ea57483a484feeb30c3663e13366d1a569d9faa22c83b4eb5201154d00713fcd550478573db987084eba0a2e8ea22c57e9 -DIST scite-5.3.0.tgz 3499449 BLAKE2B b54a4eb5c9d669f840efa782d0b02e1b087b386aabbf58dcd37bdc314f42ff6597bf674329c64bbf40befecbc3d3d00aaf13bd03d0f18a28ab6a050049b25336 SHA512 3401ea04019f4fbbd15118a6b2aeffaaeff91382e742cff4df2dcd83ea59e4d43600b288869db9dbe44609fcfad979d29659edbd200b6b0edfa56eac5a9f577d +AUX scite-5.3.5-gcc-13-fix-bgo892431.patch 1261 BLAKE2B e111d02d7aae4d965874dab8670a4f4fa2136d457d3cc890594e59c8692be3ebca7b1fd541b76b4119839f8f83cdcca8a5db1dc4698c33e63d78ac0712ebce21 SHA512 9214c691602597339199051586d7c3ec966a3227a59d7f2b0ef3b42e09cfc115be59921abec5b18a7b43d405d5208130102ed5c6e17b2ffb3c0a82b27662b9ee DIST scite-5.3.5.tgz 3535798 BLAKE2B 16bd6331b8ab5ef2d700a121d8d85078f6eea2f8c45cfd62c5b27c7c9622f853a871e98402ee3833c09652d869271ed05a61374ee1f55d58dbdcc0f5fcbd681c SHA512 18ed3e802f6f5e66573f72c4ad42d592ea3f79e191e828a32d2d55aaf285a2cb9961e206c9e99f82c77f0975494e9105ac925394d7cf48223b954e253f1dee9c -EBUILD scite-5.1.3.ebuild 2399 BLAKE2B aa552326db18257573410f3759bec58c93fa6b331997c0475f459c698f41f685cde2d05e5c9ba88e70998566a45b6a18a52a128dc5d3ad00b429d9f7e9043221 SHA512 777e8ec73b35e14962728cbfa6ca7dbe1170ccab75c2abe0cb184580a9fffb2192df27fe853fd0f65018c9991dd33dfca059b086a64f85be4f2a7044fc024bd8 -EBUILD scite-5.2.4.ebuild 2406 BLAKE2B 6792a9a78a9fd9968dacd4360bcecb0b3570950d46767bb03a6ed69ebe24ae1de1f9963e1cf4f0f8adafc255d7f372fbbffece45db92799b54a85d68b874514e SHA512 f73769262346f62af1962d2e97e1f5a81d22901ee1adb92eaee774d1572fb6c46b8147ea9bcbae3829bc9ebd278d8ab0557c8b154b2b277bb56583e50be08e29 -EBUILD scite-5.3.0.ebuild 2406 BLAKE2B 6792a9a78a9fd9968dacd4360bcecb0b3570950d46767bb03a6ed69ebe24ae1de1f9963e1cf4f0f8adafc255d7f372fbbffece45db92799b54a85d68b874514e SHA512 f73769262346f62af1962d2e97e1f5a81d22901ee1adb92eaee774d1572fb6c46b8147ea9bcbae3829bc9ebd278d8ab0557c8b154b2b277bb56583e50be08e29 -EBUILD scite-5.3.5.ebuild 2432 BLAKE2B 3425272c77557570cffdc079e1090e8831033c686ff89fa53d54271ad3e2952e44704826d6294921d741fc48882d66c13c363e2892db97cc4b86f44d79b5db63 SHA512 5bea80999379d398f37ca12ef40e811056aa28af76d726b59e4a47baa3e1eb86d8f319b172b34067bb5ff8062643ff10d144727cf26eccf889e5af05ccd1e78a +EBUILD scite-5.3.5.ebuild 2494 BLAKE2B bf5de4d17cb9ea7f2efddaf4cc975e89fa0e470654a6fe325ee245af70e7fc6ed902fb74734f7ca3f986c658247ee5389cb4e1758482557caff8a545d1f483ef SHA512 76846c0cc025661821a82f85019abae5dd00aaaeb8cc24bf05a46d6c7d5611fdeb8561db81a16dc750b8f2939e147b748c5e6b459a43f925b8a2d6a849922776 MISC metadata.xml 247 BLAKE2B 48a241bd34b1820e804bb495b923696deea0e8d8fb710efd928c6b04aea362cdde3c15c81b9edc82868e39047e00210be8ca4f1b7b550e812375277dad47a803 SHA512 a083104fd79c7979f84234a82f419dee039d3d63cbd28d44b251f4a3f7183d333f920193e055c967fed03e7d755013365b867283f28d88751af52a6574f46a3c diff --git a/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch b/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch new file mode 100644 index 000000000000..935fbdf0b8cd --- /dev/null +++ b/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch @@ -0,0 +1,40 @@ +--- a/scite/scripts/HeaderOrder.txt 2023-05-28 04:10:36.897378314 +0300 ++++ b/scite/scripts/HeaderOrder.txt 2023-05-28 04:11:48.740712313 +0300 +@@ -30,6 +30,7 @@ + + // C++ standard library + #include ++#include + #include + #include + #include +--- a/scite/src/MultiplexExtension.cxx 2023-05-28 04:16:48.680714993 +0300 ++++ b/scite/src/MultiplexExtension.cxx 2023-05-28 04:17:58.230715597 +0300 +@@ -5,6 +5,7 @@ + // Copyright 1998-2003 by Neil Hodgson + // The License.txt file describes the conditions under which this software may be distributed. + ++#include + #include + #include + #include +--- a/scite/src/SciTEBase.cxx 2023-05-28 04:20:08.850716714 +0300 ++++ b/scite/src/SciTEBase.cxx 2023-05-28 04:21:35.867384145 +0300 +@@ -15,6 +15,7 @@ + #include + #include + ++#include + #include + #include + #include +--- a/scite/src/SciTEProps.cxx 2023-05-28 04:22:53.904051478 +0300 ++++ b/scite/src/SciTEProps.cxx 2023-05-28 04:23:43.374051910 +0300 +@@ -13,6 +13,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/app-editors/scite/scite-5.1.3.ebuild b/app-editors/scite/scite-5.1.3.ebuild deleted file mode 100644 index 56eaa7f3c945..000000000000 --- a/app-editors/scite/scite-5.1.3.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 ) - -inherit lua-single toolchain-funcs xdg - -DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring" -HOMEPAGE="https://www.scintilla.org/SciTE.html" -SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" - -LICENSE="HPND lua? ( MIT )" -SLOT="0" -KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="lua" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/atk - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango - lua? ( ${LUA_DEPS} )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig" - -DOCS=("../README") - -S="${WORKDIR}/${PN}/gtk" - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX RANLIB - - # remove hardcoded CC, Optimizations and clang unknown flags - sed -i "${WORKDIR}/scintilla/gtk/makefile" \ - -e "s#^CC = gcc#CC = ${CC}#" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-Os##" \ - -e "s#-Wno-misleading-indentation##" \ - || die "error patching /scintilla/gtk/makefile" - - sed -i "${S}/makefile" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ - -e "s#-Os##" \ - || die "error patching gtk/makefile" - - # repair and enhance the .desktop file - sed -i "${S}/SciTE.desktop" \ - -e "s#text/plain#text/\*;application/xhtml+xml#" \ - -e "s#^Categories=\(.*\)#Categories=Development;#" \ - || die "error patching /scite/gtk/SciTe.desktop" - - # add the ebuild suffix as shell type for working with ebuilds - sed -i "${WORKDIR}/scite/src/perl.properties" \ - -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \ - || die "error patching /scite/src/perl.properties" - - # it seems that pwd here is ${S}, but user patches are relative to ${workdir} - # Bug #576162 - - cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user -} - -src_compile() { - # prepare make options - local emake_pars=("GTK3=1") - - tc-is-clang && emake_pars+=("CLANG=1") - use !lua && emake_pars+=("NO_LUA=1") - - emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}" - emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}" - emake "${emake_pars[@]}" -} - -# want to use the base src_install() as base_src_install() - -src_install() { - default - dosym SciTE /usr/bin/scite -} diff --git a/app-editors/scite/scite-5.2.4.ebuild b/app-editors/scite/scite-5.2.4.ebuild deleted file mode 100644 index 351ecb41df39..000000000000 --- a/app-editors/scite/scite-5.2.4.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-4 ) - -inherit lua-single toolchain-funcs xdg - -DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring" -HOMEPAGE="https://www.scintilla.org/SciTE.html" -SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" - -LICENSE="HPND lua? ( MIT )" -SLOT="0" -KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="lua" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/atk - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango - lua? ( ${LUA_DEPS} )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig" - -DOCS=("../README") - -S="${WORKDIR}/${PN}/gtk" - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX RANLIB - - # remove hardcoded CC, Optimizations and clang unknown flags - sed -i "${WORKDIR}/scintilla/gtk/makefile" \ - -e "s#^CC = gcc#CC = ${CC}#" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-Os##" \ - -e "s#-Wno-misleading-indentation##" \ - || die "error patching /scintilla/gtk/makefile" - - sed -i "${S}/makefile" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ - -e "s#-Os##" \ - || die "error patching gtk/makefile" - - # repair and enhance the .desktop file - sed -i "${S}/SciTE.desktop" \ - -e "s#text/plain#text/\*;application/xhtml+xml#" \ - -e "s#^Categories=\(.*\)#Categories=Development;#" \ - || die "error patching /scite/gtk/SciTe.desktop" - - # add the ebuild suffix as shell type for working with ebuilds - sed -i "${WORKDIR}/scite/src/perl.properties" \ - -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \ - || die "error patching /scite/src/perl.properties" - - # it seems that pwd here is ${S}, but user patches are relative to ${workdir} - # Bug #576162 - - cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user -} - -src_compile() { - # prepare make options - local emake_pars=("GTK3=1") - - tc-is-clang && emake_pars+=("CLANG=1") - use !lua && emake_pars+=("NO_LUA=1") - - emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}" - emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}" - emake "${emake_pars[@]}" -} - -# want to use the base src_install() as base_src_install() - -src_install() { - GTK3=1 default - dosym SciTE /usr/bin/scite -} diff --git a/app-editors/scite/scite-5.3.0.ebuild b/app-editors/scite/scite-5.3.0.ebuild deleted file mode 100644 index 351ecb41df39..000000000000 --- a/app-editors/scite/scite-5.3.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-4 ) - -inherit lua-single toolchain-funcs xdg - -DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring" -HOMEPAGE="https://www.scintilla.org/SciTE.html" -SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" - -LICENSE="HPND lua? ( MIT )" -SLOT="0" -KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="lua" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/atk - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango - lua? ( ${LUA_DEPS} )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig" - -DOCS=("../README") - -S="${WORKDIR}/${PN}/gtk" - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX RANLIB - - # remove hardcoded CC, Optimizations and clang unknown flags - sed -i "${WORKDIR}/scintilla/gtk/makefile" \ - -e "s#^CC = gcc#CC = ${CC}#" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-Os##" \ - -e "s#-Wno-misleading-indentation##" \ - || die "error patching /scintilla/gtk/makefile" - - sed -i "${S}/makefile" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ - -e "s#-Os##" \ - || die "error patching gtk/makefile" - - # repair and enhance the .desktop file - sed -i "${S}/SciTE.desktop" \ - -e "s#text/plain#text/\*;application/xhtml+xml#" \ - -e "s#^Categories=\(.*\)#Categories=Development;#" \ - || die "error patching /scite/gtk/SciTe.desktop" - - # add the ebuild suffix as shell type for working with ebuilds - sed -i "${WORKDIR}/scite/src/perl.properties" \ - -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \ - || die "error patching /scite/src/perl.properties" - - # it seems that pwd here is ${S}, but user patches are relative to ${workdir} - # Bug #576162 - - cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user -} - -src_compile() { - # prepare make options - local emake_pars=("GTK3=1") - - tc-is-clang && emake_pars+=("CLANG=1") - use !lua && emake_pars+=("NO_LUA=1") - - emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}" - emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}" - emake "${emake_pars[@]}" -} - -# want to use the base src_install() as base_src_install() - -src_install() { - GTK3=1 default - dosym SciTE /usr/bin/scite -} diff --git a/app-editors/scite/scite-5.3.5.ebuild b/app-editors/scite/scite-5.3.5.ebuild index 1283d94ee015..1242ae6a372f 100644 --- a/app-editors/scite/scite-5.3.5.ebuild +++ b/app-editors/scite/scite-5.3.5.ebuild @@ -34,6 +34,8 @@ DOCS=( "../README" ) S="${WORKDIR}/${PN}/gtk" +PATCHES=( "${FILESDIR}"/scite-5.3.5-gcc-13-fix-bgo892431.patch ) + pkg_setup() { use lua && lua-single_pkg_setup } @@ -72,7 +74,7 @@ src_prepare() { # Bug #576162 cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user + default } src_compile() { -- cgit v1.2.3