Skip to content

Commit afeac3d

Browse files
committed
pkg/debian: Revert minimum meson version
1 parent 1eeb240 commit afeac3d

File tree

3 files changed

+40
-1
lines changed

3 files changed

+40
-1
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From d95e1ae36c73d125f1f2574b57fbd1f540c467a5 Mon Sep 17 00:00:00 2001
2+
From: Maximilian Luz <[email protected]>
3+
Date: Tue, 11 Jun 2024 21:13:08 +0200
4+
Subject: [PATCH] Revert minimum meson version to v0.53.0
5+
6+
---
7+
meson.build | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/meson.build b/meson.build
11+
index c1787b5..0b31e5b 100644
12+
--- a/meson.build
13+
+++ b/meson.build
14+
@@ -2,7 +2,7 @@ project('libwacom', 'c',
15+
version: '2.12.0',
16+
license: 'HPND',
17+
default_options: [ 'c_std=gnu99', 'warning_level=2' ],
18+
- meson_version: '>= 0.56.0')
19+
+ meson_version: '>= 0.53.0')
20+
21+
dir_bin = get_option('prefix') / get_option('bindir')
22+
dir_data = get_option('prefix') / get_option('datadir') / 'libwacom'
23+
@@ -304,7 +304,7 @@ if get_option('tests').enabled()
24+
args: ['--verbose',
25+
'-rfES',
26+
'--log-level=DEBUG',
27+
- '--log-file', meson.project_build_root() / 'meson-logs' / 'pytest.log',
28+
+ '--log-file', meson.build_root() / 'meson-logs' / 'pytest.log',
29+
'--log-file-level=DEBUG',
30+
meson.current_source_dir() / 'test' / f,
31+
],
32+
--
33+
2.45.1
34+

pkg/debian/PKGBUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ validpgpkeys=(
3939
source=(
4040
"https://github.com/linuxwacom/libwacom/releases/download/libwacom-${_pkgver1}/libwacom-${_pkgver1}.tar.bz2"{,.sig}
4141
"https://github.com/linuxwacom/libwacom/releases/download/libwacom-${_pkgver2}/libwacom-${_pkgver2}.tar.xz"{,.sig}
42+
'0001-Revert-minimum-meson-version-to-v0.53.0.patch'
4243
'v1-0001-Add-support-for-BUS_VIRTUAL.patch'
4344
'v1-0002-Add-support-for-Intel-Management-Engine-bus.patch'
4445
'v1-0003-data-Add-Microsoft-Surface-Pro-3.patch'
@@ -76,6 +77,7 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
7677
'SKIP'
7778
'40462434a8568e3c0a75c18a5452aa50e041819363853090c4e7ba7e23a4a180'
7879
'SKIP'
80+
'c6bf372cf0ff9001add9dea672a5c23702bbb697d98dba83a034e52fc2805979'
7981
'c504893656f851832116616e6e5bd50b3d0ac36f7288042dc7eb50e396212bc4'
8082
'c64275d8129ed21c58442cda159c90bea6e97813ee91e3911344dd0760a6f35c'
8183
'279ad2b83cc9d7ee855ee24b5fe952472483b8d4d2f8884b10a9cc12fac7256d'
@@ -112,12 +114,14 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
112114
prepare() {
113115
msg2 "patching libwacom-${_pkgver1}"
114116
cd "${srcdir}/libwacom-${_pkgver1}"
117+
patch -Np1 -i "${srcdir}/0001-Revert-minimum-meson-version-to-v0.53.0.patch" || true
115118
for p in "${srcdir}/v1-"*.patch ; do
116119
patch -Np1 -i "${p}" || true
117120
done
118121

119122
msg2 "patching libwacom-${_pkgver2}"
120123
cd "${srcdir}/libwacom-${_pkgver2}"
124+
patch -Np1 -i "${srcdir}/0001-Revert-minimum-meson-version-to-v0.53.0.patch" || true
121125
for p in "${srcdir}/v2-"*.patch ; do
122126
patch -Np1 -i "${p}" || true
123127
done

pkg/debian/updlinks.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env sh
22

3-
rm -rf ./*.patch
3+
rm -rf ./v1-*.patch
4+
rm -rf ./v2-*.patch
45

56
for f in ../../patches/v1/*.patch; do
67
cp "${f}" "v1-$(basename "$f")"

0 commit comments

Comments
 (0)