Attachment #255760 for bug #282568

View | Details | Raw Unified | Return to bug 282568
Collapse All | Expand All

Lines 1-45 Link Here

(-)b/cad/qucs-s/Makefile (-17 / +19 lines)
1	PORTNAME= qucs-s	1	PORTNAME= qucs-s
2	DISTVERSION= 24.1.0	2	DISTVERSION= 24.4.1
3	CATEGORIES= cad	3	CATEGORIES= cad
4	MASTER_SITES= https://github.com/ra3xdh/qucs_s/releases/download/${DISTVERSION}/	4	MASTER_SITES= https://github.com/ra3xdh/qucs_s/releases/download/${DISTVERSION}/
5		5
6	MAINTAINER= yuri@FreeBSD.org	6	MAINTAINER= yuri@FreeBSD.org
7	COMMENT= Quite Universal Circuit Simulator: GUI for circuit simulation kernels	7	COMMENT= Quite Universal Circuit Simulator: GUI for circuit simulation kernels
8	WWW= https://ra3xdh.github.io/	8	WWW= https://ra3xdh.github.io/ \
		9	https://github.com/ra3xdh/qucs_s/
9		10
10	LICENSE= GPLv2	11	LICENSE= GPLv2
11	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
12		13
		14	BUILD_DEPENDS= dos2unix:converters/dos2unix \
		15	gperf:devel/gperf
		16
13	USES= bison cmake gl localbase qt:6	17	USES= bison cmake gl localbase qt:6
14	USE_QT= base svg tools:build
15	USE_GL= gl opengl	18	USE_GL= gl opengl
		19	USE_QT= base charts svg tools:build
		20
		21	CMAKE_ON= WITH_QT6
16		22
		23	OPTIONS_DEFAULT= NGSPICE
17	OPTIONS_GROUP= BACKENDS RTDEPENDS	24	OPTIONS_GROUP= BACKENDS RTDEPENDS
18	OPTIONS_GROUP_BACKENDS= NGSPICE XYCE QUCSATOR	25	OPTIONS_GROUP_BACKENDS= NGSPICE XYCE QUCSATOR
19	OPTIONS_GROUP_RTDEPENDS= OCTAVE ADMS	26	OPTIONS_GROUP_RTDEPENDS= OCTAVE ADMS
20	OPTIONS_DEFAULT= NGSPICE
21		27
		28	ADMS_DESC= ADMS model generator used for some non-essential features
22	BACKENDS_DESC= Simulation backends	29	BACKENDS_DESC= Simulation backends
		30	NGSPICE_DESC= ngspice mixed-signal circuit simulator
		31	OCTAVE_DESC= Octave is used for some non-essential features
		32	QUCSATOR_DESC= Circuit simulator of the Qucs project
23	RTDEPENDS_DESC= Optional run-time dependencies	33	RTDEPENDS_DESC= Optional run-time dependencies
		34	XYCE_DESC= Xyce electronic simulator
