1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
diff -Nur p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile
--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 13:41:43.000000000 -0200
+++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2014-05-03 11:19:47.618563272 -0300
@@ -158,14 +158,6 @@
NsisIn.o \
NsisRegister.o \
-RAR_OBJS = \
- RarHandler.o \
- RarHeader.o \
- RarIn.o \
- RarItem.o \
- RarVolumeInStream.o \
- RarRegister.o \
-
TAR_OBJS = \
TarHandler.o \
TarHandlerOut.o \
@@ -243,13 +235,6 @@
ZlibEncoder.o \
ZDecoder.o \
-COMPRESS_OBJS_NON_FREE = \
- Rar1Decoder.o \
- Rar2Decoder.o \
- Rar3Decoder.o \
- Rar3Vm.o \
- RarCodecsRegister.o \
-
CRYPTO_OBJS = \
7zAes.o \
7zAesRegister.o \
@@ -257,8 +242,6 @@
MyAes.o \
Pbkdf2HmacSha1.o \
RandGen.o \
- Rar20Crypto.o \
- RarAes.o \
Sha1.o \
WzAes.o \
ZipCrypto.o \
diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp
--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp 2010-11-07 13:55:36.000000000 -0200
+++ p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp 2014-05-03 11:28:17.542065931 -0300
@@ -774,8 +774,6 @@
/////////////////////////////////////////////////////
-#include "res/ParentFolder.h"
-
SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) :
wxPanel(parent,id) , m_frame(frame), _wList(0)
{
@@ -793,7 +791,7 @@
int sizes[] = {150, 250, 350, -1};
wxArrayString pathArray;
wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL);
- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT );
pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend
--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend 2011-02-19 07:33:17.000000000 -0200
+++ p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend 2014-05-03 11:28:17.545399286 -0300
@@ -714,7 +714,7 @@
res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \
res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \
../../../Common/MyString.h ../../../Windows/ResourceString.h \
- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h
+ /usr/include/wx-2.8/wx/mstream.h
OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \
../../../myWindows/config.h ../../../Common/MyWindows.h \
../../../Common/MyGuidDef.h ../../../Common/Types.h \
diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile
--- p7zip_9.20.1.orig/makefile 2011-03-13 08:52:45.000000000 -0300
+++ p7zip_9.20.1/makefile 2014-05-03 11:19:47.618563272 -0300
@@ -56,7 +56,6 @@
$(MAKE) -C CPP/7zip/UI/Client7z depend
$(MAKE) -C CPP/7zip/UI/Console depend
$(MAKE) -C CPP/7zip/Bundles/Format7zFree depend
- $(MAKE) -C CPP/7zip/Compress/Rar depend
$(MAKE) -C CPP/7zip/UI/GUI depend
$(MAKE) -C CPP/7zip/UI/FileManager depend
$(MAKE) -C check/my_86_filter depend
@@ -68,7 +67,6 @@
common7z:common
$(MKDIR) bin/Codecs
$(MAKE) -C CPP/7zip/Bundles/Format7zFree all
- $(MAKE) -C CPP/7zip/Compress/Rar all
7z: common7z
$(MAKE) -C CPP/7zip/UI/Console all
@@ -93,7 +91,6 @@
$(MAKE) -C CPP/7zip/UI/FileManager clean
$(MAKE) -C CPP/7zip/UI/GUI clean
$(MAKE) -C CPP/7zip/Bundles/Format7zFree clean
- $(MAKE) -C CPP/7zip/Compress/Rar clean
$(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean
$(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean
$(MAKE) -C CPP/7zip/TEST/TestUI clean
diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake
--- p7zip_9.20.1.orig/makefile.oldmake 2011-03-13 08:53:08.000000000 -0300
+++ p7zip_9.20.1/makefile.oldmake 2014-05-03 11:19:47.618563272 -0300
@@ -56,7 +56,6 @@
cd CPP/7zip/UI/Client7z ; $(MAKE) depend
cd CPP/7zip/UI/Console ; $(MAKE) depend
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
- cd CPP/7zip/Compress/Rar ; $(MAKE) depend
cd CPP/7zip/UI/GUI ; $(MAKE) depend
cd CPP/7zip/UI/FileManager ; $(MAKE) depend
cd check/my_86_filter ; $(MAKE) depend
@@ -68,7 +67,6 @@
common7z:common
$(MKDIR) bin/Codecs
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
- cd CPP/7zip/Compress/Rar ; $(MAKE) all
7z: common7z
cd CPP/7zip/UI/Console ; $(MAKE) all
@@ -93,7 +91,6 @@
cd CPP/7zip/UI/FileManager ; $(MAKE) clean
cd CPP/7zip/UI/GUI ; $(MAKE) clean
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
- cd CPP/7zip/Compress/Rar ; $(MAKE) clean
cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean
cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean
cd CPP/7zip/TEST/TestUI ; $(MAKE) clean
diff -Nur p7zip_9.20.1.orig/makefile.qnx_shared.so p7zip_9.20.1/makefile.qnx_shared.so
--- p7zip_9.20.1.orig/makefile.qnx_shared.so 2007-06-28 04:34:14.000000000 -0300
+++ p7zip_9.20.1/makefile.qnx_shared.so 2014-05-03 11:19:47.618563272 -0300
@@ -1,5 +1,4 @@
###################################################
-# makefile.machine for "7z.so , Codecs/Rar29.so" :
# tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
OPTFLAGS=-O
diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules
--- p7zip_9.20.1.orig/makefile.rules 2010-11-07 14:08:51.000000000 -0200
+++ p7zip_9.20.1/makefile.rules 2014-05-03 11:19:47.621896630 -0300
@@ -448,18 +448,6 @@
NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp
$(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp
-RarHandler.o : ../../Archive/Rar/RarHandler.cpp
- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp
-RarHeader.o : ../../Archive/Rar/RarHeader.cpp
- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp
-RarIn.o : ../../Archive/Rar/RarIn.cpp
- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp
-RarItem.o : ../../Archive/Rar/RarItem.cpp
- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp
-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp
- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp
-RarRegister.o : ../../Archive/Rar/RarRegister.cpp
- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp
UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp
$(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp
@@ -535,10 +523,6 @@
$(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp
WzAes.o : ../../Crypto/WzAes.cpp
$(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp
-Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp
- $(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp
-RarAes.o : ../../Crypto/RarAes.cpp
- $(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp
HmacSha1.o : ../../Crypto/HmacSha1.cpp
$(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp
Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp
|
