Skip to contentSkip to conversation

package/transmission: drop second patch

PATCH New Fabrice Fontaine 2 participants 4 messages Oct 17, 2020 – Oct 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/transmission: drop second patch

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

---
 ...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
package/transmission/0002-fix-utp-include.patch renamed from package/transmission/0003-fix-utp-include.patch +0 -0
similarity index 100%
rename from package/transmission/0003-fix-utp-include.patch
rename to package/transmission/0002-fix-utp-include.patch
package/transmission/0002-musl-missing-header.patch deleted +0 -36
deleted file mode 100644
index ebb74cbffb..0000000000
@@ -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 <[email protected]>
-
-
-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 <[email protected]>
-
-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
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/transmission: drop second patch

Fabrice, All,

On 2020-10-17 21:46 +0200, Fabrice Fontaine spake thusly:

Quoted 5 lines

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

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 60 lines
---
 ...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
package/transmission/0002-fix-utp-include.patch renamed from package/transmission/0003-fix-utp-include.patch +0 -0
similarity index 100%
rename from package/transmission/0003-fix-utp-include.patch
rename to package/transmission/0002-fix-utp-include.patch
package/transmission/0002-musl-missing-header.patch deleted +0 -36
deleted file mode 100644
index ebb74cbffb..0000000000
@@ -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 <[email protected]>
-
-
-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 <[email protected]>
-
-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
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/transmission: drop second patch

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-10-17 21:46 +0200, Fabrice Fontaine spake thusly:

Quoted 5 lines

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

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.

Quoted 60 lines
---
 ...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
package/transmission/0002-fix-utp-include.patch renamed from package/transmission/0003-fix-utp-include.patch +0 -0
similarity index 100%
rename from package/transmission/0003-fix-utp-include.patch
rename to package/transmission/0002-fix-utp-include.patch
package/transmission/0002-musl-missing-header.patch deleted +0 -36
deleted file mode 100644
index ebb74cbffb..0000000000
@@ -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 <[email protected]>
-
-
-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 <[email protected]>
-
-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
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 package/transmission: drop second patch

Fabrice, All,

On 2020-10-18 18:40 +0200, Yann E. MORIN spake thusly:

Quoted 7 lines

Fabrice, All,

On 2020-10-17 21:46 +0200, Fabrice Fontaine spake thusly:

Quoted 4 lines

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

Quoted 6 lines
Quoted 1 line

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.

Quoted 77 lines

Thanks!

Regards,
Yann E. MORIN.

Quoted 60 lines
---
 ...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
package/transmission/0002-fix-utp-include.patch renamed from package/transmission/0003-fix-utp-include.patch +0 -0
similarity index 100%
rename from package/transmission/0003-fix-utp-include.patch
rename to package/transmission/0002-fix-utp-include.patch
package/transmission/0002-musl-missing-header.patch deleted +0 -36
deleted file mode 100644
index ebb74cbffb..0000000000
@@ -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 <[email protected]>
-
-
-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 <[email protected]>
-
-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
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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 at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'