24		35
25	NGSPICE_DESC= ngspice mixed-signal circuit simulator	36	ADMS_RUN_DEPENDS= admsXml:cad/adms
26	NGSPICE_RUN_DEPENDS= ngspice:cad/ngspice_rework	37	NGSPICE_RUN_DEPENDS= ngspice:cad/ngspice_rework
27		38	OCTAVE_RUN_DEPENDS= octave:math/octave
28	XYCE_DESC= Xyce electronic simulator	39	QUCSATOR_RUN_DEPENDS= qucsator:cad/qucsator
29	XYCE_RUN_DEPENDS= Xyce:cad/xyce \	40	XYCE_RUN_DEPENDS= Xyce:cad/xyce \
30	mpich>0:net/mpich # mpich for the mpirun executable	41	mpich>0:net/mpich # mpich for the mpirun executable
31		42
32	QUCSATOR_DESC= Circuit simulator of the Qucs project
33	QUCSATOR_RUN_DEPENDS= qucsator:cad/qucsator
34
35	OCTAVE_DESC= Octave is used for some non-essential features
36	OCTAVE_RUN_DEPENDS= octave:math/octave
37
38	ADMS_DESC= ADMS model generator used for some non-essential features
39	ADMS_RUN_DEPENDS= admsXml:cad/adms
40
41	post-patch:	43	post-patch:
42	# first the patch under files/ introduces %%PREFIX%%, and now we fix it here	44	# first the patch under files/ introduces %%PREFIX%%, and now we fix it here
43	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/qucs/main.cpp	45	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/qucs/main.cpp ${WRKSRC}/qucs/settings.cpp
44		46
45	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/cad/qucs-s/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1708273970	1	TIMESTAMP = 1733742899
2	SHA256 (qucs-s-24.1.0.tar.gz) = ce6e03e26fddbe107d1749329423214c2714d3103f9a528bbcccd228eb14bac0	2	SHA256 (qucs-s-24.4.1.tar.gz) = 214bcc151cd8bc06c8365420d1a2ef0a6d46b154acfd8b4b51ecf5d9f112eda9
3	SIZE (qucs-s-24.1.0.tar.gz) = 3843381	3	SIZE (qucs-s-24.4.1.tar.gz) = 4659723




- workaround  for https://gitlab.kitware.com/cmake/cmake/-/issues/25691
- also see https://github.com/ra3xdh/qucs_s/issues/592#issuecomment-1952967356

--- CMakeLists.txt.orig	2024-02-18 17:40:43 UTC
+++ CMakeLists.txt
@@ -35,7 +35,7 @@ set(QT_DEFAULT_MAJOR_VERSION 6)
 message(STATUS "${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX} ${qucs-suite_BINARY_DIR}" )
 
 set(QT_DEFAULT_MAJOR_VERSION 6)
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
 message(STATUS "QT Major Version: " ${QT_VERSION_MAJOR})
 




--- qucs/main.cpp.orig	2024-12-09 13:48:17 UTC

--- qucs/main.cpp.orig	2022-06-30 18:34:40 UTC
+++ qucs/main.cpp
@@ -108,10 +108,10 @@ bool loadSettings()
         if (QucsSettings.Qucsconv.isEmpty())
             QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv_rf" + executableSuffix;
     } else {
-        QucsSettings.Qucsator = QucsSettings.BinDir + "qucsator_rf" + executableSuffix;
+        QucsSettings.Qucsator = "%%PREFIX%%/bin/qucsator";
         QucsSettings.QucsatorDir = QucsSettings.BinDir;
         if (QucsSettings.Qucsconv.isEmpty())
-            QucsSettings.Qucsconv = QucsSettings.BinDir + "qucsconv_rf" + executableSuffix;
+            QucsSettings.Qucsconv = "%%PREFIX%%/bin/qucsconv";
     }
 
     QucsSettings.AdmsXmlBinDir.setPath(_settings::Get().item<QString>("AdmsXmlBinDir"));
@@ -139,13 +139,13 @@ bool loadSettings()
 #ifdef Q_OS_WIN
         QucsSettings.XyceExecutable = "Xyce.exe";
 #else
-        QucsSettings.XyceExecutable = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
+        QucsSettings.XyceExecutable = "%%PREFIX%%/bin/Xyce";
 #endif
     }
     if(settings.contains("XyceParExecutable")) QucsSettings.XyceParExecutable = settings.value("XyceParExecutable").toString();
-    else QucsSettings.XyceParExecutable = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
+    else QucsSettings.XyceParExecutable = "mpirun -np %p %%PREFIX%%/bin/Xyce";
     if(settings.contains("SpiceOpusExecutable")) QucsSettings.SpiceOpusExecutable = settings.value("SpiceOpusExecutable").toString();
-    else QucsSettings.SpiceOpusExecutable = "spiceopus";
+    else QucsSettings.SpiceOpusExecutable = "%%PREFIX%%/bin/spiceopus";
     if(settings.contains("Nprocs")) QucsSettings.NProcs = settings.value("Nprocs").toInt();
     else QucsSettings.NProcs = 4;
     if(settings.contains("S4Q_workdir")) QucsSettings.S4Qworkdir = settings.value("S4Q_workdir").toString();




