From a8288858d2a0396fd58a217eba3e9f785fe9f70958d6b2f1270b7aff3f28e691 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Fri, 21 Aug 2015 13:05:16 +0000 Subject: [PATCH] Accepting request 325032 from home:Heinervdm:branches:Education Update to 0.9.2b Switch to Qt5, drop support for debian builds as debian has it's own fritzing package OBS-URL: https://build.opensuse.org/request/show/325032 OBS-URL: https://build.opensuse.org/package/show/Education/fritzing?expand=0&rev=45 --- 0.9.2b.tar.gz | 3 + debian.changelog | 150 --------------------- debian.tar.gz | 3 - fritzing-0.9.0b.source.tar.bz2 | 3 - fritzing-restore-qt5.1-compatibility.patch | 12 ++ fritzing.changes | 59 ++++++++ fritzing.dsc | 10 -- fritzing.spec | 56 ++++---- 8 files changed, 97 insertions(+), 199 deletions(-) create mode 100644 0.9.2b.tar.gz delete mode 100644 debian.changelog delete mode 100644 debian.tar.gz delete mode 100644 fritzing-0.9.0b.source.tar.bz2 create mode 100644 fritzing-restore-qt5.1-compatibility.patch delete mode 100644 fritzing.dsc diff --git a/0.9.2b.tar.gz b/0.9.2b.tar.gz new file mode 100644 index 0000000..b27adbf --- /dev/null +++ b/0.9.2b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e9dbb94a4ca5e23effc2056f471c78913b9efa4c154ced94de8f72bfe29735f +size 10913985 diff --git a/debian.changelog b/debian.changelog deleted file mode 100644 index b7b12bc..0000000 --- a/debian.changelog +++ /dev/null @@ -1,150 +0,0 @@ -fritzing (0.9.0b-0) stable; urgency=low - - * new upstream release 0.9.0b - - -- Thomas Zimmermann Tue, 15 Jul 2014 09:48:00 +0200 - -fritzing (0.8.7b-0) stable; urgency=low - - * new upstream release 0.8.7b - - -- Thomas Zimmermann Sat, 25 Jan 2014 18:41:00 +0100 - -fritzing (0.8.3b-0) stable; urgency=low - - * new upstream release 0.8.3b - - -- Thomas Zimmermann Sun, 28 Jul 2013 07:51:00 +0200 - -fritzing (0.8.2b-0) stable; urgency=low - - * new upstream release 0.8.2b - - -- Thomas Zimmermann Sat, 27 Jul 2013 08:31:00 +0200 - -fritzing (0.8.0b-0) stable; urgency=low - - * new upstream release 0.8.0b - - -- Thomas Zimmermann Fri, 14 Jun 2013 11:44:00 +0200 - -fritzing (0.7.12b-0) stable; urgency=low - - * new upstream release 0.7.12b - - -- Thomas Zimmermann Tue, 26 Feb 2013 09:35:00 +0100 - -fritzing (0.7.11b-0) stable; urgency=low - - * new upstream release 0.7.11b - - -- Thomas Zimmermann Fri, 04 Jan 2013 08:50:00 +0100 -fritzing (0.7.10b-0) stable; urgency=low - - * new upstream release 0.7.10b - - -- Thomas Zimmermann Wed, 17 Oct 2012 09:24:00 +0200 -fritzing (0.7.9b-0) stable; urgency=low - - * new upstream release 0.7.9b - - -- Thomas Zimmermann Wed, 10 Oct 2012 09:41:00 +0200 - -fritzing (0.7.7b-0) stable; urgency=low - - * new upstream release 0.7.7b - - -- Thomas Zimmermann Sat, 15 Aug 2012 09:21:00 +0200 - -fritzing (0.7.6b-0) stable; urgency=low - - * new upstream release 0.7.6b - - -- Thomas Zimmermann Sat, 11 Jul 2012 08:50:00 +0200 - -fritzing (0.7.5b-0) stable; urgency=low - - * new upstream release 0.7.5b - - -- Thomas Zimmermann Thu, 12 Apr 2012 13:00:00 +0200 - - -fritzing (0.7.4b-0) stable; urgency=low - - * new upstream release 0.7.4b - - -- Thomas Zimmermann Thu, 12 Apr 2012 13:00:00 +0200 - -fritzing (0.7.3b-0) stable; urgency=low - - * new upstream release 0.7.3b - - -- Thomas Zimmermann Tue, 10 Apr 2012 12:17:00 +0200 - -fritzing (0.7.1b-0) stable; urgency=low - - * new upstream release 0.7.1b - - -- Thomas Zimmermann Thu, 13 Mar 2012 11:58:00 +0100 - -fritzing (0.7.0b-0) stable; urgency=low - - * new upstream release 0.7.0b - - -- Thomas Zimmermann Sat, 04 Feb 2012 09:30:00 +0100 - -fritzing (0.6.5b-0) stable; urgency=low - - * new upstream release 0.6.5b - - -- Thomas Zimmermann Thu, 03 Jan 2011 12:27:00 +0100 - -fritzing (0.6.4b-0) stable; urgency=low - - * new upstream release 0.6.4b - - -- Thomas Zimmermann Fri, 16 Dec 2011 23:00:00 +0100 - -fritzing (0.6.3b-0) stable; urgency=low - - * new upstream release 0.6.3b - - -- Thomas Zimmermann Fri, 19 Aug 2011 16:07:00 +0200 -fritzing (0.6.2b-6) stable; urgency=low - - * Add translations - - -- Thomas Zimmermann Mon, 01 Aug 2011 21:04:00 +0200 -fritzing (0.6.2b-5) stable; urgency=low - - * Remove unused includes to compile with qt 4.6 too - * Add libqt4-gui and libqt4-sql-sqlite to Depends - - -- Thomas Zimmermann Mon, 01 Aug 2011 15:56:00 +0200 -fritzing (0.6.2b-4) stable; urgency=low - - * Fix fritzing-fix-app-folder.patch to apply cleanly for all packages - - -- Thomas Zimmermann Fri, 29 Jul 2011 13:25:00 +0200 -fritzing (0.6.2b-3) stable; urgency=low - - * Add patch to fix the search path for shared data - - -- Thomas Zimmermann Thu, 28 Jul 2011 23:11:30 +0200 -fritzing (0.6.2b-2) stable; urgency=low - - * Add parts, manpage and desktop link to package - - -- Thomas Zimmermann Fri, 22 Jul 2011 20:38:08 +0200 - -fritzing (0.6.2b-1) stable; urgency=low - - * Try to add all files to the package - - -- Thomas Zimmermann Fri, 22 Jul 2011 19:18:08 +0200 - -fritzing (0.6.2b-0) stable; urgency=low - - * Initial Release - - -- Thomas Zimmermann Wed, 20 Jul 2011 21:49:38 +0200 diff --git a/debian.tar.gz b/debian.tar.gz deleted file mode 100644 index d2179e6..0000000 --- a/debian.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dc33501cbbd4fae496860fc0272751cdb8d639f959853821cc718393814ffbf -size 1200 diff --git a/fritzing-0.9.0b.source.tar.bz2 b/fritzing-0.9.0b.source.tar.bz2 deleted file mode 100644 index 2e17df7..0000000 --- a/fritzing-0.9.0b.source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a56d407a99eb3ea9153d852779987c98f4574e4ffff1938f510113a503c20ef -size 20807998 diff --git a/fritzing-restore-qt5.1-compatibility.patch b/fritzing-restore-qt5.1-compatibility.patch new file mode 100644 index 0000000..b0502cc --- /dev/null +++ b/fritzing-restore-qt5.1-compatibility.patch @@ -0,0 +1,12 @@ +diff -Nurd fritzing-0.9.1b.source.orig/fritzing-app-master/src/program/programtab.cpp fritzing-0.9.1b.source/fritzing-app-master/src/program/programtab.cpp +--- fritzing-0.9.1b.source.orig/fritzing-app-master/src/program/programtab.cpp 2014-12-02 03:46:32.000000000 +0100 ++++ fritzing-0.9.1b.source/fritzing-app-master/src/program/programtab.cpp 2015-01-05 15:45:23.508333593 +0100 +@@ -751,7 +751,7 @@ + m_programButton->setEnabled(false); + m_console->setPlainText(""); + m_platform->upload(this, +- m_portComboBox->currentData().toString(), ++ m_portComboBox->currentText(), + m_boardComboBox->currentText(), + m_filename); + } diff --git a/fritzing.changes b/fritzing.changes index 13f8214..96b82ab 100644 --- a/fritzing.changes +++ b/fritzing.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Tue Apr 7 18:02:36 UTC 2015 - bugs@vdm-design.de + +- Update to version 0.9.2b + * Parts + RaspIO Duino http://raspi.tv/tag/raspio-duino + stm32 nucleo board http://bit.do/2cmY + dquid io board http://www.dquid.com/ + Raspberry Pi 2 http://bit.do/2cnn + sodaq mbili http://mbili.sodaq.net/ + WeIO http://www.we-io.net/ + netduino plus2 http://www.netduino.com/netduinoplus2/specs.htm + some more sparkfun-parts + ws2812 + sim928A + 8x8 matrix + + * Translations + Romanian, thanks to titus08 + + * Bug fixes + various part definition fixes + +------------------------------------------------------------------- +Fri Dec 26 12:26:12 UTC 2014 - bugs@vdm-design.de + +- Change from Qt4 to Qt5, because it's getting to complicated to + compile with Qt4 +- Add patch fritzing-restore-qt5.1-compatibility.patch + This patch replaces one call to a function introduced in Qt5.2 + by an equivalent call of a function existing since Qt4 +- Update to version 0.9.1b + * Code View + The new Code View lets you edit and upload your program straight from Fritzing. Now you can keep your code together with your circuit! + * New Parts + Seeeduino, Grove, and more, thanks to SeeedStudio + Intel Galileo Gen. 2, Edison, and more, supported by Intel Software + Raspberry Pi B+ and RPi Hat template + Pinocc.io Scout, Backpack supported byPinocc.io + LightBlue Bean, supported by Punchthrough + UDOO Duo/Quad, supported by Udoo + Touch Board, supported by Bare Conductive + blueIOT, thanks to Guido Burger + More SparkFun parts, thanks to SparkFun + and a couple of smaller components + * Bug fixes + Jumper wire couldn’t be resized + Traces were sometimes displaced after file load + Windows 8: printing didn’t work + Linux: Gerber export, ground fill, autorouting broken if OS language was set to non-English + and various part definition fixes + * Developers + Simplified build setup for Windows (less dependencies) + Moved source code to github + Documented command line options + * Updated Translations + German, thanks to Atalanttore + French, thanks to klostery + ------------------------------------------------------------------- Tue Jul 15 07:52:44 UTC 2014 - bugs@vdm-design.de diff --git a/fritzing.dsc b/fritzing.dsc deleted file mode 100644 index 8c51e67..0000000 --- a/fritzing.dsc +++ /dev/null @@ -1,10 +0,0 @@ -Format: 1.0 -Source: fritzing -Version: 0.9.0b -Binary: fritzing -Maintainer: Brendan Howell -Architecture: any -Build-Depends: debhelper (>= 7.0.12), libqtcore4 (>=4.7), libqtgui4 (>=4.7), libstdc++6, libc6, qt4-qmake, libqt4-dev (>=4.7), zlib1g-dev, libqt4-sql-sqlite (>=4.7), libboost-dev -Files: - 8ea0765b8fd31874da0ee00515a68576 10808479 fritzing-0.9.0b.source.tar.gz - bc4a6dc116f0d762cdf5a374b5e865f9 1200 debian.tar.gz diff --git a/fritzing.spec b/fritzing.spec index 28da690..3e92490 100644 --- a/fritzing.spec +++ b/fritzing.spec @@ -1,7 +1,7 @@ # # spec file for package fritzing # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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,30 +17,30 @@ Name: fritzing -Version: 0.9.0b +Version: 0.9.2b Release: 0 Summary: Intuitive EDA platform featuring from prototype to product License: GPL-3.0+ Group: Productivity/Scientific/Electronics Url: http://fritzing.org/ -Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}-%{version}.source.tar.bz2 -Requires: libqt4-sql-sqlite -Requires: libqt4-x11 +Source0: https://github.com/fritzing/fritzing-app/archive/%{version}.tar.gz +#PATCH-FIX-UPSTREAM fritzing-restore-qt5.1-compatibility.patch -- this patch restores compatibility with Qt5.1 +Patch0: fritzing-restore-qt5.1-compatibility.patch BuildRequires: boost-devel BuildRequires: desktop-file-utils -BuildRequires: libqt4-devel >= 4.7 -%if 0%{?suse_version} || 0%{?sles_version} +BuildRequires: zlib-devel BuildRequires: fdupes +BuildRequires: libqt5-qtbase-devel +%if 0%{?suse_version} < 1320 +BuildRequires: libQt5SerialPort-devel +BuildRequires: libQt5Svg-devel +Requires: libqt5-sql-sqlite +%else +BuildRequires: libqt5-qtserialport-devel +BuildRequires: libqt5-qtsvg-devel +Requires: libQt5Sql5-sqlite %endif -%if 0%{?centos_version} || 0%{?rhel_version} -BuildRequires: gcc-c++ -BuildRequires: qt4-devel -%endif -%if 0%{?fedora} -BuildRequires: gcc-c++ -BuildRequires: libstdc++-devel -BuildRequires: qt -%endif +Requires: fritzing-parts = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,20 +52,13 @@ allows users to document their Arduino and other electronic-based prototypes, and to create a PCB layout for manufacturing. %prep -%setup -q -n %{name}-%{version}.source -sed -i 's/\r$//' README.txt +%setup -q -n %{name}-app-%{version} +%patch0 -p2 sed -i 's/\r$//' LICENSE.CC-BY-SA +chmod -x LICENSE* readme.md Fritzing.1 %build -%if 0%{?mandriva_version} || 0%{?centos_version} -export PATH=/usr/lib/qt4/bin:/usr/lib64/qt4/bin:$PATH -export QTDIR=%{_prefix}/lib/qt4/ -%endif -%if 0%{?fedora} || 0%{?rhel_version} -qmake-qt4 -%else -qmake -%endif +qmake-qt5 make %{?_smp_mflags} %install @@ -73,19 +66,16 @@ make INSTALL_ROOT=%{buildroot} install install -d %{buildroot}%{_datadir}/pixmaps/ mv %{buildroot}%{_datadir}/icons/fritzing.png %{buildroot}%{_datadir}/pixmaps/ desktop-file-install --dir=%{buildroot}%{_datadir}/applications fritzing.desktop -find %{buildroot}%{_datadir}/%{name}/parts -name *.svg -exec chmod -x {} \; -find %{buildroot}%{_datadir}/%{name}/parts -name *.fzp -exec chmod -x {} \; -%if 0%{?suse_version} || 0%{?sles_version} -%fdupes %{buildroot}%{_datadir}/%{name}/parts +find %{buildroot}%{_datadir}/%{name}/ -type f -exec chmod -x {} \; +rm -rf %{buildroot}%{_datadir}/%{name}/parts %fdupes %{buildroot}%{_datadir}/%{name}/sketches -%endif %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc README.txt LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA +%doc readme.md LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA %{_bindir}/Fritzing %{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.png