[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
commit: edb50d74d1826794b24fe6e90186bc5d973f064a
Author: Dex Conner danwin1210 de>
AuthorDate: Wed May 4 06:32:31 2022 +
Commit: Haelwenn Monnier hacktivis me>
CommitDate: Wed May 4 06:35:08 2022 +
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 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"
[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
commit: ea11f083ca7f15abf42ebd8154ad78fcc0a04001
Author: Dex Conner danwin1210 de>
AuthorDate: Mon Apr 18 10:19:05 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon Apr 18 10:21:50 2022 +
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 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
+}
[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
commit: 759052518b1b7a312eaa5658e21c277f82ea7298 Author: Dex Conner danwin1210 de> AuthorDate: Fri Apr 15 05:39:13 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri Apr 15 05:39:13 2022 + 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 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 @@ Add sci-visualization/gnuplot for plotting support - Add xls/xlsx support. Pulls in dev-python/xlsxwriter, dev-haskell/libxml, dev-libs/libzip and dev-libs/libxls + Add xls/xlsx support Add dev-libs/libzip for ods import support Use x11-misc/xclip for clipboard copy/paste Use app-misc/tmux for clipboard copy/paste
[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
commit: cd10b2990d8bef52ab21a523329753db49e50c5a
Author: Dex Conner danwin1210 de>
AuthorDate: Thu Apr 14 10:37:43 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Thu Apr 14 10:37:43 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd10b299
app-office/sc-im: add missing eapply
Signed-off-by: Dex Conner 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
}
[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/files/, app-office/sc-im/
commit: 4709ec0506b5ba321e1a5a3ba8ab125a9895c441
Author: Dex Conner danwin1210 de>
AuthorDate: Wed Apr 13 16:26:12 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Apr 13 16:26:12 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4709ec05
app-office/sc-im: initial import
Signed-off-by: Dex Conner danwin1210.de>
app-office/sc-im/Manifest | 1 +
app-office/sc-im/files/sc-im-0.8.2-prefix.patch | 11 +++
app-office/sc-im/metadata.xml | 14 +
app-office/sc-im/sc-im-0.8.2.ebuild | 38 +
4 files changed, 64 insertions(+)
diff --git a/app-office/sc-im/Manifest b/app-office/sc-im/Manifest
new file mode 100644
index 0..a085c5e62
--- /dev/null
+++ b/app-office/sc-im/Manifest
@@ -0,0 +1 @@
+DIST sc-im-0.8.2.tar.gz 1619617 BLAKE2B
1957b79749012b5e8b24e26f3cde63c84bf971d2183791f986c98ec823a9ab74bf8a126dcdb2a58920af07e068520ebd7efe9c9394235c5a58670f120495e980
SHA512
ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c
diff --git a/app-office/sc-im/files/sc-im-0.8.2-prefix.patch
b/app-office/sc-im/files/sc-im-0.8.2-prefix.patch
new file mode 100644
index 0..c34d226c2
--- /dev/null
+++ b/app-office/sc-im/files/sc-im-0.8.2-prefix.patch
@@ -0,0 +1,11 @@
+--- src/Makefile
src/Makefile
+@@ -2,7 +2,7 @@
+ name = sc-im
+
+ # The base directory where everything should be installed.
+-prefix = /usr/local
++prefix = /usr
+
+ EXDIR = $(prefix)/bin
+ HELPDIR = $(prefix)/share/$(name)
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
new file mode 100644
index 0..ff8f94c7c
--- /dev/null
+++ b/app-office/sc-im/metadata.xml
@@ -0,0 +1,14 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ cantcuckt...@danwin1210.de
+ Dex Conner
+
+
+ Add sci-visualization/gnuplot for
plotting support
+ Add xls/xlsx support. Pulls in
dev-python/xlsxwriter, dev-haskell/libxml,
dev-libs/libzip and dev-libs/libxls
+ Add dev-libs/libzip for ods import
support
+ Use x11-misc/xclip for clipboard
copy/paste
+
+
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild
b/app-office/sc-im/sc-im-0.8.2.ebuild
new file mode 100644
index 0..e59b5e8f0
--- /dev/null
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet
program for terminal"
+HOMEPAGE="https://github.com/andmarti1424/sc-im;
+SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X plots xls lua ods"
+
+PATCHES=(
+ "${FILESDIR}/${P}-prefix.patch"
+)
+
+DEPEND="
+ sys-libs/ncurses
+ X? ( || ( app-misc/tmux x11-misc/xclip ) )
+ plots? ( sci-visualization/gnuplot )
+ xls? (
+ dev-libs/libxlsxwriter
+ dev-haskell/libxml
+ dev-libs/libzip
+ dev-libs/libxls
+ )
+ lua? (
+ dev-lang/lua
+ )
+ ods? (
+ dev-libs/libzip
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+S="${WORKDIR}/${P}/src"
[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/files/, app-office/sc-im/
commit: b29e34669e5c14296b8fd1fb8bec4d9356a04336
Author: Dex Conner danwin1210 de>
AuthorDate: Wed Apr 13 17:14:27 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Apr 13 17:14:27 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b29e3466
app-office/sc-im: tmux patch and dependency
Properly added the tmux flag with the dependency and
the Makefile patch.
Signed-off-by: Dex Conner danwin1210.de>
app-office/sc-im/files/sc-im-0.8.2-tmux.patch | 23 +++
app-office/sc-im/metadata.xml | 1 +
app-office/sc-im/sc-im-0.8.2.ebuild | 11 ++-
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/app-office/sc-im/files/sc-im-0.8.2-tmux.patch
b/app-office/sc-im/files/sc-im-0.8.2-tmux.patch
new file mode 100644
index 0..63f910c54
--- /dev/null
+++ b/app-office/sc-im/files/sc-im-0.8.2-tmux.patch
@@ -0,0 +1,23 @@
+--- src/Makefile
src/Makefile
+@@ -58,16 +58,16 @@
+ # Choose one of the following commands for copying to different clipboards:
+ # You can later change it at runtime.
+ #to copy to tmux clipboard:
+-#CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
++CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
+ #to copy to X clipboard:
+-CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard
<"\"
++#CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard
<"\"
+ #to copy to OSX clipboard:
+ #CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""pbcopy <"\"
+ #
+ # Choose one of the proposed commands for pasting from different clipboards:
+ # You can later change it at runtime.
+-#CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
+-CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection
clipboard"\"
++CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
++#CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection
clipboard"\"
+ #CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""pbpaste"\"
+
+ # Command to open file or link under cursor
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
index ff8f94c7c..64d566c87 100644
--- a/app-office/sc-im/metadata.xml
+++ b/app-office/sc-im/metadata.xml
@@ -10,5 +10,6 @@
Add xls/xlsx support. Pulls in
dev-python/xlsxwriter, dev-haskell/libxml,
dev-libs/libzip and dev-libs/libxls
Add dev-libs/libzip for ods import
support
Use x11-misc/xclip for clipboard
copy/paste
+ Use app-misc/tmux for clipboard
copy/paste
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 69b694230..eed3d720a 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -10,15 +10,18 @@
SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-4"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="X plots xls lua ods"
+IUSE="X plots xls lua ods tmux"
PATCHES=(
"${FILESDIR}/${P}-prefix.patch"
+ "${FILESDIR}/${P}-tmux.patch"
+
)
DEPEND="
sys-libs/ncurses
X? ( x11-misc/xclip )
+ tmux? ( app-misc/tmux )
plots? ( sci-visualization/gnuplot )
xls? (
dev-libs/libxlsxwriter
@@ -36,3 +39,9 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND=""
S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}-prefix.patch"
+ use tmux && "${FILESDIR}/${P}-tmux.patch"
+ eapply_user
+}
[gentoo-commits] repo/proj/guru:master commit in: app-office/sc-im/
commit: bda843e20b5e627a32a1b73ca1a0434ca266e0b7 Author: Dex Conner danwin1210 de> AuthorDate: Wed Apr 13 16:30:40 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Apr 13 16:30:40 2022 + 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 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
