diff options
| author |  Unit 193 <unit193@ubuntu.com> | 2018-10-07 08:50:50 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2018-10-07 08:50:50 -0400 |
| commit | e8b563c04b963ff8c5758e962d472d5e91a9fa54 (patch) | |
| tree | 742727b1816fbb9d38a066faa266044572152be1 | |
| parent | 20b1f04e7f192e51c6be160dc3441d367e97b4e4 (diff) | |
| download | veracrypt-e8b563c04b963ff8c5758e962d472d5e91a9fa54.tar.bz2 veracrypt-e8b563c04b963ff8c5758e962d472d5e91a9fa54.tar.xz veracrypt-e8b563c04b963ff8c5758e962d472d5e91a9fa54.tar.zst | |
d/p/002-indicator-support.diff: Update to account for GTK3 wxgtk.
| -rw-r--r-- | debian/patches/002-indicator-support.diff | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/debian/patches/002-indicator-support.diff b/debian/patches/002-indicator-support.diff index 858f3af..c1e2dec 100644 --- a/debian/patches/002-indicator-support.diff +++ b/debian/patches/002-indicator-support.diff @@ -170,18 +170,24 @@ Index: veracrypt/src/Makefile =================================================================== --- veracrypt.orig/src/Makefile +++ veracrypt/src/Makefile -@@ -61,6 +61,15 @@ CPPFLAGS+=$(shell dpkg-buildflags --get - CFLAGS+=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) -Wno-sequence-point - CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) -Wno-narrowing - LFLAGS+=$(shell dpkg-buildflags --get LDFLAGS) -+ifeq ($(shell pkg-config --exists appindicator-0.1 && echo $$?),0) +@@ -57,6 +57,21 @@ export WXCONFIG_CFLAGS := + export WXCONFIG_CXXFLAGS := + WX_ROOT ?= .. + ++ifneq (,$(findstring gtk3,$(shell $(WX_CONFIG) --selected-config))) ++ INDICATOR_LIBRARY=appindicator3-0.1 ++else ++ INDICATOR_LIBRARY=appindicator-0.1 ++endif ++ ++ifeq ($(shell pkg-config --exists $(INDICATOR_LIBRARY) && echo $$?),0) + export C_CXX_FLAGS += -DHAVE_INDICATORS -DUBUNTU_INDICATOR -+ export LIBS += $(shell pkg-config --libs appindicator-0.1) -+ C_CXX_FLAGS += $(shell pkg-config --cflags appindicator-0.1) -+else ifeq ($(shell pkg-config --exists ayatana-appindicator-0.1 && echo $$?),0) ++ export LIBS += $(shell pkg-config --libs $(INDICATOR_LIBRARY)) ++ C_CXX_FLAGS += $(shell pkg-config --cflags $(INDICATOR_LIBRARY)) ++else ifeq ($(shell pkg-config --exists ayatana-$(INDICATOR_LIBRARY) && echo $$?),0) + export C_CXX_FLAGS += -DHAVE_INDICATORS -DAYATANA_INDICATOR -+ export LIBS += $(shell pkg-config --libs ayatana-appindicator-0.1) -+ C_CXX_FLAGS += $(shell pkg-config --cflags ayatana-appindicator-0.1) ++ export LIBS += $(shell pkg-config --libs ayatana-$(INDICATOR_LIBRARY)) ++ C_CXX_FLAGS += $(shell pkg-config --cflags ayatana-$(INDICATOR_LIBRARY)) +endif export TC_BUILD_CONFIG := Release |