diff options
| author | Charles Milette | 2017-09-12 12:50:24 -0400 |
|---|---|---|
| committer | Charles Milette | 2017-09-12 12:50:24 -0400 |
| commit | 79ed86a87842d97ed9cc7d1f4f4b4fe93ccaf8a2 (patch) | |
| tree | f1de2d5ae19d3f262f6c2adc15807613aebd0375 /orange-no-conflict.patch | |
| parent | a578c54a34bb577e4e7982c0d4e9b21b3a07617e (diff) | |
| download | aur-79ed86a87842d97ed9cc7d1f4f4b4fe93ccaf8a2.tar.gz | |
Fix conflicts
Diffstat (limited to 'orange-no-conflict.patch')
| -rw-r--r-- | orange-no-conflict.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/orange-no-conflict.patch b/orange-no-conflict.patch new file mode 100644 index 000000000000..27c27c1e82bd --- /dev/null +++ b/orange-no-conflict.patch @@ -0,0 +1,32 @@ +From 73ff2d119674efc81d1995154037feb8e2ab639f Mon Sep 17 00:00:00 2001 +From: Charles Milette <charles.milette@gmail.com> +Date: Tue, 12 Sep 2017 12:39:15 -0400 +Subject: [PATCH] Make Arc and Arc Orange live together + +--- + common/Makefile.am | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/common/Makefile.am b/common/Makefile.am +index 7966da8..8633b38 100755 +--- a/common/Makefile.am ++++ b/common/Makefile.am +@@ -1,6 +1,12 @@ +-themedir = $(datadir)/themes/Arc +-themedarkerdir = $(datadir)/themes/Arc-Darker +-themedarkdir = $(datadir)/themes/Arc-Dark ++if !ENABLE_TRANSPARENCY ++ themedir = $(datadir)/themes/Arc-Orange-solid ++ themedarkerdir = $(datadir)/themes/Arc-Darker-Orange-solid ++ themedarkdir = $(datadir)/themes/Arc-Dark-Orange-solid ++else ++ themedir = $(datadir)/themes/Arc-Orange ++ themedarkerdir = $(datadir)/themes/Arc-Darker-Orange ++ themedarkdir = $(datadir)/themes/Arc-Dark-Orange ++endif + + ithemedir = $(DESTDIR)$(themedir) + ithemedarkerdir = $(DESTDIR)$(themedarkerdir) +-- +2.14.1 + |