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 patch originally, so the above may
screw things up even worse.
-jon
On 06/24/2018 04:42 PM, Chase wrote:
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 4:53 PM, Jon Trulson <j...@radscan.com> wrote:
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/dtudcfonted/libfal/_falSetLocale.c:161
error: cde/programs/dtudcfonted/libfal/_falSetLocale.c: patch does not apply
Patch failed at 0001 Remove ultrix support
This kind of stuff needs to go into cde-next rather than master... Only
bug fixes, doc fixes, etc should go into master until release.
Once release is released, then we can merge cde-next into master.
-jon
On 06/23/2018 08:50 PM, Chase via cdesktopenv-devel wrote:
Third times the charm!
Posting some last minute patches before the release comes.
Thank you for your time,
-Chase
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
--
Jon Trulson
"Fire all weapons and open a hailing frequency for my victory yodle."
- Zapp Brannigan
--------------------------------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
--
Jon Trulson
"Fire all weapons and open a hailing frequency for my victory yodle."
- Zapp Brannigan
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
