diff options
| author | Enrico Tassi | 2019-04-29 09:26:24 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2019-04-29 09:26:24 +0200 |
| commit | 4e25d51b89b66d4b9c982e85a5de9645e7e537ad (patch) | |
| tree | 11bb34a169bc33c4a413df64581e1f86aa585777 | |
| parent | 4f2da48207010b5edca8f0a9a4c5afe7e10eec17 (diff) | |
| parent | 258517725bda26d8d7eb273e438998a0c541a93e (diff) | |
Merge PR #9997: CoqIDE: fix open-file dialog and icons on macOS
Ack-by: SkySkimmer
Reviewed-by: gares
| -rw-r--r-- | Makefile.ide | 4 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.ide b/Makefile.ide index 8f9088a04a..4cec7aa443 100644 --- a/Makefile.ide +++ b/Makefile.ide @@ -68,6 +68,7 @@ GTKBIN=$(shell pkg-config --variable=prefix gtk+-3.0)/bin GTKLIBS=$(shell pkg-config --variable=libdir gtk+-3.0) PIXBUFBIN=$(shell pkg-config --variable=prefix gdk-pixbuf-2.0)/bin SOURCEVIEWSHARE=$(shell pkg-config --variable=prefix gtksourceview-3.0)/share +ADWAITASHARE=$(shell ls -d /usr/local/Cellar/adwaita-icon-theme/*)/share ########################################################################### # CoqIde special targets @@ -255,6 +256,9 @@ $(COQIDEAPP)/Contents/Resources/share: $(COQIDEAPP)/Contents $(INSTALLLIB) "$(SOURCEVIEWSHARE)/"gtksourceview-3.0/styles/{styles.rng,classic.xml} $@/gtksourceview-3.0/styles/ cp -R "$(GTKSHARE)/"locale $@ cp -R "$(GTKSHARE)/"themes $@ + $(MKDIR) $@/glib-2.0/schemas + glib-compile-schemas --targetdir=$@/glib-2.0/schemas "$(GTKSHARE)/"glib-2.0/schemas/ + cp -R "$(ADWAITASHARE)/"icons $@ $(COQIDEAPP)/Contents/Resources/loaders: $(COQIDEAPP)/Contents $(MKDIR) $@ diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6fcc64f77e..f09087b172 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,7 +52,7 @@ jobs: - script: | set -e brew update - brew install gnu-time opam pkg-config gtksourceview3 + brew install gnu-time opam pkg-config gtksourceview3 adwaita-icon-theme pip3 install macpack displayName: 'Install system dependencies' |