bug#66506: 30.0.50; java/INSTALL contains unnecessary patch for Android-ImageMagick7.

bug#66506: 30.0.50; java/INSTALL contains unnecessary patch for Android-ImageMagick7.

[Takesi Ayanokoji]

[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]

Hello,

When I tried building Android port of emacs-30.0.50 with modules, I
realized unnecessary hunk is included in the patch for
libjpeg-turbo-2.0.2/jconfig.h part of Android-ImageMagick7.

This hunk seems deletes empty lines only.

diff --git a/libjpeg-turbo-2.0.2/jconfig.h b/libjpeg-turbo-2.0.2/jconfig.h
index 47d14c9..5c6f8ee 100644
--- a/libjpeg-turbo-2.0.2/jconfig.h
+++ b/libjpeg-turbo-2.0.2/jconfig.h
@@ -1,57 +1,43 @@
-/* autogenerated jconfig.h based on Android.mk var JCONFIG_FLAGS */
+/* autogenerated jconfig.h based on Android.mk var JCONFIG_FLAGS */
 #ifndef JPEG_LIB_VERSION
 #define JPEG_LIB_VERSION 62
 #endif
-
 #ifndef LIBJPEG_TURBO_VERSION
 #define LIBJPEG_TURBO_VERSION 2.0.2
 #endif
-
 #ifndef LIBJPEG_TURBO_VERSION_NUMBER
 #define LIBJPEG_TURBO_VERSION_NUMBER 202
 #endif
-
 #ifndef C_ARITH_CODING_SUPPORTED
 #define C_ARITH_CODING_SUPPORTED
 #endif
-
 #ifndef D_ARITH_CODING_SUPPORTED
 #define D_ARITH_CODING_SUPPORTED
 #endif
-
 #ifndef MEM_SRCDST_SUPPORTED
 #define MEM_SRCDST_SUPPORTED
 #endif
-
 #ifndef WITH_SIMD
 #define WITH_SIMD
 #endif
-
 #ifndef BITS_IN_JSAMPLE
 #define BITS_IN_JSAMPLE 8
 #endif
-
 #ifndef HAVE_LOCALE_H
 #define HAVE_LOCALE_H
 #endif
-
 #ifndef HAVE_STDDEF_H
 #define HAVE_STDDEF_H
 #endif
-
 #ifndef HAVE_STDLIB_H
 #define HAVE_STDLIB_H
 #endif
-
 #ifndef NEED_SYS_TYPES_H
 #define NEED_SYS_TYPES_H
 #endif
-
 #ifndef HAVE_UNSIGNED_CHAR
 #define HAVE_UNSIGNED_CHAR
 #endif
-
 #ifndef HAVE_UNSIGNED_SHORT
 #define HAVE_UNSIGNED_SHORT
 #endif
-

Thanks,

[-- Attachment #2: Type: text/html, Size: 3107 bytes --]

bug#66506: 30.0.50; java/INSTALL contains unnecessary patch for Android-ImageMagick7.

[Stefan Kangas]

Takesi Ayanokoji <ayanokoji.takesi@gmail.com> writes:

> Hello,
>
> When I tried building Android port of emacs-30.0.50 with modules, I realized unnecessary hunk is included in the patch for
> libjpeg-turbo-2.0.2/jconfig.h part of Android-ImageMagick7.
>
> This hunk seems deletes empty lines only.

Po Lu, any comments?

>
> diff --git a/libjpeg-turbo-2.0.2/jconfig.h b/libjpeg-turbo-2.0.2/jconfig.h
> index 47d14c9..5c6f8ee 100644
> --- a/libjpeg-turbo-2.0.2/jconfig.h
> +++ b/libjpeg-turbo-2.0.2/jconfig.h
> @@ -1,57 +1,43 @@
> -/* autogenerated jconfig.h based on Android.mk var JCONFIG_FLAGS */
> +/* autogenerated jconfig.h based on Android.mk var JCONFIG_FLAGS */
>  #ifndef JPEG_LIB_VERSION
>  #define JPEG_LIB_VERSION 62
>  #endif
> -
>  #ifndef LIBJPEG_TURBO_VERSION
>  #define LIBJPEG_TURBO_VERSION 2.0.2
>  #endif
> -
>  #ifndef LIBJPEG_TURBO_VERSION_NUMBER
>  #define LIBJPEG_TURBO_VERSION_NUMBER 202
>  #endif
> -
>  #ifndef C_ARITH_CODING_SUPPORTED
>  #define C_ARITH_CODING_SUPPORTED
>  #endif
> -
>  #ifndef D_ARITH_CODING_SUPPORTED
>  #define D_ARITH_CODING_SUPPORTED
>  #endif
> -
>  #ifndef MEM_SRCDST_SUPPORTED
>  #define MEM_SRCDST_SUPPORTED
>  #endif
> -
>  #ifndef WITH_SIMD
>  #define WITH_SIMD
>  #endif
> -
>  #ifndef BITS_IN_JSAMPLE
>  #define BITS_IN_JSAMPLE 8
>  #endif
> -
>  #ifndef HAVE_LOCALE_H
>  #define HAVE_LOCALE_H
>  #endif
> -
>  #ifndef HAVE_STDDEF_H
>  #define HAVE_STDDEF_H
>  #endif
> -
>  #ifndef HAVE_STDLIB_H
>  #define HAVE_STDLIB_H
>  #endif
> -
>  #ifndef NEED_SYS_TYPES_H
>  #define NEED_SYS_TYPES_H
>  #endif
> -
>  #ifndef HAVE_UNSIGNED_CHAR
>  #define HAVE_UNSIGNED_CHAR
>  #endif
> -
>  #ifndef HAVE_UNSIGNED_SHORT
>  #define HAVE_UNSIGNED_SHORT
>  #endif
> -
>
> Thanks,

bug#66506: 30.0.50; java/INSTALL contains unnecessary patch for Android-ImageMagick7.

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Stefan Kangas <stefankangas@gmail.com> writes:

> Takesi Ayanokoji <ayanokoji.takesi@gmail.com> writes:
>
>> Hello,
>>
>> When I tried building Android port of emacs-30.0.50 with modules, I
>> realized unnecessary hunk is included in the patch for
>> libjpeg-turbo-2.0.2/jconfig.h part of Android-ImageMagick7.
>>
>> This hunk seems deletes empty lines only.
>
> Po Lu, any comments?

Parts of these patches are generated by a computer program, and since
one of its actions is to remove empty lines in a header file, that
should be reflected in the patches generated, if only for consistency's
sake.

Thanks.

bug#66506: 30.0.50; java/INSTALL contains unnecessary patch for Android-ImageMagick7.

[Stefan Kangas]

Po Lu <luangruo@yahoo.com> writes:

> Parts of these patches are generated by a computer program, and since
> one of its actions is to remove empty lines in a header file, that
> should be reflected in the patches generated, if only for consistency's
> sake.

What action do you propose here?  Close as notabug?

bug#66506: 30.0.50; java/INSTALL contains unnecessary patch for Android-ImageMagick7.

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

tags 66506 notabug
close 66506
thanks

Stefan Kangas <stefankangas@gmail.com> writes:

> Po Lu <luangruo@yahoo.com> writes:
>
>> Parts of these patches are generated by a computer program, and since
>> one of its actions is to remove empty lines in a header file, that
>> should be reflected in the patches generated, if only for consistency's
>> sake.
>
> What action do you propose here?  Close as notabug?

Yes, thanks.  Now done.