Cleanup package manifest, update readme for Graphire 1 & 2 and Intuos…

… 1 & 2, publish

Makefile

@@ -45,6 +45,7 @@ include Makefile-intuos3.mk
 
 # Additional Wacom drivers which are just used as sources for files:
 include Makefile-6.3.4-3.mk
+include Makefile-6.3.7-1.mk
 include Makefile-6.3.17-5.mk
 
 # ... we can only reference the variables we need for the "all" target after first including the other makefiles

Makefile-6.3.7-1.mk

@@ -0,0 +1,40 @@
+# Contains a signed Wacom Tablet.kext 6.3.7 which has been blessed by Catalina's built-in AppleKextExcludeList:
+# 
+# /Library/Apple/System/Library/Extensions/AppleKextExcludeList.kext/Contents/Resources/ExceptionLists.plist
+#
+# It's functionally identical to the Wacom Tablet.kext in virtually all 6 series drivers
+# 
+# (it's just a codeless kext that marks Wacom devices as tablets)
+#
+# The other kext version that has such a blessing is 6.3.30
+
+EXTRACTED_DRIVERS_6_3_7_1= \
+	src/6.3.7.1/Wacom\ Tablet.kext
+
+EXTRACTED_DRIVERS+= $(EXTRACTED_DRIVERS_6_3_7_1)
+
+CREATE_DIRECTORIES+= src/6.3.7-1/
+
+# Download, mount and unpack original Wacom installers:
+
+src/6.3.7-1/WacomTablet_6.3.7-1.dmg :
+	curl -o $@ "https://cdn.wacom.com/U/Drivers/Mac/pro/WacomTablet_6.3.7-1.dmg"
+	[ $$(md5 $@ | awk '{ print $$4 }') = "0d6a2f2a397bfc3919b38ddcb5f0d304" ] || (rm $@; false) # Verify download is undamaged
+
+src/6.3.7-1/Install\ Wacom\ Tablet.pkg : src/6.3.7-1/WacomTablet_6.3.7-1.dmg
+	hdiutil attach -quiet -nobrowse -mountpoint src/6.3.7-1/dmg "$<"
+	rm -rf "$@"
+	cp -a "src/6.3.7-1/dmg/Install Wacom Tablet.pkg" "$@"
+	# The permissions on the package files are super awkward, make those more permissive for us:
+	find "src/6.3.7-1/Install Wacom Tablet.pkg" -type d -exec chmod 0755 {} \;
+	find "src/6.3.7-1/Install Wacom Tablet.pkg" -type f -exec chmod u+rw {} \;
+	hdiutil detach -force src/6.3.7-1/dmg
+	touch "$@"
+
+# Extract original files from the Wacom installers as needed:
+
+$(EXTRACTED_DRIVERS_6_3_7_1) : src/6.3.7-1/Install\ Wacom\ Tablet.pkg
+	rm -rf src/6.3.7-1/Install\ Wacom\ Tablet.pkg/Contents/Archive
+	mkdir -p src/6.3.7-1/Install\ Wacom\ Tablet.pkg/Contents/Archive
+	cd src/6.3.7-1/Install\ Wacom\ Tablet.pkg/Contents/Archive && tar --no-same-owner -xf ../Archive.pax.gz
+	cp -a src/6.3.7-1/Install\ Wacom\ Tablet.pkg/Contents/Archive/System/Library/Extensions/Wacom\ Tablet.kext src/6.3.7-1/

Makefile-graphire2.mk

@@ -35,7 +35,7 @@ SIGNED_INSTALLERS+= Install\ Wacom\ Tablet-6.1.6-4-patched.pkg
 
 # Create the installer package by modifying Wacom's original:
 
