From 87924d9cd6d0e2ab796334c8d388c5869935b82d Mon Sep 17 00:00:00 2001 From: Nicholas Sherlock Date: Sat, 21 Nov 2020 15:20:15 +1300 Subject: [PATCH] Fix touch support for Bamboo on Big Sur --- Makefile | 2 +- Readme-manual-installation.md | 19 ++++++++++++++++--- Readme.en-simple.md | 10 +++++----- Readme.es.md | 10 +++++----- Readme.ja-JP.md | 10 +++++----- Readme.md | 10 +++++----- Readme.pl.md | 10 +++++----- Readme.pt-BR.md | 10 +++++----- Readme.ru-RU.md | 10 +++++----- src/5.3.7-6/Distribution.patch | 8 ++++++++ src/5.3.7-6/PackageInfo.patch | 7 +++++++ src/5.3.7-6/preinstall.patch | 7 ++++++- src/5.3.7-6/uninstall.pl.patch | 2 ++ src/Makefile-bamboo.mk | 27 ++++++++++++++++++++++----- 14 files changed, 97 insertions(+), 45 deletions(-) create mode 100644 src/5.3.7-6/Distribution.patch create mode 100644 src/5.3.7-6/PackageInfo.patch create mode 100644 src/5.3.7-6/uninstall.pl.patch diff --git a/Makefile b/Makefile index 5338dd4..b3a2d87 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ node_modules/.bin/marked : package.json clean : rm -rf src/5.2.6-5/Install\ Bamboo.pkg src/6.3.17-5/Wacom\ Desktop\ Center.app src/5.3.0-3/Install\ Bamboo.pkg src/6.1.6-4/Install\ Wacom\ Tablet.pkg - rm -f \ + rm -rf \ $(MANUAL_INSTALLERS) $(UNSIGNED_INSTALLERS) $(SIGNED_INSTALLERS) \ build/* $(PATCHED_DRIVERS) $(EXTRACTED_DRIVERS) rm -rf package diff --git a/Readme-manual-installation.md b/Readme-manual-installation.md index 65f4ce7..b7ec3d8 100644 --- a/Readme-manual-installation.md +++ b/Readme-manual-installation.md @@ -6,8 +6,8 @@ because the manual method only replaces a couple of the driver's files and doesn Now download my patch for your tablet here: -- [Manual patch 5.3.7-6 for Bamboo tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/wacom-5.3.7-6-macOS-patched.zip) -- [Manual patch 6.3.15-3 for Intuos 3 and Cintiq tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/wacom-6.3.15-3-macOS-patched.zip) +- [Manual patch 5.3.7-6 for Bamboo tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/wacom-5.3.7-6-macOS-patched.zip) +- [Manual patch 6.3.15-3 for Intuos 3 and Cintiq tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/wacom-6.3.15-3-macOS-patched.zip) - Manual installation is not available for Graphire or Intuos 1 & 2 tablets, use the installer instead Unzip it by double clicking it, then follow the installation instructions that match your tablet: @@ -37,11 +37,24 @@ this path: Copy the ConsumerTouchDriver file from the zip you downloaded and paste it over the ConsumerTouchDriver file you see there, enter your password to confirm the replacement. +If you're using macOS Big Sur, we need to move the touch driver into a new folder for it to work properly. In Finder go to: + + /Library/Application Support/Tablet/PenTabletDriver.app/Contents/Resources + +Select the "ConsumerTouchDriver" file and click Edit -> Copy. Now go to this folder: + + /Library/Application Support/Tablet + +Click Edit, then hold down the option/alt key on your keyboard, and you should see the "Paste" menu item change into +"Move item here", click that one, and enter your password to confirm the move. + **We're done installing patches**, so back in the terminal, run: launchctl load -w /Library/LaunchAgents/com.wacom.pentablet.plist -After installing, follow the "post-install instructions" section to set the permissions properly. +After installing, follow the "post-install instructions" section to set the permissions properly. Especially note that +for touch support on Big Sur, you'll definitely need to remove the old entry for ConsumerTouchDriver from the Accessibility +section if it is already there. ### Intuos 3 and Cintiq 1st gen tablets diff --git a/Readme.en-simple.md b/Readme.en-simple.md index efd5d19..ea472a0 100644 --- a/Readme.en-simple.md +++ b/Readme.en-simple.md @@ -55,11 +55,11 @@ My fixed **Intuos 3** and **Cintiq** driver (v6.3.15-3) supports these tablets: First, download the correct driver for your tablet: -- [Fixed driver v6.1.6-4 for Graphire 1 & 2 and Intuos 1 & 2](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Fixed driver v5.2.6-5 for Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Fixed driver v5.3.0-3 for Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Fixed driver v5.3.7-6 for Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Fixed driver v6.3.15-3 for Intuos 3 and Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Fixed driver v6.1.6-4 for Graphire 1 & 2 and Intuos 1 & 2](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Fixed driver v5.2.6-5 for Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Fixed driver v5.3.0-3 for Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Fixed driver v5.3.7-6 for Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Fixed driver v6.3.15-3 for Intuos 3 and Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) Run the installer to install the driver. diff --git a/Readme.es.md b/Readme.es.md index 862686d..03a9285 100644 --- a/Readme.es.md +++ b/Readme.es.md @@ -56,11 +56,11 @@ Mi controlador corregido de Intuos 3 y Cintiq (v6.3.15-3) es compatible con esta Primero, descargue el controlador correcto para su tableta: -- [Controlador corregido v6.1.6-4 para tabletas Graphire 1 y 2 e Intuos 1 y 2](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Controlador corregido v5.2.6-5 para Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Controlador corregido v5.3.0-3 para Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Controlador corregido v5.3.7-6 para Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Controlador corregido v6.3.15-3 para Intuos 3 y Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Controlador corregido v6.1.6-4 para tabletas Graphire 1 y 2 e Intuos 1 y 2](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Controlador corregido v5.2.6-5 para Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Controlador corregido v5.3.0-3 para Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Controlador corregido v5.3.7-6 para Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Controlador corregido v6.3.15-3 para Intuos 3 y Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) Ejecute el instalador para instalar el controlador. diff --git a/Readme.ja-JP.md b/Readme.ja-JP.md index 3e0023b..dc69716 100644 --- a/Readme.ja-JP.md +++ b/Readme.ja-JP.md @@ -54,11 +54,11 @@ Intuos/Cintiq修正ドライバー (v6.3.15-3) 対応デバイス： 1) お持ちのタブレットに適用する修正ドライバーを下記からダウンロードし、インストールしてください。 -- [Graphire 1+2/Intuos 1+2修正ドライバー (v6.1.6-4)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Graphire 3修正ドライバー (v5.2.6-5)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Graphire 4修正ドライバー (v5.3.0-3)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Bamboo修正ドライバー (v5.3.7-6)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Intuos 3/Cintiq修正ドライバー (v6.3.15-3)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Graphire 1+2/Intuos 1+2修正ドライバー (v6.1.6-4)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Graphire 3修正ドライバー (v5.2.6-5)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Graphire 4修正ドライバー (v5.3.0-3)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Bamboo修正ドライバー (v5.3.7-6)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Intuos 3/Cintiq修正ドライバー (v6.3.15-3)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) 2) 古いドライバーの制限を消去してください。 diff --git a/Readme.md b/Readme.md index 753719c..e4a8236 100644 --- a/Readme.md +++ b/Readme.md @@ -66,11 +66,11 @@ And my fixed **Intuos 3** and **Cintiq** driver (v6.3.15-3) supports these table Download the correct installer for your tablet here and double click it to run it, this will install my fixed version of Wacom's driver: -- [Fixed driver v6.1.6-4 installer for Graphire 1 & 2 and Intuos 1 & 2 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Fixed driver v5.2.6-5 installer for Graphire 3 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Fixed driver v5.3.0-3 installer for Graphire 4 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Fixed driver v5.3.7-6 installer for Bamboo tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Fixed driver v6.3.15-3 for Intuos 3 and Cintiq tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Fixed driver v6.1.6-4 installer for Graphire 1 & 2 and Intuos 1 & 2 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Fixed driver v5.2.6-5 installer for Graphire 3 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Fixed driver v5.3.0-3 installer for Graphire 4 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Fixed driver v5.3.7-6 installer for Bamboo tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Fixed driver v6.3.15-3 for Intuos 3 and Cintiq tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) If you get an error message that your Mac only allows apps to be installed from the App Store, right-click on it and click "Open" instead. diff --git a/Readme.pl.md b/Readme.pl.md index f22c9fd..5de38fd 100644 --- a/Readme.pl.md +++ b/Readme.pl.md @@ -66,11 +66,11 @@ Zaktualizowane sterowniki tabletów Inutos 3 oraz Cintiq (v6.3.15-3) wspierają Pobierz odpowiednią instalkę poniżej dla posiadanego tabletu i odpal klikając podwójnie: -- [Instalka sterownika v6.1.6-4 dla Graphire 1 & 2 oraz Intuos 1 & 2](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Instalka sterownika v5.2.6-5 dla Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Instalka sterownika v5.3.0-3 dla Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Instalka sterownika v5.3.7-6 dla Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Instalka sterownika v6.3.15-3 dla Intuos 3 oraz Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Instalka sterownika v6.1.6-4 dla Graphire 1 & 2 oraz Intuos 1 & 2](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Instalka sterownika v5.2.6-5 dla Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Instalka sterownika v5.3.0-3 dla Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Instalka sterownika v5.3.7-6 dla Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Instalka sterownika v6.3.15-3 dla Intuos 3 oraz Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) Jeżeli wyskoczy błąd z wiadomością, że Mac akceptuje tylko aplikacje pobrane z App Store, kliknij prawym przyciskiem myszy na ikonę i wybierz opcję "Otwórz". diff --git a/Readme.pt-BR.md b/Readme.pt-BR.md index 1e8a4a3..881f944 100644 --- a/Readme.pt-BR.md +++ b/Readme.pt-BR.md @@ -55,11 +55,11 @@ O driver Intuos 3 e Cintiq fixo (v6.3.15-3) suporta estes tablets: Faça o download o instalador correto: -- [Driver v6.1.6-4 para Graphire 1+2 e Intuos 1+2+3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Driver v5.2.6-5 para Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Driver v5.3.0-3 para Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Driver v5.3.7-6 para Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Driver v6.3.15-3 para Intuos 3 e Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Driver v6.1.6-4 para Graphire 1+2 e Intuos 1+2+3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Driver v5.2.6-5 para Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Driver v5.3.0-3 para Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Driver v5.3.7-6 para Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Driver v6.3.15-3 para Intuos 3 e Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) Execute o instalador para instalar o driver. diff --git a/Readme.ru-RU.md b/Readme.ru-RU.md index c3602d9..18dadf8 100644 --- a/Readme.ru-RU.md +++ b/Readme.ru-RU.md @@ -66,11 +66,11 @@ with your tablet driver. Please reboot your system. If the problem persists rein Скачайте подходящую версию установщика для вашего планшета и дважды кликните скачаный файл чтобы запустить его- это запустит установку пропатченой мною версии драйвера Wacom: -- [Fixed driver v6.1.6-4 for Graphire 1 & 2 and Intuos 1 & 2 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.1.6-4-patched.pkg) -- [Fixed driver v5.2.6-5 for Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.2.6-5-patched.pkg) -- [Fixed driver v5.3.0-3 for Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.0-3-patched.pkg) -- [Fixed driver v5.3.7-6 for Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-5.3.7-6-patched.pkg) -- [Fixed driver v6.3.15-3 for Intuos 3 and Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-7/Install-Wacom-Tablet-6.3.15-3-patched.pkg) +- [Fixed driver v6.1.6-4 for Graphire 1 & 2 and Intuos 1 & 2 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.1.6-4-patched.pkg) +- [Fixed driver v5.2.6-5 for Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.2.6-5-patched.pkg) +- [Fixed driver v5.3.0-3 for Graphire 4](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.0-3-patched.pkg) +- [Fixed driver v5.3.7-6 for Bamboo](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-5.3.7-6-patched.pkg) +- [Fixed driver v6.3.15-3 for Intuos 3 and Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-8/Install-Wacom-Tablet-6.3.15-3-patched.pkg) Если появится сообщение, что ваш Mac поддерживает только установку приложений из App Store, тогда кликните по скачаному файлу правой(!) кнопкой и выберите в контекстном меню строчку "Открыть". diff --git a/src/5.3.7-6/Distribution.patch b/src/5.3.7-6/Distribution.patch new file mode 100644 index 0000000..130ea6a --- /dev/null +++ b/src/5.3.7-6/Distribution.patch @@ -0,0 +1,8 @@ +16c16 +< +--- +> +20a21 +> +29a31 +> diff --git a/src/5.3.7-6/PackageInfo.patch b/src/5.3.7-6/PackageInfo.patch new file mode 100644 index 0000000..625abef --- /dev/null +++ b/src/5.3.7-6/PackageInfo.patch @@ -0,0 +1,7 @@ +10c10,11 +< +--- +> +> +12a14 +> diff --git a/src/5.3.7-6/preinstall.patch b/src/5.3.7-6/preinstall.patch index 69a1250..d090e68 100644 --- a/src/5.3.7-6/preinstall.patch +++ b/src/5.3.7-6/preinstall.patch @@ -11,7 +11,12 @@ > push @driverPIDs, $1; > } > -147c152,155 +124c129,130 +< "/Library/Internet Plug-Ins/WacomSafari.plugin" +--- +> "/Library/Internet Plug-Ins/WacomSafari.plugin", +> "/Library/Application Support/Tablet/PenTabletDriver.app/Contents/Resources/ConsumerTouchDriver.app" +147c153,156 < --- > diff --git a/src/5.3.7-6/uninstall.pl.patch b/src/5.3.7-6/uninstall.pl.patch new file mode 100644 index 0000000..95845ce --- /dev/null +++ b/src/5.3.7-6/uninstall.pl.patch @@ -0,0 +1,2 @@ +558a559 +> rmtree("$gDriverAppPath/ConsumerTouchDriver.app"); diff --git a/src/Makefile-bamboo.mk b/src/Makefile-bamboo.mk index 52838d5..1428136 100644 --- a/src/Makefile-bamboo.mk +++ b/src/Makefile-bamboo.mk @@ -3,13 +3,19 @@ EXTRACTED_DRIVERS_5_3_7_6= \ src/5.3.7-6/ConsumerTouchDriver.original \ src/5.3.7-6/preinstall.original \ src/5.3.7-6/postinstall.original \ - src/5.3.7-6/renumtablets + src/5.3.7-6/renumtablets \ + src/5.3.7-6/PackageInfo.original \ + src/5.3.7-6/Distribution.original \ + src/5.3.7-6/uninstall.pl.original PATCHED_DRIVERS_5_3_7_6= \ src/5.3.7-6/PenTabletDriver.patched \ src/5.3.7-6/ConsumerTouchDriver.patched \ src/5.3.7-6/preinstall.patched \ - src/5.3.7-6/postinstall.patched + src/5.3.7-6/postinstall.patched \ + src/5.3.7-6/PackageInfo.patched \ + src/5.3.7-6/Distribution.patched \ + src/5.3.7-6/uninstall.pl.patched EXTRACTED_DRIVERS+= $(EXTRACTED_DRIVERS_5_3_7_6) @@ -17,7 +23,7 @@ PATCHED_DRIVERS+= $(PATCHED_DRIVERS_5_3_7_6) SIGN_ME_5_3_7_6= \ package/content.pkg/Payload/Library/Application\ Support/Tablet/PenTabletDriver.app/Contents/Resources/TabletDriver.app \ - package/content.pkg/Payload/Library/Application\ Support/Tablet/PenTabletDriver.app/Contents/Resources/ConsumerTouchDriver.app \ + package/content.pkg/Payload/Library/Application\ Support/Tablet/ConsumerTouchDriver.app \ package/content.pkg/Payload/Library/Application\ Support/Tablet/PenTabletDriver.app \ package/content.pkg/Payload/Library/PreferencePanes/PenTablet.prefpane \ package/content.pkg/Payload/Library/Frameworks/WacomMultiTouch.framework/Versions/A/WacomMultiTouch \ @@ -44,7 +50,6 @@ Install\ Wacom\ Tablet-5.3.7-6-patched-unsigned.pkg : src/5.3.7-6/Install\ Wacom # Add Welcome screen find package/Resources -type d -depth 1 -exec cp src/5.3.7-6/Welcome.rtf {}/ \; - sed -i "" -E 's/(<\/installer-gui-script>)/ \1/' package/Distribution # Add patched drivers cp src/5.3.7-6/PenTabletDriver.patched package/content.pkg/Payload/Library/Application\ Support/Tablet/PenTabletDriver.app/Contents/MacOS/PenTabletDriver @@ -52,6 +57,10 @@ Install\ Wacom\ Tablet-5.3.7-6-patched-unsigned.pkg : src/5.3.7-6/Install\ Wacom cp src/5.3.7-6/preinstall.patched package/content.pkg/Scripts/preinstall cp src/5.3.7-6/postinstall.patched package/content.pkg/Scripts/postinstall cp src/5.3.7-6/unloadagent src/5.3.7-6/loadagent package/content.pkg/Scripts/ + + # Add updated package descriptors for the reshuffle of ConsumerTouchDriver and preference pane version number bump + cp src/5.3.7-6/Distribution.patched package/Distribution + cp src/5.3.7-6/PackageInfo.patched package/content.pkg/PackageInfo # Modify preference pane version number to avoid it getting marked as "incompatible software" by SystemMigration during system update # Looks like the invalid version number string (starting with a word) caused it to always fail the compatibility check @@ -59,7 +68,6 @@ Install\ Wacom\ Tablet-5.3.7-6-patched-unsigned.pkg : src/5.3.7-6/Install\ Wacom # See /Library/Apple/Library/Bundles/IncompatibleAppsList.bundle/Contents/Resources/IncompatibleAppsList.plist # or run /System/Library/PrivateFrameworks/SystemMigration.framework/Versions/A/Resources/compatchecker -d -f IncompatibleAppsList -r / -s plutil -replace CFBundleShortVersionString -string "5.3.7-6" package/content.pkg/Payload/Library/PreferencePanes/PenTablet.prefpane/Contents/Info.plist - sed -i "" -E 's/PenTablet v5.3.7-6/5.3.7-6/' package/Distribution package/content.pkg/PackageInfo # Remove SiLabs driver, since it doesn't seem used by Bamboo rm -rf package/content.pkg/Payload/Library/Extensions/SiLabsUSBDriver64.kext @@ -67,6 +75,12 @@ Install\ Wacom\ Tablet-5.3.7-6-patched-unsigned.pkg : src/5.3.7-6/Install\ Wacom # Remove the codeless kext since it causes Big Sur's Security & Privacy panel to crash and isn't needed anyway rm -rf package/content.pkg/Payload/Library/Extensions/Pen\ Tablet.kext + # Move ConsumerTouchDriver to become a top-level app, since Big Sur won't grant kTCCServicePostEvent rights to it otherwise + mv package/content.pkg/Payload/Library/Application\ Support/Tablet/PenTabletDriver.app/Contents/Resources/ConsumerTouchDriver.app package/content.pkg/Payload/Library/Application\ Support/Tablet/ + + # Update the uninstaller to remove ConsumerTouchDriver from that new location + cp src/5.3.7-6/uninstall.pl.patched package/content.pkg/Payload/Applications/Pen\ Tablet.localized/Pen\ Tablet\ Utility.app/Contents/Resources/uninstall.pl + ifdef CODE_SIGNING_IDENTITY # Resign drivers and enable Hardened Runtime to meet notarization requirements codesign -s "$(CODE_SIGNING_IDENTITY)" -f --options=runtime --timestamp $(SIGN_ME_5_3_7_6) @@ -119,6 +133,9 @@ $(EXTRACTED_DRIVERS_5_3_7_6) : src/5.3.7-6/Install\ Wacom\ Tablet.pkg cp package/content.pkg/Scripts/preinstall src/5.3.7-6/preinstall.original cp package/content.pkg/Scripts/postinstall src/5.3.7-6/postinstall.original cp package/content.pkg/Scripts/renumtablets src/5.3.7-6/renumtablets + cp package/content.pkg/Payload/Applications/Pen\ Tablet.localized/Pen\ Tablet\ Utility.app/Contents/Resources/uninstall.pl src/5.3.7-6/uninstall.pl.original + cp package/Distribution src/5.3.7-6/Distribution.original + cp package/content.pkg/PackageInfo src/5.3.7-6/PackageInfo.original # Utility commands: