WIP: Upstream rebase

[fejfighter]

This is my WIP to rebase and combine/reword commits to make upstream integration a simpler merge.

It should make it a fast-forward merge to upstream, but will not merge into masm11/pgtk

I think I have all changes now, and it seems to compile

[masm11]

Thank you.

Notice: #21 was reverted by #24.

[masm11]

My compiler says:

image.c: In function 'imagemagick_load_image':
image.c:9399:1: error: invalid storage class for function 'imagemagick_load'
 9399 | imagemagick_load (struct frame *f, struct image *img)
      | ^~~~~~~~~~~~~~~~
image.c:9485:13: error: invalid storage class for function 'svg_load_image'
 9485 | static bool svg_load_image (struct frame *, struct image *,
      |             ^~~~~~~~~~~~~~
image.c:9527:1: error: invalid storage class for function 'svg_image_p'
 9527 | svg_image_p (Lisp_Object object)
      | ^~~~~~~~~~~
image.c:9713:1: error: invalid storage class for function 'svg_load'
 9713 | svg_load (struct frame *f, struct image *img)
      | ^~~~~~~~

... and many errors.

[fejfighter]

Sorry, I pushed on folding in more fixup commits, it might be a little out of order now..
I have taken #21 into account

[fejfighter]

Ok Should be good now

I only I get gcc 10 warnings from code neither of us have touched

[masm11]

What did you do? What should I do? What is this branch?
I don't understand.
Could you explain?

[Emantor]

This branch extracts your commits on the master branch into a linear history which can be applied on top off current emacs master. This way the commits can be carried forward using a rebase, instead of periodically merging in the emacs master branch.

[masm11]

@Emantor
Thank you for the explanation about his work.

@fejfighter
I understand rebase. I should have used it. Thank you very much for your hard work!
But this branch is not tested, and shouldn't be pushed to fsf's repository.
How are you going to do from here?

[masm11]

I'll test this branch again tomorrow night.

[fejfighter]

@masm11
All good, I have worked with a few developers over the years that didn't understand it.
just wanted to make sure there was no language barrier and what needed to be done.

As far as testing and pushing to FSF, I agree it's not yet ready

The best I can manage for testing is to compare diffs between your pgtk branch, upstream gnu and this one.

Most of the commits that I am squashing down are smaller fixups (removal of trace statements, change of functions or args) or in the cases where upstream made structural changes (XColor -> Emacs_Color) I'm trying to make the original code have that from the start

Once it's down to a manageable number of commits that implement/fix related unit of work then changing to gnu commit messages should be easier. for now I have put notes in for myself, but kep the original japanese commits in the body of the commit.

[masm11]

@fejfighter
Great!
Maybe, I can help you only by testing your branch.

I tested 8283bf1. My compiler says:

image.c:6491:2: error: #endif without #if
 6491 | #endif /* HAVE_PNG */
      |  ^~~~~
image.c: In function 'imagemagick_load_image':
image.c:9398:1: error: invalid storage class for function 'imagemagick_load'
 9398 | imagemagick_load (struct frame *f, struct image *img)
      | ^~~~~~~~~~~~~~~~
image.c:9484:13: error: invalid storage class for function 'svg_load_image'
 9484 | static bool svg_load_image (struct frame *, struct image *,
      |             ^~~~~~~~~~~~~~
image.c:9526:1: error: invalid storage class for function 'svg_image_p'
 9526 | svg_image_p (Lisp_Object object)
      | ^~~~~~~~~~~
image.c:9712:1: error: invalid storage class for function 'svg_load'
 9712 | svg_load (struct frame *f, struct image *img)
      | ^~~~~~~~
image.c: In function 'svg_load':
image.c:9738:19: warning: implicit declaration of function 'svg_load_image'; did you mean 'xpm_load_image'? [-Wimplicit-function-declaration]
 9738 |       success_p = svg_load_image (f, img, contents, size,
      |                   ^~~~~~~~~~~~~~
      |                   xpm_load_image
image.c:9738:19: warning: nested extern declaration of 'svg_load_image' [-Wnested-externs]
image.c: In function 'imagemagick_load_image':
image.c:9771:1: error: invalid storage class for function 'svg_load_image'
 9771 | svg_load_image (struct frame *f, struct image *img, char *contents,
      | ^~~~~~~~~~~~~~
image.c:10286:1: error: invalid storage class for function 'initialize_image_type'
10286 | initialize_image_type (struct image_type const *type)
      | ^~~~~~~~~~~~~~~~~~~~~
image.c:10321:54: error: initializer element is not constant
10321 |  { SYMBOL_INDEX (Qimagemagick), imagemagick_image_p, imagemagick_load,
      |                                                      ^~~~~~~~~~~~~~~~
image.c:10321:54: note: (near initialization for 'image_types[0].load')
image.c:10325:25: error: initializer element is not constant
10325 |  { SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image,
      |                         ^~~~~~~~~~~
image.c:10325:25: note: (near initialization for 'image_types[1].valid_p')
image.c:10325:38: error: initializer element is not constant
10325 |  { SYMBOL_INDEX (Qsvg), svg_image_p, svg_load, image_clear_image,
      |                                      ^~~~~~~~
image.c:10325:38: note: (near initialization for 'image_types[1].load')
image.c:10362:1: error: invalid storage class for function 'lookup_image_type'
10362 | lookup_image_type (Lisp_Object type)
      | ^~~~~~~~~~~~~~~~~
image.c:10587:1: error: expected declaration or statement at end of input
10587 | }
      | ^
image.c:10587:1: error: expected declaration or statement at end of input
image.c: At top level:
image.c:877:33: warning: 'lookup_image_type' used but never defined
  877 | static struct image_type const *lookup_image_type (Lisp_Object);
      |                                 ^~~~~~~~~~~~~~~~~
image.c:10380:1: warning: 'syms_of_image' defined but not used [-Wunused-function]
10380 | syms_of_image (void)
      | ^~~~~~~~~~~~~
image.c:10362:1: warning: 'lookup_image_type' defined but not used [-Wunused-function]
10362 | lookup_image_type (Lisp_Object type)
      | ^~~~~~~~~~~~~~~~~
In file included from image.c:37:
image.c:10273:30: warning: 'Finit_image_library' defined but not used [-Wunused-function]
10273 | DEFUN ("init-image-library", Finit_image_library, Sinit_image_library, 1, 1, 0,
      |                              ^~~~~~~~~~~~~~~~~~~
lisp.h:3070:16: note: in definition of macro 'DEFUN'
 3070 |    Lisp_Object fnname
      |                ^~~~~~
image.c:10239:30: warning: 'Fimage_transforms_p' defined but not used [-Wunused-function]
10239 | DEFUN ("image-transforms-p", Fimage_transforms_p, Simage_transforms_p, 0, 1, 0,
      |                              ^~~~~~~~~~~~~~~~~~~
lisp.h:3070:16: note: in definition of macro 'DEFUN'
 3070 |    Lisp_Object fnname
      |                ^~~~~~
image.c:9771:1: warning: 'svg_load_image' defined but not used [-Wunused-function]
 9771 | svg_load_image (struct frame *f, struct image *img, char *contents,
      | ^~~~~~~~~~~~~~
In file included from image.c:37:
image.c:9438:29: warning: 'Fimagemagick_types' defined but not used [-Wunused-function]
 9438 | DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
      |                             ^~~~~~~~~~~~~~~~~~
lisp.h:3070:16: note: in definition of macro 'DEFUN'
 3070 |    Lisp_Object fnname
      |                ^~~~~~

[masm11]

@fejfighter
For now, I'll debug many issues pointed out in emacs-devel.

[fejfighter]

@masm11, what configure string are you using?
and are the version numbers in your README.md still up to date?

I'm not using arch but I could set up a VM to compare against it, because I am sure I had those issues fixed

EDIT:
never mind, Now I am getting some of the same errors

thought I do have a slightly older ImageMagick on fedora31

[fejfighter]

I never got the defun issues but,

I found that I missed a couple of closing braces in a for loop that should fix that

later today I will try to fold in more commits,
I think the Readme and pkgbuild commits can be placed in one for easy removal closer to an upstream push

[fejfighter]

@fejfighter
The change was introduced in bd57e31.
When I merged upstream master, it conflicted with f2bb574 and I resolved in the merge commit 591b0de.

I had been looking at the wrong function trying to figure out what was different.

this should line up now

[masm11]

@fejfighter confirmed. thanks!

[masm11]

I pushed to savannah as feature/pgtk! Thank you everyone!!

https://lists.gnu.org/archive/html/emacs-devel/2020-11/msg01141.html

[Thaodan]

Close this one then?

[fejfighter]

Yeah, this is upstream now and I haven't been updating it