Applied to master. 3rd time's the charm! :)
-jon
On 09/30/2018 11:57 AM, Chase via cdesktopenv-devel wrote:
this patch also untagles some ifdef mess
Thank you for your time,
-Chase
___
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sour
You could try checking out whatever branch you did this in an see if you
can rebase from cde-next... ie:
git checkout cde-next
git pull
git checkout your-remove-ultrix-branch
git rebase cde-next
Assuming you get that to work, then you could try regenerating the
patch. I don't know how you did
This is absolutely baffling to me, I have no idea why one three separate
occasions, all removal attempts have failed. I guess Ultrix will be destined to
stay in CDE, as I can't remove it no matter what I do!
Thank you for your time,
-Chase
‐‐‐ Original Message ‐‐‐
On June 24, 2018
This one fails to apply to cde-next:
error: patch failed: cde/config/imake/imakemdep.h:561
error: cde/config/imake/imakemdep.h: patch does not apply
error: patch failed: cde/lib/tt/lib/tt_options.h:341
error: cde/lib/tt/lib/tt_options.h: patch does not apply
error: patch failed: cde/programs/dtud
And this one doesn't apply. Good night :)
Applying: remove ultrix support
.git/rebase-apply/patch:295: trailing whitespace.
.git/rebase-apply/patch:342: trailing whitespace.
#include
.git/rebase-apply/patch:356: trailing whitespace.
#include
.git/rebase-apply/patch:570: trailing whitespace.
/
With the patch this time, jeez I think that's my queue to go to bed lol...
Thank you for your time,
-Chase
‐‐‐ Original Message ‐‐‐
On May 24, 2018 7:45 PM, Chase via cdesktopenv-devel
wrote:
> Self explanatory
>
> Thank you for your time,
> -ChaseFrom 450ee26337560c13d8afef285e6c834c1
Nope on this one too:
Applying: Remove ultrix code
.git/rebase-apply/patch:807: trailing whitespace.
# undef OPT_UNIX_SOCKET_RPC
.git/rebase-apply/patch:1508: trailing whitespace.
void CheckForDone(
.git/rebase-apply/patch:1674: trailing whitespace.
if (strcmp (Lang, "C") == 0)
.git/reba