diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-util/valkyrie/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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 |