| View previous topic :: View next topic |
| Author |
Message |
urcindalo
l33t
Joined: 08 Feb 2005
Posts: 623
Location: Almeria, Spain
|
 Posted: Mon Feb 01, 2010 12:47 pm Post subject: xxdiff no longer in the tree. Which cfg-update GUI? |
 |
|
I have cfg-update-1.8.2-r1 installed on my system. However, it tries to load xxdiff: | Code: | **********************************************************************
Mergetool "/usr/bin/xxdiff" not found...
The recommended merge tool for cfg-update is xxdiff, a nice GUI tool.
Please install dev-util/xxdiff or change the MERGE_TOOL variable to
your own favorite tool. See /etc/cfg-update.conf for more details!
********************************************************************** |
which is no longer in the tree.
I tried kdiff3-0.9.95, but cfg-update seems not to be able to launch it: | Code: | (1/2) /etc/whois.conf *Custom File
* YOU ARE ABOUT TO UPDATE A CUSTOM FILE. YOU SHOULD ASK YOURSELF
* WHERE DOES IT COME FROM AND WHAT HAPPENDS WHEN YOU REPLACE IT?
* PORTAGE DID NOT INSTALL THE CURRENT FILE, MOST LIKELY IT HAS BEEN
* CREATED AFTER INSTALLATION AND IT MAY CONTAIN CUSTOM SETTINGS.
Press [y] - to merge the current file and the ._cfg0000_* file with kdiff3
Press [s] - to skip this update (to investigate first, and try again later)
Press [q] - to quit cfg-update immediately
Merge manually with file : /etc/._cfg0000_whois.conf ? [y|s|q] y
In kdiff3 you select the lines that you want to keep.
When done, click the save button and exit kdiff3!
When you exit kdiff3, cfg-update will finish the update...
^C /etc/whois.conf.merge not found...
No changes detected...
Press [1] - to replace the current file with the ._cfg0000_* file
Press [2] - to keep the current file and remove the ._cfg0000_* file
Press [u] - to undo and re-try merging the files later
Press [s] - to skip this update (to investigate first, and try again later)
Press [q] - to quit cfg-update immediately
How do you want to finish this update? [1|2|u|s|q] ^C |
As you can see, I'm forced to quit with Control-C because I am waiting for ages for kdiff3 to launch. But kdiff3 nicely appears if I launch it manually from the command line.
Which cfg-update GUI can I use?
Thanks in advance. |
|
| Back to top |
|
 |
