Skip to content

Commit

Permalink
pkg/debian: Revert minimum meson version
Browse files Browse the repository at this point in the history
  • Loading branch information
qzed committed Jun 11, 2024
1 parent 1eeb240 commit afeac3d
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 1 deletion.
34 changes: 34 additions & 0 deletions pkg/debian/0001-Revert-minimum-meson-version-to-v0.53.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From d95e1ae36c73d125f1f2574b57fbd1f540c467a5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <[email protected]>
Date: Tue, 11 Jun 2024 21:13:08 +0200
Subject: [PATCH] Revert minimum meson version to v0.53.0

---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index c1787b5..0b31e5b 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('libwacom', 'c',
version: '2.12.0',
license: 'HPND',
default_options: [ 'c_std=gnu99', 'warning_level=2' ],
- meson_version: '>= 0.56.0')
+ meson_version: '>= 0.53.0')

dir_bin = get_option('prefix') / get_option('bindir')
dir_data = get_option('prefix') / get_option('datadir') / 'libwacom'
@@ -304,7 +304,7 @@ if get_option('tests').enabled()
args: ['--verbose',
'-rfES',
'--log-level=DEBUG',
- '--log-file', meson.project_build_root() / 'meson-logs' / 'pytest.log',
+ '--log-file', meson.build_root() / 'meson-logs' / 'pytest.log',
'--log-file-level=DEBUG',
meson.current_source_dir() / 'test' / f,
],
--
2.45.1

4 changes: 4 additions & 0 deletions pkg/debian/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ validpgpkeys=(
source=(
"https://github.com/linuxwacom/libwacom/releases/download/libwacom-${_pkgver1}/libwacom-${_pkgver1}.tar.bz2"{,.sig}
"https://github.com/linuxwacom/libwacom/releases/download/libwacom-${_pkgver2}/libwacom-${_pkgver2}.tar.xz"{,.sig}
'0001-Revert-minimum-meson-version-to-v0.53.0.patch'
'v1-0001-Add-support-for-BUS_VIRTUAL.patch'
'v1-0002-Add-support-for-Intel-Management-Engine-bus.patch'
'v1-0003-data-Add-Microsoft-Surface-Pro-3.patch'
Expand Down Expand Up @@ -76,6 +77,7 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
'SKIP'
'40462434a8568e3c0a75c18a5452aa50e041819363853090c4e7ba7e23a4a180'
'SKIP'
'c6bf372cf0ff9001add9dea672a5c23702bbb697d98dba83a034e52fc2805979'
'c504893656f851832116616e6e5bd50b3d0ac36f7288042dc7eb50e396212bc4'
'c64275d8129ed21c58442cda159c90bea6e97813ee91e3911344dd0760a6f35c'
'279ad2b83cc9d7ee855ee24b5fe952472483b8d4d2f8884b10a9cc12fac7256d'
Expand Down Expand Up @@ -112,12 +114,14 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
prepare() {
msg2 "patching libwacom-${_pkgver1}"
cd "${srcdir}/libwacom-${_pkgver1}"
patch -Np1 -i "${srcdir}/0001-Revert-minimum-meson-version-to-v0.53.0.patch" || true
for p in "${srcdir}/v1-"*.patch ; do
patch -Np1 -i "${p}" || true
done

msg2 "patching libwacom-${_pkgver2}"
cd "${srcdir}/libwacom-${_pkgver2}"
patch -Np1 -i "${srcdir}/0001-Revert-minimum-meson-version-to-v0.53.0.patch" || true
for p in "${srcdir}/v2-"*.patch ; do
patch -Np1 -i "${p}" || true
done
Expand Down
3 changes: 2 additions & 1 deletion pkg/debian/updlinks.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env sh

rm -rf ./*.patch
rm -rf ./v1-*.patch
rm -rf ./v2-*.patch

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

0 comments on commit afeac3d

Please sign in to comment.