[fritzing] Initial import (#666311).
Ed Marshall
logic at fedoraproject.org
Wed Dec 21 22:28:34 UTC 2011
commit 24fa3ae247717378d6a8165a7a904a101d40dc27
Author: Ed Marshall <esm at fedora-vm.(none)>
Date: Wed Dec 21 22:28:17 2011 +0000
Initial import (#666311).
.gitignore | 1 +
fritzing-disable-autoupdate.patch | 132 +++++++++++++++++++++++++++++++++++++
fritzing-use-external-libs.patch | 64 ++++++++++++++++++
fritzing.desktop | 9 +++
fritzing.spec | 112 +++++++++++++++++++++++++++++++
sources | 1 +
6 files changed, 319 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..17d7c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/fritzing-0.6.4b.source.tar.bz2
diff --git a/fritzing-disable-autoupdate.patch b/fritzing-disable-autoupdate.patch
new file mode 100644
index 0000000..dae3746
--- /dev/null
+++ b/fritzing-disable-autoupdate.patch
@@ -0,0 +1,132 @@
+diff -ur fritzing-0.6.4b.source.orig/src/fapplication.cpp fritzing-0.6.4b.source/src/fapplication.cpp
+--- fritzing-0.6.4b.source.orig/src/fapplication.cpp 2011-12-16 11:07:52.000000000 -0800
++++ fritzing-0.6.4b.source/src/fapplication.cpp 2011-12-16 15:48:10.724843929 -0800
+@@ -727,10 +727,6 @@
+ if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.825);
+ ProcessEventBlocker::processEvents();
+
+- m_updateDialog = new UpdateDialog();
+- connect(m_updateDialog, SIGNAL(enableAgainSignal(bool)), this, SLOT(enableCheckUpdates(bool)));
+- checkForUpdates(false);
+-
+ if (m_progressIndex >= 0) splash.showProgress(m_progressIndex, 0.875);
+
+ loadSomething(firstRun, prevVersion);
+@@ -928,57 +924,6 @@
+ ViewLayer::ViewLayerID viewLayerID;
+ };
+
+-
+-
+-void FApplication::checkForUpdates() {
+- checkForUpdates(true);
+-}
+-
+-void FApplication::checkForUpdates(bool atUserRequest)
+-{
+- if (atUserRequest) {
+- enableCheckUpdates(false);
+- }
+-
+- VersionChecker * versionChecker = new VersionChecker();
+-
+- QSettings settings;
+- if (!atUserRequest) {
+- // if I've already been notified about these updates, don't bug me again
+- QString lastMainVersionChecked = settings.value("lastMainVersionChecked").toString();
+- if (!lastMainVersionChecked.isEmpty()) {
+- versionChecker->ignore(lastMainVersionChecked, false);
+- }
+- QString lastInterimVersionChecked = settings.value("lastInterimVersionChecked").toString();
+- if (!lastInterimVersionChecked.isEmpty()) {
+- versionChecker->ignore(lastInterimVersionChecked, true);
+- }
+- }
+-
+- QString atom = QString("http://fritzing.org/download/feed/atom/%1/%2")
+- .arg(PLATFORM_NAME)
+- .arg(makeRequestParamsString());
+- DebugDialog::debug(atom);
+- versionChecker->setUrl(atom);
+- m_updateDialog->setAtUserRequest(atUserRequest);
+- m_updateDialog->setVersionChecker(versionChecker);
+-
+- if (atUserRequest) {
+- m_updateDialog->show();
+- }
+-}
+-
+-void FApplication::enableCheckUpdates(bool enabled)
+-{
+- foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+- MainWindow *mainWindow = qobject_cast<MainWindow *>(widget);
+- if (mainWindow) {
+- mainWindow->enableCheckUpdates(enabled);
+- }
+- }
+-}
+-
+-
+ void FApplication::createUserDataStoreFolderStructure() {
+ // make sure that the folder structure for parts and bins, exists
+ QString userDataStorePath = FolderUtils::getUserDataStorePath();
+diff -ur fritzing-0.6.4b.source.orig/src/fapplication.h fritzing-0.6.4b.source/src/fapplication.h
+--- fritzing-0.6.4b.source.orig/src/fapplication.h 2011-12-16 11:07:53.000000000 -0800
++++ fritzing-0.6.4b.source/src/fapplication.h 2011-12-16 15:47:32.565929301 -0800
+@@ -65,9 +65,6 @@
+
+ public slots:
+ void preferences();
+- void checkForUpdates();
+- void checkForUpdates(bool atUserRequest);
+- void enableCheckUpdates(bool enabled);
+ void createUserDataStoreFolderStructure();
+ void changeActivation(bool activate, QWidget * originator);
+ void updateActivation();
+diff -ur fritzing-0.6.4b.source.orig/src/mainwindow.cpp fritzing-0.6.4b.source/src/mainwindow.cpp
+--- fritzing-0.6.4b.source.orig/src/mainwindow.cpp 2011-12-16 11:07:53.000000000 -0800
++++ fritzing-0.6.4b.source/src/mainwindow.cpp 2011-12-16 15:48:37.100093735 -0800
+@@ -156,7 +156,6 @@
+ m_windowMenuSeparator = NULL;
+ m_wireColorMenu = NULL;
+ m_viewSwitcherDock = NULL;
+- m_checkForUpdatesAct = NULL;
+ m_fileProgressDialog = NULL;
+ m_currentGraphicsView = NULL;
+ m_comboboxChanged = false;
+@@ -1785,13 +1784,6 @@
+ m_showInViewHelpAct->setChecked(show);
+ }
+
+-void MainWindow::enableCheckUpdates(bool enabled)
+-{
+- if (m_checkForUpdatesAct != NULL) {
+- m_checkForUpdatesAct->setEnabled(enabled);
+- }
+-}
+-
+ void MainWindow::swapSelectedDelay(const QString & family, const QString & prop, QMap<QString, QString> & currPropsMap, ItemBase * itemBase)
+ {
+ m_swapTimer.stop();
+diff -ur fritzing-0.6.4b.source.orig/src/mainwindow_menu.cpp fritzing-0.6.4b.source/src/mainwindow_menu.cpp
+--- fritzing-0.6.4b.source.orig/src/mainwindow_menu.cpp 2011-12-16 11:07:53.000000000 -0800
++++ fritzing-0.6.4b.source/src/mainwindow_menu.cpp 2011-12-16 15:47:18.968316261 -0800
+@@ -903,10 +903,6 @@
+ m_visitFritzingDotOrgAct->setStatusTip(tr("www.fritzing.org"));
+ connect(m_visitFritzingDotOrgAct, SIGNAL(triggered(bool)), this, SLOT(visitFritzingDotOrg()));*/
+
+- m_checkForUpdatesAct = new QAction(tr("Check for updates..."), this);
+- m_checkForUpdatesAct->setStatusTip(tr("Check whether a newer version of Fritzing is available for download"));
+- connect(m_checkForUpdatesAct, SIGNAL(triggered()), QApplication::instance(), SLOT(checkForUpdates()));
+-
+ m_aboutAct = new QAction(tr("&About"), this);
+ m_aboutAct->setStatusTip(tr("Show the application's about box"));
+ connect(m_aboutAct, SIGNAL(triggered()), this, SLOT(about()));
+@@ -1142,7 +1138,6 @@
+ m_helpMenu->addAction(m_examplesAct);
+ m_helpMenu->addAction(m_partsRefAct);
+ m_helpMenu->addSeparator();
+- m_helpMenu->addAction(m_checkForUpdatesAct);
+ m_helpMenu->addAction(m_importFilesFromPrevInstallAct);
+ m_helpMenu->addSeparator();
+ m_helpMenu->addAction(m_reportBugAct);
diff --git a/fritzing-use-external-libs.patch b/fritzing-use-external-libs.patch
new file mode 100644
index 0000000..f0e7209
--- /dev/null
+++ b/fritzing-use-external-libs.patch
@@ -0,0 +1,64 @@
+diff -ur fritzing-0.6.4b.source.orig/phoenix.pro fritzing-0.6.4b.source/phoenix.pro
+--- fritzing-0.6.4b.source.orig/phoenix.pro 2011-12-16 11:07:53.000000000 -0800
++++ fritzing-0.6.4b.source/phoenix.pro 2011-12-16 22:39:01.177898440 -0800
+@@ -106,7 +106,6 @@
+ RC_FILE = fritzing.rc
+ RESOURCES += phoenixresources.qrc
+ include(pri/kitchensink.pri)
+- include(pri/quazip.pri)
+ include(pri/partsbinpalette.pri)
+ include(pri/partseditor.pri)
+ include(pri/referencemodel.pri)
+@@ -127,10 +126,10 @@
+ include(pri/sketch.pri)
+ include(pri/translations.pri)
+ include(pri/program.pri)
+- include(pri/qtlockedfile.pri)
+ include(pri/ff.pri)
+ include(pri/qtsysteminfo.pri)
+ TARGET = Fritzing
+ TEMPLATE = app
+
+-
++INCLUDEPATH += /usr/include/quazip /usr/include/minizip
++LIBS += -lquazip -lminizip
+diff -ur fritzing-0.6.4b.source.orig/pri/utils.pri fritzing-0.6.4b.source/pri/utils.pri
+--- fritzing-0.6.4b.source.orig/pri/utils.pri 2011-12-16 11:07:50.000000000 -0800
++++ fritzing-0.6.4b.source/pri/utils.pri 2011-12-16 22:38:33.222783983 -0800
+@@ -17,8 +17,6 @@
+ # $Date: 2011-08-27 00:26:36 +0200 (Sat, 27 Aug 2011) $
+ # ********************************************************************/
+
+-INCLUDEPATH += src/lib/boost_1_43_0
+-
+ HEADERS += \
+ src/utils/abstractimagebutton.h \
+ src/utils/abstractstatesbutton.h \
+diff -ur fritzing-0.6.4b.source.orig/src/fapplication.cpp fritzing-0.6.4b.source/src/fapplication.cpp
+--- fritzing-0.6.4b.source.orig/src/fapplication.cpp 2011-12-16 11:07:52.000000000 -0800
++++ fritzing-0.6.4b.source/src/fapplication.cpp 2011-12-16 22:38:33.223783951 -0800
+@@ -58,7 +58,7 @@
+ #include "items/pinheader.h"
+ #include "items/partfactory.h"
+ #include "dialogs/recoverydialog.h"
+-#include "lib/qtlockedfile/qtlockedfile.h"
++#include <qtlockedfile.h>
+ #include "lib/qtsysteminfo/QtSystemInfo.h"
+ #include "processeventblocker.h"
+ #include "autoroute/cmrouter/panelizer.h"
+diff -ur fritzing-0.6.4b.source.orig/src/utils/folderutils.cpp fritzing-0.6.4b.source/src/utils/folderutils.cpp
+--- fritzing-0.6.4b.source.orig/src/utils/folderutils.cpp 2011-12-16 11:07:51.000000000 -0800
++++ fritzing-0.6.4b.source/src/utils/folderutils.cpp 2011-12-16 22:38:33.223783951 -0800
+@@ -33,9 +33,9 @@
+ #include <QCryptographicHash>
+
+ #include "../debugdialog.h"
+-#include "../lib/quazip/quazip.h"
+-#include "../lib/quazip/quazipfile.h"
+-#include "../lib/qtlockedfile/qtlockedfile.h"
++#include <quazip/quazip.h>
++#include <quazip/quazipfile.h>
++#include <qtlockedfile.h>
+ #include "../lib/qtsysteminfo/QtSystemInfo.h"
+
+
diff --git a/fritzing.desktop b/fritzing.desktop
new file mode 100644
index 0000000..1cc7790
--- /dev/null
+++ b/fritzing.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Fritzing
+GenericName=Fritzing
+Comment=Electronic Design Automation software
+Exec=Fritzing
+Icon=fritzing
+Terminal=false
+Type=Application
+Categories=Electronics;
diff --git a/fritzing.spec b/fritzing.spec
new file mode 100644
index 0000000..fc9ec6d
--- /dev/null
+++ b/fritzing.spec
@@ -0,0 +1,112 @@
+
+Name: fritzing
+Version: 0.6.4b
+Release: 2%{?dist}
+Summary: Electronic Design Automation software; from prototype to product
+
+Group: Applications/Engineering
+License: GPLv3+
+URL: http://fritzing.org/
+Source0: http://fritzing.org/download/%{version}/source-tarball/%{name}-%{version}.source.tar.bz2
+Source1: fritzing.desktop
+# Fedora-specific patch to remove bundled third-party libraries, and use
+# system-wide versions instead.
+Patch0: fritzing-use-external-libs.patch
+# Fedora-specific patch to disable internal auto-updating feature.
+Patch1: fritzing-disable-autoupdate.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: qt4-devel qt-webkit-devel desktop-file-utils boost-devel quazip-devel minizip-devel qtlockedfile-devel
+Requires: electronics-menu
+
+%description
+Fritzing is an open-source initiative to support designers, artists,
+researchers and hobbyists to take the step from physical prototyping
+to actual product. It is in the spirit of Processing and Arduino which
+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
+rm -f pri/quazip.pri
+rm -f pri/qtlockedfile.pri
+rm -rf src/lib/boost_1_43_0
+rm -rf src/lib/qtlockedfile
+rm -rf src/lib/quazip
+
+%{__sed} -i 's/\r//' README.txt
+
+%patch0 -p1
+%patch1 -p1
+
+echo 'CONFIG *= %{_qt4_prefix}/mkspecs/features/qtlockedfile' >> phoenix.pro
+
+%build
+CXXFLAGS="%{optflags}"
+%{_qt4_qmake}
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install INSTALL_ROOT=%{buildroot}
+
+# A few files in /usr/share/fritzing end up executable.
+find %{buildroot}%{_datadir}/%{name} -type f -exec %{__chmod} 644 {} \;
+find %{buildroot}%{_datadir}/%{name} -type d -exec %{__chmod} 755 {} \;
+
+# Icon is dumped in /usr/share/icons by default, need to move it.
+%{__mv} %{buildroot}%{_datadir}/icons %{buildroot}%{_datadir}/pixmaps
+
+# Included .desktop file is suitable for SuSE, not Fedora.
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc README.txt LICENSE.GPL2 LICENSE.GPL3 LICENSE.CC-BY-SA
+%{_bindir}/Fritzing
+%{_datadir}/%{name}
+%{_datadir}/applications/fritzing.desktop
+%{_datadir}/pixmaps/fritzing.png
+%{_mandir}/man?/*
+
+%changelog
+* Tue Dec 20 2011 Ed Marshall <esm at logic.net> - 0.6.4b-2
+- Add LICENSE.CC-BY-SA to package.
+- Add minizip-devel as a build dependency.
+
+* Sat Dec 17 2011 Ed Marshall <esm at logic.net> - 0.6.4b-1
+- Updated to 0.6.4b release.
+
+* Thu Feb 24 2011 Ed Marshall <esm at logic.net> - 0.5.2b-1
+- Updated to 0.5.2b release.
+
+* Thu Feb 17 2011 Ed Marshall <esm at logic.net> - 0.5.1b-3
+- Add patch to remove auto-update feature.
+
+* Tue Feb 15 2011 Ed Marshall <esm at logic.net> - 0.5.1b-2
+- Fixed hard-coded path to qtlockedfile qmake project file (fixes x86_64).
+
+* Tue Feb 15 2011 Ed Marshall <esm at logic.net> - 0.5.1b-1
+- Updated to 0.5.1b release
+- Don't manually strip resulting executables
+- Don't bundle third-party libraries; use Fedora-provided libs
+- Provide CXXFLAGS to qmake
+- Updated summary to be a little closer to the Fritzing tagline
+
+* Mon Feb 14 2011 Ed Marshall <esm at logic.net> - 0.5.0b-1
+- Updated to latest release
+- zlib patch included upstream, removed from RPM
+
+* Mon Dec 6 2010 Ed Marshall <esm at logic.net> - 0.4.3b-1
+- Updated to latest release
+- Added desktop file, and install icon
+- Include man page (from Debian)
+- Patch to set application folder location to /usr/share/fritzing, instead of
+ being relative to the binary directory (from Debian)
+
+* Tue Jul 7 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.5b-1
+- initial package for Fedora
diff --git a/sources b/sources
index e69de29..a2254a3 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cbc4cebe442a9eb18a3c13328964d97a fritzing-0.6.4b.source.tar.bz2
More information about the scm-commits
mailing list