[gentoo-commits] repo/gentoo:master commit in: sci-electronics/gspiceui/, sci-electronics/gspiceui/files/
commit: 99f627b10224a2cb3029cd49f42d7d0138e2320c
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Jul 5 17:43:41 2024 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Jul 5 17:48:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f627b1
sci-electronics/gspiceui: add 1.3.30_pre20240321
Closes: https://bugs.gentoo.org/918633
Signed-off-by: Pacho Ramos gentoo.org>
sci-electronics/gspiceui/Manifest | 1 +
...ui-1.3.30_pre20240321-respect-users-flags.patch | 50 ++
.../gspiceui/gspiceui-1.3.30_pre20240321.ebuild| 78 ++
3 files changed, 129 insertions(+)
diff --git a/sci-electronics/gspiceui/Manifest
b/sci-electronics/gspiceui/Manifest
index 8e067dce86db..226356f48245 100644
--- a/sci-electronics/gspiceui/Manifest
+++ b/sci-electronics/gspiceui/Manifest
@@ -1,2 +1,3 @@
+DIST gspiceui-1.3.30_pre20240321.zip 80103549 BLAKE2B
5cdbd2338dd057d73a01572e75a7af145bca99f3e9339d259ae3615076e26a5c1614eecdd1e32cd669ecdd2a5cc1e3934dc3d3f1b36980c7a2eed7c6c15e1bb6
SHA512
736f7eafbaa26c3d9b3fa0df1ae5071adf21c0716519a99a0b9d199aa10a0dd402273de51d2e16b07be4c145ab2d34e133c515a8cfbb44068aa46cdc36a20658
DIST gspiceui-v1.1.00.tar.gz 1048236 BLAKE2B
cc3d14137517cd26687dabac7e001e7518fee91aedc74f1995ac763873345f2965c3edb4e037ecb6ac8ca874289b2e658fe3185d95b3eeaf2b349efab151f37b
SHA512
46ccf3dd7a5dd9ec1cac1eb742187ecab15a6c0033467d52a44c916e239696faf7b8797e1a155191cf0ed37b04619b0666cff51e78912a06ecd2c63d377cba93
DIST gspiceui-v1.2.87.tar.gz 1089733 BLAKE2B
c1801bfebd5d42fe9c1ab26e6fd0cb06b56cac53bbad272522896325e5fd979e6fcc63d6f99262b152180f249b5b2d4aa119aa83254a2fc07256574c9ebaef10
SHA512
081d04c39f4fb96139f12fa063dfb888e036948a00a6b55de3b04a49b2b4af01b45fd9b7f903855d798a71957452550dfa8c8505c167c239e27ada29cb6fa747
diff --git
a/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch
b/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch
new file mode 100644
index ..531491829bd3
--- /dev/null
+++
b/sci-electronics/gspiceui/files/gspiceui-1.3.30_pre20240321-respect-users-flags.patch
@@ -0,0 +1,50 @@
+--- a/src/Makefile.old 2024-06-21 11:25:45.990728109 +0200
b/src/Makefile 2024-06-21 11:33:20.289571247 +0200
+@@ -46,8 +46,8 @@
+
#***
+
+ # Which compiler and linker (eg. g++ or clang++)
+-CXX = g++
+-LD = g++
++CXX ?= g++
++LD ?= g++
+ ifneq ($(GSPICEUI_MSWIN),0)
+ LD += -static-libstdc++ -static-libgcc
+ WINDRES = windres
+@@ -108,17 +108,7 @@
+ # -fabi-version=N Use version N of the C++ ABI (this choice must match the
wxWidgets library)
+
+ CXXFLAGS := -std=c++17 -fabi-version=14
+-ifeq ($(GSPICEUI_DEBUG),0)
+- # Options for release (not using -Wall since it's GCC specific)
+- CXXFLAGS += -O3
+-else
+- # Options for development
+- CXXFLAGS += -g3 -O0 -Wall -Wextra -Wpedantic
+-
+- # The following warning has been disabled because I don't know how to fix it
+- CXXFLAGS += -Wno-overloaded-virtual
+-endif
+-CXXFLAGS += -pipe $(shell $(WXCFG) --cxxflags)
++CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+
+ # I like to compile using the option "-Wall" etc. however tests that break
wxWidgets are turned off
+ ifneq ($(GSPICEUI_DEBUG),0)
+@@ -231,7 +221,7 @@
+ # -o specify the output file name
+
+ $(BINDIR)/$(PROG) : $(OBJS)
+- $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
++ $(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
+ ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
+ cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
+ endif
+@@ -296,7 +286,7 @@
+
+ # Compiler options
+
+-test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
++test_% : CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+ test_% : CXXFLAGS += -D $(shell echo $@ | tr "[:lower:]" "[:upper:]")
+ # Libraries
+ test_% : LIBS = $(shell $(WXCFG) --libs core,base)
diff --git a/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild
b/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild
new file mode 100644
index ..afbe20c26ef0
--- /dev/null
+++ b/sci-electronics/gspiceui/gspiceui-1.3.30_pre20240321.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit desktop optfeature wxwidgets xdg
+
+DESCRIPTION="GUI frontend for Ngspice and Gnucap"
+HOMEPAGE="https://sourceforge.net/projects/gspiceui/;
+#SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz;
+MY_REV="382"
+# SF source is temporal
+#SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gs/${PN}/code/${PN}-code-r${MY_REV}-trunk.zip
-> ${P}.zip"
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${PN}-code-r${MY_REV}-trunk.zip
-> ${P}.zip"
+S="${WORKDIR}/${PN}-code-r${MY_REV}-trunk"
+
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/gspiceui/, sci-electronics/gspiceui/files/
commit: 2679c27fcd64465c371a274e8bcb82dd96980bb1
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Thu Feb 24 13:55:43 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Thu Feb 24 13:55:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2679c27f
sci-electronics/gspiceui: respect CXX and fix build with clang
Also update icon cache in postinst
Closes: https://bugs.gentoo.org/833994
Closes: https://bugs.gentoo.org/833993
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../gspiceui-1.2.87-respect-users-flags.patch | 34 --
sci-electronics/gspiceui/gspiceui-1.2.87.ebuild| 5 ++--
2 files changed, 34 insertions(+), 5 deletions(-)
diff --git
a/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch
b/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch
index fd5881745279..c39b6a329aba 100644
--- a/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch
+++ b/sci-electronics/gspiceui/files/gspiceui-1.2.87-respect-users-flags.patch
@@ -1,7 +1,18 @@
diff --git a/src/Makefile b/src/Makefile
-index 50736fd..22a1328 100644
+index 50736fd..8dbfcfa 100644
--- a/src/Makefile
+++ b/src/Makefile
+@@ -39,8 +39,8 @@ DESTDIR = /usr/local/bin
+
#***
+
+ # Which compiler and linker (eg. g++ or clang++)
+-CXX = g++
+-LD = g++
++CXX ?= g++
++LD ?= g++
+ ifneq ($(GSPICEUI_MSWIN),0)
+ LD += -static-libstdc++ -static-libgcc
+ WINDRES = windres
@@ -91,13 +91,7 @@ BINDIR = $(ROOT)/bin
# -Os Optimize for size
# -Og Optimize debugging experience but don't break debugging
@@ -17,12 +28,29 @@ index 50736fd..22a1328 100644
# I like to compile using the option "-Wall" etc., tests that break wxWidgets
are turned off below
ifeq ($(GSPICEUI_DEBUG),1)
-@@ -181,7 +175,7 @@ $(OBJDIR)/%.o : %.cpp
+@@ -117,6 +111,7 @@ INCLUDES = -I.
+
+ # Libraries
+ LIBS := $(shell $(WXCFG) --libs core,base,html)
++LIBS += -lm -lstdc++
+ # (The pkg-config stuff was requested by a user, somehow pangox was missing)
2019-08-07 ???
+ #ifeq ($(GSPICEUI_MSWIN),0)
+ #LIBS := $(shell $(WXCFG) --libs core,base,html) # $(shell pkg-config
--libs-only-l pangox)
+@@ -181,7 +176,7 @@ $(OBJDIR)/%.o : %.cpp
# -o specify the output file name
$(BINDIR)/$(PROG) : $(OBJS)
- $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LIBS)
-+ $(LD) -pipe -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
++ $(CXX) -o $(BINDIR)/$(PROG) obj/*.o $(LDFLAGS) $(LIBS)
ifeq ($(ROOT)/GSpiceUI.app,$(wildcard $(ROOT)/GSpiceUI.app))
cp $(BINDIR)/$(PROG) $(ROOT)/GSpiceUI.app/Contents/MacOS/gspiceui
endif
+@@ -223,7 +218,7 @@ tests : test_Component test_NetList test_CnvtType
test_CmdNgSpiceOPT test_CmdNgS
+
+ # Compiler options
+
+-test_% : CXXFLAGS = -Wall -g -pipe $(shell $(WXCFG) --cxxflags)
++test_% : CXXFLAGS += $(shell $(WXCFG) --cxxflags)
+ ifeq ($(GSPICEUI_WXLIB),2.8) # This suppresses spurious warnings from gcc
with wxWidgets v2.8.12
+ test_% : CXXFLAGS += -Wno-unused-local-typedefs
+ endif
diff --git a/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild
b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild
index 8c007ed14442..d5377a288285 100644
--- a/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild
+++ b/sci-electronics/gspiceui/gspiceui-1.2.87.ebuild
@@ -4,7 +4,7 @@
EAPI=8
WX_GTK_VER="3.0-gtk3"
-inherit desktop optfeature toolchain-funcs wxwidgets
+inherit desktop optfeature wxwidgets xdg
MY_P="${PN}-v${PV}"
@@ -50,7 +50,7 @@ src_configure() {
}
src_compile() {
- emake CXX="$(tc-getCXX)"
+ emake
}
src_install() {
@@ -70,6 +70,7 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
if use examples ; then
elog "If you want to use the examples, copy and extract from"
elog "${EROOT}/usr/share/doc/${PF} the sch and lib directory"
