| 1 |
idl0r 13/01/28 22:58:53 |
| 2 |
|
| 3 |
Added: fritzing-0.7.11b-no_bundled_quazip.patch |
| 4 |
Removed: no-bundled-quazip.patch |
| 5 |
Log: |
| 6 |
Version bump, bug 454168 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key B427ABC8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/fritzing/files/fritzing-0.7.11b-no_bundled_quazip.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: fritzing-0.7.11b-no_bundled_quazip.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/phoenix.pro b/phoenix.pro |
| 19 |
index 8232c54..241eb61 100644 |
| 20 |
--- a/phoenix.pro |
| 21 |
+++ b/phoenix.pro |
| 22 |
@@ -115,7 +115,6 @@ RC_FILE = fritzing.rc |
| 23 |
RESOURCES += phoenixresources.qrc |
| 24 |
include(pri/kitchensink.pri) |
| 25 |
include(pri/mainwindow.pri) |
| 26 |
- include(pri/quazip.pri) |
| 27 |
include(pri/partsbinpalette.pri) |
| 28 |
include(pri/partseditor.pri) |
| 29 |
include(pri/referencemodel.pri) |
| 30 |
diff --git a/pri/utils.pri b/pri/utils.pri |
| 31 |
index 94f18c1..ab0de4f 100644 |
| 32 |
--- a/pri/utils.pri |
| 33 |
+++ b/pri/utils.pri |
| 34 |
@@ -68,4 +68,4 @@ src/utils/textutils.cpp \ |
| 35 |
src/utils/zoomslider.cpp |
| 36 |
|
| 37 |
|
| 38 |
- |
| 39 |
+LIBS += -lquazip |
| 40 |
diff --git a/src/autoroute/panelizer.cpp b/src/autoroute/panelizer.cpp |
| 41 |
index 38db81a..9bdeb2f 100644 |
| 42 |
--- a/src/autoroute/panelizer.cpp |
| 43 |
+++ b/src/autoroute/panelizer.cpp |
| 44 |
@@ -25,22 +25,22 @@ $Date: 2013/01/28 22:58:53 $ |
| 45 |
********************************************************************/ |
| 46 |
|
| 47 |
#include "panelizer.h" |
| 48 |
-#include "../../debugdialog.h" |
| 49 |
-#include "../../sketch/pcbsketchwidget.h" |
| 50 |
-#include "../../utils/textutils.h" |
| 51 |
-#include "../../utils/graphicsutils.h" |
| 52 |
-#include "../../utils/folderutils.h" |
| 53 |
-#include "../../utils/folderutils.h" |
| 54 |
-#include "../../items/resizableboard.h" |
| 55 |
-#include "../../items/logoitem.h" |
| 56 |
-#include "../../items/groundplane.h" |
| 57 |
-#include "../../fsvgrenderer.h" |
| 58 |
-#include "../../fapplication.h" |
| 59 |
-#include "../../svg/gerbergenerator.h" |
| 60 |
-#include "../../referencemodel/referencemodel.h" |
| 61 |
-#include "../../version/version.h" |
| 62 |
-#include "../../processeventblocker.h" |
| 63 |
-#include "../../connectors/connectoritem.h" |
| 64 |
+#include "../debugdialog.h" |
| 65 |
+#include "../sketch/pcbsketchwidget.h" |
| 66 |
+#include "../utils/textutils.h" |
| 67 |
+#include "../utils/graphicsutils.h" |
| 68 |
+#include "../utils/folderutils.h" |
| 69 |
+#include "../utils/folderutils.h" |
| 70 |
+#include "../items/resizableboard.h" |
| 71 |
+#include "../items/logoitem.h" |
| 72 |
+#include "../items/groundplane.h" |
| 73 |
+#include "../fsvgrenderer.h" |
| 74 |
+#include "../fapplication.h" |
| 75 |
+#include "../svg/gerbergenerator.h" |
| 76 |
+#include "../referencemodel/referencemodel.h" |
| 77 |
+#include "../version/version.h" |
| 78 |
+#include "../processeventblocker.h" |
| 79 |
+#include "../connectors/connectoritem.h" |
| 80 |
|
| 81 |
#include "cmrouter/tileutils.h" |
| 82 |
|
| 83 |
diff --git a/src/autoroute/panelizer.h b/src/autoroute/panelizer.h |
| 84 |
index a21dbf2..f6f36a4 100644 |
| 85 |
--- a/src/autoroute/panelizer.h |
| 86 |
+++ b/src/autoroute/panelizer.h |
| 87 |
@@ -30,8 +30,8 @@ $Date: 2013/01/28 22:58:53 $ |
| 88 |
#include <QString> |
| 89 |
#include <QSizeF> |
| 90 |
|
| 91 |
-#include "../../mainwindow/mainwindow.h" |
| 92 |
-#include "../../items/itembase.h" |
| 93 |
+#include "../mainwindow/mainwindow.h" |
| 94 |
+#include "../items/itembase.h" |
| 95 |
#include "cmrouter/tile.h" |
| 96 |
|
| 97 |
|
| 98 |
diff --git a/src/utils/folderutils.cpp b/src/utils/folderutils.cpp |
| 99 |
index bba0b9e..a84da8f 100644 |
| 100 |
--- a/src/utils/folderutils.cpp |
| 101 |
+++ b/src/utils/folderutils.cpp |
| 102 |
@@ -34,8 +34,8 @@ $Date: 2013/01/28 22:58:53 $ |
| 103 |
#include <QCryptographicHash> |
| 104 |
|
| 105 |
#include "../debugdialog.h" |
| 106 |
-#include "../lib/quazip/quazip.h" |
| 107 |
-#include "../lib/quazip/quazipfile.h" |
| 108 |
+#include <quazip/quazip.h> |
| 109 |
+#include <quazip/quazipfile.h> |
| 110 |
#include "../lib/qtsysteminfo/QtSystemInfo.h" |
| 111 |
|
| 112 |
|
| 113 |
@@ -552,4 +552,4 @@ void FolderUtils::copyBin(const QString & dest, const QString & source) { |
| 114 |
#endif |
| 115 |
|
| 116 |
); |
| 117 |
-} |
| 118 |
\ No newline at end of file |
| 119 |
+} |
Archives