Philippe23
Tux's lil' helper
Joined: 20 Dec 2006
Posts: 76
Location: Rome, NY
|
 Posted: Wed Nov 28, 2007 2:10 pm Post subject: Need help figuring out scrollkeeper update patches. |
 |
|
So a few months ago, the glade-2.6.8 ebuild got updated and decided it wanted to update on my system, but suddenly it fails to apply a patch that it's always applied before. I opened bug #192812, and then looked at the patch, found that the lines it changed had moved a hundred lines or so, figured that was the problem, fixed the patch and attached it to that bug. compnerd was good enough to commit the patch, and then I found that it didn't solve anything.
So this morning I started digging deeper. The glade-2.6.8 ebuild is pretty darn simple.
| Code: | src_unpack() {
gnome2_src_unpack
# this patch fixes potential issues
# with scrollkeeper. speeds up unnecessary scroll generation
epatch "${FILESDIR}/${PN}-2.0.0-scrollkeeper.patch"
} |
Now, I have no idea what scrollkeeper is, but that scrollkeeper.patch is pretty simple:
| Code: | --- glade-2.6.8/omf-install/Makefile.in 2004-12-21 07:11:12.000000000 -0500
+++ glade-2.6.8/omf-install/Makefile.in.new 2007-10-18 12:08:09.000000000 -0400
@@ -384,21 +384,22 @@
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall uninstall-am uninstall-info-am uninstall-local
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+ -scrollkeeper-update -p $(scrollkeeper_localstate_dir) \
+ -o $(DESTDIR)$(omf_dest_dir)
uninstall-local:
-for file in $(srcdir)/*.omf; do \
basefile=`basename $$file`; \
rm -f $(omf_dest_dir)/$$basefile; \
done
-rmdir $(omf_dest_dir)
-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. |
So it basically just adds some parameters to a scrollkeeper-update line.
But obviously something is wrong since the patch doesn't work. I looked in my /tmp/.../glade-2.6.8/working/ folder and found that the original scrollkeeper-update line had been changed to a call to true. So the only thing that could be causing this is that call to gnome2_src_unpack.
I found that gnome2_src_unpack (in /usr/portage/eclass/gnome2.eclass) calls gnome2_omf_fix to "Prevent scrollkeeper access violations". gnome2_omf_fix (in /usr/portage/eclass/gnome2-utils.eclass) seem to find all the makefiles and replace all calls to scrollkeeper-update with calls to true in order to "Workaround applied to Makefile rules in order to remove redundant calls to scrollkeeper-update and sandbox violations."
So my question boils down to: which is correct/which is newer? This removal of calls to scrollkeeper-update or the call to it with the extra parameters? I have a feeling that the former is the correct one. (I also suspect that someone added this scrollkeeper-update fix to gnome2_src_unpack a "few months ago", and that's what caused my problem.) If it is the former, then the patch adding the extra parameters is no longer needed, correct? |
|
Portage & Programming