jfp
Guru
Joined: 08 Jul 2007
Posts: 326
Location: Virginia, USA
|
| Posted: Mon Feb 01, 2010 1:15 pm Post subject: |
|
|
I am a fan of app-portage/etc-proposals
_________________
jfp |
|
| Back to top |
|
|
SamuliSuominen
Retired Dev
Joined: 30 Sep 2005
Posts: 2133
Location: Finland
|
| Posted: Mon Feb 01, 2010 4:31 pm Post subject: |
|
|
Based on this thread I made some research and found Qt4 based diffing tool, beediff, it's now in Portage as dev-util/beediff
(Because xxdiff used to be Qt3) |
|
| Back to top |
|
|
urcindalo
l33t
Joined: 08 Feb 2005
Posts: 623
Location: Almeria, Spain
|
| Posted: Tue Feb 02, 2010 11:15 am Post subject: |
|
|
| ssuominen wrote: | | Based on this thread I made some research and found Qt4 based diffing tool, beediff, it's now in Portage as dev-util/beediff |
Thanks. I emerged beediff but cfg-update does not support it yet 
I filed a bug. |
|
| Back to top |
|
|
ppurka
Advocate
Joined: 26 Dec 2004
Posts: 3256
|
| Posted: Tue Feb 02, 2010 3:36 pm Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| urcindalo wrote: | I have cfg-update-1.8.2-r1 installed on my system. However, it tries to load xxdiff: | Code: | **********************************************************************
Mergetool "/usr/bin/xxdiff" not found...
The recommended merge tool for cfg-update is xxdiff, a nice GUI tool.
Please install dev-util/xxdiff or change the MERGE_TOOL variable to
your own favorite tool. See /etc/cfg-update.conf for more details!
********************************************************************** |
which is no longer in the tree.
Which cfg-update GUI can I use?
Thanks in advance. |
See /etc/cfg-update.conf for more details!
You have your answer right there. There are a whole bunch of different diff programs that cfg-update supports. And you can also give your own custom diff program.
_________________
emerge --quiet redefined | E17 vids: I, II | Now using kde5 | e is unstable :-/ |
|
| Back to top |
|
|
urcindalo
l33t
Joined: 08 Feb 2005
Posts: 623
Location: Almeria, Spain
|
| Posted: Tue Feb 02, 2010 4:34 pm Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| ppurka wrote: | See /etc/cfg-update.conf for more details!
You have your answer right there. There are a whole bunch of different diff programs that cfg-update supports. And you can also give your own custom diff program. |
What do you think it was the first thing I tried? Look at this: | Code: | # +----------+
# | MERGETOOL \
# +------------+-------------------------------------------------------------+
# | The recommended tool for merging is xxdiff but you can also use other |
# | tools if you don't like xxdiff. The Supported tools are listed below: |
# +----------+-----+--------------------------+------------------------------+
# | xxdiff | GUI | KDE (or Gnome with QT) | |
# | kdiff3 | GUI | KDE (or Gnome with QT) | |
# | meld | GUI | Gnome (or KDE with GTK) | |
# | gtkdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! |
# | gvimdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! |
# | tkdiff | GUI | Gnome (or KDE with TK) | |
# | vimdiff | CLI | Systems without X | STAGE 3 not supported! |
# | sdiff | CLI | Systems without X | STAGE 3 not supported! |
# | imediff2 | CLI | Systems without X | STAGE 3 not supported! |
# +----------+-----+--------------------------+------------------------------+
#MERGE_TOOL = /usr/bin/xxdiff
MERGE_TOOL = /usr/bin/beediff |
As you can see:
1) I have correctly set my MERGE_TOOL variable
2) beediff is not listed as supported
That's why I filed a bug asking for suport to be added. |
|
| Back to top |
|
|
SamuliSuominen
Retired Dev
Joined: 30 Sep 2005
Posts: 2133
Location: Finland
|
| Posted: Tue Feb 02, 2010 4:38 pm Post subject: |
|
|
Yep, cfg-update ebuild needs some updating, removal of xxdiff references, addition of beediff, and some checking if the kdiff3 stuff work on KDE4's version of it, since I think the support for it was originally added for the KDE3 version
overall: the ebuild needs a bit love  |
|
| Back to top |
|
|
devsk
Advocate
Joined: 24 Oct 2003
Posts: 2995
Location: Bay Area, CA
|
| Posted: Mon Feb 15, 2010 3:06 am Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| urcindalo wrote: | | ppurka wrote: | See /etc/cfg-update.conf for more details!
You have your answer right there. There are a whole bunch of different diff programs that cfg-update supports. And you can also give your own custom diff program. |
What do you think it was the first thing I tried? Look at this: | Code: | # +----------+
# | MERGETOOL \
# +------------+-------------------------------------------------------------+
# | The recommended tool for merging is xxdiff but you can also use other |
# | tools if you don't like xxdiff. The Supported tools are listed below: |
# +----------+-----+--------------------------+------------------------------+
# | xxdiff | GUI | KDE (or Gnome with QT) | |
# | kdiff3 | GUI | KDE (or Gnome with QT) | |
# | meld | GUI | Gnome (or KDE with GTK) | |
# | gtkdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! |
# | gvimdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! |
# | tkdiff | GUI | Gnome (or KDE with TK) | |
# | vimdiff | CLI | Systems without X | STAGE 3 not supported! |
# | sdiff | CLI | Systems without X | STAGE 3 not supported! |
# | imediff2 | CLI | Systems without X | STAGE 3 not supported! |
# +----------+-----+--------------------------+------------------------------+
#MERGE_TOOL = /usr/bin/xxdiff
MERGE_TOOL = /usr/bin/beediff |
As you can see:
1) I have correctly set my MERGE_TOOL variable
2) beediff is not listed as supported
That's why I filed a bug asking for suport to be added. |
Can you please give me the bug number?
Also, I think cfg-update is sort of not being maintained although it works. Is there a good enough replacement for cfg-update, which is not from 2008? |
|
| Back to top |
|
|
ppurka
Advocate
Joined: 26 Dec 2004
Posts: 3256
|
| Posted: Mon Feb 15, 2010 3:36 am Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| devsk wrote: | | Also, I think cfg-update is sort of not being maintained although it works. Is there a good enough replacement for cfg-update, which is not from 2008? |
The author of cfg-update had asked for a dev who could continue updating cfg-update. This request was made long time ago. Unfortunately, no one stepped up.
I personally use cfg-update with gvimdiff. For other GUI config update tools you can look at etc-proposals. I haven't used it though, since I find it very convenient that cfg-update auto-updates almost all the changes. For example, after updating openrc from 0.5.* to 0.6.0 today, it asked me for only one manual update even though I have customized many configs in /etc.
_________________
emerge --quiet redefined | E17 vids: I, II | Now using kde5 | e is unstable :-/ |
|
| Back to top |
|
|
keenblade
Veteran
Joined: 03 Oct 2004
Posts: 1087
|
| Posted: Mon Feb 15, 2010 5:53 am Post subject: |
|
|
| jfp wrote: | | I am a fan of app-portage/etc-proposals |
+
If you don't mind gnome based diff tool, dev-util/meld may work for cfg-update.
_________________
Anyway it's all the same at the end...
Need help to get it working: "x-fi surround 5.1" |
|
| Back to top |
|
|
devsk
Advocate
Joined: 24 Oct 2003
Posts: 2995
Location: Bay Area, CA
|
| Posted: Mon Feb 15, 2010 6:08 am Post subject: |
|
|
| keenblade wrote: | | jfp wrote: | | I am a fan of app-portage/etc-proposals |
+
If you don't mind gnome based diff tool, dev-util/meld may work for cfg-update. |
I am a happy camper with gvimdiff. |
|
| Back to top |
|
|
SamuliSuominen
Retired Dev
Joined: 30 Sep 2005
Posts: 2133
Location: Finland
|
| Posted: Mon Feb 15, 2010 8:05 am Post subject: |
|
|
I really don't use cfg-update but here's a lame attempt,
*cfg-update-1.8.2-r2 (15 Feb 2010)
15 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+cfg-update-1.8.2-r2.ebuild,
+files/cfg-update-1.8.2-xxdiff-to-beediff.patch:
Replace xxdiff with beediff wrt #303199. Replace USE="gnome" with USE="X"
wrt #300344. |
|
| Back to top |
|
|
urcindalo
l33t
Joined: 08 Feb 2005
Posts: 623
Location: Almeria, Spain
|
| Posted: Mon Feb 15, 2010 8:21 am Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| devsk wrote: | | urcindalo wrote: | | That's why I filed a bug asking for suport to be added. |
Can you please give me the bug number? |
Sure:
https://bugs.gentoo.org/show_bug.cgi?id=303199
| ssuominen wrote: | | *cfg-update-1.8.2-r2 (15 Feb 2010) |
Thanks very much for your efforts. I really appreciate them.
I just sync'ed but it does not appear yet, nor are the files available as attachments in any of the two bugs you mention it.
Is it just a matter of waiting for it to reach the portage tree? |
|
| Back to top |
|
|
SamuliSuominen
Retired Dev
Joined: 30 Sep 2005
Posts: 2133
Location: Finland
|
| Posted: Mon Feb 15, 2010 8:29 am Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| urcindalo wrote: |
Is it just a matter of waiting for it to reach the portage tree? |
Yep, wait a ~hour or so and it should hit the mirrors, it's really just a minor depend adjustment and config defaults... |
|
| Back to top |
|
|
urcindalo
l33t
Joined: 08 Feb 2005
Posts: 623
Location: Almeria, Spain
|
| Posted: Mon Feb 15, 2010 8:35 am Post subject: Re: xxdiff no longer in the tree. Which cfg-update GUI? |
|
|
| ssuominen wrote: | | urcindalo wrote: |
Is it just a matter of waiting for it to reach the portage tree? |
Yep, wait a ~hour or so and it should hit the mirrors, it's really just a minor depend adjustment and config defaults... |
I just saw it in packages.gentoo.org
I'm going to resync again and test it
Again, thanks for you help. It is a pleasure to use Gentoo with such helpful developers. |
|
| Back to top |
|
|
devsk
Advocate
Joined: 24 Oct 2003
Posts: 2995
Location: Bay Area, CA
|
| Posted: Tue Feb 16, 2010 7:59 am Post subject: |
|
|
| I updated to r2 but it still says beediff is unsupported. |
|
| Back to top |
|
|
SamuliSuominen
Retired Dev
Joined: 30 Sep 2005
Posts: 2133
Location: Finland
|
|
| Back to top |
|
|
|
Portage & Programming
