Author |
Message |
amigo
Joined: 02 Apr 2007 Posts: 2641
|
Posted: Sat 13 Feb 2010, 04:08 Post subject:
|
|
Yeah, creating full-folder diffs is a pain sometimes. Try running configure and then 'make distclean' in the 'raw' sources to help cut down the numbers.
If you have only modified a couple of files, I find it easier to use 'gendiff' which comes with rpm:
Code: | #!/bin/sh
[ -z "$1" -o -z "$2" ] && {
# usage
echo "usage: $0 <directory> <diff-extension>" 1>&2
exit 1
}
find $1 \( -name "*$2" -o -name ".*$2" \) -print |
while read f; do
U=-u
[ "`basename $f`" = "ChangeLog$2" ] && U=-U0
# diff ${U} $f `echo $f | sed s/$2\$//`
if [ -r "$f" ]; then
diff ${U} "${f}" "${f%$2}"
else
diff ${U} /dev/null "${f%$2}"
fi
done |
To use it, simply create copies of the original files with a suffix like '.00' and place them in the edited sources. Then, from the topdir of the edited sources run:
gendiff . .00 > name-of-patch
Sometimes I go through both trees of sources and remove files from both which are showing up in the diff but which are not pertinent to the changes -like Makefile.in autogen.sh, etc. This case is a typical example of comparing incomplete autoconf sources(from CVS or other -hence the autogen.sh) against sources which have already had their conf files regenerated and then edited as well.
You can also manually cut and remove the sections of the diff which don't matter. If you can't figure it out, attach the big diff and I'll cut it down to size for you. I've gotten pretty handy at it after a few hundred times of dissecting debian patches which typically run in the 250-300 thousand lines (exactly because they always include 'debianized' config.guess, config.sub and all the Makefile.in files which are not often essential to the source code changes).
A few runs of this sort (run in both trees) can help a lot:
find -name Makefile.in -exe rm -f {} \;
find -name "*~" -exe rm -f {} \;
find -name CVS -exe rm -rf {} \;
|
Back to top
|
|
 |
disciple
Joined: 20 May 2006 Posts: 6781 Location: Auckland, New Zealand
|
Posted: Sat 13 Feb 2010, 05:54 Post subject:
|
|
Quote: | Try running configure... in the 'raw' sources to help cut down the numbers. |
Ah, I should have thought of that Still had to delete a few thousand lines though.
This patch seems to work.
Now, I think the answer to my question about the .po files is yes, edit them manually, but also do this https://bugzilla.gnome.org/show_bug.cgi?id=454894#c6
Perhaps someone can check that the locales are actually working now?
Description |
|

Download |
Filename |
glipper-lite_NLS.pet |
Filesize |
5.94 KB |
Downloaded |
688 Time(s) |
Description |
|

Download |
Filename |
glipper-lite.pet |
Filesize |
18.8 KB |
Downloaded |
806 Time(s) |
Description |
|

Download |
Filename |
glipper-gtkbuilder.diff.gz |
Filesize |
8.23 KB |
Downloaded |
639 Time(s) |
_________________ If you have or know of a good gtkdialog application, please post a link here
Classic Puppy quotes
ROOT FOREVER
|
Back to top
|
|
 |
amigo
Joined: 02 Apr 2007 Posts: 2641
|
Posted: Sat 13 Feb 2010, 07:27 Post subject:
|
|
The bugzilla link is broken. Oops, got it now -there was hidden window about the outdated security certificate...
Looks to me like you may need to be using a late version of intltool to make it work intltool-0.41 can be found through ubuntu.
|
Back to top
|
|
 |
aragon
Joined: 15 Oct 2007 Posts: 1698 Location: Germany
|
Posted: Sat 13 Feb 2010, 09:48 Post subject:
|
|
disciple wrote: | Perhaps someone can check that the locales are actually working now? |
Your wish is my command.
German does work.
aragon
_________________ PUPPY SEARCH: http://wellminded.com/puppy/pupsearch.html
|
Back to top
|
|
 |
amigo
Joined: 02 Apr 2007 Posts: 2641
|
Posted: Sat 13 Feb 2010, 10:13 Post subject:
|
|
Shouldn't that be 'Your wish is my command-line' ?
|
Back to top
|
|
 |
aragon
Joined: 15 Oct 2007 Posts: 1698 Location: Germany
|
Posted: Sat 13 Feb 2010, 11:07 Post subject:
|
|
amigo wrote: | Shouldn't that be 'Your wish is my command-line' ? |
dict.leo.org does not know of this one...
aragon
_________________ PUPPY SEARCH: http://wellminded.com/puppy/pupsearch.html
|
Back to top
|
|
 |