-Install\ Wacom\ Tablet-6.1.6-4-patched-unsigned.pkg : src/6.1.6-4/Install\ Wacom\ Tablet.pkg src/6.1.6-4/Welcome.rtf src/6.1.6-4/PackageInfo src/6.1.6-4/Distribution $(PATCHED_DRIVERS_6_1_6_4) src/6.3.4-3/Wacom\ Tablet\ Utility.app tools/fix_LC_VERSION_MIN_MACOSX/fixSDKVersion
+Install\ Wacom\ Tablet-6.1.6-4-patched-unsigned.pkg : src/6.1.6-4/Install\ Wacom\ Tablet.pkg src/6.1.6-4/Welcome.rtf src/6.1.6-4/PackageInfo src/6.1.6-4/Distribution $(PATCHED_DRIVERS_6_1_6_4) src/6.3.7.1/Wacom\ Tablet.kext src/6.3.4-3/Wacom\ Tablet\ Utility.app tools/fix_LC_VERSION_MIN_MACOSX/fixSDKVersion
 	# Have to do a bunch of work here to upgrade the old-style directory package into a modern flat-file .pkg
 	rm -rf package
 	mkdir package
@@ -73,6 +73,11 @@ Install\ Wacom\ Tablet-6.1.6-4-patched-unsigned.pkg : src/6.1.6-4/Install\ Wacom
 	# Remove old PowerPC-only TabletDriverCFPlugin.bundle
 	rm -rf package/content.pkg/Payload/System/Library/Extensions/TabletDriverCFPlugin.bundle
 
+	# Replace Wacom Tablet.kext with one from 6.3.7-1 that is signed and that Catalina has a built-in hash exception for (allowing it to load without a timestamped notarisation)
+	# It's functionally identical anyway
+	rm -rf package/content.pkg/Payload/System/Library/Extensions/Wacom\ Tablet.kext
+	cp -a src/6.3.7-1/Wacom\ Tablet.kext package/content.pkg/Payload/System/Library/Extensions/
+
 	# Remove 32-bit Wacom Tablet Utility and replace it with the one from 6.3.4-3 (the new uninstaller is similar enough to be useful)
 	rm -rf package/content.pkg/Payload/Applications/Wacom\ Tablet.localized/Wacom\ Tablet\ Utility.app
 	cp -a src/6.3.4-3/Wacom\ Tablet\ Utility.app package/content.pkg/Payload/Applications/Wacom\ Tablet.localized/

Readme-manual-installation.md

@@ -8,7 +8,7 @@ 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-5/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-5/wacom-6.3.15-3-macOS-patched.zip)
-- Manual installation is not available for Graphire tablets, use the installer instead
+- 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:
 

Readme.en-simple.md

@@ -1,6 +1,6 @@
-# Fixed drivers for Wacom Bamboo, Graphire, Intuos 3 and Cintiq 1st gen tablets on macOS 10.15 Catalina
+# Fixed drivers for Wacom Bamboo, Graphire, Intuos 1, 2 & 3 and Cintiq 1st gen tablets on macOS 10.15 Catalina
 
-Wacom's drivers for Bamboo, Graphire, Intuos 3 and Cintiq 1st gen tablets have bugs in them that
+Wacom's drivers for Bamboo, Graphire, Intuos 1, 2 & 3 and Cintiq 1st gen tablets have bugs in them that
 make them no longer work on macOS 10.15 Catalina, and Wacom is no longer updating these drivers. 
 Luckily I was able to fix the bugs and get the drivers working again!
 
@@ -20,6 +20,16 @@ My fixed Bamboo driver (v5.3.7-6) supports these tablets:
 - CTT-460 - Bamboo Touch
 - MTE-450 - Bamboo
 