--- qucs/settings.cpp.orig	2024-12-09 13:44:56 UTC
+++ qucs/settings.cpp
@@ -59,15 +59,15 @@ void settingsManager::initDefaults()
     m_Defaults["OctaveExecutable"] = "octave.exe";
 #else
     m_Defaults["NgspiceExecutable"] = "ngspice";
-    m_Defaults["XyceExecutable"] = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
+    m_Defaults["XyceExecutable"] = "%%PREFIX%%/bin/Xyce";
     m_Defaults["RFLayoutExecutable"] = "qucsrflayout";
     m_Defaults["OctaveExecutable"] = "octave";
 #endif
 
-    m_Defaults["XyceParExecutable"] = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
+    m_Defaults["XyceParExecutable"] = "mpirun -np %p %%PREFIX%%/bin/Xyce";
     m_Defaults["S4Q_workdir"] = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
     m_Defaults["Nprocs"] = 4;
-    m_Defaults["SpiceOpusExecutable"] = "spiceopus";
+    m_Defaults["SpiceOpusExecutable"] = "%%PREFIX%%/bin/spiceopus";
     m_Defaults["SimParameters"] = "";
     m_Defaults["GraphAntiAliasing"] = false;
     m_Defaults["TextAntiAliasing"] = false;

Lines 3-13 bin/qucs-sactivefilter Link Here

(-)b/cad/qucs-s/pkg-plist (-2 / +41 lines)
3	bin/qucs-sattenuator	3	bin/qucs-sattenuator
4	bin/qucs-sfilter	4	bin/qucs-sfilter
5	bin/qucs-spowercombining	5	bin/qucs-spowercombining
		6	bin/qucs-sspar-viewer
6	bin/qucs-strans	7	bin/qucs-strans
7	bin/qucs_mkdigilib	8	bin/qucs_mkdigilib
8	bin/qucs_run_hdl	9	bin/qucs_run_hdl
9	bin/qucs_run_verilog	10	bin/qucs_run_verilog
10	bin/vcd2qucsdat	11	bin/qucsator_rf
		12	bin/qucsconv_rf
11	share/applications/qucs-s.desktop	13	share/applications/qucs-s.desktop
12	share/icons/hicolor/128x128/apps/qucs-s.png	14	share/icons/hicolor/128x128/apps/qucs-s.png
13	share/icons/hicolor/16x16/apps/qucs-s.png	15	share/icons/hicolor/16x16/apps/qucs-s.png
Lines 19-24 share/icons/hicolor/512x512/apps/qucs-s.png Link Here
19	share/icons/hicolor/64x64/apps/qucs-s.png	21	share/icons/hicolor/64x64/apps/qucs-s.png
20	share/icons/hicolor/scalable/apps/qucs-s.svg	22	share/icons/hicolor/scalable/apps/qucs-s.svg
21	share/man/man1/qucs-s.1.gz	23	share/man/man1/qucs-s.1.gz
		24	share/man/man1/qucsator_rf.1.gz
		25	share/man/man1/qucsconv_rf.1.gz
		26	share/metainfo/io.github.ra3xdh.qucs_s.metainfo.xml
22	%%DATADIR%%/examples/README	27	%%DATADIR%%/examples/README
23	%%DATADIR%%/examples/external_interface/cpp-interface/boostconverter.net	28	%%DATADIR%%/examples/external_interface/cpp-interface/boostconverter.net
24	%%DATADIR%%/examples/external_interface/cpp-interface/main.cpp	29	%%DATADIR%%/examples/external_interface/cpp-interface/main.cpp
Lines 44-49 share/man/man1/qucs-s.1.gz Link Here
44	%%DATADIR%%/examples/ngspice/BJT-swp.sch	49	%%DATADIR%%/examples/ngspice/BJT-swp.sch
45	%%DATADIR%%/examples/ngspice/BJT.sch	50	%%DATADIR%%/examples/ngspice/BJT.sch
46	%%DATADIR%%/examples/ngspice/BJT_Phase_Shift_Osc.sch	51	%%DATADIR%%/examples/ngspice/BJT_Phase_Shift_Osc.sch
		52	%%DATADIR%%/examples/ngspice/BJT_TEMPER_swp.sch
		53	%%DATADIR%%/examples/ngspice/BJT_T_swp.sch
