summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch2
-rw-r--r--meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch2
-rw-r--r--meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch4
-rw-r--r--meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch
index 943e1026b..9dfcce042 100644
--- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch
+++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Move tvheadend specific LD/CFLAGS into a helper variable to
6 6
7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 7Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
8 8
9Upstream-status: Inappropriate [OE specific] 9Upstream-Status: Inappropriate [OE specific]
10--- 10---
11 Makefile | 20 ++++++++++---------- 11 Makefile | 20 ++++++++++----------
12 support/configure.inc | 8 ++++---- 12 support/configure.inc | 8 ++++----
diff --git a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch b/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch
index 27d1d4a39..5f2df4334 100644
--- a/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch
+++ b/meta-oe/recipes-multimedia/libav/libav-0.8.4/0001-configure-enable-pic-for-AArch64.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] configure: enable pic for AArch64
5 5
6Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> 6Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
7 7
8Upstream-status: Backport 8Upstream-Status: Backport
9--- 9---
10 configure | 2 +- 10 configure | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch b/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch
index eedbd6f24..ca5c36222 100644
--- a/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch
+++ b/meta-systemd/meta-xfce/recipes-xfce/xfce4-session/files/0001-Add-shutdown-reboot-functionality-for-systemd-bug-87.patch
@@ -4,9 +4,9 @@ Date: Sun, 4 Nov 2012 21:23:36 +0100
4Subject: [PATCH] Add shutdown/reboot functionality for systemd (bug #8729). 4Subject: [PATCH] Add shutdown/reboot functionality for systemd (bug #8729).
5 5
6Based on patch by Christian Hesse and Evangelos Foutras. 6Based on patch by Christian Hesse and Evangelos Foutras.
7---
8 7
9Upstream-status: backport 8Upstream-Status: backport
9---
10 configure.in | 4 + 10 configure.in | 4 +
11 xfce4-session/Makefile.am | 14 ++- 11 xfce4-session/Makefile.am | 14 ++-
12 xfce4-session/xfsm-shutdown.c | 35 ++++++- 12 xfce4-session/xfsm-shutdown.c | 35 ++++++-
diff --git a/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch b/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch
index 6d5e9c886..b26669f6e 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch
+++ b/meta-xfce/recipes-xfce/xfce4-session/files/0002-Remove-gnome-keyring-remains.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove gnome-keyring remains.
6Not required anymore. gnome_keyring_daemon_prepare_environment_sync 6Not required anymore. gnome_keyring_daemon_prepare_environment_sync
7is a stub function that does nothing. 7is a stub function that does nothing.
8 8
9Upstream-status: backport [1] 9Upstream-Status: backport [1]
10 10
11[1] http://git.xfce.org/xfce/xfce4-session/commit/?id=7a75a8a0f7089b716e702e6bb0cf13fc3194e3db 11[1] http://git.xfce.org/xfce/xfce4-session/commit/?id=7a75a8a0f7089b716e702e6bb0cf13fc3194e3db
12--- 12---