+My fixed Graphire 1 & 2 and Intuos 1 & 2 driver (v6.1.6-4) supports these tablets:
+
+- ET-0405-U - Graphire / Graphire 1 (USB)
+- ET-0405-R - Graphire / Graphire 1 (Serial)
+- ET-0405A - Graphire 2
+- GD-0405-U, GD-0608-U, GD-0912-U, GD-1212-U, GD-1218-U - Intuos (USB) (1998)
+- GD-0405-R, GD-0608-R, GD-0912-R, GD-1212-R, GD-1218-R - Intuos (Serial) (1998)
+- XD-0405-U, XD-0608-U, XD-0912-U, XD-1212-U, XD-1218-U - Intuos 2 (USB)
+- XD-0405-R, XD-0608-R, XD-0912-R, XD-1212-R, XD-1218-R - Intuos 2 (Serial)
+
 My fixed Graphire 3 driver (v5.2.6-5) supports these tablets:
 
 - CTE-430, CTE-630 - Graphire 3
@@ -29,7 +39,7 @@ My fixed Graphire 4 driver (v5.3.0-3) supports these tablets:
 - CTE-440, CTE-640 - Graphire 4
 - CTE-630BT - Graphire 3 Wireless (untested, let me know if this works!)
 
-My fixed Intuos and Cintiq driver (v6.3.15-3) supports these tablets:
+My fixed Intuos 3 and Cintiq driver (v6.3.15-3) supports these tablets:
 
 - PTZ-430, PTZ-630, PTZ-630SE, PTZ-631W, PTZ-930, PTZ-1230, PTZ-1231W - Intuos 3
 - DTZ-2100 - Cintiq 21UX 1st Gen.
@@ -44,8 +54,8 @@ My fixed Intuos 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](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-6.1.6-4-patched.pkg)
-- [Fixed driver v5.2.6-5 Graphire 3](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-5.2.6-5-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-6/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-6/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-6/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-6/Install-Wacom-Tablet-5.3.7-6-patched.pkg)
 - [Fixed driver v6.3.15-13 for Intuos 3 and Cintiq](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-6.3.15-3-patched.pkg)

Readme.ja-JP.md

@@ -1,6 +1,6 @@
-# WACOM Bamboo, Graphire, Intuos 3, Cintiq第１世代タブレットmacOS 10.15修正ドライバー
+# WACOM Bamboo, Graphire, Intuos 1+2+3, Cintiq第１世代タブレットmacOS 10.15修正ドライバー
 
-WACOM Bamboo, Graphire, Intuos 3及びCintiq第１世代タブレットがmacOS 10.15 Catalinaでは[バグがある](https://github.com/thenickdude/wacom-driver-fix/blob/master/Readme.md#technical-details-of-the-bugs)為、
+WACOM Bamboo, Graphire, Intuos 1+2+3及びCintiq第１世代タブレットがmacOS 10.15 Catalinaでは[バグがある](https://github.com/thenickdude/wacom-driver-fix/blob/master/Readme.md#technical-details-of-the-bugs)為、
 近日起動しなくなりました。もしお困りの方は、下記修正ドライバーの作成により再度起動できる様になりましたので是非ご使用ください。
 
 Bamboo修正ドライバー (v5.3.7-6) 対応デバイス：
@@ -19,6 +19,16 @@ Bamboo修正ドライバー (v5.3.7-6) 対応デバイス：
 - CTT-460 - Bamboo Touch
 - MTE-450 - Bamboo
 
+Graphire 1+2/Intuos 1+2修正ドライバー (v6.1.6-4) 対応デバイス：
+
+- ET-0405-U - Graphire / Graphire 1 (USB)
+- ET-0405-R - Graphire / Graphire 1 (Serial)
+- ET-0405A - Graphire 2
+- GD-0405-U, GD-0608-U, GD-0912-U, GD-1212-U, GD-1218-U - Intuos (USB) (1998)
+- GD-0405-R, GD-0608-R, GD-0912-R, GD-1212-R, GD-1218-R - Intuos (Serial) (1998)
+- XD-0405-U, XD-0608-U, XD-0912-U, XD-1212-U, XD-1218-U - Intuos 2 (USB)
+- XD-0405-R, XD-0608-R, XD-0912-R, XD-1212-R, XD-1218-R - Intuos 2 (Serial)
+
 Graphire 3修正ドライバー (v5.2.6-5) 対応デバイス：
 
 - CTE-430, CTE-630 - Graphire 3
@@ -42,11 +52,11 @@ Intuos/Cintiq修正ドライバー (v6.3.15-3) 対応デバイス：
 
 1) お持ちのタブレットに適用する修正ドライバーを下記からダウンロードし、インストールしてください。
 
-- [Graphire 1+2 修正ドライバー (v6.1.6-4)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-6.1.6-4-patched.pkg)
+- [Graphire 1+2/Intuos 1+2修正ドライバー (v6.1.6-4)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/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-6/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-6/Install-Wacom-Tablet-5.3.0-3-patched.pkg)
 - [Bamboo修正ドライバー (v5.3.7-6)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-5.3.7-6-patched.pkg)
-- [Intuos/Cintiq修正ドライバー (v6.3.15-13)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-6.3.15-3-patched.pkg)
+- [Intuos 3/Cintiq修正ドライバー (v6.3.15-13)](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-6.3.15-3-patched.pkg)
 
 2) 古いドライバーの制限を消去してください。
 

