| Message ID | b4747db801190413e60441c7abbd0405a52097ad.camel@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#54829,v2,1/3] gnu: emacs: Update to 28.1. | expand |
> * gnu/packages/emacs.scm (emacs): Update to 28.1 > * gnu/packages/patches/emacs-exec-path.patch: Adjust accordingly. > * gnu/packages/patches/emacs-ignore-empty-xim-styles.patch: Delete file. > * gnu/local.mk: Remove it here. > --- > gnu/local.mk | 1 - > gnu/packages/emacs.scm | 5 ++-- > gnu/packages/patches/emacs-exec-path.patch | 12 +++++----- > .../emacs-ignore-empty-xim-styles.patch | 24 ------------------- > 4 files changed, 8 insertions(+), 34 deletions(-) > delete mode 100644 gnu/packages/patches/emacs-ignore-empty-xim-styles.patch LGTM! Building emacs, emacs-minimal, emacs-xwidgets, emacs-no-x, emacs-no-x-toolkit, emacs-wide-int (and running them) with this v2 1/3 patch worked well me.
Hi Liliana, Applying patch v2 1/3, I get: --8<---------------cut here---------------start------------->8--- error: corrupt patch at line 71 hint: Use 'git am --show-current-patch=diff' to see the failed patch Applying: gnu: emacs: Update to 28.1. Patch failed at 0001 gnu: emacs: Update to 28.1. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". --8<---------------cut here---------------end--------------->8--- I do not know what is wrong. Could you provide the commit against which this patch applies? See 'git format-patch --base='. Moreover, since the upgrade of Emacs leads to an emacs-world rebuild, it could be nice to also remove all the trailing #t. WDYT? Cheers, simon
Am Dienstag, dem 12.04.2022 um 10:15 +0200 schrieb zimoun: > Hi Liliana, > > Applying patch v2 1/3, I get: > > --8<---------------cut here---------------start------------->8--- > error: corrupt patch at line 71 > hint: Use 'git am --show-current-patch=diff' to see the failed patch > Applying: gnu: emacs: Update to 28.1. > Patch failed at 0001 gnu: emacs: Update to 28.1. > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am -- > abort". > --8<---------------cut here---------------end--------------->8--- > > I do not know what is wrong. Could you provide the commit against > which this patch applies? See 'git format-patch --base='. I have some unfinished work below this, so it's not clean, but I'm doing somewhat regular rebases on master. The last commit is 47b6451eb55d74161d6e5899f0079e219cfa8a00. > Moreover, since the upgrade of Emacs leads to an emacs-world rebuild, > it could be nice to also remove all the trailing #t. WDYT? Sure, those should go towards 2/3, but perhaps I didn't catch (all of) them. Cheers
Hi Liliana, On Tue, 12 Apr 2022 at 20:19, Liliana Marie Prikler <liliana.prikler@gmail.com> wrote: > Am Dienstag, dem 12.04.2022 um 10:15 +0200 schrieb zimoun: >> Applying patch v2 1/3, I get: >> >> --8<---------------cut here---------------start------------->8--- >> error: corrupt patch at line 71 >> hint: Use 'git am --show-current-patch=diff' to see the failed patch >> Applying: gnu: emacs: Update to 28.1. >> Patch failed at 0001 gnu: emacs: Update to 28.1. >> When you have resolved this problem, run "git am --continue". >> If you prefer to skip this patch, run "git am --skip" instead. >> To restore the original branch and stop patching, run "git am -- >> abort". >> --8<---------------cut here---------------end--------------->8--- >> >> I do not know what is wrong. Could you provide the commit against >> which this patch applies? See 'git format-patch --base='. > > I have some unfinished work below this, so it's not clean, but I'm > doing somewhat regular rebases on master. The last commit is > 47b6451eb55d74161d6e5899f0079e219cfa8a00. For some reasons I totally miss, the patch v2 1/3 does not apply for me with the same message as above, even against 47b6451eb55d74161d6e5899f0. Anyway, I can wait for v3. :-) Cheers, simon
diff --git a/gnu/local.mk b/gnu/local.mk index a44815bdbb..9d6d81b3e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1028,7 +1028,6 @@ dist_patch_DATA = \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ - %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index bfb3f9790e..7d791250d2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -79,17 +79,16 @@ (define-module (gnu packages emacs) (define-public emacs (package (name "emacs") - (version "27.2") + (version "28.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl")) + "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98")) (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" - "emacs-ignore-empty-xim-styles.patch" "emacs-source-date-epoch.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-exec-path.patch b/gnu/packages/patches/emacs-exec-path.patch index 7303599df1..9a76b0237d 100644 --- a/gnu/packages/patches/emacs-exec-path.patch +++ b/gnu/packages/patches/emacs-exec-path.patch @@ -4,13 +4,13 @@ with things like GCC being referenced. --- a/lisp/loadup.el +++ b/lisp/loadup.el -@@ -481,7 +481,8 @@ lost after dumping"))) +@@ -530,7 +530,8 @@ lost after dumping"))) ((equal dump-mode "dump") "emacs") ((equal dump-mode "bootstrap") "emacs") ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") -- (t (error "unrecognized dump mode %s" dump-mode))))) -+ (t (error "unrecognized dump mode %s" dump-mode)))) +- (t (error "Unrecognized dump mode %s" dump-mode))))) ++ (t (error "Unrecognized dump mode %s" dump-mode)))) + (exec-path nil)) - (message "Dumping under the name %s" output) - (condition-case () - (delete-file output) + (when (and (featurep 'native-compile) + (equal dump-mode "pdump")) + ;; Don't enable this before bootstrap is completed, as the diff --git a/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch b/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch deleted file mode 100644 index 398e65bdc8..0000000000 --- a/gnu/packages/patches/emacs-ignore-empty-xim-styles.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix contributed upstream here: -https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42694. - -Index: emacs-26.3/src/xfns.c -=================================================================== ---- emacs-26.3.orig/src/xfns.c -+++ emacs-26.3/src/xfns.c -@@ -2628,6 +2628,8 @@ xic_free_xfontset (struct frame *f) - static XIMStyle - best_xim_style (XIMStyles *xim) - { -+ if (xim == NULL) goto out; -+ - int i, j; - int nr_supported = ARRAYELTS (supported_xim_styles); - -@@ -2636,6 +2638,7 @@ best_xim_style (XIMStyles *xim) - if (supported_xim_styles[i] == xim->supported_styles[j]) - return supported_xim_styles[i]; - -+ out: - /* Return the default style. */ - return XIMPreeditNothing | XIMStatusNothing; - }