| 1 |
alonbl 08/02/22 22:31:22 |
| 2 |
|
| 3 |
Modified: truecrypt-5.0-nogui.patch |
| 4 |
Log: |
| 5 |
Fix -X, bug#210485 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-crypt/truecrypt/files/truecrypt-5.0-nogui.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/truecrypt/files/truecrypt-5.0-nogui.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/truecrypt/files/truecrypt-5.0-nogui.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/truecrypt/files/truecrypt-5.0-nogui.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: truecrypt-5.0-nogui.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/files/truecrypt-5.0-nogui.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- truecrypt-5.0-nogui.patch 15 Feb 2008 08:40:38 -0000 1.1 |
| 22 |
+++ truecrypt-5.0-nogui.patch 22 Feb 2008 22:31:22 -0000 1.2 |
| 23 |
@@ -1,16 +1,6 @@ |
| 24 |
- |
| 25 |
-Disable requirement for X. |
| 26 |
- |
| 27 |
-Based on: |
| 28 |
-http://home.att.net/~Tom.Horsley/tah-tc-5.0.tar.gz |
| 29 |
- |
| 30 |
-Don't use internal wxUSE_GUI but force the state. |
| 31 |
- |
| 32 |
---- |
| 33 |
- |
| 34 |
-diff -urNp truecrypt-5.0a-source.base1/Main/Application.cpp truecrypt-5.0a-source.new1/Main/Application.cpp |
| 35 |
---- truecrypt-5.0a-source.base1/Main/Application.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 36 |
-+++ truecrypt-5.0a-source.new1/Main/Application.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 37 |
+diff -urNp truecrypt-5.0a-source/Main/Application.cpp truecrypt-5.0a-source.new/Main/Application.cpp |
| 38 |
+--- truecrypt-5.0a-source/Main/Application.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 39 |
++++ truecrypt-5.0a-source.new/Main/Application.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 40 |
@@ -22,11 +22,13 @@ namespace TrueCrypt |
| 41 |
return mUserInterface; |
| 42 |
} |
| 43 |
@@ -39,9 +29,9 @@ |
| 44 |
|
| 45 |
default: |
| 46 |
throw ParameterIncorrect (SRC_POS); |
| 47 |
-diff -urNp truecrypt-5.0a-source.base1/Main/FatalErrorHandler.cpp truecrypt-5.0a-source.new1/Main/FatalErrorHandler.cpp |
| 48 |
---- truecrypt-5.0a-source.base1/Main/FatalErrorHandler.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 49 |
-+++ truecrypt-5.0a-source.new1/Main/FatalErrorHandler.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 50 |
+diff -urNp truecrypt-5.0a-source/Main/FatalErrorHandler.cpp truecrypt-5.0a-source.new/Main/FatalErrorHandler.cpp |
| 51 |
+--- truecrypt-5.0a-source/Main/FatalErrorHandler.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 52 |
++++ truecrypt-5.0a-source.new/Main/FatalErrorHandler.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 53 |
@@ -90,6 +90,7 @@ namespace TrueCrypt |
| 54 |
|
| 55 |
#endif // wxUSE_STACKWALKER |
| 56 |
@@ -87,9 +77,9 @@ |
| 57 |
} |
| 58 |
|
| 59 |
_exit (1); |
| 60 |
-diff -urNp truecrypt-5.0a-source.base1/Main/GraphicUserInterface.cpp truecrypt-5.0a-source.new1/Main/GraphicUserInterface.cpp |
| 61 |
---- truecrypt-5.0a-source.base1/Main/GraphicUserInterface.cpp 2008-02-07 17:48:16.000000000 +0200 |
| 62 |
-+++ truecrypt-5.0a-source.new1/Main/GraphicUserInterface.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 63 |
+diff -urNp truecrypt-5.0a-source/Main/GraphicUserInterface.cpp truecrypt-5.0a-source.new/Main/GraphicUserInterface.cpp |
| 64 |
+--- truecrypt-5.0a-source/Main/GraphicUserInterface.cpp 2008-02-07 17:48:16.000000000 +0200 |
| 65 |
++++ truecrypt-5.0a-source.new/Main/GraphicUserInterface.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 66 |
@@ -19,6 +19,9 @@ |
| 67 |
#include "Application.h" |
| 68 |
#include "GraphicUserInterface.h" |
| 69 |
@@ -105,9 +95,9 @@ |
| 70 |
GraphicUserInterface *Gui = nullptr; |
| 71 |
} |
| 72 |
+#endif |
| 73 |
-diff -urNp truecrypt-5.0a-source.base1/Main/GraphicUserInterface.h truecrypt-5.0a-source.new1/Main/GraphicUserInterface.h |
| 74 |
---- truecrypt-5.0a-source.base1/Main/GraphicUserInterface.h 2008-02-05 19:56:46.000000000 +0200 |
| 75 |
-+++ truecrypt-5.0a-source.new1/Main/GraphicUserInterface.h 2008-02-15 09:42:18.000000000 +0200 |
| 76 |
+diff -urNp truecrypt-5.0a-source/Main/GraphicUserInterface.h truecrypt-5.0a-source.new/Main/GraphicUserInterface.h |
| 77 |
+--- truecrypt-5.0a-source/Main/GraphicUserInterface.h 2008-02-05 19:56:46.000000000 +0200 |
| 78 |
++++ truecrypt-5.0a-source.new/Main/GraphicUserInterface.h 2008-02-23 00:18:40.000000000 +0200 |
| 79 |
@@ -14,6 +14,7 @@ |
| 80 |
#include "Main.h" |
| 81 |
#include "UserInterface.h" |
| 82 |
@@ -123,9 +113,9 @@ |
| 83 |
+#endif |
| 84 |
|
| 85 |
#endif // TC_HEADER_Main_GraphicUserInterface |
| 86 |
-diff -urNp truecrypt-5.0a-source.base1/Main/Main.make truecrypt-5.0a-source.new1/Main/Main.make |
| 87 |
---- truecrypt-5.0a-source.base1/Main/Main.make 2008-02-15 09:25:30.000000000 +0200 |
| 88 |
-+++ truecrypt-5.0a-source.new1/Main/Main.make 2008-02-15 09:42:18.000000000 +0200 |
| 89 |
+diff -urNp truecrypt-5.0a-source/Main/Main.make truecrypt-5.0a-source.new/Main/Main.make |
| 90 |
+--- truecrypt-5.0a-source/Main/Main.make 2008-02-22 19:05:05.000000000 +0200 |
| 91 |
++++ truecrypt-5.0a-source.new/Main/Main.make 2008-02-23 00:19:04.000000000 +0200 |
| 92 |
@@ -21,6 +21,7 @@ OBJS += UserPreferences.o |
| 93 |
OBJS += VolumeHistory.o |
| 94 |
OBJS += Xml.o |
| 95 |
@@ -142,33 +132,24 @@ |
| 96 |
OBJS += Resources.o |
| 97 |
|
| 98 |
PCH := SystemPrecompiled.h.gch |
| 99 |
-@@ -67,15 +69,21 @@ WX_CONFIG_EXTRA ?= --static |
| 100 |
- |
| 101 |
- #------ wxWidgets configuration ------ |
| 102 |
- |
| 103 |
-+ifeq "$(TC_BUILD_GUI)" "True" |
| 104 |
-+WX_ASK_LIBS=adv,core,base |
| 105 |
-+else |
| 106 |
-+WX_ASK_LIBS=core,base |
| 107 |
-+endif |
| 108 |
-+ |
| 109 |
+@@ -70,12 +72,12 @@ WX_CONFIG_EXTRA ?= --static |
| 110 |
ifeq "$(TC_BUILD_CONFIG)" "Release" |
| 111 |
|
| 112 |
CXXFLAGS += $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --cxxflags) |
| 113 |
-WX_LIBS = $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --libs adv,core,base) |
| 114 |
-+WX_LIBS = $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --libs $(WX_ASK_LIBS)) |
| 115 |
++WX_LIBS = $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --libs) |
| 116 |
|
| 117 |
else |
| 118 |
|
| 119 |
CXXFLAGS += $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --debug --cxxflags) |
| 120 |
-WX_LIBS = $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --debug --libs adv,core,base) |
| 121 |
-+WX_LIBS = $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --debug --libs $(WX_ASK_LIBS)) |
| 122 |
++WX_LIBS = $(shell $(WX_CONFIG) $(WX_CONFIG_EXTRA) --debug --libs) |
| 123 |
|
| 124 |
endif |
| 125 |
|
| 126 |
-diff -urNp truecrypt-5.0a-source.base1/Main/Resources.cpp truecrypt-5.0a-source.new1/Main/Resources.cpp |
| 127 |
---- truecrypt-5.0a-source.base1/Main/Resources.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 128 |
-+++ truecrypt-5.0a-source.new1/Main/Resources.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 129 |
+diff -urNp truecrypt-5.0a-source/Main/Resources.cpp truecrypt-5.0a-source.new/Main/Resources.cpp |
| 130 |
+--- truecrypt-5.0a-source/Main/Resources.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 131 |
++++ truecrypt-5.0a-source.new/Main/Resources.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 132 |
@@ -35,6 +35,7 @@ namespace TrueCrypt |
| 133 |
} |
| 134 |
#endif // TC_WINDOWS |
| 135 |
@@ -199,9 +180,9 @@ |
| 136 |
} |
| 137 |
+#endif |
| 138 |
} |
| 139 |
-diff -urNp truecrypt-5.0a-source.base1/Main/Resources.h truecrypt-5.0a-source.new1/Main/Resources.h |
| 140 |
---- truecrypt-5.0a-source.base1/Main/Resources.h 2008-02-04 13:14:14.000000000 +0200 |
| 141 |
-+++ truecrypt-5.0a-source.new1/Main/Resources.h 2008-02-15 09:42:18.000000000 +0200 |
| 142 |
+diff -urNp truecrypt-5.0a-source/Main/Resources.h truecrypt-5.0a-source.new/Main/Resources.h |
| 143 |
+--- truecrypt-5.0a-source/Main/Resources.h 2008-02-04 13:14:14.000000000 +0200 |
| 144 |
++++ truecrypt-5.0a-source.new/Main/Resources.h 2008-02-23 00:18:40.000000000 +0200 |
| 145 |
@@ -17,14 +17,18 @@ namespace TrueCrypt |
| 146 |
class Resources |
| 147 |
{ |
| 148 |
@@ -221,22 +202,37 @@ |
| 149 |
|
| 150 |
protected: |
| 151 |
}; |
| 152 |
-diff -urNp truecrypt-5.0a-source.base1/Main/SystemPrecompiled.h truecrypt-5.0a-source.new1/Main/SystemPrecompiled.h |
| 153 |
---- truecrypt-5.0a-source.base1/Main/SystemPrecompiled.h 2008-02-04 13:22:08.000000000 +0200 |
| 154 |
-+++ truecrypt-5.0a-source.new1/Main/SystemPrecompiled.h 2008-02-15 09:42:18.000000000 +0200 |
| 155 |
-@@ -9,7 +9,9 @@ |
| 156 |
+diff -urNp truecrypt-5.0a-source/Main/SystemPrecompiled.h truecrypt-5.0a-source.new/Main/SystemPrecompiled.h |
| 157 |
+--- truecrypt-5.0a-source/Main/SystemPrecompiled.h 2008-02-04 13:22:08.000000000 +0200 |
| 158 |
++++ truecrypt-5.0a-source.new/Main/SystemPrecompiled.h 2008-02-23 00:18:40.000000000 +0200 |
| 159 |
+@@ -7,16 +7,24 @@ |
| 160 |
+ */ |
| 161 |
+ |
| 162 |
#include <wx/wx.h> |
| 163 |
++#ifdef ENABLE_wxGUI |
| 164 |
#include <wx/dnd.h> |
| 165 |
++#endif |
| 166 |
#include <wx/filename.h> |
| 167 |
+#ifdef ENABLE_wxGUI |
| 168 |
#include <wx/imaglist.h> |
| 169 |
-+#endif |
| 170 |
#include <wx/listctrl.h> |
| 171 |
++#endif |
| 172 |
#include <wx/mstream.h> |
| 173 |
#include <wx/power.h> |
| 174 |
-diff -urNp truecrypt-5.0a-source.base1/Main/TextUserInterface.cpp truecrypt-5.0a-source.new1/Main/TextUserInterface.cpp |
| 175 |
---- truecrypt-5.0a-source.base1/Main/TextUserInterface.cpp 2008-02-04 18:38:04.000000000 +0200 |
| 176 |
-+++ truecrypt-5.0a-source.new1/Main/TextUserInterface.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 177 |
+ #include <wx/snglinst.h> |
| 178 |
++#ifdef ENABLE_wxGUI |
| 179 |
+ #include <wx/taskbar.h> |
| 180 |
++#endif |
| 181 |
+ #include <wx/txtstrm.h> |
| 182 |
++#ifdef ENABLE_wxGUI |
| 183 |
+ #include <wx/valgen.h> |
| 184 |
++#endif |
| 185 |
+ #include <wx/wfstream.h> |
| 186 |
+ |
| 187 |
+ #include <iostream> |
| 188 |
+diff -urNp truecrypt-5.0a-source/Main/TextUserInterface.cpp truecrypt-5.0a-source.new/Main/TextUserInterface.cpp |
| 189 |
+--- truecrypt-5.0a-source/Main/TextUserInterface.cpp 2008-02-04 18:38:04.000000000 +0200 |
| 190 |
++++ truecrypt-5.0a-source.new/Main/TextUserInterface.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 191 |
@@ -423,8 +423,9 @@ namespace TrueCrypt |
| 192 |
|
| 193 |
InterfaceType = UserInterfaceType::Text; |
| 194 |
@@ -248,9 +244,9 @@ |
| 195 |
} |
| 196 |
catch (exception &e) |
| 197 |
{ |
| 198 |
-diff -urNp truecrypt-5.0a-source.base1/Main/Unix/Main.cpp truecrypt-5.0a-source.new1/Main/Unix/Main.cpp |
| 199 |
---- truecrypt-5.0a-source.base1/Main/Unix/Main.cpp 2008-02-12 22:21:58.000000000 +0200 |
| 200 |
-+++ truecrypt-5.0a-source.new1/Main/Unix/Main.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 201 |
+diff -urNp truecrypt-5.0a-source/Main/Unix/Main.cpp truecrypt-5.0a-source.new/Main/Unix/Main.cpp |
| 202 |
+--- truecrypt-5.0a-source/Main/Unix/Main.cpp 2008-02-12 22:21:58.000000000 +0200 |
| 203 |
++++ truecrypt-5.0a-source.new/Main/Unix/Main.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 204 |
@@ -59,6 +59,9 @@ int main (int argc, char **argv) |
| 205 |
if (!getenv ("DISPLAY")) |
| 206 |
forceTextUI = true; |
| 207 |
@@ -261,9 +257,9 @@ |
| 208 |
|
| 209 |
// Set user interface type |
| 210 |
if (forceTextUI || (argc > 1 && (strcmp (argv[1], "-t") == 0 || strcmp (argv[1], "--text") == 0))) |
| 211 |
-diff -urNp truecrypt-5.0a-source.base1/Main/UserInterface.cpp truecrypt-5.0a-source.new1/Main/UserInterface.cpp |
| 212 |
---- truecrypt-5.0a-source.base1/Main/UserInterface.cpp 2008-02-12 22:28:34.000000000 +0200 |
| 213 |
-+++ truecrypt-5.0a-source.new1/Main/UserInterface.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 214 |
+diff -urNp truecrypt-5.0a-source/Main/UserInterface.cpp truecrypt-5.0a-source.new/Main/UserInterface.cpp |
| 215 |
+--- truecrypt-5.0a-source/Main/UserInterface.cpp 2008-02-12 22:28:34.000000000 +0200 |
| 216 |
++++ truecrypt-5.0a-source.new/Main/UserInterface.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 217 |
@@ -302,8 +302,10 @@ namespace TrueCrypt |
| 218 |
{ |
| 219 |
wxString message = ExceptionTypeToString (typeid (ex)); |
| 220 |
@@ -275,9 +271,9 @@ |
| 221 |
|
| 222 |
return message; |
| 223 |
} |
| 224 |
-diff -urNp truecrypt-5.0a-source.base1/Main/VolumeHistory.cpp truecrypt-5.0a-source.new1/Main/VolumeHistory.cpp |
| 225 |
---- truecrypt-5.0a-source.base1/Main/VolumeHistory.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 226 |
-+++ truecrypt-5.0a-source.new1/Main/VolumeHistory.cpp 2008-02-15 09:42:18.000000000 +0200 |
| 227 |
+diff -urNp truecrypt-5.0a-source/Main/VolumeHistory.cpp truecrypt-5.0a-source.new/Main/VolumeHistory.cpp |
| 228 |
+--- truecrypt-5.0a-source/Main/VolumeHistory.cpp 2008-02-04 13:14:16.000000000 +0200 |
| 229 |
++++ truecrypt-5.0a-source.new/Main/VolumeHistory.cpp 2008-02-23 00:18:40.000000000 +0200 |
| 230 |
@@ -10,6 +10,9 @@ |
| 231 |
#include "Application.h" |
| 232 |
#include "GraphicUserInterface.h" |
| 233 |
@@ -294,9 +290,9 @@ |
| 234 |
} |
| 235 |
+ |
| 236 |
+#endif |
| 237 |
-diff -urNp truecrypt-5.0a-source.base1/Makefile truecrypt-5.0a-source.new1/Makefile |
| 238 |
---- truecrypt-5.0a-source.base1/Makefile 2008-02-04 20:19:02.000000000 +0200 |
| 239 |
-+++ truecrypt-5.0a-source.new1/Makefile 2008-02-15 09:47:23.000000000 +0200 |
| 240 |
+diff -urNp truecrypt-5.0a-source/Makefile truecrypt-5.0a-source.new/Makefile |
| 241 |
+--- truecrypt-5.0a-source/Makefile 2008-02-22 19:05:05.000000000 +0200 |
| 242 |
++++ truecrypt-5.0a-source.new/Makefile 2008-02-23 00:18:40.000000000 +0200 |
| 243 |
@@ -11,6 +11,7 @@ |
| 244 |
# DEBUGGER: Enable debugging information for use by debuggers |
| 245 |
# NOSTRIP: Do not strip release binaries |
| 246 |
@@ -317,7 +313,7 @@ |
| 247 |
|
| 248 |
#------ Build configuration ------ |
| 249 |
|
| 250 |
-@@ -145,6 +151,9 @@ C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_F |
| 251 |
+@@ -150,6 +156,9 @@ C_CXX_FLAGS += -DTC_UNIX -DTC_BSD -DTC_F |
| 252 |
|
| 253 |
endif |
| 254 |
|
| 255 |
@@ -327,7 +323,7 @@ |
| 256 |
|
| 257 |
CFLAGS := $(C_CXX_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) |
| 258 |
CXXFLAGS := $(C_CXX_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) |
| 259 |
-@@ -189,6 +198,12 @@ CXXFLAGS := |
| 260 |
+@@ -194,6 +203,12 @@ CXXFLAGS := |
| 261 |
LFLAGS := |
| 262 |
endif |
| 263 |
|
| 264 |
@@ -340,7 +336,7 @@ |
| 265 |
wxbuild: |
| 266 |
|
| 267 |
ifneq "$(shell test -f $(WX_ROOT)/configure || test -f $(WX_BUILD_DIR)/../configure && echo 1)" "1" |
| 268 |
-@@ -198,7 +213,7 @@ endif |
| 269 |
+@@ -203,7 +218,7 @@ endif |
| 270 |
|
| 271 |
mkdir -p $(WX_BUILD_DIR) |
| 272 |
@echo Configuring wxWidgets library... |
| 273 |
|
| 274 |
|
| 275 |
|
| 276 |
-- |
| 277 |
gentoo-commits@l.g.o mailing list |
Archives