diff options
Diffstat (limited to 'dev-util/valkyrie/files')
| -rw-r--r-- | dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch | 37 | ||||
| -rw-r--r-- | dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch | 11 |
2 files changed, 48 insertions, 0 deletions
diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch new file mode 100644 index 000000000000..d2d33166a85c --- /dev/null +++ b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch @@ -0,0 +1,37 @@ +Fix building with gcc-4.7 + +https://bugs.gentoo.org/show_bug.cgi?id=421867 + +Patch written by LE GARREC Vincent <legarrec.vincent@gmail.com> +--- a/src/objects/tool_object.cpp ++++ b/src/objects/tool_object.cpp +@@ -50,6 +50,7 @@ stopProcess() + #include <QKeySequence> + #include <QString> + #include <QStringList> ++#include <unistd.h> // usleep + + + #if 1 +--- a/src/utils/vk_config.cpp ++++ b/src/utils/vk_config.cpp +@@ -25,6 +25,8 @@ + #include "utils/vk_utils.h" + + #include <pwd.h> // getpwuid ++#include <sys/types.h> // getuid ++#include <unistd.h> // getuid + + #include <QColor> + #include <QDir> +--- a/src/utils/vk_utils.cpp ++++ b/src/utils/vk_utils.cpp +@@ -22,6 +22,8 @@ + #include "utils/vk_config.h" // vkname() + + #include <cstdlib> // exit, mkstemp, free/malloc, etc ++#include <sys/types.h> // getpid ++#include <unistd.h> // getpid + + #include <QDateTime> + #include <QFile> diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch new file mode 100644 index 000000000000..2f18491e8f81 --- /dev/null +++ b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch @@ -0,0 +1,11 @@ +--- valkyrie-2.0.0/vk_config.pri ++++ valkyrie-2.0.0/vk_config.pri +@@ -14,7 +14,7 @@ + # Set a default value for PREFIX (etc) in the generated makefiles + # Note: ignore INSTALL_ROOT: it's a qt special, can't be set from here + isEmpty(PREFIX) { +- PREFIX = /usr/local ++ PREFIX = /usr + } + isEmpty(BINDIR) { + BINDIR = $$PREFIX/bin |