Readme.md

@@ -1,14 +1,14 @@
-# Wacom Bamboo, Graphire, Intuos 3, and Cintiq 1st gen macOS driver fix
+# Wacom Bamboo, Graphire, Intuos 1, 2 & 3, and Cintiq 1st gen macOS driver fix
 
-Wacom's macOS drivers for Bamboo, Graphire, Intuos 3 and Cintiq 1st gen tablets have bugs in them that cause them to
-completely fail to start on macOS 10.15 Catalina (and likely other versions of macOS). This doesn't apply to the Windows 
-driver, or to the drivers for their newer tablets.
+Wacom's macOS drivers for Bamboo, Graphire, Intuos 1, 2 & 3 and Cintiq 1st gen tablets have bugs in them that cause them to
+completely fail to start on macOS 10.15 Catalina. This doesn't apply to the Windows driver, or to the drivers for their 
+newer tablets.
 
 When you try to open the Wacom preference pane with a Bamboo tablet, you'll get an error message saying
 "Waiting for synchronization", then finally "There is a problem with your tablet driver.
 Please reboot your system. If the problem persists reinstall or update the driver". For an Intuos 3 or Cintiq 1st gen tablet, 
 the preference pane will open, but clicking anything will cause it to crash with the message "There was an error in Wacom
-Tablet preferences." For Graphire tablets, the driver's installer couldn't even run on Catalina.
+Tablet preferences." For Graphire and Intuos 1 & 2 tablets, the driver's installer couldn't even run on Catalina.
 
 Thankfully I was able to track down the issues and I have patched the drivers to fix them!
 
@@ -28,10 +28,15 @@ My fixed Bamboo driver (v5.3.7-6) supports these tablets:
 - CTT-460 - Bamboo Touch
 - MTE-450 - Bamboo
 
-My fixed Graphire 1 & 2 driver (v6.1.6-4) supports these tablets:
+My fixed Graphire 1 & 2 and Intuos 1 & 2 driver (v6.1.6-4) supports these tablets:
 
-- ET-0405-U/R - Graphire / Graphire 1
+- ET-0405-U - Graphire / Graphire 1 (USB)
+- ET-0405-R - Graphire / Graphire 1 (Serial) - Untested, let me know if it works!
 - ET-0405A - Graphire 2
+- GD-0405-U, GD-0608-U, GD-0912-U, GD-1212-U, GD-1218-U - Intuos (USB) (1998)
+- GD-0405-R, GD-0608-R, GD-0912-R, GD-1212-R, GD-1218-R - Intuos (Serial) (1998) - Untested
+- XD-0405-U, XD-0608-U, XD-0912-U, XD-1212-U, XD-1218-U - Intuos 2 (USB)
+- XD-0405-R, XD-0608-R, XD-0912-R, XD-1212-R, XD-1218-R - Intuos 2 (Serial) - Untested
 
 My fixed Graphire 3 driver (v5.2.6-5) supports these tablets:
 
