diff -ur fritzing-0.7.0b.source.orig/phoenix.pro fritzing-0.7.0b.source/phoenix.pro --- fritzing-0.7.0b.source.orig/phoenix.pro 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/phoenix.pro 2012-02-03 17:46:14.021572371 -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) @@ -133,3 +132,5 @@ TEMPLATE = app +INCLUDEPATH += /usr/include/quazip /usr/include/minizip +LIBS += -lquazip -lminizip diff -ur fritzing-0.7.0b.source.orig/pri/utils.pri fritzing-0.7.0b.source/pri/utils.pri --- fritzing-0.7.0b.source.orig/pri/utils.pri 2012-02-03 12:19:29.000000000 -0800 +++ fritzing-0.7.0b.source/pri/utils.pri 2012-02-03 17:46:55.061256221 -0800 @@ -17,7 +17,6 @@ # $Date: 2012-02-01 10:30:37 +0100 (Wed, 01 Feb 2012) $ # ********************************************************************/ -INCLUDEPATH += src/lib/boost_1_43_0 HEADERS += \ src/utils/abstractimagebutton.h \ diff -ur fritzing-0.7.0b.source.orig/src/utils/folderutils.cpp fritzing-0.7.0b.source/src/utils/folderutils.cpp --- fritzing-0.7.0b.source.orig/src/utils/folderutils.cpp 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/src/utils/folderutils.cpp 2012-02-03 17:47:49.573507791 -0800 @@ -34,8 +34,8 @@ #include <QCryptographicHash> #include "../debugdialog.h" -#include "../lib/quazip/quazip.h" -#include "../lib/quazip/quazipfile.h" +#include <quazip/quazip.h> +#include <quazip/quazipfile.h> #include "../lib/qtsysteminfo/QtSystemInfo.h" diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_ar.ts fritzing-0.7.0b.source/translations/fritzing_ar.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_ar.ts 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_ar.ts 2012-02-03 17:49:27.432565826 -0800 @@ -5596,14 +5596,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_bg.ts fritzing-0.7.0b.source/translations/fritzing_bg.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_bg.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_bg.ts 2012-02-03 17:49:32.909390344 -0800 @@ -5560,14 +5560,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_cs.ts fritzing-0.7.0b.source/translations/fritzing_cs.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_cs.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_cs.ts 2012-02-03 17:49:37.322248960 -0800 @@ -5617,14 +5617,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation>ZIP/UNZIP API chyba %1</translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_de.ts fritzing-0.7.0b.source/translations/fritzing_de.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_de.ts 2012-02-03 17:51:50.163992903 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_de.ts 2012-02-03 17:49:41.881102837 -0800 @@ -5599,14 +5599,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation>ZIP/UNZIP API-Fehler %1</translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_el.ts fritzing-0.7.0b.source/translations/fritzing_el.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_el.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_el.ts 2012-02-03 17:49:46.887942173 -0800 @@ -5560,14 +5560,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_en.ts fritzing-0.7.0b.source/translations/fritzing_en.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_en.ts 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_en.ts 2012-02-03 17:49:51.288801491 -0800 @@ -5564,14 +5564,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_es.ts fritzing-0.7.0b.source/translations/fritzing_es.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_es.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_es.ts 2012-02-03 17:49:56.983619058 -0800 @@ -5595,14 +5595,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation>Error en la API ZIP/UNZIP %1</translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_et.ts fritzing-0.7.0b.source/translations/fritzing_et.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_et.ts 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_et.ts 2012-02-03 17:50:01.539473087 -0800 @@ -5560,14 +5560,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_fr.ts fritzing-0.7.0b.source/translations/fritzing_fr.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_fr.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_fr.ts 2012-02-03 17:50:05.864334500 -0800 @@ -5576,14 +5576,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation>ZIP/UNZIP erreur d'API %1</translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_gl.ts fritzing-0.7.0b.source/translations/fritzing_gl.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_gl.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_gl.ts 2012-02-03 17:50:10.364190355 -0800 @@ -5560,14 +5560,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_hi.ts fritzing-0.7.0b.source/translations/fritzing_hi.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_hi.ts 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_hi.ts 2012-02-03 17:50:14.829047268 -0800 @@ -5560,14 +5560,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_hu.ts fritzing-0.7.0b.source/translations/fritzing_hu.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_hu.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_hu.ts 2012-02-03 17:50:19.585895025 -0800 @@ -5551,14 +5551,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_ko.ts fritzing-0.7.0b.source/translations/fritzing_ko.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_ko.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_ko.ts 2012-02-03 17:50:32.138492731 -0800 @@ -5604,14 +5604,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation>ZIP/UNZIP API 에러 %1</translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_pl.ts fritzing-0.7.0b.source/translations/fritzing_pl.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_pl.ts 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_pl.ts 2012-02-03 17:50:38.441290838 -0800 @@ -5569,14 +5569,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_ro.ts fritzing-0.7.0b.source/translations/fritzing_ro.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_ro.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_ro.ts 2012-02-03 17:50:46.798022997 -0800 @@ -5569,14 +5569,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_sv.ts fritzing-0.7.0b.source/translations/fritzing_sv.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_sv.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_sv.ts 2012-02-03 17:51:03.179498547 -0800 @@ -5560,14 +5560,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_tr.ts fritzing-0.7.0b.source/translations/fritzing_tr.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_tr.ts 2012-02-03 12:19:35.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_tr.ts 2012-02-03 17:51:15.578101010 -0800 @@ -5551,14 +5551,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/> diff -ur fritzing-0.7.0b.source.orig/translations/fritzing_zh_tw.ts fritzing-0.7.0b.source/translations/fritzing_zh_tw.ts --- fritzing-0.7.0b.source.orig/translations/fritzing_zh_tw.ts 2012-02-03 12:19:36.000000000 -0800 +++ fritzing-0.7.0b.source/translations/fritzing_zh_tw.ts 2012-02-03 17:51:22.681873394 -0800 @@ -5584,14 +5584,6 @@ </message> </context> <context> - <name>QuaZipFile</name> - <message> - <location filename="../src/lib/quazip/quazipfile.cpp" line="141"/> - <source>ZIP/UNZIP API error %1</source> - <translation>壓縮/解壓縮 API 錯誤 %1</translation> - </message> -</context> -<context> <name>RecoveryDialog</name> <message> <location filename="../src/dialogs/recoverydialog.cpp" line="65"/>