Hello community, here is the log from the commit of package qucs for openSUSE:Factory checked in at 2014-11-10 17:27:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qucs (Old) and /work/SRC/openSUSE:Factory/.qucs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qucs" Changes: -------- --- /work/SRC/openSUSE:Factory/qucs/qucs.changes 2013-07-05 15:11:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qucs.new/qucs.changes 2014-11-10 17:27:47.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 1 14:27:43 UTC 2014 - [email protected] + +- Update to version 0.0.18 + * See NEWS.md for details +- Fix no-return-in-nonvoid-function + * qucs-no-return-in-nonvoid-function.patch + +------------------------------------------------------------------- @@ -11 +19 @@ -Tue Oct 2 19:47:23 UTC 2012 - [email protected] +Tue Oct 2 19:47:23 UTC 2012 - [email protected] @@ -16 +24 @@ -Sun Sep 30 19:47:38 UTC 2012 - [email protected] +Sun Sep 30 19:47:38 UTC 2012 - [email protected] @@ -22 +30 @@ -Sat Sep 29 08:52:27 UTC 2012 - [email protected] +Sat Sep 29 08:52:27 UTC 2012 - [email protected] @@ -29 +37 @@ -Sat Aug 18 13:25:44 UTC 2012 - [email protected] +Sat Aug 18 13:25:44 UTC 2012 - [email protected] Old: ---- qucs-0.0.17.tar.gz New: ---- qucs-0.0.18.tar.gz qucs-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qucs.spec ++++++ --- /var/tmp/diff_new_pack.7hJ4AR/_old 2014-11-10 17:27:49.000000000 +0100 +++ /var/tmp/diff_new_pack.7hJ4AR/_new 2014-11-10 17:27:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qucs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: qucs -Version: 0.0.17 +Version: 0.0.18 Release: 0 Summary: Circuit Simulator with Graphical User Interface (Qt) License: GPL-2.0 and GPL-2.0+ @@ -29,17 +29,20 @@ Source2: %{name}.png # PATCH-FIX-OPENSUSE qucs-digisim-verilog.patch -- using verilog for digital simulation by default Patch1: qucs-digisim-verilog.patch - +# PATCH-FIX-UPSTREAM qucs-no-return-in-nonvoid-function.patch +Patch2: qucs-no-return-in-nonvoid-function.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gperf +# fix directory owner +BuildRequires: hicolor-icon-theme BuildRequires: libqt4-devel BuildRequires: update-desktop-files - +Requires: adms +Requires: asco Requires: iverilog - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,44 +52,79 @@ that simulation has finished you can view the simulation results on a presentation page or window. +%package -n libqucs0 +Summary: Qucs library +Group: System/libraries + +%description -n libqucs0 +Qucs is an integrated circuit simulator which means you are able to +setup a circuit with a graphical user interface (GUI) and simulate the +large-signal, small-signal and noise behaviour of the circuit. After +that simulation has finished you can view the simulation results on a +presentation page or window. + +%package devel +Summary: Development files fir QUCS library +Group: Development/Libraries/Other +Requires: libqucs0 = %{version} + +%description devel +Qucs is an integrated circuit simulator which means you are able to +setup a circuit with a graphical user interface (GUI) and simulate the +large-signal, small-signal and noise behaviour of the circuit. After +that simulation has finished you can view the simulation results on a +presentation page or window. + %prep %setup -q %patch1 -p1 +%patch2 -p1 cp %{SOURCE1} . cp %{SOURCE2} . %build -%configure +%configure \ + --disable-adms \ + --disable-asco + make %{?_smp_mflags} %install -%makeinstall +%make_install %fdupes %{buildroot}/%{_datadir}/qucs/ +rm -rf %{buildroot}/%{_libdir}/libqucs.la + install -Dm 644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -Dm 644 %{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png +# hicolor-icon-theme does not contain this size +rm -rf %{buildroot}%{_datadir}/icons/hicolor/512x512/ %suse_update_desktop_file %{name} -%clean -rm -rf %{buildroot} +%post -n libqucs0 -p /sbin/ldconfig + +%postun -n libqucs0 -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc NEWS README COPYING -%{_bindir}/alter -%{_bindir}/asco -%{_bindir}/asco-test -%{_bindir}/log -%{_bindir}/monte -%{_bindir}/postp +%defattr(-,root,root) +%doc NEWS.md README COPYING %{_bindir}/ps2sp %{_bindir}/qucs* -%{_bindir}/rosen %{_datadir}/qucs/ %{_mandir}/man1/* %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/qucs.* %{_datadir}/pixmaps/%{name}.png +%files -n libqucs0 +%defattr(-,root,root) +%{_libdir}/libqucs.so.0* + +%files devel +%defattr(-,root,root) +%{_libdir}/libqucs.so +%{_includedir}/qucs-core/ + %changelog ++++++ qucs-0.0.17.tar.gz -> qucs-0.0.18.tar.gz ++++++ /work/SRC/openSUSE:Factory/qucs/qucs-0.0.17.tar.gz /work/SRC/openSUSE:Factory/.qucs.new/qucs-0.0.18.tar.gz differ: char 5, line 1 ++++++ qucs-no-return-in-nonvoid-function.patch ++++++ diff --git a/qucs/dialogs/exportdialog.cpp b/qucs/dialogs/exportdialog.cpp index a23047a..15bf988 100644 --- a/qucs/dialogs/exportdialog.cpp +++ b/qucs/dialogs/exportdialog.cpp @@ -331,11 +331,18 @@ void ExportDialog::recalcScale() ExportDialog::ImgFormat ExportDialog::getImgFormat() { + // default + ExportDialog::ImgFormat ImgFormat = ExportDialog::Coloured; + switch (cbxImgType->currentIndex()) { - case 0 : return ExportDialog::Coloured; + case 0 : + ImgFormat = ExportDialog::Coloured; break; - case 1 : return ExportDialog::Monochrome; + case 1 : + ImgFormat = ExportDialog::Monochrome; break; default : break; } + + return ImgFormat; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
