packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.4: Update gdm patch, enable consolekit

This commit is contained in:
Colin Walters 2012-02-24 10:23:10 -05:00
parent 16c0cfe9b5
commit 4e3621236e
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnomeos/3.4/gdm-disable-documentation.patch
View File

@ -1,4 +1,4 @@
From d2e7caf3b67bc76d7354a20344505ba22f877de7 Mon Sep 17 00:00:00 2001 From 06a5d03ae1abd70fd0f5c6eb37ce26dee1490f7d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org> From: Colin Walters <walters@verbum.org>
Date: Sun, 15 Jan 2012 16:49:07 -0500 Date: Sun, 15 Jan 2012 16:49:07 -0500
Subject: [PATCH] build: Add --disable-documentation Subject: [PATCH] build: Add --disable-documentation
@ -7,15 +7,15 @@ Documentation is the source of many cyclical build loops. Allow
operating system builders to manually cut these cycles initially operating system builders to manually cut these cycles initially
by disabling documentation for a first pass. by disabling documentation for a first pass.
--- ---
Makefile.am | 8 +++++++- Makefile.am | 4 +++-
configure.ac | 4 ++++ configure.ac | 4 ++++
2 files changed, 11 insertions(+), 1 deletions(-) 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index f522f40..3f00a16 100644 index f522f40..2d0443d 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -4,12 +4,18 @@ SUBDIRS = \ @@ -4,12 +4,14 @@ SUBDIRS = \
data \ data \
common \ common \
daemon \ daemon \
@ -25,18 +25,14 @@ index f522f40..3f00a16 100644
po \ po \
tests \ tests \
$(NULL) $(NULL)
+DIST_SUBDIRS =
+
+if ENABLE_DOCUMENTATION +if ENABLE_DOCUMENTATION
+SUBDIRS += docs +SUBDIRS += docs
+else
+DIST_SUBDIRS += docs
+endif +endif
# add these when help gets added back # add these when help gets added back
# omf-install # omf-install
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 30397c5..291627c 100644 index 3c94f94..f3934a5 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -44,6 +44,10 @@ AC_CONFIG_MACRO_DIR([m4]) @@ -44,6 +44,10 @@ AC_CONFIG_MACRO_DIR([m4])
@ -51,5 +47,5 @@ index 30397c5..291627c 100644
GETTEXT_PACKAGE=gdm GETTEXT_PACKAGE=gdm
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
-- --
1.7.6.4 1.7.6.5

3
gnomeos/3.4/manifest.json
View File

@ -677,7 +677,8 @@
"patches": ["accountsservice-builddir.patch"]}, "patches": ["accountsservice-builddir.patch"]},
{"src": "gnome:gdm", {"src": "gnome:gdm",
"config-opts": ["--disable-documentation"], "config-opts": ["--disable-documentation",
"--with-consolekit"],
"patches": ["gdm-disable-documentation.patch", "patches": ["gdm-disable-documentation.patch",
"gdm-pam-auth.patch"]}, "gdm-pam-auth.patch"]},