47	%%DATADIR%%/examples/ngspice/BJT_dc.sch	54	%%DATADIR%%/examples/ngspice/BJT_dc.sch
48	%%DATADIR%%/examples/ngspice/BSIM4/BSIM4_Ring_Osc.sch	55	%%DATADIR%%/examples/ngspice/BSIM4/BSIM4_Ring_Osc.sch
49	%%DATADIR%%/examples/ngspice/BSIM4/BSIM4_inv.sch	56	%%DATADIR%%/examples/ngspice/BSIM4/BSIM4_inv.sch
Lines 154-159 share/man/man1/qucs-s.1.gz Link Here
154	%%DATADIR%%/examples/ngspice/time_resistor.sch	161	%%DATADIR%%/examples/ngspice/time_resistor.sch
155	%%DATADIR%%/examples/qucsator/Amp_Baseband_Low-noise.sch	162	%%DATADIR%%/examples/qucsator/Amp_Baseband_Low-noise.sch
156	%%DATADIR%%/examples/qucsator/Amp_Two_Tone.sch	163	%%DATADIR%%/examples/qucsator/Amp_Two_Tone.sch
		164	%%DATADIR%%/examples/qucsator/BJT_T_swp_qucs.sch
157	%%DATADIR%%/examples/qucsator/BPF_1550_edge_cpld.sch	165	%%DATADIR%%/examples/qucsator/BPF_1550_edge_cpld.sch
158	%%DATADIR%%/examples/qucsator/BPF_2000_Co-ax.sch	166	%%DATADIR%%/examples/qucsator/BPF_2000_Co-ax.sch
159	%%DATADIR%%/examples/qucsator/Comb_Gen.sch	167	%%DATADIR%%/examples/qucsator/Comb_Gen.sch
Lines 238-244 share/man/man1/qucs-s.1.gz Link Here
238	%%DATADIR%%/examples/templates_ngspice/AC_TRAN_Active_Filter_analysis.sch	246	%%DATADIR%%/examples/templates_ngspice/AC_TRAN_Active_Filter_analysis.sch
239	%%DATADIR%%/examples/templates_ngspice/AC_TRAN_FOUR_OpAmp.sch	247	%%DATADIR%%/examples/templates_ngspice/AC_TRAN_FOUR_OpAmp.sch
240	%%DATADIR%%/examples/templates_ngspice/AC_TRAN_OpAmp.sch	248	%%DATADIR%%/examples/templates_ngspice/AC_TRAN_OpAmp.sch
		249	%%DATADIR%%/examples/templates_ngspice/Monte_Carlo.sch
241	%%DATADIR%%/examples/templates_ngspice/Pass_Parameters_Subcircuit.sch	250	%%DATADIR%%/examples/templates_ngspice/Pass_Parameters_Subcircuit.sch
		251	%%DATADIR%%/examples/templates_ngspice/Pwr-Amp_DC_analysis.sch
242	%%DATADIR%%/examples/templates_ngspice/Pwr-Amp_wingspread_analysis.sch	252	%%DATADIR%%/examples/templates_ngspice/Pwr-Amp_wingspread_analysis.sch
243	%%DATADIR%%/examples/templates_ngspice/S-parameter_active_analysis.sch	253	%%DATADIR%%/examples/templates_ngspice/S-parameter_active_analysis.sch
244	%%DATADIR%%/examples/templates_ngspice/S-parameter_passive_analysis.sch	254	%%DATADIR%%/examples/templates_ngspice/S-parameter_passive_analysis.sch
Lines 332-348 share/man/man1/qucs-s.1.gz Link Here
332	%%DATADIR%%/library/Crystal.lib	342	%%DATADIR%%/library/Crystal.lib
333	%%DATADIR%%/library/Diodes.lib	343	%%DATADIR%%/library/Diodes.lib
334	%%DATADIR%%/library/DiodesSchottky.lib	344	%%DATADIR%%/library/DiodesSchottky.lib
		345	%%DATADIR%%/library/Diodes_Extended.lib
		346	%%DATADIR%%/library/GeDiodes.lib
