public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/scite/
Date: Tue, 28 Apr 2020 07:44:32 +0000 (UTC)	[thread overview]
Message-ID: <1588059847.d8203d919d35887d010802415afdc220d066b7da.juippis@gentoo> (raw)

commit:     d8203d919d35887d010802415afdc220d066b7da
Author:     Ervin Peters <coder <AT> ervnet <DOT> de>
AuthorDate: Mon Apr 27 04:51:52 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 07:44:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8203d91

app-editors/scite: Version Bump to 4.3.3.

Actual enhancements and upstream bugfixes. See
http://www.scintilla.org/ScintillaHistory.html

Signed-off-by: Ervin Peters <coder <AT> ervnet.de>
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/15538
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-editors/scite/Manifest           |   1 +
 app-editors/scite/scite-4.3.3.ebuild | 113 +++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 808dd3f0d0e..212ac9a7c22 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -2,3 +2,4 @@ DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f3
 DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
 DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
+DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b

diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
new file mode 100644
index 00000000000..e34188a5587
--- /dev/null
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://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 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5:= )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+DOCS=("../README")
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_pretend() {
+	if tc-is-clang ; then
+		# need c++17 features
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(clang-major-version) -lt 5 ]] &&
+		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
+		($(clang-major-version))."
+
+	elif tc-is-gcc; then
+		# older gcc is not supported
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(gcc-major-version) -lt 7 ]] &&
+		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
+	else
+		die "Either gcc or clang should be configured for building scite"
+	fi
+}
+
+src_prepare() {
+	# 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++#CC = ${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++#CC = ${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.prperties"
+
+	# 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}/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
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}


             reply	other threads:[~2020-04-28  7:45 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-28  7:44 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-05-29 12:30 [gentoo-commits] repo/gentoo:master commit in: app-editors/scite/ Joonas Niilola
2023-05-27 10:47 Sam James
2023-05-25  8:04 Arthur Zamarin
2023-05-25  8:02 Arthur Zamarin
2023-04-23  8:02 Sam James
2023-04-23  8:02 Sam James
2023-04-23  5:02 Sam James
2022-11-18 17:44 Arthur Zamarin
2022-11-14  7:44 Joonas Niilola
2022-11-14  7:44 Joonas Niilola
2022-09-12 13:40 Joonas Niilola
2022-09-12 13:40 Joonas Niilola
2022-09-01 17:50 Matt Turner
2022-08-29  7:22 Joonas Niilola
2022-08-29  7:22 Joonas Niilola
2022-07-23 12:50 Joonas Niilola
2022-07-23 12:50 Joonas Niilola
2022-05-17  5:34 Sam James
2021-12-20 11:06 Joonas Niilola
2021-12-20 11:06 Joonas Niilola
2021-12-20 11:06 Joonas Niilola
2021-12-11 19:10 Arthur Zamarin
2021-12-11 14:42 Jakov Smolić
2021-12-11 12:45 Jakov Smolić
2021-10-29 13:31 Yixun Lan
2021-10-04 12:33 Joonas Niilola
2021-09-21 16:35 Sam James
2021-09-19 22:12 Sam James
2021-09-19 22:12 Sam James
2021-09-10  7:22 Joonas Niilola
2021-09-10  7:22 Joonas Niilola
2021-09-10  7:22 Joonas Niilola
2020-12-03 22:58 Marek Szuba
2020-08-21  7:15 Joonas Niilola
2020-08-21  7:15 Joonas Niilola
2020-08-21  7:15 Joonas Niilola
2020-04-21  8:18 Joonas Niilola
2020-02-03 15:24 Agostino Sarubbo
2020-02-03 12:38 Agostino Sarubbo
2020-02-03 12:30 Agostino Sarubbo
2019-11-09  8:00 Joonas Niilola
2019-10-27  9:12 Michał Górny
2019-10-27  9:12 Michał Górny
2019-08-03 11:38 Jonas Stein
2019-06-04 20:54 Agostino Sarubbo
2019-06-04 14:45 Thomas Deutschmann
2019-03-20 18:26 Aaron Bauman
2019-02-15 15:04 Agostino Sarubbo
2018-05-20  0:16 Aaron Bauman
2018-04-16 21:26 Sergei Trofimovich
2018-03-31 21:46 Aaron Bauman
2018-02-11 10:01 Michał Górny
2017-11-18  1:26 Jonas Stein
2017-11-17  0:11 Jonas Stein
2017-11-16 22:40 Jonas Stein
2017-11-13 19:51 Jonas Stein
2017-08-23 16:07 Michał Górny
2017-01-29 14:38 Fabian Groffen
2016-07-04  0:05 Göktürk Yüksek
2016-05-13 16:04 Ian Delaney
2016-05-05  8:06 Ian Delaney
2016-05-05  8:06 Ian Delaney
2016-05-03 10:55 Sam Jorna
2016-04-10  6:59 Ian Delaney
2015-12-28 15:06 Agostino Sarubbo
2015-09-25 14:11 Ian Delaney
2015-09-20  6:29 Ian Delaney
2015-09-19 12:32 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1588059847.d8203d919d35887d010802415afdc220d066b7da.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox