summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch (renamed from meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch)0
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch27
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb7
3 files changed, 31 insertions, 3 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch
index f9fd4970fb..f9fd4970fb 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch
+++ b/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
new file mode 100644
index 0000000000..afe11f3536
--- /dev/null
+++ b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch
@@ -0,0 +1,27 @@
1From 72812894cfd9454d70e4b0753531e46580416771 Mon Sep 17 00:00:00 2001
2From: dgod <dgod.osa@gmail.com>
3Date: Mon, 21 Mar 2016 19:25:25 +0800
4Subject: [PATCH] fix css under gtk 3.20
5
6Upstream-Status: Applied [1]
7
8[1] https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771
9---
10 data/themes/Industrial/gtk.css | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
14index 179f0d6..f8e6432 100644
15--- a/data/themes/Industrial/gtk.css
16+++ b/data/themes/Industrial/gtk.css
17@@ -17,6 +17,7 @@
18 color: #000000;
19 }
20
21+#bottom_pane label,
22 #bottom_pane GtkLabel {
23 font: Sans 12;
24 color: #9E9D9B;
25--
262.14.4
27
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
index 8e7efcdada..701266bccd 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
@@ -7,14 +7,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.
7 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ 7 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \
8 ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ 8 ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
9 file://0002-let-autotools-create-lxdm.conf.patch \ 9 file://0002-let-autotools-create-lxdm.conf.patch \
10 file://0001-check-for-libexecinfo-providing-backtrace-APIs.patch \ 10 file://0003-check-for-libexecinfo-providing-backtrace-APIs.patch \
11 file://0004-fix-css-under-gtk-3.20.patch \
11 " 12 "
12SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" 13SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0"
13SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" 14SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f"
14 15
15PE = "1" 16PE = "1"
16 17
17DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" 18DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+3 virtual/libx11 libxcb pango iso-codes"
18DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" 19DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
19DEPENDS_append_libc-musl = " libexecinfo" 20DEPENDS_append_libc-musl = " libexecinfo"
20 21
@@ -28,7 +29,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
28CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " 29CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
29LDFLAGS_append_libc-musl = " -lexecinfo" 30LDFLAGS_append_libc-musl = " -lexecinfo"
30 31
31EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ 32EXTRA_OECONF += "--enable-gtk3=yes --enable-password=yes --with-x -with-xconn=xcb \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ 33 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
34" 35"