diff mbox series

[1/1] package/transmission: drop second patch

Message ID 20201017194639.3919479-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/transmission: drop second patch | expand

Commit Message

Fabrice Fontaine Oct. 17, 2020, 7:46 p.m. UTC
transmission in version 3.00 is building fine on musl and upstream
thinks that this patch is not needed anymore:
https://github.com/transmission/transmission/pull/1156

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...clude.patch => 0002-fix-utp-include.patch} |  0
 .../0002-musl-missing-header.patch            | 36 -------------------
 2 files changed, 36 deletions(-)
 rename package/transmission/{0003-fix-utp-include.patch => 0002-fix-utp-include.patch} (100%)
 delete mode 100644 package/transmission/0002-musl-missing-header.patch

Comments

Yann E. MORIN Oct. 17, 2020, 9:59 p.m. UTC | #1
Fabrice, All,

On 2020-10-17 21:46 +0200, Fabrice Fontaine spake thusly:
> transmission in version 3.00 is building fine on musl and upstream
> thinks that this patch is not needed anymore:
> https://github.com/transmission/transmission/pull/1156
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...clude.patch => 0002-fix-utp-include.patch} |  0
>  .../0002-musl-missing-header.patch            | 36 -------------------
>  2 files changed, 36 deletions(-)
>  rename package/transmission/{0003-fix-utp-include.patch => 0002-fix-utp-include.patch} (100%)
>  delete mode 100644 package/transmission/0002-musl-missing-header.patch
> 
> diff --git a/package/transmission/0003-fix-utp-include.patch b/package/transmission/0002-fix-utp-include.patch
> similarity index 100%
> rename from package/transmission/0003-fix-utp-include.patch
> rename to package/transmission/0002-fix-utp-include.patch
> diff --git a/package/transmission/0002-musl-missing-header.patch b/package/transmission/0002-musl-missing-header.patch
> deleted file mode 100644
> index ebb74cbffb..0000000000
> --- a/package/transmission/0002-musl-missing-header.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -Fix musl build
> -
> -Downloaded from
> -https://cgit.gentoo.org/proj/musl.git/tree/net-p2p/transmission/files/transmission-2.84-musl-missing-header.patch
> -
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> -
> -
> -libtransmission/transmission.h: add missing <sys/types.h>
> -
> -transmission.h and several files including it, like bitfield.c and fdlimits.h
> -make reference to ssize_t, off_t and other types defined in <sys/types.h> but
> -never include the header.  By including <sys/types.h> in transmission.h, the
> -required type definitions are propagated to all files that need them.
> -
> -Not including <sys/types.h> on glibc and uClibc systems does not pose a problem
> -because of the way the headers stack in those C Standard Libraries, but on musl
> -excluding <sys/types.h> leads to compile time failure.
> -
> -For the POSIX specs, see
> -
> -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
> -
> -Signed-of-by: Anthony G. Basile <blueness@gentoo.org>
> -
> -diff -Naur transmission-2.84.orig/libtransmission/transmission.h transmission-2.84/libtransmission/transmission.h
> ---- transmission-2.84.orig/libtransmission/transmission.h	2014-07-01 13:09:01.682910744 -0400
> -+++ transmission-2.84/libtransmission/transmission.h	2015-07-19 03:11:07.379219181 -0400
> -@@ -28,6 +28,7 @@
> - 
> - #include <inttypes.h> /* uintN_t */
> - #include <time.h> /* time_t */
> -+#include <sys/types.h>
> - 
> - #ifdef WIN32
> -  #define __USE_MINGW_ANSI_STDIO 1
> -- 
> 2.28.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Yann E. MORIN Oct. 18, 2020, 4:40 p.m. UTC | #2
Fabrice, All,

On 2020-10-17 21:46 +0200, Fabrice Fontaine spake thusly:
> transmission in version 3.00 is building fine on musl and upstream
> thinks that this patch is not needed anymore:
> https://github.com/transmission/transmission/pull/1156
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, after expanding about the reason this is now correct.

I also updated the patch to jsut drop the code instead of commenting it
out, and by restoring CR/LF line endings as used by upstream.

