public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
@ 2022-04-13 19:45 Arthur Zamarin
  0 siblings, 0 replies; 5+ messages in thread
From: Arthur Zamarin @ 2022-04-13 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     bda843e20b5e627a32a1b73ca1a0434ca266e0b7
Author:     Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Wed Apr 13 16:30:40 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 16:30:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bda843e2

app-office/sc-im: Remove tmux dependency

This dependency doesn't make sense in it's current flag,
neither does it make sense without patching the Makefile.
It will be added later together with the proper patch and
use flag.

Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>

 app-office/sc-im/sc-im-0.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index e59b5e8f0..69b694230 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -18,7 +18,7 @@ PATCHES=(
 
 DEPEND="
 	sys-libs/ncurses
-	X? ( || ( app-misc/tmux x11-misc/xclip ) )
+	X? ( x11-misc/xclip )
 	plots? ( sci-visualization/gnuplot )
 	xls? (
 		dev-libs/libxlsxwriter


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
@ 2022-04-14 13:31 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-04-14 13:31 UTC (permalink / raw
  To: gentoo-commits

commit:     cd10b2990d8bef52ab21a523329753db49e50c5a
Author:     Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Thu Apr 14 10:37:43 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 10:37:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd10b299

app-office/sc-im: add missing eapply

Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>

 app-office/sc-im/sc-im-0.8.2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index eed3d720a..49753c8bb 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -15,7 +15,6 @@ IUSE="X plots xls lua ods tmux"
 PATCHES=(
 	"${FILESDIR}/${P}-prefix.patch"
 	"${FILESDIR}/${P}-tmux.patch"
-
 )
 
 DEPEND="
@@ -42,6 +41,6 @@ S="${WORKDIR}/${P}/src"
 
 src_prepare() {
 	eapply "${FILESDIR}/${P}-prefix.patch"
-	use tmux && "${FILESDIR}/${P}-tmux.patch"
+	use tmux && eapply "${FILESDIR}/${P}-tmux.patch"
 	eapply_user
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
@ 2022-04-15 18:42 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-04-15 18:42 UTC (permalink / raw
  To: gentoo-commits

commit:     759052518b1b7a312eaa5658e21c277f82ea7298
Author:     Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Fri Apr 15 05:39:13 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 05:39:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=75905251

app-office/sc-im: fix verbose flag description

Removed list of dependencies from flag description.

Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>

 app-office/sc-im/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
index 64d566c87..ed2ff157e 100644
--- a/app-office/sc-im/metadata.xml
+++ b/app-office/sc-im/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name='plots'>Add <pkg>sci-visualization/gnuplot</pkg> for plotting support</flag>
-		<flag name='xls'>Add xls/xlsx support. Pulls in <pkg>dev-python/xlsxwriter</pkg>, <pkg>dev-haskell/libxml</pkg>, <pkg>dev-libs/libzip</pkg> and <pkg>dev-libs/libxls</pkg></flag>
+		<flag name='xls'>Add xls/xlsx support</flag>
 		<flag name='ods'>Add <pkg>dev-libs/libzip</pkg> for ods import support</flag>
 		<flag name='X'>Use <pkg>x11-misc/xclip</pkg> for clipboard copy/paste</flag>
 		<flag name='tmux'>Use <pkg>app-misc/tmux</pkg> for clipboard copy/paste</flag>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
@ 2022-04-18 11:47 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-04-18 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ea11f083ca7f15abf42ebd8154ad78fcc0a04001
Author:     Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Mon Apr 18 10:19:05 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 10:21:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea11f083

app-office/sc-im: export cc

Closes: https://bugs.gentoo.org/839150
Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>

 app-office/sc-im/sc-im-0.8.2.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index e61cbc8f9..3c1ab1a27 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-1 luajit )
 
-inherit lua-single
+inherit lua-single toolchain-funcs
 
 DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
 HOMEPAGE="https://github.com/andmarti1424/sc-im"
@@ -74,3 +74,8 @@ pkg_setup() {
 	# Run lua setup
 	lua-single_pkg_setup
 }
+
+src_configure() {
+	tc-export CC
+	default
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
@ 2022-05-05  4:07 Haelwenn Monnier
  0 siblings, 0 replies; 5+ messages in thread
From: Haelwenn Monnier @ 2022-05-05  4:07 UTC (permalink / raw
  To: gentoo-commits

commit:     edb50d74d1826794b24fe6e90186bc5d973f064a
Author:     Dex Conner <cantcuckthis <AT> danwin1210 <DOT> de>
AuthorDate: Wed May  4 06:32:31 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Wed May  4 06:35:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edb50d74

app-office/sc-im: remove xlsx export support

Temporarily removed xlsx export support because of build errors.

Signed-off-by: Dex Conner <cantcuckthis <AT> danwin1210.de>

 app-office/sc-im/sc-im-0.8.2-r1.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-office/sc-im/sc-im-0.8.2-r1.ebuild b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
index d95a385a1..8bf7613d1 100644
--- a/app-office/sc-im/sc-im-0.8.2-r1.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2-r1.ebuild
@@ -121,10 +121,10 @@ src_configure() {
 		append-cflags -DODS -DXLSX $(${PKGCONF} --cflags libxml-2.0 libzip)
 		LDLIBS+=" -DODS -DXLSX $(${PKGCONF} --libs libxml-2.0 libzip)"
 	fi
-	if use xlsx ; then
-		append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
-		LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
-	fi
+	# if use xlsx ; then
+	# 	append-cflags -DXLSX_EXPORT $(${PKGCONF} --cflags xlsxwriter)
+	# 	LDLIBS+=" -DXLSX_EXPORT $(${PKGCONF} --libs xlsxwriter)"
+	# fi
 	if use lua ; then
 		append-cflags -DXLUA $(${PKGCONF} --cflags lua)
 		LDLIBS+=" -DXLUA $(${PKGCONF} --libs lua) -rdynamic"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-05-05  4:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-18 11:47 [gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-05-05  4:07 Haelwenn Monnier
2022-04-15 18:42 Andrew Ammerlaan
2022-04-14 13:31 Andrew Ammerlaan
2022-04-13 19:45 Arthur Zamarin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox