31 Mar
2012
31 Mar
'12
4:45 a.m.
Like I said, I've been working on some patches quietly. Here is one.
This fixes bug 908, by implementing an option to enable cycling
through desktops with the mouse wheel.
Please test this out.
http://bugs.trinitydesktop.org/show_bug.cgi?id=908
Thanks,
Calvin
31 Mar
31 Mar
6:56 p.m.
New subject: [trinity-devel] bug #908 fix
Like I said, I've been working on
some patches quietly. Here is one.
This fixes bug 908, by implementing an option to enable
cycling through desktops with the mouse wheel.
Please test this out.
http://bugs.trinitydesktop.org/show_bug.cgi?id=908
Calvin,
I never can merge your patches regardless of the -p level I use. I always have to manually
edit the patches with path names to find the files.
How do I merge your patches? I run this in my build scripts:
cat $CWD/pagerpatch.patch | patch -p1 --verbose --no-backup-if-mismatch || exit 1
How do you create your patches to get that "Index:" thingie at the top?
Darrell
7 p.m.
New subject: [trinity-devel] bug #908 fix
On 31 March 2012 14:56, Darrell Anderson <humanreadable(a)yahoo.com> wrote:
I almost exclusively use the control system's diff command, be it GIT or SVN.
I am running on 3.5.13 sources so I make all my patches under the
3.5.13 code. ( I make sure not to add any conflicts with the current
GIT head), I just use svn diff and pipe the output into a file.
Calvin
Like I said,
I've been working on
some patches quietly. Here is one.
This fixes bug 908, by implementing an option to enable
cycling through desktops with the mouse wheel.
Please test this out.
http://bugs.trinitydesktop.org/show_bug.cgi?id=908
Calvin,
I never can merge your patches regardless of the -p level I use. I always have to
manually edit the patches with path names to find the files.
How do I merge your patches? I run this in my build scripts:
cat $CWD/pagerpatch.patch | patch -p1 --verbose --no-backup-if-mismatch || exit 1
How do you create your patches to get that "Index:" thingie at the top?
Darrell
7:20 p.m.
New subject: [trinity-devel] bug #908 fix
I almost exclusively use the control system's diff
command,
be it GIT or SVN.
So how do I merge them? If you were merging your own patch on a different system, what is
the full command you would use?
I am running on 3.5.13 sources so I make all my
patches under the 3.5.13 code. ( I make sure not to add any conflicts with the
current GIT head), I just use svn diff and pipe the output into a
file.
Yes, I remember you are running on 3.5.13. About half the time the patches need some
tweaks to merge to the GIT sources. :) That part I deal with easily. The manual editing
seems backwards. I don't know how to merge your patches. I just need to now the
appropriate command syntax.
Darrell
7:31 p.m.
New subject: [trinity-devel] bug #908 fix
On 31 March 2012 15:20, Darrell Anderson <humanreadable(a)yahoo.com> wrote:
I just used:
calvin@boxi:~/builds/tde/main/tdebase$ patch -p0 < fixedup.patch
and it worked (except for a failed hunk, no idea why, it's just two lines
and I am attaching the new patch which should work.
I almost
exclusively use the control system's diff command,
be it GIT or SVN.
So how do I merge them? If you were merging your own patch on a different system, what is
the full command you would use?
I am running on 3.5.13 sources so I make all my
patches under the 3.5.13 code. ( I make sure not to add any conflicts with the
current GIT head), I just use svn diff and pipe the output into a
file.
Yes, I remember you are running on 3.5.13. About half the time the patches need some
tweaks to merge to the GIT sources. :) That part I deal with easily. The manual editing
seems backwards. I don't know how to merge your patches. I just need to now the
appropriate command syntax.
9:13 p.m.
New subject: [trinity-devel] bug #908 fix
I just used:
calvin@boxi:~/builds/tde/main/tdebase$ patch -p0 < fixedup.patch
and it worked (except for a failed hunk, no idea why, it's
just two lines
I don't know why they won't work here.
and I am attaching the new patch which should work.
Old patch (edited by me) works. New patch is "malformed"?
Regardless, the new option works. Good job!
Next I get sidetracked noticing the patch modifies pagersettings.kcfg. After installing
the rebuilt package I searched my system for pagersettings.kcfg.
No such file in /opt/trinity/share/config.kcfg/. No pagersettings.kcfg installed anywhere.
Not in the rebuilt package either. Where did that file go?
I looked at the CMakeLists.txt and there is no "install" directive to install
pagersettings.kcfg. I next looked at the original Makefile.am and there is no directive
there, which explains why none exist in CMakeLists.txt.
Has this been broken for years in KDE3?
I added a directive to CMakeLists.txt and created a quick patch:
install( FILES pagersettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
I rebuilt.
We now have pagersettings.kcfg in our packages.
I'll push both patches to GIT.
Darrell
4663
days inactive
4663
days old
5 comments
2 participants
participants (2)
-
Calvin Morrison -
Darrell Anderson