Revert "Temporarily allow build with w/o JJR fork of wayland-protocols"

This reverts commit e34ced7.

CMakeLists.txt

@@ -339,9 +339,7 @@ protocolnew("unstable/text-input" "text-input-unstable-v3" false)
 protocolnew("unstable/pointer-constraints" "pointer-constraints-unstable-v1"
             false)
 protocolnew("staging/xdg-activation" "xdg-activation-v1" false)
-# JJR: This change is TEMPORARY, only here to allow build w/o my fork of wayland-protocols
-# protocolnew("staging/ext-idle-notify" "ext-idle-notify-v1" false)
-protocolnew("protocols" "ext-idle-notify-v1" true) # Again, TEMPORARY!
+protocolnew("staging/ext-idle-notify" "ext-idle-notify-v1" false)
 protocolnew("staging/ext-session-lock" "ext-session-lock-v1" false)
 protocolnew("stable/tablet" "tablet-v2" false)
 protocolnew("stable/presentation-time" "presentation-time" false)

protocols/meson.build

@@ -55,9 +55,7 @@ protocols = [
 	wayland_protocol_dir / 'unstable/text-input/text-input-unstable-v1.xml',
 	wayland_protocol_dir / 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
 	wayland_protocol_dir / 'staging/xdg-activation/xdg-activation-v1.xml',
-	# JJR: This change is TEMPORARY, only here to allow build w/o my fork of wayland-protocols
-	# wayland_protocol_dir / 'staging/ext-idle-notify/ext-idle-notify-v1.xml',
-	'ext-idle-notify-v1.xml', # Again, TEMPORARY!
+	wayland_protocol_dir / 'staging/ext-idle-notify/ext-idle-notify-v1.xml',
 	wayland_protocol_dir / 'staging/ext-session-lock/ext-session-lock-v1.xml',
 	wayland_protocol_dir / 'stable/tablet/tablet-v2.xml',
 	wayland_protocol_dir / 'stable/presentation-time/presentation-time.xml',