summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTérence Clastres2019-03-30 11:58:57 +0100
committerTérence Clastres2019-03-30 11:58:57 +0100
commit9341520844dddce9ff40681199bc58a00c8a759c (patch)
treefd2644f205397acd36568831c688642cab261405
parent1ed44d85b3f97d8b3605958ed3b8c7c53f258ec6 (diff)
downloadaur-9341520844dddce9ff40681199bc58a00c8a759c.tar.gz
Only use last commit of !281 and enable !363 which is now conflict free
-rw-r--r--PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ca10c3dc0dd5..ceff66969a3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -60,12 +60,12 @@ prepare() {
# clutter-stage-cogl: Reduce output latency and reduce missed frames too [performance]
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/281
- git cherry-pick -n 6c72dcdb^..186f16f8
+ # first commit replaced by !363
+ git cherry-pick -n 186f16f8
# Consolidate all frame throttling into clutter-stage-cogl [performance]
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/363
- # incompatible with !281 atm
- # git cherry-pick -n 7e4270de^..27f669d0
+ git cherry-pick -n 577084a4^..c71e6523
# clutter-actor: Add detail to captured-event signal [performance]
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/283