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 | |
| parent | 7c598d6c17f478616d799772d65aa9b22c74eb22 (diff) | |
| download | pkgsrc-a8d3b00414e5cc64a32e6e5aeda119bf2796a665.tar.gz | |
Make sure that kdm can find its greeter module.
| -rw-r--r-- | x11/kdebase2/files/patch-sum | 5 | ||||
| -rw-r--r-- | x11/kdebase2/patches/patch-ac | 11 | ||||
| -rw-r--r-- | x11/kdebase2/patches/patch-ae | 5 |
3 files changed, 16 insertions, 5 deletions
diff --git a/x11/kdebase2/files/patch-sum b/x11/kdebase2/files/patch-sum index f4c733f3259..6de678e06bc 100644 --- a/x11/kdebase2/files/patch-sum +++ b/x11/kdebase2/files/patch-sum @@ -1,10 +1,10 @@ -$NetBSD: patch-sum,v 1.1.1.1 2001/03/14 16:03:09 skrll Exp $ +$NetBSD: patch-sum,v 1.2 2001/03/14 20:12:17 skrll Exp $ SHA1 (patch-aa) = 69618f1b6542f66b99922f6f0c00ea777597a6f8 SHA1 (patch-ab) = 06386d9f87a4782265b00375f4847517be48c1fc SHA1 (patch-ac) = 5e5dff4db62386b0bc15514c1051de5671aef92a SHA1 (patch-ad) = fec43e52f595b687f1dcbf4fec05b5c74fb419ab -SHA1 (patch-ae) = 8a9feb023505cddafe6b782abd5fa1bf23f11813 +SHA1 (patch-ae) = bff3f4eb01e684b28e2291ed8723c2dfa08d7c92 SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f SHA1 (patch-ag) = 1666f52f9d31f972c49879d8f314c7f93fd992d4 SHA1 (patch-ah) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502 @@ -24,3 +24,4 @@ SHA1 (patch-au) = 7e82964090089b37f2e4e1a4ca0f2201506b8303 SHA1 (patch-av) = edd6bb62a65f7569907d26bf76a65beecc434670 SHA1 (patch-aw) = 6510c6e55f619778c318a96cd5120bb07d9aa6d9 SHA1 (patch-ax) = bd3a8494663da789fffd1a9d5340b0f44819f26c +SHA1 (patch-ay) = 05c5a15f94ece6fb58a1505e096a23ad1db547c7 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"); |