Thanks!

Regards,
Yann E. MORIN.

> ---
>  ...clude.patch => 0002-fix-utp-include.patch} |  0
>  .../0002-musl-missing-header.patch            | 36 -------------------
>  2 files changed, 36 deletions(-)
>  rename package/transmission/{0003-fix-utp-include.patch => 0002-fix-utp-include.patch} (100%)
>  delete mode 100644 package/transmission/0002-musl-missing-header.patch
> 
> diff --git a/package/transmission/0003-fix-utp-include.patch b/package/transmission/0002-fix-utp-include.patch
> similarity index 100%
> rename from package/transmission/0003-fix-utp-include.patch
> rename to package/transmission/0002-fix-utp-include.patch
> diff --git a/package/transmission/0002-musl-missing-header.patch b/package/transmission/0002-musl-missing-header.patch
> deleted file mode 100644
> index ebb74cbffb..0000000000
> --- a/package/transmission/0002-musl-missing-header.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -Fix musl build
> -
> -Downloaded from
> -https://cgit.gentoo.org/proj/musl.git/tree/net-p2p/transmission/files/transmission-2.84-musl-missing-header.patch
> -
> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> -
> -
> -libtransmission/transmission.h: add missing <sys/types.h>
> -
> -transmission.h and several files including it, like bitfield.c and fdlimits.h
> -make reference to ssize_t, off_t and other types defined in <sys/types.h> but
> -never include the header.  By including <sys/types.h> in transmission.h, the
> -required type definitions are propagated to all files that need them.
> -
> -Not including <sys/types.h> on glibc and uClibc systems does not pose a problem
> -because of the way the headers stack in those C Standard Libraries, but on musl
> -excluding <sys/types.h> leads to compile time failure.
> -
> -For the POSIX specs, see
> -
> -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
> -
> -Signed-of-by: Anthony G. Basile <blueness@gentoo.org>
> -
> -diff -Naur transmission-2.84.orig/libtransmission/transmission.h transmission-2.84/libtransmission/transmission.h
> ---- transmission-2.84.orig/libtransmission/transmission.h	2014-07-01 13:09:01.682910744 -0400
> -+++ transmission-2.84/libtransmission/transmission.h	2015-07-19 03:11:07.379219181 -0400
> -@@ -28,6 +28,7 @@
> - 
> - #include <inttypes.h> /* uintN_t */
> - #include <time.h> /* time_t */
> -+#include <sys/types.h>
> - 
> - #ifdef WIN32
> -  #define __USE_MINGW_ANSI_STDIO 1
> -- 
> 2.28.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Yann E. MORIN Oct. 18, 2020, 7:50 p.m. UTC | #3
Fabrice, All,

On 2020-10-18 18:40 +0200, Yann E. MORIN spake thusly:
> Fabrice, All,
> 
> On 2020-10-17 21:46 +0200, Fabrice Fontaine spake thusly:
> > transmission in version 3.00 is building fine on musl and upstream
> > thinks that this patch is not needed anymore:
> > https://github.com/transmission/transmission/pull/1156
> > 
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> 
> Applied to master, after expanding about the reason this is now correct.
> 
> I also updated the patch to jsut drop the code instead of commenting it
> out, and by restoring CR/LF line endings as used by upstream.

I mistakenly replied to this thread, when I wanting to reply to the
patch titled "package/transmission: fix build with UTP", which is thus
applied to master, thanks!

Sorry for the confusion.

Regards,
Yann E. MORIN.