@@ -42,7 +47,7 @@ My fixed Graphire 4 driver (v5.3.0-3) supports these tablets:
 - CTE-440, CTE-640 - Graphire 4
 - CTE-630BT - Graphire 3 Wireless (untested, let me know if this works!)
 
-And my fixed Intuos and Cintiq driver (v6.3.15-3) supports these tablets:
+And my fixed Intuos 3 and Cintiq driver (v6.3.15-3) supports these tablets:
 
 - PTZ-430, PTZ-630, PTZ-630SE, PTZ-631W, PTZ-930, PTZ-1230, PTZ-1231W - Intuos 3
 - DTZ-2100 - Cintiq 21UX 1st Gen.
@@ -58,11 +63,11 @@ And my fixed Intuos and Cintiq driver (v6.3.15-3) supports these tablets:
 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:
 
-- [Download patched v6.1.6-4 installer for Graphire 1 & 2 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-6.1.6-4-patched.pkg)
-- [Download patched v5.2.6-5 installer for Graphire 3 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-5.2.6-5-patched.pkg)
-- [Download patched v5.3.0-3 installer for Graphire 4 tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-5.3.0-3-patched.pkg)
-- [Download patched v5.3.7-6 installer for Bamboo tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/Install-Wacom-Tablet-5.3.7-6-patched.pkg)
-- [Download patched v6.3.15-13 for Intuos 3 and Cintiq tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/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-6/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-6/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-6/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-6/Install-Wacom-Tablet-5.3.7-6-patched.pkg)
+- [Fixed driver v6.3.15-13 for Intuos 3 and Cintiq tablets](https://github.com/thenickdude/wacom-driver-fix/releases/download/patch-6/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.
@@ -82,7 +87,7 @@ On the Accessibility page, click the padlock to unlock the page, then find and t
 If your tablet supports touch, touch the tablet with your finger, it should again prompt you to grant permissions. 
 On the Accessibility page, tick the `ConsumerTouchDriver` or `WacomTouchDriver` entry. 
 
-For Intuos 3 and Cintiq tablets, the driver might only appear on the Input Monitoring page, and you may need to reboot a second time
+With some tablets, the driver might only appear on the Input Monitoring page, and you may need to reboot a second time
 for it to appear on the Accessibility page too.
 
 **If your Wacom preference pane, pen support, or touch support is not yet working, or the entries never appeared in the
@@ -100,7 +105,7 @@ For Bamboo and Graphire 3 & 4 tablets:
 
     launchctl load -w /Library/LaunchAgents/com.wacom.pentablet.plist
 
-For Intuos 3 and Cintiq tablets:
+For Graphire 1 & 2, Intuos, and Cintiq tablets:
 
     launchctl unload /Library/LaunchAgents/com.wacom.wacomtablet.plist
 
@@ -355,7 +360,7 @@ So now if the preferences are too new, `MigratePen()` won't attempt to upgrade t
 loading the preferences. This causes the preferences to remain at their defaults, and if the user edits the settings using 
 the preference pane, the settings should be cleanly overwritten.
 
-### Graphire drivers
+### Graphire 3 & 4 drivers
 
 The installers for the Graphire drivers are an old format that Catalina no longer supports, so I had to completely 
 rebuild them.
@@ -432,5 +437,7 @@ void OPopupOutlineView::reloadData(OPopupOutlineView *this) {
 }
 ```
 
-The drivers for Graphire 1 & 2 additionally have this problem in their ORadialSubMenuTableView::reloadData() method, and the
-fix is the same there.
+### Graphire 1 & 2 and Intuos 1 & 2 drivers
+
+These drivers have the same problems as the Graphire 3 & 4 drivers, plus the same `_dataSource` problem in their
+`ORadialSubMenuTableView::reloadData() method`, with the same fix.