| 1 |
xarthisius 10/09/08 07:09:21 |
| 2 |
|
| 3 |
Added: lightdm-0.1.1-webkit.patch |
| 4 |
Log: |
| 5 |
Make webkit greeter optional, add missing doc flag and dependencies. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc73/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/files/lightdm-0.1.1-webkit.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lightdm-0.1.1-webkit.patch |
| 16 |
=================================================================== |
| 17 |
Make webkit-greeter optional |
| 18 |
|
| 19 |
--- greeters/Makefile.am |
| 20 |
+++ greeters/Makefile.am 2010-09-07 22:14:42.287187204 +0200 |
| 21 |
@@ -1,4 +1,7 @@ |
| 22 |
-libexec_PROGRAMS = ldm-gtk-greeter ldm-webkit-greeter |
| 23 |
+libexec_PROGRAMS = ldm-gtk-greeter |
| 24 |
+if WEBKIT |
| 25 |
+ libexec_PROGRAMS += ldm-webkit-greeter |
| 26 |
+endif |
| 27 |
|
| 28 |
LIBGREETER_LIB = $(top_builddir)/libldmgreeter/libldmgreeter.la |
| 29 |
LIBGREETER_CFLAGS = \ |
| 30 |
--- configure.ac |
| 31 |
+++ configure.ac |
| 32 |
@@ -9,10 +9,11 @@ |
| 33 |
AC_PROG_LIBTOOL |
| 34 |
AM_MAINTAINER_MODE |
| 35 |
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) |
| 36 |
+PKG_PROG_PKG_CONFIG |
| 37 |
|
| 38 |
GOBJECT_INTROSPECTION_CHECK(0.6.7) |
| 39 |
|
| 40 |
-GNOME_COMPILE_WARNINGS(maximum) |
| 41 |
+dnl GNOME_COMPILE_WARNINGS(maximum) |
| 42 |
|
| 43 |
dnl ########################################################################### |
| 44 |
dnl Dependencies |
| 45 |
@@ -66,11 +67,16 @@ |
| 46 |
dbus-glib-1 |
| 47 |
]) |
| 48 |
|
| 49 |
-PKG_CHECK_MODULES(LIGHTDM_WKGREETER, [ |
| 50 |
- gtk+-2.0 |
| 51 |
- webkit-1.0 |
| 52 |
- dbus-glib-1 |
| 53 |
+AC_ARG_ENABLE([webkit], AC_HELP_STRING([--enable-webkit],[Build with webkit interface])) |
| 54 |
+ |
| 55 |
+AS_IF([test "x$enable_webkit" != "xno"], [ |
| 56 |
+ PKG_CHECK_MODULES(LIGHTDM_WKGREETER, [ |
| 57 |
+ gtk+-2.0 |
| 58 |
+ webkit-1.0 |
| 59 |
+ dbus-glib-1 |
| 60 |
+ ]) |
| 61 |
]) |
| 62 |
+AM_CONDITIONAL([WEBKIT], [test x$webkit = xtrue]) |
| 63 |
|
| 64 |
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) |
| 65 |
AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool) |
| 66 |
@@ -190,7 +196,7 @@ |
| 67 |
dnl Documentation |
| 68 |
dnl ########################################################################### |
| 69 |
|
| 70 |
-GNOME_DOC_INIT |
| 71 |
+dnl GNOME_DOC_INIT |
| 72 |
GTK_DOC_CHECK |
| 73 |
|
| 74 |
dnl ########################################################################### |
| 75 |
--- Makefile.am |
| 76 |
+++ Makefile.am |
| 77 |
@@ -1,3 +1,5 @@ |
| 78 |
+ACLOCAL_AMFLAGS = -I m4 |
| 79 |
+ |
| 80 |
SUBDIRS = libldmgreeter data greeters po src themes doc |
| 81 |
|
| 82 |
DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc |
Archives