335	%%DATADIR%%/library/Ideal.lib	347	%%DATADIR%%/library/Ideal.lib
336	%%DATADIR%%/library/JFETs.lib	348	%%DATADIR%%/library/JFETs.lib
337	%%DATADIR%%/library/LEDs.lib	349	%%DATADIR%%/library/LEDs.lib
338	%%DATADIR%%/library/Loudspeaker.lib	350	%%DATADIR%%/library/Loudspeaker.lib
339	%%DATADIR%%/library/MOSFETs.lib	351	%%DATADIR%%/library/MOSFETs.lib
		352	%%DATADIR%%/library/MixerIC.lib
340	%%DATADIR%%/library/NMOSFETs.lib	353	%%DATADIR%%/library/NMOSFETs.lib
341	%%DATADIR%%/library/OpAmps.lib	354	%%DATADIR%%/library/OpAmps.lib
342	%%DATADIR%%/library/Optocoupler.lib	355	%%DATADIR%%/library/Optocoupler.lib
		356	%%DATADIR%%/library/PIN_Diodes.lib
343	%%DATADIR%%/library/PMOSFETs.lib	357	%%DATADIR%%/library/PMOSFETs.lib
		358	%%DATADIR%%/library/PWM_Controller.lib
344	%%DATADIR%%/library/PhotovoltaicRelay.lib	359	%%DATADIR%%/library/PhotovoltaicRelay.lib
345	%%DATADIR%%/library/Regulators.lib	360	%%DATADIR%%/library/Regulators.lib
		361	%%DATADIR%%/library/SPICE_TLine.lib
346	%%DATADIR%%/library/SpiceOpamp.lib	362	%%DATADIR%%/library/SpiceOpamp.lib
347	%%DATADIR%%/library/Substrates.lib	363	%%DATADIR%%/library/Substrates.lib
348	%%DATADIR%%/library/Thermistor.lib	364	%%DATADIR%%/library/Thermistor.lib
Lines 350-355 share/man/man1/qucs-s.1.gz Link Here
350	%%DATADIR%%/library/Transformers.lib	366	%%DATADIR%%/library/Transformers.lib
351	%%DATADIR%%/library/Transistors.lib	367	%%DATADIR%%/library/Transistors.lib
352	%%DATADIR%%/library/Tubes.lib	368	%%DATADIR%%/library/Tubes.lib
		369	%%DATADIR%%/library/Varactor.lib
		370	%%DATADIR%%/library/Varactor_RF.lib
353	%%DATADIR%%/library/Varistors.lib	371	%%DATADIR%%/library/Varistors.lib
354	%%DATADIR%%/library/VoltageComparators.lib	372	%%DATADIR%%/library/VoltageComparators.lib
355	%%DATADIR%%/library/VoltageReferences.lib	373	%%DATADIR%%/library/VoltageReferences.lib
Lines 409-418 share/man/man1/qucs-s.1.gz Link Here
409	%%DATADIR%%/python/parse_result_example.py	427	%%DATADIR%%/python/parse_result_example.py
410	%%DATADIR%%/python/rc_ac_sweep.dat	428	%%DATADIR%%/python/rc_ac_sweep.dat
411	%%DATADIR%%/python/rc_ac_sweep.net	429	%%DATADIR%%/python/rc_ac_sweep.net
		430	%%DATADIR%%/symbols/and2.sym
		431	%%DATADIR%%/symbols/buf.sym
		432	%%DATADIR%%/symbols/darlington_npn.sym
		433	%%DATADIR%%/symbols/darlington_pnp.sym
		434	%%DATADIR%%/symbols/diac.sym
		435	%%DATADIR%%/symbols/diode.sym
		436	%%DATADIR%%/symbols/inv.sym
		437	%%DATADIR%%/symbols/nand2.sym
