From 6721575713f9a11ddce1a5b26c3d871f1fddf7a8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Oct 2021 14:13:56 +0000 Subject: src/CMakeLists.txt: Use different include paths for GTK-2 and GTK-3 builds (even if header files are indentical). --- src/CMakeLists.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a63eb8..9d3fb22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,13 +6,21 @@ # indicator-service.h # indicator.h -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-desktop-shortcuts.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-image-helper.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-ng.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-object.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service-manager.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libayatana-indicator3-0.4/libayatana-indicator") +if (FLAVOUR_GTK3) + # libayatana-indicator3.so + set (ayatana_indicator_gtkver "ayatana-indicator3") +else() + # libayatana-indicator.so + set (ayatana_indicator_gtkver "ayatana-indicator") +endif() + +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-desktop-shortcuts.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-image-helper.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-ng.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-object.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service-manager.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator-service.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/indicator.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/lib${ayatana_indicator_gtkver}-0.${API_VERSION}/libayatana-indicator") set(HEADERS indicator.h @@ -123,14 +131,6 @@ string(APPEND GEN_INDICATOR_SERVICE_XML_C "\;") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/gen-indicator-service.xml.c" ${GEN_INDICATOR_SERVICE_XML_C}) -if (FLAVOUR_GTK3) - # libayatana-indicator3.so - set (ayatana_indicator_gtkver "ayatana-indicator3") -else() - # libayatana-indicator.so - set (ayatana_indicator_gtkver "ayatana-indicator") -endif() - # libayatana-indicator{,3}.so set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) -- cgit v1.2.3 From 548d13a43e17419ce3be8cd0ed6bbf842b11169b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 19 Oct 2021 16:17:35 +0200 Subject: debian/libayatana-indicator*-dev.install: Ship include header files correctly in two separate dev:pkgs. --- debian/libayatana-indicator-dev.install | 2 +- debian/libayatana-indicator3-dev.install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/libayatana-indicator-dev.install b/debian/libayatana-indicator-dev.install index 8d167db..e4d125f 100644 --- a/debian/libayatana-indicator-dev.install +++ b/debian/libayatana-indicator-dev.install @@ -1,3 +1,3 @@ -usr/include +usr/include/libayatana-indicator-0.4/ usr/lib/*/pkgconfig/ayatana-indicator-0.4.pc usr/lib/*/libayatana-indicator.so diff --git a/debian/libayatana-indicator3-dev.install b/debian/libayatana-indicator3-dev.install index 73dc715..1998935 100644 --- a/debian/libayatana-indicator3-dev.install +++ b/debian/libayatana-indicator3-dev.install @@ -1,3 +1,3 @@ -usr/include +usr/include/libayatana-indicator3-0.4/ usr/lib/*/pkgconfig/ayatana-indicator3-0.4.pc usr/lib/*/libayatana-indicator3.so -- cgit v1.2.3 From 0b69ab97b5b81c0a101320784d9546b24707d2e3 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 2 Sep 2021 14:48:48 +0200 Subject: Fix Travis status image --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb5daeb..690b225 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# libayatana-indicator - Ayatana Indicators Shared Library [![Build Status](https://travis-ci.com/AyatanaIndicators/libayatana-indicator.svg)](https://travis-ci.com/AyatanaIndicators/libayatana-indicator) +# libayatana-indicator - Ayatana Indicators Shared Library [![Build Status](https://api.travis-ci.com/AyatanaIndicators/libayatana-indicator.svg)](https://travis-ci.com/github/AyatanaIndicators/libayatana-indicator) ## About Ayatana Indicators -- cgit v1.2.3 From eecd9dd882516b59f1b5e08bca9e6928b1fa2054 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 20 Sep 2021 12:57:49 +0200 Subject: Fix copyright headers --- tests/dummy-indicator-blank.c | 2 +- tests/dummy-indicator-entry-func.h | 2 +- tests/dummy-indicator-null.c | 2 +- tests/dummy-indicator-signaler.c | 2 +- tests/dummy-indicator-simple.c | 2 +- tests/dummy-indicator-visible.c | 2 +- tests/service-manager-connect-service.c | 2 +- tests/service-manager-connect.c | 2 +- tests/service-manager-no-connect.c | 2 +- tests/service-manager-nostart-connect.c | 2 +- tests/service-shutdown-timeout.c | 2 +- tests/service-version-bad-service.c | 2 +- tests/service-version-good-service.c | 2 +- tests/service-version-manager.c | 2 +- tests/service-version-multiwatch-manager-impolite.c | 2 +- tests/service-version-multiwatch-manager.c | 2 +- tests/service-version-multiwatch-service.c | 2 +- tests/test-desktop-shortcuts.c | 2 +- tests/test-loader.c | 2 +- tools/indicator-loader.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c index e447d6c..1f30f40 100644 --- a/tests/dummy-indicator-blank.c +++ b/tests/dummy-indicator-blank.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/dummy-indicator-entry-func.h b/tests/dummy-indicator-entry-func.h index 97b3a04..9d5e7a1 100644 --- a/tests/dummy-indicator-entry-func.h +++ b/tests/dummy-indicator-entry-func.h @@ -2,7 +2,7 @@ Test for libindicator Copyright 2012 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c index adb05d3..addfd4c 100644 --- a/tests/dummy-indicator-null.c +++ b/tests/dummy-indicator-null.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index 2fa3a8b..ae7f121 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index e42d1fe..bbe11b5 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c index 639f7c8..4e4d12f 100644 --- a/tests/dummy-indicator-visible.c +++ b/tests/dummy-indicator-visible.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2012 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Charles Kerr diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index a17bada..7d8aa5a 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index cf7cb6a..e655d8c 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c index 5b5d389..7f1e378 100644 --- a/tests/service-manager-no-connect.c +++ b/tests/service-manager-no-connect.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c index 44a87a9..f596d1a 100644 --- a/tests/service-manager-nostart-connect.c +++ b/tests/service-manager-nostart-connect.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c index 338ebb6..d8401a6 100644 --- a/tests/service-shutdown-timeout.c +++ b/tests/service-shutdown-timeout.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c index 46574cb..28735be 100644 --- a/tests/service-version-bad-service.c +++ b/tests/service-version-bad-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c index 3257ce2..c246c7b 100644 --- a/tests/service-version-good-service.c +++ b/tests/service-version-good-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index 07c6173..afb36f8 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c index 97678d3..dc5194a 100644 --- a/tests/service-version-multiwatch-manager-impolite.c +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 7f82e82..d53de8d 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index e1ca660..504f12a 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c index 48a668d..63917a2 100644 --- a/tests/test-desktop-shortcuts.c +++ b/tests/test-desktop-shortcuts.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tests/test-loader.c b/tests/test-loader.c index d6dabc5..fed3f40 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 159b17b..8bd5f68 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -3,7 +3,7 @@ * and during development of them. * * Copyright 2009 Canonical Ltd. - * Copyright 2021 AyatanaIndicators + * Copyright 2021 Robert Tari * * Authors: * Ted Gould -- cgit v1.2.3