-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This is a re-merge, in fact. Now the first parent is master as of right before the "first merge" (ac6761c). A few commits pushed in-between into master now look like coming from stdenv-updates, but otherwise this seems to fix the situation. Cf. 320209a#commitcomment-5125991
- Loading branch information
Showing
200 changed files
with
2,782 additions
and
2,706 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,11 @@ | |||
--- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 | |||
+++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 | |||
@@ -239,7 +239,7 @@ | |||
private: | |||
GtkWidget *tool_toolbox; | |||
GtkWidget *aux_toolbox; | |||
- GtkWidget *commands_toolbox,; | |||
+ GtkWidget *commands_toolbox; | |||
GtkWidget *snap_toolbox; | |||
|
|||
static void init(SPDesktopWidget *widget); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,40 @@ | |||
From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001 | |||
From: Michael Palimaka <kensington@gentoo.org> | |||
Date: Fri, 20 Jul 2012 03:27:38 +1000 | |||
Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes. | |||
|
|||
--- | |||
processwrapper.cc | 4 ++++ | |||
qtsingleapplication/src/qtlocalpeer.cpp | 1 + | |||
2 files changed, 5 insertions(+) | |||
|
|||
diff --git processwrapper.cc processwrapper.cc | |||
index f7f3f19..86b985d 100644 | |||
--- processwrapper.cc | |||
+++ processwrapper.cc | |||
@@ -2,6 +2,10 @@ | |||
|
|||
#include <QtCore> | |||
|
|||
+#if defined(Q_OS_UNIX) | |||
+#include <unistd.h> | |||
+#endif | |||
+ | |||
#ifdef Q_OS_WIN32 | |||
|
|||
#include <windows.h> | |||
diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp | |||
index 382d182..506c142 100644 | |||
--- qtsingleapplication/src/qtlocalpeer.cpp | |||
+++ qtsingleapplication/src/qtlocalpeer.cpp | |||
@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0; | |||
#endif | |||
#if defined(Q_OS_UNIX) | |||
#include <time.h> | |||
+#include <unistd.h> | |||
#endif | |||
|
|||
namespace QtLP_Private { | |||
-- | |||
1.7.11.1 | |||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,40 @@ | |||
#!/bin/bash | |||
|
|||
set -e | |||
set -u | |||
|
|||
# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( | |||
# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 | |||
# but still no success. | |||
cmd="@ld@ -z ignore" | |||
|
|||
args=("$@"); | |||
|
|||
# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. | |||
# GNU binutils does not have this problem: | |||
# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter | |||
i=0; | |||
while [[ $i -lt $# ]]; do | |||
case "${args[$i]}" in | |||
-L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;; | |||
-L*) cmd="$cmd ${args[$i]}" ;; | |||
*) ;; | |||
esac | |||
i=($i+1); | |||
done | |||
|
|||
i=0; | |||
while [[ $i -lt $# ]]; do | |||
case "${args[$i]}" in | |||
-L) i=($i+1); ;; | |||
-L*) ;; | |||
*) cmd="$cmd ${args[$i]}" ;; | |||
esac | |||
i=($i+1); | |||
done | |||
|
|||
# Trace: | |||
set -x | |||
exec $cmd | |||
|
|||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,15 @@ | |||
https://bbs.archlinux.org/viewtopic.php?id=144949 | |||
--- a/gcc/config/i386/linux-unwind.h 2011-01-03 20:52:22.000000000 +0000 | |||
+++ b/gcc/config/i386/linux-unwind.h 2012-07-06 12:23:51.562859470 +0100 | |||
@@ -133,9 +133,9 @@ | |||
{ | |||
struct rt_sigframe { | |||
int sig; | |||
- struct siginfo *pinfo; | |||
+ siginfo_t *pinfo; | |||
void *puc; | |||
- struct siginfo info; | |||
+ siginfo_t info; | |||
struct ucontext uc; | |||
} *rt_ = context->cfa; | |||
/* The void * cast is necessary to avoid an aliasing warning. |
Oops, something went wrong.