> Thanks!
> 
> Regards,
> Yann E. MORIN.
> 
> > ---
> >  ...clude.patch => 0002-fix-utp-include.patch} |  0
> >  .../0002-musl-missing-header.patch            | 36 -------------------
> >  2 files changed, 36 deletions(-)
> >  rename package/transmission/{0003-fix-utp-include.patch => 0002-fix-utp-include.patch} (100%)
> >  delete mode 100644 package/transmission/0002-musl-missing-header.patch
> > 
> > diff --git a/package/transmission/0003-fix-utp-include.patch b/package/transmission/0002-fix-utp-include.patch
> > similarity index 100%
> > rename from package/transmission/0003-fix-utp-include.patch
> > rename to package/transmission/0002-fix-utp-include.patch
> > diff --git a/package/transmission/0002-musl-missing-header.patch b/package/transmission/0002-musl-missing-header.patch
> > deleted file mode 100644
> > index ebb74cbffb..0000000000
> > --- a/package/transmission/0002-musl-missing-header.patch
> > +++ /dev/null
> > @@ -1,36 +0,0 @@
> > -Fix musl build
> > -
> > -Downloaded from
> > -https://cgit.gentoo.org/proj/musl.git/tree/net-p2p/transmission/files/transmission-2.84-musl-missing-header.patch
> > -
> > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> > -
> > -
> > -libtransmission/transmission.h: add missing <sys/types.h>
> > -
> > -transmission.h and several files including it, like bitfield.c and fdlimits.h
> > -make reference to ssize_t, off_t and other types defined in <sys/types.h> but
> > -never include the header.  By including <sys/types.h> in transmission.h, the
> > -required type definitions are propagated to all files that need them.
> > -
> > -Not including <sys/types.h> on glibc and uClibc systems does not pose a problem
> > -because of the way the headers stack in those C Standard Libraries, but on musl
> > -excluding <sys/types.h> leads to compile time failure.
> > -
> > -For the POSIX specs, see
> > -
> > -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
> > -
> > -Signed-of-by: Anthony G. Basile <blueness@gentoo.org>
> > -
> > -diff -Naur transmission-2.84.orig/libtransmission/transmission.h transmission-2.84/libtransmission/transmission.h
> > ---- transmission-2.84.orig/libtransmission/transmission.h	2014-07-01 13:09:01.682910744 -0400
> > -+++ transmission-2.84/libtransmission/transmission.h	2015-07-19 03:11:07.379219181 -0400
> > -@@ -28,6 +28,7 @@
> > - 
> > - #include <inttypes.h> /* uintN_t */
> > - #include <time.h> /* time_t */
> > -+#include <sys/types.h>
> > - 
> > - #ifdef WIN32
> > -  #define __USE_MINGW_ANSI_STDIO 1
> > -- 
> > 2.28.0
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot@busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
> 
> -- 
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/transmission/0003-fix-utp-include.patch b/package/transmission/0002-fix-utp-include.patch
similarity index 100%
rename from package/transmission/0003-fix-utp-include.patch
rename to package/transmission/0002-fix-utp-include.patch
diff --git a/package/transmission/0002-musl-missing-header.patch b/package/transmission/0002-musl-missing-header.patch
deleted file mode 100644
index ebb74cbffb..0000000000
--- a/package/transmission/0002-musl-missing-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@ 
-Fix musl build
-
-Downloaded from
-https://cgit.gentoo.org/proj/musl.git/tree/net-p2p/transmission/files/transmission-2.84-musl-missing-header.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-
-libtransmission/transmission.h: add missing <sys/types.h>
-
-transmission.h and several files including it, like bitfield.c and fdlimits.h
-make reference to ssize_t, off_t and other types defined in <sys/types.h> but
-never include the header.  By including <sys/types.h> in transmission.h, the
-required type definitions are propagated to all files that need them.
-
-Not including <sys/types.h> on glibc and uClibc systems does not pose a problem
-because of the way the headers stack in those C Standard Libraries, but on musl
-excluding <sys/types.h> leads to compile time failure.
-
-For the POSIX specs, see
-
-http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
-
-Signed-of-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur transmission-2.84.orig/libtransmission/transmission.h transmission-2.84/libtransmission/transmission.h
---- transmission-2.84.orig/libtransmission/transmission.h	2014-07-01 13:09:01.682910744 -0400
-+++ transmission-2.84/libtransmission/transmission.h	2015-07-19 03:11:07.379219181 -0400
-@@ -28,6 +28,7 @@
- 
- #include <inttypes.h> /* uintN_t */
- #include <time.h> /* time_t */
-+#include <sys/types.h>
- 
- #ifdef WIN32
-  #define __USE_MINGW_ANSI_STDIO 1