amigo
Joined: 02 Apr 2007 Posts: 2641
|
Posted: Sat 13 Feb 2010, 11:53 Post subject:
|
|
Dein Wunsch ist mein Befehl?? I was just kidding aragon, you used it just right.
|
Back to top
|
|
 |
disciple
Joined: 20 May 2006 Posts: 6781 Location: Auckland, New Zealand
|
Posted: Sat 13 Feb 2010, 16:41 Post subject:
|
|
Thanks Aragon.
_________________ If you have or know of a good gtkdialog application, please post a link here
Classic Puppy quotes
ROOT FOREVER
|
Back to top
|
|
 |
disciple
Joined: 20 May 2006 Posts: 6781 Location: Auckland, New Zealand
|
Posted: Sat 13 Feb 2010, 22:49 Post subject:
|
|
Sorry aragon, I'm not certain that I was specific enough. Can you please confirm that the German works in the preferences dialogue?
Thanks.
_________________ If you have or know of a good gtkdialog application, please post a link here
Classic Puppy quotes
ROOT FOREVER
|
Back to top
|
|
 |
aragon
Joined: 15 Oct 2007 Posts: 1698 Location: Germany
|
Posted: Mon 15 Feb 2010, 05:01 Post subject:
|
|
amigo wrote: | Dein Wunsch ist mein Befehl?? I was just kidding aragon, you used it just right. |
gotcha
aragon
_________________ PUPPY SEARCH: http://wellminded.com/puppy/pupsearch.html
|
Back to top
|
|
 |
aragon
Joined: 15 Oct 2007 Posts: 1698 Location: Germany
|
Posted: Mon 15 Feb 2010, 05:06 Post subject:
|
|
disciple wrote: | Sorry aragon, I'm not certain that I was specific enough. Can you please confirm that the German works in the preferences dialogue?
Thanks. |
no problem. Yes german works in prefs-dialogue.
aragon
_________________ PUPPY SEARCH: http://wellminded.com/puppy/pupsearch.html
|
Back to top
|
|
 |
disciple
Joined: 20 May 2006 Posts: 6781 Location: Auckland, New Zealand
|
Posted: Tue 16 Feb 2010, 03:32 Post subject:
|
|
Fantastic, thanks!
_________________ If you have or know of a good gtkdialog application, please post a link here
Classic Puppy quotes
ROOT FOREVER
|
Back to top
|
|
 |
Dingo

Joined: 11 Dec 2007 Posts: 1434 Location: somewhere at the end of rainbow...
|
Posted: Tue 22 Mar 2011, 20:07 Post subject:
|
|
I compiled this version of glipper (1.0) for Puppy 3.01
it seems, however that the size is more bigger than your builds (in Puppy higher than 3.01)
keeping the default CFLAGS in makefile, my glipper executable consists in:
- 1250 KB
- 1028 KB after stripping (-strip --strip-unneeded)
- 404 KB (after compression with upx)
while glipper 0.89 compiled originally by Barry Kauler is only 14 KB!
I have seen several other times that compiler in Puppy 3.01 produces executable bigger than other devx in higher puppies
_________________ replace .co.cc with .info to get access to stuff I posted in forum
dropbox 2GB free
OpenOffice for Puppy Linux
|
Back to top
|
|
 |
technosaurus

Joined: 18 May 2008 Posts: 4787 Location: Kingwood, TX
|
Posted: Tue 22 Mar 2011, 21:51 Post subject:
|
|
it sounds like you may be missing a .so... or more than 1 due to paths etc... the compiler is using one or more of your .a files
putting .so symlinks in usr/lib may fix ... and may give some ignorable relocation warnings
or more likely the devx has header files and static libs for which the main sfs has no shared counterpart... then configure will autodetect a lib that you don't really want or need
_________________ Check out my github repositories. I may eventually get around to updating my blogspot.
|
Back to top
|
|
 |
disciple
Joined: 20 May 2006 Posts: 6781 Location: Auckland, New Zealand
|
Posted: Fri 25 Mar 2011, 18:27 Post subject:
|
|
Dingo wrote: | I compiled this version of glipper (1.0) for Puppy 3.01
it seems, however that the size is more bigger than your builds (in Puppy higher than 3.01)
keeping the default CFLAGS in makefile, my glipper executable consists in:
- 1250 KB
- 1028 KB after stripping (-strip --strip-unneeded)
- 404 KB (after compression with upx)
while glipper 0.89 compiled originally by Barry Kauler is only 14 KB!
I have seen several other times that compiler in Puppy 3.01 produces executable bigger than other devx in higher puppies |
Glipper 1.0 was rewritten in python so is completely different. It doesn't even have an executable for you to strip and upx, does it?
_________________ If you have or know of a good gtkdialog application, please post a link here
Classic Puppy quotes
ROOT FOREVER
|
Back to top
|
|
 |
|