diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:05:25 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-02-02 10:05:25 +0100 |
commit | 6e2d3b98473523672b06ff5c90b5b387a029e566 (patch) | |
tree | 4f53d0adf17553b40031d35fae3e6f263933fd93 /pkgs/tools/security/vidalia/gcc-4.7.patch | |
parent | fcaa782b6ab7cd18b8ccca82cc6615b0b3c36b18 (diff) | |
parent | 14a6a059f5863bfd9e7c69336baa8a918b41a86a (diff) | |
download | nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.gz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.bz2 nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.lz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.xz nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.tar.zst nixpkgs-6e2d3b98473523672b06ff5c90b5b387a029e566.zip |
Merge master into x-updates
Diffstat (limited to 'pkgs/tools/security/vidalia/gcc-4.7.patch')
-rw-r--r-- | pkgs/tools/security/vidalia/gcc-4.7.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch new file mode 100644 index 00000000000..4c163af760c --- /dev/null +++ b/pkgs/tools/security/vidalia/gcc-4.7.patch @@ -0,0 +1,12 @@ +diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp +--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp 2012-08-08 18:02:01.901732270 +0200 ++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp 2012-08-08 18:03:26.241677875 +0200 +@@ -20,6 +20,8 @@ + + #include "Vidalia.h" + ++#include <unistd.h> ++ + PluginEngine::PluginEngine(QObject *parent) + : QScriptEngine(parent) + { |