diff options
| author | skrll <skrll> | 2001-03-14 20:12:17 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2001-03-14 20:12:17 +0000 |
| commit | a8d3b00414e5cc64a32e6e5aeda119bf2796a665 (patch) | |
| tree | 7d73cf81251f7e8729e2b48d8792fd8f0c0837a0 /x11/kdebase2/patches | |
| parent | 7c598d6c17f478616d799772d65aa9b22c74eb22 (diff) | |
| download | pkgsrc-a8d3b00414e5cc64a32e6e5aeda119bf2796a665.tar.gz | |
Make sure that kdm can find its greeter module.
Diffstat (limited to 'x11/kdebase2/patches')
| -rw-r--r-- | x11/kdebase2/patches/patch-ac | 11 | ||||
| -rw-r--r-- | x11/kdebase2/patches/patch-ae | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac index 7a1f4289b40..73234624e6e 100644 --- a/x11/kdebase2/patches/patch-ac +++ b/x11/kdebase2/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $ +$NetBSD: patch-ac,v 1.2 2001/03/14 20:12:18 skrll Exp $ --- kdm/Makefile.am.orig Mon Feb 19 11:21:43 2001 +++ kdm/Makefile.am +@@ -12,7 +12,7 @@ + EXTRA_PROGRAMS = greetest + greetest_SOURCES = greetest.c + +-AM_CFLAGS = $(STD_DEFINES) $(CONN_FLAGS) ++AM_CFLAGS = $(STD_DEFINES) $(CONN_FLAGS) -DGREETERLIB_DIR=\"@kde_libraries@\" + + # this is for static linking - inserted into KDM_GREET_LIBS by configure + KDM_KDE_LIBS = $(LIB_KDEUI) -lXau $(PASSLIB) \ @@ -24,7 +24,8 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSLIB) \ $(LIB_LIBS) $(KERBEROS_LIBS) $(LIBSOCKET) \ diff --git a/x11/kdebase2/patches/patch-ae b/x11/kdebase2/patches/patch-ae index 5922b61bb6e..6b0dbec2343 100644 --- a/x11/kdebase2/patches/patch-ae +++ b/x11/kdebase2/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $ +$NetBSD: patch-ae,v 1.2 2001/03/14 20:12:18 skrll Exp $ --- kdm/session.c.orig Sun Feb 18 15:28:17 2001 +++ kdm/session.c @@ -23,13 +23,14 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $ #endif Debug ("ManageSession %s\n", d->name); -@@ -309,12 +306,15 @@ +@@ -309,12 +306,16 @@ greet_user_proc = GreetUser; #else Debug("ManageSession: loading greeter library %s\n", greeterLib); - greet_lib_handle = dlopen(greeterLib, RTLD_NOW); + LTDL_SET_PRELOADED_SYMBOLS(); + lt_dlinit(); ++ lt_dladdsearchdir(GREETERLIB_DIR); + greet_lib_handle = lt_dlopen(greeterLib); if (greet_lib_handle != NULL) - greet_user_proc = (GreetUserProc)dlsym(greet_lib_handle, "GreetUser"); |