Darn - I suspect I omitted the switch. And more than once during "testing"
Sorry for the noise. And thank you Bruce for your explanation. Taz > Sent: Wednesday, November 27, 2019 at 12:02 PM > From: "Bruce Dubbs via blfs-support" <[email protected]> > To: [email protected] > Cc: "Bruce Dubbs" <[email protected]> > Subject: Re: [blfs-support] polkit 0.116 patch > > On 11/26/19 4:45 PM, Teresa Williams via blfs-support wrote: > > Hi > > > > I'm building from the 11 Nov SVN book. At polkit 0.116 the patch fails to > > apply: > > > > hunk #1 FAILED at 221 > > patch: ***** Can't reopen file- : no such file or directory. > > > > There's a reference to polkit-0115 in the patch. I'd guess that's the > > issue, but I'm not familiar with patch internals. > > > > I've butchered configure.ac by hand for now, but can anyone confirm? > > > It should apply OK. The patch file is only: > > diff -Naurp polkit-0.115-orig/configure.ac polkit-0.115/configure.ac > --- polkit-0.115-orig/configure.ac 2018-04-03 15:57:57.000000000 -0500 > +++ polkit-0.115/configure.ac 2018-12-12 01:12:18.375337033 -0600 > @@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes > > AC_SUBST(LIBSYSTEMD_CFLAGS) > AC_SUBST(LIBSYSTEMD_LIBS) > -AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], > [Using libsystemd]) > +AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || > test "$have_libelogind" = "yes"], [Using libsystemd]) > > dnl > --------------------------------------------------------------------------- > dnl - systemd unit / service files > > > When we apply it, we use: > > patch -Np1 -i ../polkit-0.116-fix_elogind_detection-1.patch > > The switch -Np1 means: > > Strip the smallest prefix containing num (1 in this case) leading > slashes from each file name found in the patch file. > > That means that the 'polkit-0.115-orig/' portions of the file names > should be stripped. In this case, means to just look for the > configure.ac file. > > In your case, you did not use -Np1 or did not change into the > appropriate directory after extracting the tarball. > > -- Bruce > > -- > http://lists.linuxfromscratch.org/listinfo/blfs-support > FAQ: http://www.linuxfromscratch.org/blfs/faq.html > Unsubscribe: See the above information page > -- http://lists.linuxfromscratch.org/listinfo/blfs-support FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
