[1/1] package/janus-gateway: update the patches to be applied with fuzz 0
diff mbox series

Message ID 20240706103111.3489071-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [1/1] package/janus-gateway: update the patches to be applied with fuzz 0
Related show

Commit Message

Dario Binacchi July 6, 2024, 10:31 a.m. UTC 
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, janus-gateway fails to build with output:

    Applying 0002-Add-test-for-Wunused-but-set-variable.patch using patch:
    patching file src/Makefile.am
    Hunk #1 succeeded at 132 (offset -19 lines).
    patching file configure.ac
    Hunk #1 succeeded at 12 (offset -1 lines).
    Hunk #2 FAILED at 67.
    1 out of 2 hunks FAILED -- saving rejects to file configure.ac.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .checkpackageignore                            |  1 -
 ...Add-test-for-Wunused-but-set-variable.patch | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

Comments

'Jan Kiszka' via Amarula Linux July 8, 2024, 8:21 p.m. UTC | #1 
On Sat,  6 Jul 2024 12:31:11 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:

> Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0") reduced the fuzz factor.
> 
> Due to this change, janus-gateway fails to build with output:
> 
>     Applying 0002-Add-test-for-Wunused-but-set-variable.patch using patch:
>     patching file src/Makefile.am
>     Hunk #1 succeeded at 132 (offset -19 lines).
>     patching file configure.ac
>     Hunk #1 succeeded at 12 (offset -1 lines).
>     Hunk #2 FAILED at 67.
>     1 out of 2 hunks FAILED -- saving rejects to file configure.ac.rej
> 
> This commit refreshes the package patch on the current package version.
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>  .checkpackageignore                            |  1 -
>  ...Add-test-for-Wunused-but-set-variable.patch | 18 ++++++++++--------
>  2 files changed, 10 insertions(+), 9 deletions(-)

Applied to master, thanks.

Thomas

Patch
diff mbox series 

diff --git a/.checkpackageignore b/.checkpackageignore
index 0a1d2627455e..9e9c493711e1 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -767,7 +767,6 @@  package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch
 package/iucode-tool/S00iucode-tool lib_sysv.Variables
 package/iwd/S40iwd Shellcheck lib_sysv.Variables
 package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream
-package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch lib_patch.Upstream
 package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch lib_patch.Upstream
 package/jose/0002-man-add-option-to-skip-building-man-pages.patch lib_patch.Upstream
 package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream
diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch
index 31796d6e28ed..4596577af390 100644
--- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch
+++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch
@@ -20,8 +20,10 @@  Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 Signed-off-by: Adam Duskett <Aduskett@gmail.com>
 [rebased against v1.0.3)
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: rejected
-(https://github.com/meetecho/janus-gateway/pull/1789)]
+Upstream: rejected (https://github.com/meetecho/janus-gateway/pull/1789)
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
+
 ---
  Makefile.am                 |  1 +
  configure.ac                |  6 ++-
@@ -30,10 +32,10 @@  Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  create mode 100644 m4/ax_check_compile_flag.m4
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index f961fdb..3ddbe59 100644
+index 96d361e53be0..a8bfd17c930c 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -151,6 +151,7 @@ janus_CFLAGS = \
+@@ -132,6 +132,7 @@ janus_CFLAGS = \
  	-DEVENTDIR=\"$(eventdir)\" \
  	-DLOGGERDIR=\"$(loggerdir)\" \
  	-DCONFDIR=\"$(confdir)\" \
@@ -42,10 +44,10 @@  index f961fdb..3ddbe59 100644
  	$(NULL)
  
 diff --git a/configure.ac b/configure.ac
-index ca17a29..beef91a 100644
+index c37c85b7ab06..5afe0ef0bbff 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -13,6 +13,9 @@ AM_SILENT_RULES([yes])
+@@ -12,6 +12,9 @@ AM_SILENT_RULES([yes])
  AC_USE_SYSTEM_EXTENSIONS
  
  AC_PROG_CC
@@ -55,7 +57,7 @@  index ca17a29..beef91a 100644
  
  LT_PREREQ([2.2])
  LT_INIT
-@@ -64,8 +67,7 @@ clang*)
+@@ -65,8 +68,7 @@ cc*)
  	CFLAGS="$CFLAGS \
  		-Wcast-align \
  		-Wno-override-init \
@@ -64,7 +66,7 @@  index ca17a29..beef91a 100644
 +		-Wunsafe-loop-optimizations"
  esac
  
- JANUS_VERSION=103
+ JANUS_VERSION=1102
 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
 new file mode 100644
 index 0000000..51df0c0