Skip to content

Commit 1469600

Browse files
committed
Use patch to temporary fix compiling mps branch
1 parent dcc2d18 commit 1469600

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

.github/workflows/_build-emacs.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
branch:
88
required: true
99
type: string
10+
patch:
11+
type: string
1012
build_gui:
1113
required: true
1214
type: string
@@ -41,6 +43,11 @@ jobs:
4143
ref: ${{ inputs.branch }}
4244
path: emacs-src
4345

46+
- name: Patch emacs soruce
47+
run: |
48+
cd emacs-src && patch -p1 < ../patch/${{ inputs.patch }}
49+
if: ${{ inputs.patch }}
50+
4451
- name: Download builder image
4552
uses: actions/download-artifact@v4
4653
with:

.github/workflows/daily-mps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
with:
4747
name: mps-${{ matrix.build_native_comp == 'no' && 'no_native_comp' || 'native_comp' }}
4848
branch: scratch/igc
49+
patch: mps-xfaces-label.patch
4950
build_gui: ${{ matrix.build_gui }}
5051
build_native_comp: ${{ matrix.build_native_comp }}
5152
do_test: false

patch/mps-xfaces-label.patch

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/src/xfaces.c b/src/xfaces.c
2+
index 69d4070b603..221efec62e0 100644
3+
--- a/src/xfaces.c
4+
+++ b/src/xfaces.c
5+
@@ -4638,10 +4638,10 @@ free_realized_face (struct frame *f, struct face *face)
6+
7+
#ifdef HAVE_X_WINDOWS
8+
free_face:
9+
-#endif /* HAVE_X_WINDOWS */
10+
#ifndef HAVE_MPS
11+
xfree (face);
12+
#endif
13+
+#endif /* HAVE_X_WINDOWS */
14+
}
15+
}
16+

0 commit comments

Comments
 (0)