diff options
| author | Robert Tari <robert@tari.in> | 2021-10-22 11:38:37 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-22 11:38:37 +0200 |
| commit | c9063c6b37ce788a68a73498599dbaa2af9eff20 (patch) | |
| tree | 440e55e613efd69b0a4727a264d300a689df6025 | |
| parent | 99649c51f2c197c1223a204aa9c30b3f6b9c930d (diff) | |
| parent | c15189facd577c1fd3d3bf22b30bffe313b3078c (diff) | |
| download | libayatana-indicator-c9063c6b37ce788a68a73498599dbaa2af9eff20.tar.gz libayatana-indicator-c9063c6b37ce788a68a73498599dbaa2af9eff20.tar.bz2 libayatana-indicator-c9063c6b37ce788a68a73498599dbaa2af9eff20.zip | |
Merge branch 'sunweaver-pr/gtk2-flavour-build-fix'
Attributes GH PR #57: https://github.com/AyatanaIndicators/libayatana-indicator/pull/57
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 16 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b92a3c..cfd3bfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,10 +40,21 @@ endif() set(DEPS glib-2.0>=2.37 - gtk+-3.0>=3.24 gmodule-2.0 gio-unix-2.0 ) +if (FLAVOUR_GTK3) + set(DEPS + ${DEPS} + gtk+-3.0>=3.24 + ) +endif() +if (FLAVOUR_GTK2) + set(DEPS + ${DEPS} + gtk+-2.0>=2.18 + ) +endif() if (FLAVOUR_GTK3 AND ENABLE_IDO) set(DEPS diff --git a/debian/rules b/debian/rules index fd5a956..2fce74b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -FLAVORS = gtk2 gtk3 +FLAVOURS = gtk2 gtk3 export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 @@ -19,12 +19,12 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: dh $@ -override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) +override_dh_auto_configure: $(FLAVOURS:%=doconfigure-%) doconfigure-%: DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(COMMON_CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_$*) -override_dh_auto_build: $(FLAVORS:%=dobuild-%) +override_dh_auto_build: $(FLAVOURS:%=dobuild-%) dobuild-%: dh_auto_build --builddirectory=builddir/$* @@ -33,7 +33,7 @@ override_dh_auto_test: xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk2 xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk3 -override_dh_auto_install: $(FLAVORS:%=doinstall-%) +override_dh_auto_install: $(FLAVOURS:%=doinstall-%) doinstall-%: dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* |