412	%%DATADIR%%/symbols/nmos4.sym	438	%%DATADIR%%/symbols/nmos4.sym
		439	%%DATADIR%%/symbols/nor2.sym
413	%%DATADIR%%/symbols/opamp3t.sym	440	%%DATADIR%%/symbols/opamp3t.sym
414	%%DATADIR%%/symbols/opamp5t.sym	441	%%DATADIR%%/symbols/opamp5t.sym
		442	%%DATADIR%%/symbols/opamp6t.sym
		443	%%DATADIR%%/symbols/opamp7t.sym
		444	%%DATADIR%%/symbols/opto_bjt4.sym
		445	%%DATADIR%%/symbols/opto_bjt5.sym
		446	%%DATADIR%%/symbols/or2.sym
415	%%DATADIR%%/symbols/pmos4.sym	447	%%DATADIR%%/symbols/pmos4.sym
		448	%%DATADIR%%/symbols/thyristor.sym
		449	%%DATADIR%%/symbols/triac.sym
		450	%%DATADIR%%/symbols/tube_penthode.sym
		451	%%DATADIR%%/symbols/tube_triode.sym
		452	%%DATADIR%%/symbols/varactor.sym
		453	%%DATADIR%%/symbols/xor.sym
		454	%%DATADIR%%/symbols/zener.sym
		455	%%DATADIR%%/symbols/zener3.sym
416	%%DATADIR%%/tline/cstrip_kj_1.trc	456	%%DATADIR%%/tline/cstrip_kj_1.trc
417	%%DATADIR%%/tline/cstrip_kj_2.trc	457	%%DATADIR%%/tline/cstrip_kj_2.trc
418	%%DATADIR%%/tline/hp.trc	458	%%DATADIR%%/tline/hp.trc
419	-

Return to bug 282568

Removed Link Here

(-)a/cad/qucs-s/files/patch-CMakeLists.txt (-14 lines)
1	- workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25691
2	- also see https://github.com/ra3xdh/qucs_s/issues/592#issuecomment-1952967356
3
4	--- CMakeLists.txt.orig 2024-02-18 17:40:43 UTC
5	+++ CMakeLists.txt
6	@@ -35,7 +35,7 @@ set(QT_DEFAULT_MAJOR_VERSION 6)
7	message(STATUS "${PROJECT_NAME} ${CMAKE_INSTALL_PREFIX} ${qucs-suite_BINARY_DIR}" )
8
9	set(QT_DEFAULT_MAJOR_VERSION 6)
10	-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
11	+find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
12	find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets LinguistTools)
13	message(STATUS "QT Major Version: " ${QT_VERSION_MAJOR})
14

Lines 1-34 Link Here

