diff --git a/.gitignore b/.gitignore index aa0a3f9..da51661 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ qucs-0.0.15.tar.gz /qucs-0.0.16.tar.gz /qucs-0.0.17.tar.gz /qucs-0.0.18.tar.gz +/qucs-0.0.19.tar.gz diff --git a/qucs-0.0.18-Fix-desktop-file.patch b/qucs-0.0.18-Fix-desktop-file.patch deleted file mode 100644 index dfab52b..0000000 --- a/qucs-0.0.18-Fix-desktop-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 553a3725d4fbdb599d40d83c24959ae46efa6a24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 14 Jul 2017 13:36:24 +0200 -Subject: [PATCH] Fix dektop file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Petr Písař ---- - debian/qucs.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/debian/qucs.desktop b/debian/qucs.desktop -index a3ccf6a..2760ac0 100644 ---- a/debian/qucs.desktop -+++ b/debian/qucs.desktop -@@ -11,5 +11,5 @@ Exec=qucs %U - Icon=/usr/share/pixmaps/big.qucs.xpm - Terminal=false - Type=Application --Categories=Education;Electronics -+Categories=Education;Electronics; - StartupNotify=false --- -2.9.4 - diff --git a/qucs-0.0.18-Fix-multiple-definitions-in-adms.patch b/qucs-0.0.18-Fix-multiple-definitions-in-adms.patch deleted file mode 100644 index a29d0ea..0000000 --- a/qucs-0.0.18-Fix-multiple-definitions-in-adms.patch +++ /dev/null @@ -1,76 +0,0 @@ -From d9bbea573484c0161cff819397ef56412c7340c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Wed, 15 Jul 2020 12:13:11 +0200 -Subject: [PATCH] Fix multiple definitions in adms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since GCC 10: - -libtool: link: gcc -O2 -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -Wl,-z -Wl,relro -Wl,--as-needed -Wl,-z -Wl,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -o admsXml admsXml.o libadmsElement.a libadmsVeriloga.a libadmsPreprocessor.a libadmsAdmstpath.a -lm -/usr/bin/ld: libadmsElement.a(adms.o):/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1542: multiple definition of `adms_NAN'; admsXml.o:/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1542: first defined here -/usr/bin/ld: libadmsElement.a(adms.o):/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1515: multiple definition of `stdadmstdbgimpl'; admsXml.o:/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1515: first defined here -/usr/bin/ld: libadmsElement.a(adms.o):/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1552: multiple definition of `minusone'; admsXml.o:/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1552: first defined here -/usr/bin/ld: libadmsElement.a(adms.o):/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1541: multiple definition of `adms_dzero'; admsXml.o:/home/test/fedora/qucs/qucs-0.0.18/qucs-core/deps/adms/admsXml/adms.h:1541: first defined here - -This patch fixes it. - -Signed-off-by: Petr Písař ---- - qucs-core/deps/adms/admsXml/adms.h | 9 ++++----- - qucs-core/deps/adms/admsXml/admstpathYacc.h | 4 ++-- - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/qucs-core/deps/adms/admsXml/adms.h b/qucs-core/deps/adms/admsXml/adms.h -index c035b4f..e326bcc 100644 ---- a/qucs-core/deps/adms/admsXml/adms.h -+++ b/qucs-core/deps/adms/admsXml/adms.h -@@ -1512,8 +1512,7 @@ typedef const p_yaccval p_kyaccval; - /*miscH*/ - typedef struct s_slist t_slist; - typedef t_slist* p_slist; --FILE *stdadmstdbgimpl; --FILE *stdadmstdbgimpl; -+extern FILE *stdadmstdbgimpl; - #define stdadmstdbg (stdadmstdbgimpl?stdadmstdbgimpl:stderr) - int admsmain(const char*xcode,const char*xflag,const char*vacode); - int adms_global_nbadmstnew(void); -@@ -1538,8 +1537,8 @@ p_admst adms_admst_newpp (p_admst myprevious,p_admst mypreviouspath,admse item); - - /*-- Miscellaneous routines --*/ - --const double adms_dzero; --double adms_NAN; -+extern const double adms_dzero; -+extern double adms_NAN; - p_admst aread (p_admst myadmst); - void deref(p_admst mystack); - union admsu -@@ -1549,7 +1548,7 @@ union admsu - char* s; - p_adms p; - }; --const int minusone; -+extern const int minusone; - - int adms_strtol (p_ktransform mytransform,const char* mynumber); - double adms_strtod (p_ktransform mytransform,const char* myreal); -diff --git a/qucs-core/deps/adms/admsXml/admstpathYacc.h b/qucs-core/deps/adms/admsXml/admstpathYacc.h -index 013882f..2f90dd8 100644 ---- a/qucs-core/deps/adms/admsXml/admstpathYacc.h -+++ b/qucs-core/deps/adms/admsXml/admstpathYacc.h -@@ -4,8 +4,8 @@ - - #include "adms.h" - --p_slist globalfileoutputlist; --int break_found; -+extern p_slist globalfileoutputlist; -+extern int break_found; - - FILE *OUT(void); - int is_admst (const char* name); --- -2.25.4 - diff --git a/qucs-0.0.18-Fix-multiple-definitions-in-asco.patch b/qucs-0.0.18-Fix-multiple-definitions-in-asco.patch deleted file mode 100644 index 5da7aa9..0000000 --- a/qucs-0.0.18-Fix-multiple-definitions-in-asco.patch +++ /dev/null @@ -1,310 +0,0 @@ -From 83cab9b08889c66988afaa56e6b138d13f65cf97 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 14 Jul 2020 16:38:01 +0200 -Subject: [PATCH] Fix multiple definitions in asco -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since GCC 10: - -gcc -O2 -fexceptions -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -s -o alter auxfunc_alter.o alter.o auxfunc.o -lm -/usr/bin/ld: alter.o:(.bss+0x4): multiple definition of `spice'; auxfunc_alter.o:(.bss+0x4): first defined here -/usr/bin/ld: alter.o:(.bss+0x0): multiple definition of `MPI_EXXIT'; auxfunc_alter.o:(.bss+0x0): first defined here -/usr/bin/ld: alter.o:(.bss+0x20): multiple definition of `lkk'; auxfunc_alter.o:(.bss+0x20): first defined here -/usr/bin/ld: auxfunc.o:(.bss+0x4): multiple definition of `spice'; auxfunc_alter.o:(.bss+0x4): first defined here -/usr/bin/ld: auxfunc.o:(.bss+0x0): multiple definition of `MPI_EXXIT'; auxfunc_alter.o:(.bss+0x0): first defined here -/usr/bin/ld: auxfunc.o:(.bss+0x20): multiple definition of `lkk'; auxfunc_alter.o:(.bss+0x20): first defined here - -This patch fixes it. - -Signed-off-by: Petr Písař ---- - asco/auxfunc.c | 3 +++ - asco/auxfunc.h | 6 +++--- - asco/auxfunc_measurefromlis.c | 1 + - asco/auxfunc_measurefromlis.h | 2 +- - asco/errfunc.c | 1 + - asco/errfunc.h | 2 +- - asco/initialize.c | 14 ++++++++++++++ - asco/initialize.h | 12 ++++++------ - asco/tools/alter/auxfunc.h | 6 +++--- - asco/tools/auxfunc/auxfunc.c | 3 +++ - asco/tools/auxfunc/auxfunc.h | 6 +++--- - asco/tools/log/auxfunc.c | 2 ++ - asco/tools/log/auxfunc.h | 4 ++-- - asco/tools/monte/auxfunc.h | 6 +++--- - asco/tools/postp/auxfunc.h | 6 +++--- - asco/tools/postp/auxfunc_measurefromlis.c | 1 + - asco/tools/postp/auxfunc_measurefromlis.h | 2 +- - asco/tools/postp/auxfunc_updatelis.c | 1 + - asco/tools/postp/auxfunc_updatelis.h | 2 +- - 19 files changed, 53 insertions(+), 27 deletions(-) - -diff --git a/asco/auxfunc.c b/asco/auxfunc.c -index 061457f..592998b 100644 ---- a/asco/auxfunc.c -+++ b/asco/auxfunc.c -@@ -34,6 +34,9 @@ - #include "auxfunc.h" - - -+char lkk[LONGSTRINGSIZE]; -+int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+int MPI_EXXIT; /* exits MPI if set to 1*/ - - - /*Check if at end of file, using Pascal "eof" semantics. End-of-file for -diff --git a/asco/auxfunc.h b/asco/auxfunc.h -index 5882c1c..2a019d1 100644 ---- a/asco/auxfunc.h -+++ b/asco/auxfunc.h -@@ -40,6 +40,6 @@ int P_eof(FILE *f); - - - --char lkk[LONGSTRINGSIZE]; --int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ --int MPI_EXXIT; /* exits MPI if set to 1*/ -+extern char lkk[LONGSTRINGSIZE]; -+extern int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+extern int MPI_EXXIT; /* exits MPI if set to 1*/ -diff --git a/asco/auxfunc_measurefromlis.c b/asco/auxfunc_measurefromlis.c -index 8ea1d22..9f8eded 100644 ---- a/asco/auxfunc_measurefromlis.c -+++ b/asco/auxfunc_measurefromlis.c -@@ -14,6 +14,7 @@ - #include "auxfunc_measurefromlis.h" - #include "auxfunc.h" - -+measure_line measure[MAXMEAS]; - - #ifdef ASCO - extern void WriteToMem(int num_measures); -diff --git a/asco/auxfunc_measurefromlis.h b/asco/auxfunc_measurefromlis.h -index f712d42..04abab8 100644 ---- a/asco/auxfunc_measurefromlis.h -+++ b/asco/auxfunc_measurefromlis.h -@@ -57,4 +57,4 @@ void DoMath(int num_measures); - - - --measure_line measure[MAXMEAS]; -+extern measure_line measure[MAXMEAS]; -diff --git a/asco/errfunc.c b/asco/errfunc.c -index 5baafac..4f9cd08 100644 ---- a/asco/errfunc.c -+++ b/asco/errfunc.c -@@ -35,6 +35,7 @@ - - - -+double maxcost; - - - -diff --git a/asco/errfunc.h b/asco/errfunc.h -index 027e0af..8b8e452 100644 ---- a/asco/errfunc.h -+++ b/asco/errfunc.h -@@ -21,4 +21,4 @@ double errfunc(char *filename, double *x); - /* double CostFunction(); */ - /* int AllConstraintsMet(); */ - --double maxcost; -+extern double maxcost; -diff --git a/asco/initialize.c b/asco/initialize.c -index e0a18bd..3bfd3f9 100644 ---- a/asco/initialize.c -+++ b/asco/initialize.c -@@ -27,6 +27,20 @@ - #include "rfmodule.h" - - -+parameters_line parameters[MAXPARAMETERS]; /**/ -+measurements_line measurements[MAXMEASUREMENTS]; /**/ -+/* -+ * to know if an ALTER and/or MC simulation is to be performed -+ * 0 0 (0) => nothing -+ * 0 1 (1) => MC -+ * 1 0 (2) => ALTER -+ * 1 1 (3) => ALTER + MC -+ */ -+int AlterMC; /* execute AlterMC simulation? yes, no */ -+double AlterMCcost; /* execute AlterMC simulation if the last cost is smaller than this value. */ -+double Wobj, Wcon; /* weights for the cost due to the objectives and constraints */ -+int ExecuteRF; /* add parasitics using the RF module? yes, no */ -+/*Think on merging the above variables*/ - - - /* -diff --git a/asco/initialize.h b/asco/initialize.h -index ceb276c..19fc9ee 100644 ---- a/asco/initialize.h -+++ b/asco/initialize.h -@@ -68,8 +68,8 @@ double scaleto(double value, double ina, double inb, double outa, double outb, i - - - --parameters_line parameters[MAXPARAMETERS]; /**/ --measurements_line measurements[MAXMEASUREMENTS]; /**/ -+extern parameters_line parameters[MAXPARAMETERS]; /**/ -+extern measurements_line measurements[MAXMEASUREMENTS]; /**/ - /* - * to know if an ALTER and/or MC simulation is to be performed - * 0 0 (0) => nothing -@@ -77,8 +77,8 @@ measurements_line measurements[MAXMEASUREMENTS]; /**/ - * 1 0 (2) => ALTER - * 1 1 (3) => ALTER + MC - */ --int AlterMC; /* execute AlterMC simulation? yes, no */ --double AlterMCcost; /* execute AlterMC simulation if the last cost is smaller than this value. */ --double Wobj, Wcon; /* weights for the cost due to the objectives and constraints */ --int ExecuteRF; /* add parasitics using the RF module? yes, no */ -+extern int AlterMC; /* execute AlterMC simulation? yes, no */ -+extern double AlterMCcost; /* execute AlterMC simulation if the last cost is smaller than this value. */ -+extern double Wobj, Wcon; /* weights for the cost due to the objectives and constraints */ -+extern int ExecuteRF; /* add parasitics using the RF module? yes, no */ - /*Think on merging the above variables*/ -diff --git a/asco/tools/alter/auxfunc.h b/asco/tools/alter/auxfunc.h -index 5882c1c..2a019d1 100644 ---- a/asco/tools/alter/auxfunc.h -+++ b/asco/tools/alter/auxfunc.h -@@ -40,6 +40,6 @@ int P_eof(FILE *f); - - - --char lkk[LONGSTRINGSIZE]; --int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ --int MPI_EXXIT; /* exits MPI if set to 1*/ -+extern char lkk[LONGSTRINGSIZE]; -+extern int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+extern int MPI_EXXIT; /* exits MPI if set to 1*/ -diff --git a/asco/tools/auxfunc/auxfunc.c b/asco/tools/auxfunc/auxfunc.c -index 061457f..592998b 100644 ---- a/asco/tools/auxfunc/auxfunc.c -+++ b/asco/tools/auxfunc/auxfunc.c -@@ -34,6 +34,9 @@ - #include "auxfunc.h" - - -+char lkk[LONGSTRINGSIZE]; -+int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+int MPI_EXXIT; /* exits MPI if set to 1*/ - - - /*Check if at end of file, using Pascal "eof" semantics. End-of-file for -diff --git a/asco/tools/auxfunc/auxfunc.h b/asco/tools/auxfunc/auxfunc.h -index 5882c1c..2a019d1 100644 ---- a/asco/tools/auxfunc/auxfunc.h -+++ b/asco/tools/auxfunc/auxfunc.h -@@ -40,6 +40,6 @@ int P_eof(FILE *f); - - - --char lkk[LONGSTRINGSIZE]; --int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ --int MPI_EXXIT; /* exits MPI if set to 1*/ -+extern char lkk[LONGSTRINGSIZE]; -+extern int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+extern int MPI_EXXIT; /* exits MPI if set to 1*/ -diff --git a/asco/tools/log/auxfunc.c b/asco/tools/log/auxfunc.c -index 061457f..f7dc371 100644 ---- a/asco/tools/log/auxfunc.c -+++ b/asco/tools/log/auxfunc.c -@@ -34,6 +34,8 @@ - #include "auxfunc.h" - - -+char lkk[LONGSTRINGSIZE]; -+int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice */ - - - /*Check if at end of file, using Pascal "eof" semantics. End-of-file for -diff --git a/asco/tools/log/auxfunc.h b/asco/tools/log/auxfunc.h -index b51cd56..ce9ab9e 100644 ---- a/asco/tools/log/auxfunc.h -+++ b/asco/tools/log/auxfunc.h -@@ -38,5 +38,5 @@ int P_eof(FILE *f); - - - --char lkk[LONGSTRINGSIZE]; --int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice */ -+extern char lkk[LONGSTRINGSIZE]; -+extern int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice */ -diff --git a/asco/tools/monte/auxfunc.h b/asco/tools/monte/auxfunc.h -index 5882c1c..2a019d1 100644 ---- a/asco/tools/monte/auxfunc.h -+++ b/asco/tools/monte/auxfunc.h -@@ -40,6 +40,6 @@ int P_eof(FILE *f); - - - --char lkk[LONGSTRINGSIZE]; --int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ --int MPI_EXXIT; /* exits MPI if set to 1*/ -+extern char lkk[LONGSTRINGSIZE]; -+extern int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+extern int MPI_EXXIT; /* exits MPI if set to 1*/ -diff --git a/asco/tools/postp/auxfunc.h b/asco/tools/postp/auxfunc.h -index 5882c1c..2a019d1 100644 ---- a/asco/tools/postp/auxfunc.h -+++ b/asco/tools/postp/auxfunc.h -@@ -40,6 +40,6 @@ int P_eof(FILE *f); - - - --char lkk[LONGSTRINGSIZE]; --int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ --int MPI_EXXIT; /* exits MPI if set to 1*/ -+extern char lkk[LONGSTRINGSIZE]; -+extern int spice; /* 1:Eldo, 2:HPSPICE, 3:LTspice, 4:Spectre, 50:Qucs */ -+extern int MPI_EXXIT; /* exits MPI if set to 1*/ -diff --git a/asco/tools/postp/auxfunc_measurefromlis.c b/asco/tools/postp/auxfunc_measurefromlis.c -index 8ea1d22..9f8eded 100644 ---- a/asco/tools/postp/auxfunc_measurefromlis.c -+++ b/asco/tools/postp/auxfunc_measurefromlis.c -@@ -14,6 +14,7 @@ - #include "auxfunc_measurefromlis.h" - #include "auxfunc.h" - -+measure_line measure[MAXMEAS]; - - #ifdef ASCO - extern void WriteToMem(int num_measures); -diff --git a/asco/tools/postp/auxfunc_measurefromlis.h b/asco/tools/postp/auxfunc_measurefromlis.h -index f712d42..04abab8 100644 ---- a/asco/tools/postp/auxfunc_measurefromlis.h -+++ b/asco/tools/postp/auxfunc_measurefromlis.h -@@ -57,4 +57,4 @@ void DoMath(int num_measures); - - - --measure_line measure[MAXMEAS]; -+extern measure_line measure[MAXMEAS]; -diff --git a/asco/tools/postp/auxfunc_updatelis.c b/asco/tools/postp/auxfunc_updatelis.c -index 125616c..abfe3e0 100644 ---- a/asco/tools/postp/auxfunc_updatelis.c -+++ b/asco/tools/postp/auxfunc_updatelis.c -@@ -14,6 +14,7 @@ - #include "auxfunc.h" - - -+char skip[SKIPTRAN][SHORTSTRINGSIZE]; /*100 transistor to skip*/ - - - /***************************************************************/ -diff --git a/asco/tools/postp/auxfunc_updatelis.h b/asco/tools/postp/auxfunc_updatelis.h -index a6c14bc..80f98e2 100644 ---- a/asco/tools/postp/auxfunc_updatelis.h -+++ b/asco/tools/postp/auxfunc_updatelis.h -@@ -35,4 +35,4 @@ void UpdateLIS(char *ConfigFile,char *InputFile); - - - --char skip[SKIPTRAN][SHORTSTRINGSIZE]; /*100 transistor to skip*/ -+extern char skip[SKIPTRAN][SHORTSTRINGSIZE]; /*100 transistor to skip*/ --- -2.25.4 - diff --git a/qucs-0.0.18-gcc-ppc64le-bug.patch b/qucs-0.0.18-gcc-ppc64le-bug.patch deleted file mode 100644 index 6993efb..0000000 --- a/qucs-0.0.18-gcc-ppc64le-bug.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- qucs-0.0.18/qucs-core/src/evaluate.cpp 2014-08-31 09:20:36.000000000 +0200 -+++ qucs-0.0.18/qucs-core/src/evaluate.cpp 2016-01-19 14:56:09.373929758 +0100 -@@ -2820,11 +2820,12 @@ - qucs::vector * Rn = V (_ARES(2)); - nr_double_t F = D (_ARES(3)); - qucs::vector * arc = V (_ARES(4)); -+ qucs::vector N, R, C; - - _DEFV (); -- qucs::vector N = circuit::z0 / 4 / *Rn * (F - *Fmin) * norm (1 + *Sopt); -- qucs::vector R = sqrt (N * N + N * (1 - norm (*Sopt))) / (1 + N); -- qucs::vector C = *Sopt / (1 + N); -+ N = circuit::z0 / 4 / *Rn * (F - *Fmin) * norm (1 + *Sopt); -+ R = sqrt (N * N + N * (1 - norm (*Sopt))) / (1 + N); -+ C = *Sopt / (1 + N); - qucs::vector * circle = new qucs::vector (C.getSize () * arc->getSize ()); - int i, a, j; nr_complex_t v; - for (i = 0, j = 0; i < C.getSize (); i++) { -@@ -2899,9 +2900,10 @@ - _ARMV0 (S); - _ARV1 (arc); - _DEFV (); -- qucs::vector D = norm (S->get (1, 1)) - norm (det (*S)); -- qucs::vector C = (conj (S->get (1, 1)) - S->get (0, 0) * conj (det (*S))) / D; -- qucs::vector R = abs (S->get (0, 1)) * abs (S->get (1, 0)) / D; -+ qucs::vector D_, C, R; -+ D_ = norm (S->get (1, 1)) - norm (det (*S)); -+ C = (conj (S->get (1, 1)) - S->get (0, 0) * conj (det (*S))) / D_; -+ R = abs (S->get (0, 1)) * abs (S->get (1, 0)) / D_; - qucs::vector * circle = new qucs::vector (S->getSize () * arc->getSize ()); - int a, d, i; nr_complex_t v; - for (i = 0, d = 0; i < S->getSize (); i++) { -@@ -2930,9 +2932,10 @@ - _ARMV0 (S); - _ARV1 (arc); - _DEFV (); -- qucs::vector D = norm (S->get (0, 0)) - norm (det (*S)); -- qucs::vector C = (conj (S->get (0, 0)) - S->get (1, 1) * conj (det (*S))) / D; -- qucs::vector R = abs (S->get (0, 1)) * abs (S->get (1, 0)) / D; -+ qucs::vector D_, C, R; -+ D_ = norm (S->get (0, 0)) - norm (det (*S)); -+ C = (conj (S->get (0, 0)) - S->get (1, 1) * conj (det (*S))) / D_; -+ R = abs (S->get (0, 1)) * abs (S->get (1, 0)) / D_; - qucs::vector * circle = new qucs::vector (S->getSize () * arc->getSize ()); - int a, d, i; nr_complex_t v; - for (i = 0, d = 0; i < S->getSize (); i++) { diff --git a/qucs-0.0.18-qucsrescodes-progname-typo.patch b/qucs-0.0.18-qucsrescodes-progname-typo.patch deleted file mode 100644 index 81f3f9d..0000000 --- a/qucs-0.0.18-qucsrescodes-progname-typo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur qucs-0.0.18.orig/qucs/qucs_actions.cpp qucs-0.0.18/qucs/qucs_actions.cpp ---- qucs-0.0.18.orig/qucs/qucs_actions.cpp 2014-08-31 09:20:37.000000000 +0200 -+++ qucs-0.0.18/qucs/qucs_actions.cpp 2016-01-19 14:11:49.992134997 +0100 -@@ -841,7 +841,7 @@ - #elif __APPLE__ - prog = "qucsrescodes.app/Contents/MacOS/qucsrescodes"; - #else -- prog = "qucrescodes"; -+ prog = "qucsrescodes"; - #endif - - QProcess *QucsRes = new QProcess(); diff --git a/qucs-0.0.19-fix-desktop-file.patch b/qucs-0.0.19-fix-desktop-file.patch new file mode 100644 index 0000000..1d3c675 --- /dev/null +++ b/qucs-0.0.19-fix-desktop-file.patch @@ -0,0 +1,11 @@ +diff --git a/qucs/qucs/qucs.desktop b/qucs/qucs/qucs.desktop +index 3fc80b5..ca64a42 100755 +--- a/qucs/qucs/qucs.desktop ++++ b/qucs/qucs/qucs.desktop +@@ -12,5 +12,5 @@ Icon=qucs + Terminal=false + + Type=Application +-Categories=Education;Electronics ++Categories=Education;Electronics; + StartupNotify=false diff --git a/qucs.spec b/qucs.spec index 80358dc..bfc1504 100644 --- a/qucs.spec +++ b/qucs.spec @@ -3,28 +3,39 @@ Summary: Circuit simulator Name: qucs -Version: 0.0.18 -Release: 21%{?dist} +Version: 0.0.19 +Release: 1%{?dist} License: GPL+ URL: http://qucs.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz -Patch0: qucs-0.0.18-qucsrescodes-progname-typo.patch -# Temporary fix for gcc bug #1299599 -Patch1: %{name}-%{version}-gcc-ppc64le-bug.patch # Desktop file categories must terminate with a semicolon, bug #1424234 -Patch2: %{name}-0.0.18-Fix-desktop-file.patch -# Restore compatibility with GCC 10, bug #1799962 -Patch3: %{name}-0.0.18-Fix-multiple-definitions-in-asco.patch -# Restore compatibility with GCC 10, bug #1799962 -Patch4: %{name}-0.0.18-Fix-multiple-definitions-in-adms.patch +Patch0: qucs-0.0.19-fix-desktop-file.patch +Patch1: qucs-0.0.19-compile-fix.patch +Patch2: qucs-0.0.19-latex-fix.patch +BuildRequires: gcc-c++ BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: qt-devel BuildRequires: flex BuildRequires: bison +BuildRequires: gperf +BuildRequires: mot-adms >= 2.3.4 +BuildRequires: octave-devel +BuildRequires: doxygen +BuildRequires: transfig +BuildRequires: latex2html +BuildRequires: texlive +BuildRequires: texlive-SIunits +BuildRequires: texlive-relsize +BuildRequires: texlive-IEEEtran +BuildRequires: texlive-savesym +BuildRequires: texlive-subfigure +BuildRequires: texlive-keystroke +BuildRequires: texlive-epstopdf +BuildRequires: texlive-stmaryrd %if %{with qucs_enables_freehdl} Requires: freehdl %endif @@ -59,36 +70,34 @@ Qucs circuit simulator development headers %prep %setup -q -%patch0 -p1 -%ifarch ppc64le -%patch1 -p1 -%endif -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +# fix file modes +chmod 644 qucs/{AUTHORS,COPYING,ChangeLog,NEWS,README,THANKS,TODO} -# fixing the icon path -sed -i 's|Icon=/usr/share/pixmaps|Icon=/usr/share/qucs/bitmaps|' debian/%{name}.desktop +%patch0 -p1 -b .fix-desktop-file +%patch1 -p1 -b .compile-fix +%patch2 -p1 -b .latex-fix %build -%configure --disable-dependency-tracking +export CFLAGS="%{optflags}" +export CXXFLAGS="$CFLAGS" +%configure --disable-dependency-tracking --enable-debug=yes # remove rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' qucs-core/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' qucs-core/libtool -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install install -d %{buildroot}%{_datadir}/applications %if !%{with qucs_enables_freehdl} -rm %{buildroot}/%{_bindir}/qucsdigi* -rm %{buildroot}/%{_mandir}/man1/qucsdigi* -rm %{buildroot}/%{_datadir}/qucs/docs/*/{qucsdigi.png,start_digi.html} +rm -f %{buildroot}/%{_bindir}/qucsdigi* +rm -f %{buildroot}/%{_mandir}/man1/qucsdigi* +rm -f %{buildroot}/%{_datadir}/qucs/docs/*/{qucsdigi.png,start_digi.html} %endif desktop-file-install \ @@ -96,30 +105,21 @@ desktop-file-install \ --add-category "Engineering" \ --set-icon "qucs" \ --dir=%{buildroot}%{_datadir}/applications \ - debian/%{name}.desktop + qucs/qucs/%{name}.desktop + +# drop .la +rm -f %{buildroot}%{_libdir}/libqucs.la %files -%license COPYING -%doc AUTHORS ChangeLog NEWS README TODO +%license qucs/COPYING +%doc qucs/AUTHORS qucs/ChangeLog qucs/NEWS NEWS.md README.md qucs/README qucs/THANKS qucs/TODO %{_bindir}/qucs* %{_bindir}/ps2sp* %{_datadir}/%{name} +%{_datadir}/qucs-core %{_datadir}/applications/* %{_mandir}/man1/* -# the following binaries were introduced in 0.0.17 (repoquery shows no conflicts with other pkgs) -%{_bindir}/alter -%{_bindir}/asco -%{_bindir}/asco-test -%{_bindir}/log -%{_bindir}/monte -%{_bindir}/postp -%{_bindir}/rosen -# introduced in 0.0.18 - adms provided by mot-adms -%exclude %{_bindir}/admsCheck -%exclude %{_bindir}/admsXml -%exclude %{_mandir}/man1/admsXml.* -%exclude %{_mandir}/man1/admsCheck.* %{_datadir}/icons/* @@ -130,10 +130,13 @@ desktop-file-install \ %files devel %{_includedir}/* %{_libdir}/libqucs.so -%{_libdir}/libqucs.la %changelog +* Wed Aug 12 2020 Jaroslav Škarvada - 0.0.19-1 +- New version + Resolves: rhbz#1416791 + * Sat Aug 01 2020 Fedora Release Engineering - 0.0.18-21 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index cbe9192..3dccef2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4985d66565e8c29c9e6d7e7c98781e60 qucs-0.0.18.tar.gz +SHA512 (qucs-0.0.19.tar.gz) = 0ce68bc84a14ba0515bee4acb3f6e77f9637de817e3a75cba20ca88f093d0e06b9ad229df09e7d0953ceb5b0902dc4dd902a6b5bf7fee1e4a056b55fc7bb3867