Skip to content

Commit 9ede791

Browse files
passgatRomainNaour
authored andcommitted
package/libglfw: update the patches to be applied with fuzz 0
Commit 8f88a64 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, libglfw fails to build with output: Applying 0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch using patch: patching file src/CMakeLists.txt Hunk #1 FAILED at 75. 1 out of 1 hunk FAILED -- saving rejects to file src/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <[email protected]> Signed-off-by: Romain Naour <[email protected]>
1 parent 4309211 commit 9ede791

3 files changed

+22
-17
lines changed

.checkpackageignore

-1
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,6 @@ package/libfuse/0001-fix-aarch64-build.patch lib_patch.Upstream
763763
package/libfuse/0002-util-ulockmgr_server-c-conditionally-define-closefrom-fix-glibc-2-34.patch lib_patch.Upstream
764764
package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch lib_patch.Upstream
765765
package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch lib_patch.Upstream
766-
package/libglfw/0002-src-CMakeLists.txt-allow-override-of-wayland-pkgdata.patch lib_patch.Upstream
767766
package/libgpiod/0001-build-add-a-configure-switch-for-building-examples.patch lib_patch.Upstream
768767
package/libgsm/0001-Misc-fixes-from-Archlinux.patch lib_patch.Upstream
769768
package/libgtk2/0001-reduce-dependencies.patch lib_patch.Upstream

package/libglfw/0001-Wayland-Remove-extra-cmake-modules-dependency.patch

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2747e47393cbca2d09db56223e735bd94b21e2eb Mon Sep 17 00:00:00 2001
1+
From 8ebf1067390948d03330a5a0c814e5f7f860e678 Mon Sep 17 00:00:00 2001
22
From: Joel Winarske <[email protected]>
33
Date: Mon, 28 Sep 2020 22:23:02 -0700
44
Subject: [PATCH] Wayland: Remove extra-cmake-modules dependency
@@ -8,17 +8,18 @@ Fixes #1774.
88
[Retrieved (and backported) from:
99
https://github.com/glfw/glfw/commit/2747e47393cbca2d09db56223e735bd94b21e2eb]
1010
Signed-off-by: Fabrice Fontaine <[email protected]>
11+
[Dario: make the patch to be applied with fuzz factor 0 dropping all Hunks]
12+
Signed-off-by: Dario Binacchi <[email protected]>
1113
---
12-
.gitignore | 4 ---
1314
CMakeLists.txt | 16 ++++++------
1415
src/CMakeLists.txt | 62 ++++++++++++++++++++++++++++------------------
15-
3 files changed, 45 insertions(+), 37 deletions(-)
16+
2 files changed, 45 insertions(+), 33 deletions(-)
1617

1718
diff --git a/CMakeLists.txt b/CMakeLists.txt
18-
index 42bfa1806d..394827520b 100644
19+
index 75069161fc36..b315eaa15305 100644
1920
--- a/CMakeLists.txt
2021
+++ b/CMakeLists.txt
21-
@@ -191,20 +191,18 @@ endif()
22+
@@ -249,20 +249,18 @@ endif()
2223
# Use Wayland for window creation
2324
#--------------------------------------------------------------------
2425
if (_GLFW_WAYLAND)
@@ -47,10 +48,10 @@ index 42bfa1806d..394827520b 100644
4748
include(CheckIncludeFiles)
4849
include(CheckFunctionExists)
4950
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
50-
index 2f2bdd883d..e834506c6c 100644
51+
index b6dd86c54512..29be6515ae58 100644
5152
--- a/src/CMakeLists.txt
5253
+++ b/src/CMakeLists.txt
53-
@@ -45,30 +45,44 @@ if (_GLFW_X11 OR _GLFW_WAYLAND)
54+
@@ -40,30 +40,44 @@ elseif (_GLFW_WAYLAND)
5455
posix_time.c posix_thread.c xkb_unicode.c
5556
egl_context.c osmesa_context.c)
5657

@@ -119,3 +120,6 @@ index 2f2bdd883d..e834506c6c 100644
119120
elseif (_GLFW_OSMESA)
120121
set(glfw_HEADERS ${common_HEADERS} null_platform.h null_joystick.h
121122
posix_time.h posix_thread.h osmesa_context.h)
123+
--
124+
2.43.0
125+
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 46aaf2b2b4d3ec240b9aad175bb3eddb6ae11ead Mon Sep 17 00:00:00 2001
1+
From a2c88988b6cfe4023fe78f13519b56a8ac9f568b Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <[email protected]>
33
Date: Fri, 4 Mar 2022 17:59:19 +0100
44
Subject: [PATCH] src/CMakeLists.txt: allow override of wayland pkgdatadir
@@ -7,17 +7,19 @@ Allow the user to override WAYLAND_{PROTOCOLS_BASE,CLIENT_PKGDATADIR}
77
(needed when cross-compiling)
88

99
Signed-off-by: Fabrice Fontaine <[email protected]>
10-
[Upstream status: https://github.com/glfw/glfw/pull/2053]
10+
Upstream: https://github.com/glfw/glfw/pull/2053
11+
[Dario: make the patch to be applied with fuzz factor 0]
12+
Signed-off-by: Dario Binacchi <[email protected]>
1113
---
12-
src/CMakeLists.txt | 8 ++++++--
13-
1 file changed, 6 insertions(+), 2 deletions(-)
14+
src/CMakeLists.txt | 4 +++-
15+
1 file changed, 3 insertions(+), 1 deletion(-)
1416

1517
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
16-
index 01f191c9..475ce882 100644
18+
index 29be6515ae58..1767b3c8ad8f 100644
1719
--- a/src/CMakeLists.txt
1820
+++ b/src/CMakeLists.txt
19-
@@ -75,7 +75,9 @@ if (GLFW_BUILD_WAYLAND)
20-
include(FindPkgConfig)
21+
@@ -42,7 +42,9 @@ elseif (_GLFW_WAYLAND)
22+
2123
find_program(WAYLAND_SCANNER_EXECUTABLE NAMES wayland-scanner)
2224
pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols>=1.15)
2325
- pkg_get_variable(WAYLAND_PROTOCOLS_BASE wayland-protocols pkgdatadir)
@@ -26,7 +28,7 @@ index 01f191c9..475ce882 100644
2628
+ endif()
2729

2830
macro(wayland_generate protocol_file output_file)
29-
add_custom_command(OUTPUT "${output_file}.h"
31+
add_custom_command(OUTPUT ${output_file}.h
3032
--
31-
2.34.1
33+
2.43.0
3234

0 commit comments

Comments
 (0)