(-)b/cad/qucs-s/files/patch-qucs_main.cpp (-26 / +7 lines)
1	- this patch works together with post-patch: %%PREFIX%% are substituted there	1	--- qucs/main.cpp.orig 2024-12-09 13:48:17 UTC
2
3	--- qucs/main.cpp.orig 2022-06-30 18:34:40 UTC
4	+++ qucs/main.cpp	2	+++ qucs/main.cpp
5	@@ -114,10 +114,10 @@ bool loadSettings()	3	@@ -108,10 +108,10 @@ bool loadSettings()
6	if (QucsSettings.Qucsconv.isEmpty())	4	if (QucsSettings.Qucsconv.isEmpty())
7	QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv" + executableSuffix;	5	QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv_rf" + executableSuffix;
8	} else {	6	} else {
9	- QucsSettings.Qucsator = QucsSettings.BinDir + "qucsator" + executableSuffix;	7	- QucsSettings.Qucsator = QucsSettings.BinDir + "qucsator_rf" + executableSuffix;
10	+ QucsSettings.Qucsator = "%%PREFIX%%/bin/qucsator";	8	+ QucsSettings.Qucsator = "%%PREFIX%%/bin/qucsator";
11	QucsSettings.QucsatorDir = QucsSettings.BinDir;	9	QucsSettings.QucsatorDir = QucsSettings.BinDir;
12	if (QucsSettings.Qucsconv.isEmpty())	10	if (QucsSettings.Qucsconv.isEmpty())
13	- QucsSettings.Qucsconv = QucsSettings.BinDir + "qucsconv" + executableSuffix;	11	- QucsSettings.Qucsconv = QucsSettings.BinDir + "qucsconv_rf" + executableSuffix;
14	+ QucsSettings.Qucsconv = "%%PREFIX%%/bin/qucsconv";	12	+ QucsSettings.Qucsconv = "%%PREFIX%%/bin/qucsconv";
15	}	13	}
16	//if(settings.contains("BinDir"))QucsSettings.BinDir = settings.value("BinDir").toString();	14
17	//if(settings.contains("LangDir"))QucsSettings.LangDir = settings.value("LangDir").toString();	15	QucsSettings.AdmsXmlBinDir.setPath(_settings::Get().item<QString>("AdmsXmlBinDir"));
18	@@ -139,13 +139,13 @@ bool loadSettings()
19	#ifdef Q_OS_WIN
20	QucsSettings.XyceExecutable = "Xyce.exe";
21	#else
22	- QucsSettings.XyceExecutable = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
23	+ QucsSettings.XyceExecutable = "%%PREFIX%%/bin/Xyce";
24	#endif
25	}
26	if(settings.contains("XyceParExecutable")) QucsSettings.XyceParExecutable = settings.value("XyceParExecutable").toString();
27	- else QucsSettings.XyceParExecutable = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
28	+ else QucsSettings.XyceParExecutable = "mpirun -np %p %%PREFIX%%/bin/Xyce";
29	if(settings.contains("SpiceOpusExecutable")) QucsSettings.SpiceOpusExecutable = settings.value("SpiceOpusExecutable").toString();
30	- else QucsSettings.SpiceOpusExecutable = "spiceopus";
31	+ else QucsSettings.SpiceOpusExecutable = "%%PREFIX%%/bin/spiceopus";
32	if(settings.contains("Nprocs")) QucsSettings.NProcs = settings.value("Nprocs").toInt();
33	else QucsSettings.NProcs = 4;
34	if(settings.contains("S4Q_workdir")) QucsSettings.S4Qworkdir = settings.value("S4Q_workdir").toString();

Added Link Here

(-)b/cad/qucs-s/files/patch-qucs_settings.cpp (+21 lines)
1	--- qucs/settings.cpp.orig 2024-12-09 13:44:56 UTC
2	+++ qucs/settings.cpp
3	@@ -59,15 +59,15 @@ void settingsManager::initDefaults()
4	m_Defaults["OctaveExecutable"] = "octave.exe";
5	#else
6	m_Defaults["NgspiceExecutable"] = "ngspice";
7	- m_Defaults["XyceExecutable"] = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
8	+ m_Defaults["XyceExecutable"] = "%%PREFIX%%/bin/Xyce";
9	m_Defaults["RFLayoutExecutable"] = "qucsrflayout";
10	m_Defaults["OctaveExecutable"] = "octave";
11	#endif
12
13	- m_Defaults["XyceParExecutable"] = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
14	+ m_Defaults["XyceParExecutable"] = "mpirun -np %p %%PREFIX%%/bin/Xyce";
15	m_Defaults["S4Q_workdir"] = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
16	m_Defaults["Nprocs"] = 4;
17	- m_Defaults["SpiceOpusExecutable"] = "spiceopus";
18	+ m_Defaults["SpiceOpusExecutable"] = "%%PREFIX%%/bin/spiceopus";
19	m_Defaults["SimParameters"] = "";
20	m_Defaults["GraphAntiAliasing"] = false;
21	m_Defaults["TextAntiAliasing"] = false;