From d9628fb37e7ca3961acfdce84e34e6f60994f208 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 20:24:23 +0200 Subject: tests/CMakeLists.txt: Add missing ${URL_DISPATCHER_LIBRARIES} to target_link_libraries(). --- tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 61ce542..ecb3c12 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -26,6 +26,7 @@ target_include_directories(tst_utils PUBLIC "${CMAKE_SOURCE_DIR}/src") target_link_libraries(tst_utils ayatana-common ${GLIB_LIBRARIES} + ${URL_DISPATCHER_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} -- cgit v1.2.3 From 203b419f099b8deb038806e09366b971d4040510 Mon Sep 17 00:00:00 2001 From: Weblate Date: Sat, 28 Aug 2021 22:46:03 +0200 Subject: Added translation using Weblate (Kurdish (Southern)) --- po/sdh.po | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 po/sdh.po diff --git a/po/sdh.po b/po/sdh.po new file mode 100644 index 0000000..0bc5754 --- /dev/null +++ b/po/sdh.po @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-06-17 14:12+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: sdh\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/org.ayatana.common.gschema.xml.in:1 +msgid "Maximum menu text length" +msgstr "" + +#: ../data/org.ayatana.common.gschema.xml.in:2 +msgid "" +"The number of characters to show in dynamic menu items before the text is " +"ellipsized. Set to 0 to leave unchanged." +msgstr "" -- cgit v1.2.3 From 890f7117640c9557dc2ff011e6d2498b95e1e665 Mon Sep 17 00:00:00 2001 From: Weblate Date: Sat, 28 Aug 2021 22:46:03 +0200 Subject: Added translation using Weblate (Kurdish (Northern)) --- po/kmr.po | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 po/kmr.po diff --git a/po/kmr.po b/po/kmr.po new file mode 100644 index 0000000..067e6da --- /dev/null +++ b/po/kmr.po @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-06-17 14:12+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: kmr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/org.ayatana.common.gschema.xml.in:1 +msgid "Maximum menu text length" +msgstr "" + +#: ../data/org.ayatana.common.gschema.xml.in:2 +msgid "" +"The number of characters to show in dynamic menu items before the text is " +"ellipsized. Set to 0 to leave unchanged." +msgstr "" -- cgit v1.2.3 From 7cb304774fdeef0b2a674aaa54d394872512335a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 16:15:23 +0200 Subject: GIR and Vala bindings: Properly detect GObjectIntrospection and Vala and disable GIR and Vala if not found. --- CMakeLists.txt | 15 ++++++++++++ src/CMakeLists.txt | 66 +++++++++++++++++++++++++++------------------------- tests/CMakeLists.txt | 15 +++++++----- 3 files changed, 58 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 751bf36..4dfc038 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,10 @@ pkg_check_modules( ) include_directories(${URLDISPATCHER_INCLUDE_DIRS}) +# for GIR and Vala bindings +find_package (GObjectIntrospection QUIET) +find_package (Vala QUIET) + set(CC_WARNING_ARGS " -Wall -pedantic -Wextra -Wno-missing-field-initializers") add_subdirectory(src) @@ -76,3 +80,14 @@ endif() message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") message(STATUS "Unit tests: ${ENABLE_TESTS}") message(STATUS "Build with -Werror: ${ENABLE_WERROR}") + +if (INTROSPECTION_FOUND) + message(STATUS "Build GObjectIntrospection: YES") + if (VALA_COMPILER) + message(STATUS "Build Vala bindings: YES") + else() + message(STATUS "Build Vala bindings: NO") + endif() +else() + message(STATUS "Build GObjectIntrospection: NO") +endif() \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 637ce9f..39682a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,41 +30,43 @@ install(TARGETS ayatana-common DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) # AyatanaCommon.gir -find_package(GObjectIntrospection REQUIRED QUIET) - -add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" - DEPENDS "ayatana-common" - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND - ${INTROSPECTION_SCANNER} - utils.c utils.h - --namespace=AyatanaCommon - --c-include=ayatana/common/utils.h - --quiet - --warn-all - --include=GLib-2.0 - --library="ayatana-common" - --library-path=${CMAKE_CURRENT_BINARY_DIR} - --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" -) - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") +if (INTROSPECTION_FOUND) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + DEPENDS "ayatana-common" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND + ${INTROSPECTION_SCANNER} + utils.c utils.h + --namespace=AyatanaCommon + --c-include=ayatana/common/utils.h + --quiet + --warn-all + --include=GLib-2.0 + --library="ayatana-common" + --library-path=${CMAKE_CURRENT_BINARY_DIR} + --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") # AyatanaCommon.vapi -find_package(Vala REQUIRED QUIET) + if (VALA_COMPILER) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${VAPI_GEN} + --library=AyatanaCommon + AyatanaCommon.gir + ) -add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND - ${VAPI_GEN} - --library=AyatanaCommon - AyatanaCommon.gir -) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi") + add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi") -add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi") + endif() + +endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ecb3c12..002e4db 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -56,10 +56,13 @@ add_custom_command( # tst_utils_vala -add_executable("tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}/tst_utils.c") -target_include_directories("tst_utils_vala" PUBLIC "${GLIB_INCLUDE_DIRS};${CMAKE_BINARY_DIR}/src") -target_link_libraries("tst_utils_vala" "${GLIB_LIBRARIES} -layatana-common -L${CMAKE_BINARY_DIR}/src") -target_link_directories("tst_utils_vala" PUBLIC "${CMAKE_BINARY_DIR}/src") -add_dependencies("tst_utils_vala" "src") +if (VALA_COMPILER) -add_test(NAME "TstUtilsVala" COMMAND "${CMAKE_CURRENT_BINARY_DIR}/tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}") + add_executable("tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}/tst_utils.c") + target_include_directories("tst_utils_vala" PUBLIC "${GLIB_INCLUDE_DIRS};${CMAKE_BINARY_DIR}/src") + target_link_libraries("tst_utils_vala" "${GLIB_LIBRARIES} -layatana-common -L${CMAKE_BINARY_DIR}/src") + target_link_directories("tst_utils_vala" PUBLIC "${CMAKE_BINARY_DIR}/src") + add_dependencies("tst_utils_vala" "src") + + add_test(NAME "TstUtilsVala" COMMAND "${CMAKE_CURRENT_BINARY_DIR}/tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}") +endif() -- cgit v1.2.3 From 32575a68bf8b21a9aa0326a576c0ea774f0b574c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 22:05:55 +0200 Subject: src/CMakeLists.txt: Also generate binary typelib file (and set nsversion for this). --- src/CMakeLists.txt | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39682a7..dfebdf5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,35 +32,51 @@ install(TARGETS ayatana-common DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) if (INTROSPECTION_FOUND) add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" DEPENDS "ayatana-common" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${INTROSPECTION_SCANNER} utils.c utils.h --namespace=AyatanaCommon + --nsversion=0.0 --c-include=ayatana/common/utils.h --quiet --warn-all --include=GLib-2.0 --library="ayatana-common" --library-path=${CMAKE_CURRENT_BINARY_DIR} - --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + +# AyatanaCommon.typelib + + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${INTROSPECTION_COMPILER} + --includedir=${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir + -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0") # AyatanaCommon.vapi if (VALA_COMPILER) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.gir" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${VAPI_GEN} --library=AyatanaCommon - AyatanaCommon.gir + AyatanaCommon-0.0.gir ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi") -- cgit v1.2.3 From 3cceadb33ce0911d8580d82d8c97979103efa029 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 22:07:03 +0200 Subject: debian/: Fix DEB packaging; add GIR, VAPI, translation and GSchema files. Add gir1.2-ayatanacommon-0.0 bin:pkg. --- debian/ayatana-indicator-common.install | 2 ++ debian/control | 13 +++++++++++++ debian/libayatana-common-dev.install | 2 ++ debian/rules | 3 +++ 4 files changed, 20 insertions(+) diff --git a/debian/ayatana-indicator-common.install b/debian/ayatana-indicator-common.install index b252da6..ad0fa10 100755 --- a/debian/ayatana-indicator-common.install +++ b/debian/ayatana-indicator-common.install @@ -1,2 +1,4 @@ #! /usr/bin/dh-exec [linux-any] usr/lib/systemd +usr/share/locale/ +usr/share/glib-2.0/schemas/ diff --git a/debian/control b/debian/control index 897dec8..df2fec0 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + gir1.2-ayatanacommon-0.0 (= ${binary:Version}), libayatana-common0 (= ${binary:Version}), Description: Ayatana System Indicators' common API functions (development headers) This package contains common API functions used by Ayatana System @@ -45,6 +46,18 @@ Description: Ayatana System Indicators' common API functions (development header . This package contains the development headers. +Package: gir1.2-ayatanacommon-0.0 +Section: introspection +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${gir:Depends}, +Description: Ayatana System Indicators' common API functions (GObject Introspection) + This package contains common API functions used by Ayatana System + Indicators. + . + This package contains the GObject Introspection file. + Package: ayatana-indicator-common Architecture: all Depends: ${misc:Depends}, diff --git a/debian/libayatana-common-dev.install b/debian/libayatana-common-dev.install index e650b7c..954378f 100644 --- a/debian/libayatana-common-dev.install +++ b/debian/libayatana-common-dev.install @@ -1,3 +1,5 @@ usr/include usr/lib/*/pkgconfig/libayatana-common.pc usr/lib/*/libayatana-common.so +usr/share/gir-1.0/ +usr/share/vala/vapi/ diff --git a/debian/rules b/debian/rules index 82088c0..f23cfb5 100755 --- a/debian/rules +++ b/debian/rules @@ -15,5 +15,8 @@ override_dh_auto_configure: -DCMAKE_INSTALL_DIR=/usr \ $(NULL) +override_dh_missing: + dh_missing --fail-missing + get-orig-source: uscan --noconf --force-download --rename --download-current-version --destdir=.. -- cgit v1.2.3 From cb72491c89ae9cf77695ccba6285ced4b60a64f9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 23:41:30 +0200 Subject: debian/gir1.2-ayatanacommon-0.0.install: Add missing file. --- debian/gir1.2-ayatanacommon-0.0.install | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/gir1.2-ayatanacommon-0.0.install diff --git a/debian/gir1.2-ayatanacommon-0.0.install b/debian/gir1.2-ayatanacommon-0.0.install new file mode 100644 index 0000000..eee37f2 --- /dev/null +++ b/debian/gir1.2-ayatanacommon-0.0.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0/*.typelib -- cgit v1.2.3 From 3e45864475cf784cffa97851c0e04e26478514e2 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 29 Aug 2021 00:26:02 +0200 Subject: Whitespace fix --- src/CMakeLists.txt | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dfebdf5..bf2c1f6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,58 +31,58 @@ install(TARGETS ayatana-common DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) # AyatanaCommon.gir if (INTROSPECTION_FOUND) - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" - DEPENDS "ayatana-common" - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND - ${INTROSPECTION_SCANNER} - utils.c utils.h - --namespace=AyatanaCommon - --nsversion=0.0 - --c-include=ayatana/common/utils.h - --quiet - --warn-all - --include=GLib-2.0 - --library="ayatana-common" - --library-path=${CMAKE_CURRENT_BINARY_DIR} - --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" - ) - - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" + DEPENDS "ayatana-common" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND + ${INTROSPECTION_SCANNER} + utils.c utils.h + --namespace=AyatanaCommon + --nsversion=0.0 + --c-include=ayatana/common/utils.h + --quiet + --warn-all + --include=GLib-2.0 + --library="ayatana-common" + --library-path=${CMAKE_CURRENT_BINARY_DIR} + --output "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") # AyatanaCommon.typelib - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND - ${INTROSPECTION_COMPILER} - --includedir=${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir - -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" - ) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${INTROSPECTION_COMPILER} + --includedir=${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.gir + -o "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/girepository-1.0") # AyatanaCommon.vapi - if (VALA_COMPILER) - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMAND - ${VAPI_GEN} - --library=AyatanaCommon - AyatanaCommon-0.0.gir - ) + if (VALA_COMPILER) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon-0.0.typelib" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND + ${VAPI_GEN} + --library=AyatanaCommon + AyatanaCommon-0.0.gir + ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/vala/vapi") - add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi") + add_custom_target("src" ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/AyatanaCommon.vapi") - endif() + endif() endif() -- cgit v1.2.3 From 21d4adbfac0d4f631cb069ecca90c8204f3f1422 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 29 Aug 2021 01:08:42 +0200 Subject: Fix missing ayatana-common library during GIR scanning --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bf2c1f6..3e4d529 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,6 +38,7 @@ if (INTROSPECTION_FOUND) COMMAND ${INTROSPECTION_SCANNER} utils.c utils.h + --no-libtool --namespace=AyatanaCommon --nsversion=0.0 --c-include=ayatana/common/utils.h -- cgit v1.2.3 From 8f472447d08a63cfd704763952590171505b0561 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 29 Aug 2021 01:54:12 +0200 Subject: debian/control: Fix Breaks: relation between ayatana-indicator-common and ayatana-indicator-keyboard. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index df2fec0..9049504 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,7 @@ Multi-Arch: foreign Breaks: ayatana-indicator-application (<< 0.8.0), ayatana-indicator-datetime (<< 0.8.0), ayatana-indicator-display (<< 0.8.0), - ayatana-indicator-keyboard (<< 0.8.0), + ayatana-indicator-keyboard (<< 0.7.90), ayatana-indicator-messages (<< 0.8.0), ayatana-indicator-notifications (<< 0.8.0), ayatana-indicator-printers (<< 0.8.0), -- cgit v1.2.3 From 396782012c31d75e7ef99a199cac718833f16b38 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 28 Aug 2021 20:56:08 +0000 Subject: Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: Ayatana Indicators/Ayatana Common Library Translate-URL: https://hosted.weblate.org/projects/ayatana-indicators/libayatana-common/de/ --- po/de.po | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index e2ac694..a615fed 100644 --- a/po/de.po +++ b/po/de.po @@ -8,21 +8,26 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-06-17 14:12+0200\n" -"PO-Revision-Date: 2021-06-12 01:05+0100\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2021-08-29 21:33+0000\n" +"Last-Translator: Mike Gabriel \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.8.1-dev\n" #: ../data/org.ayatana.common.gschema.xml.in:1 msgid "Maximum menu text length" -msgstr "" +msgstr "Maximale Textlänge in Menüs" #: ../data/org.ayatana.common.gschema.xml.in:2 msgid "" "The number of characters to show in dynamic menu items before the text is " "ellipsized. Set to 0 to leave unchanged." msgstr "" +"Die Anzahl an Zeichen, die in dynamischen Menüeinträgen angezeigt werden " +"sollen, bevor der Text gekürzt wird. Den Wert auf 0 setzen um Text nicht zu " +"kürzen." -- cgit v1.2.3 From ecabcbd846c6ac20b3dcf74d4cbb16bb6a341021 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 1 Sep 2021 09:39:26 +0200 Subject: release 0.9.4 --- AUTHORS | 1 + CMakeLists.txt | 2 +- ChangeLog | 48 +++++++++++++++++++++++++++++++++++++++++++++++- debian/changelog | 7 +++++++ 4 files changed, 56 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index e6866ee..2e9440d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,4 +13,5 @@ Milo Ivir Oğuz Ersen Quentin PAGÈS Robert Tari +Weblate Yaron Shahrabani diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dfc038..07fc724 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -set(PROJECT_VERSION "0.9.3") +set(PROJECT_VERSION "0.9.4") set(PACKAGE ${CMAKE_PROJECT_NAME}) set(GETTEXT_PACKAGE "ayatana-common") set(API_VERSION 0) diff --git a/ChangeLog b/ChangeLog index 633ed16..15e1435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,52 @@ +2021-09-01 Mike Gabriel + + * release 0.9.4 (HEAD -> main, tag: 0.9.4) + +2021-08-28 Mike Gabriel + + * Translated using Weblate (German) (69b0e8b) + +2021-08-29 Mike Gabriel + + * debian/control: Fix Breaks: relation between + ayatana-indicator-common and ayatana-indicator-keyboard. + (d4a0a41) + * Merge branch 'tari01-pr/fix-gir-error' (6976edc) + +2021-08-29 Robert Tari + + * Fix missing ayatana-common library during GIR scanning (2f582bd) + * Whitespace fix (8c9b69a) + +2021-08-28 Mike Gabriel + + * debian/gir1.2-ayatanacommon-0.0.install: Add missing file. + (5c156a7) + * Merge branch 'sunweaver-pr/generate-typelib-file' (1669b29) + * debian/: Fix DEB packaging; add GIR, VAPI, translation and GSchema + files. Add gir1.2-ayatanacommon-0.0 bin:pkg. (908b36b) + * src/CMakeLists.txt: Also generate binary typelib file (and set + nsversion for this). (765360a) + * Merge branch 'sunweaver-pr/conditional-gir-and-vala' (f3ac7d6) + * GIR and Vala bindings: Properly detect GObjectIntrospection and + Vala and disable GIR and Vala if not found. (3859fae) + +2021-08-28 Weblate + + * Added translation using Weblate (Kurdish (Northern)) (91282da) + * Added translation using Weblate (Kurdish (Southern)) (2a7bb3b) + 2021-08-28 Mike Gabriel - * release 0.9.3 (HEAD -> master, tag: 0.9.3) + * Merge branch 'sunweaver-pr/fix-vala-unittests--against-GLib-2.58' + (55155fe) + * tests/tst_utils.vala: Use older GLib.assert() API to make tests + work correctly when building against GLib 2.58. (d6b78d0) + * .travis.yml: Fix branch name what is now the default branch in + ayatana-dev-scripts. (8b40ad5) + * debian/control: Add B-Ds: valac, gobject-introspection and + libgirepository1.0-dev. (39f6704) + * release 0.9.3 (0334f03) (tag: 0.9.3) 2021-08-27 Adolfo Jayme Barrientos diff --git a/debian/changelog b/debian/changelog index 3c36f35..87a5989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libayatana-common (0.9.4-0) unstable; urgency=medium + + * Upstream-provided Debian package for libayatana-common. + See upstream ChangeLog for recent changes. + + -- Mike Gabriel Wed, 01 Sep 2021 09:38:49 +0200 + libayatana-common (0.9.3-0) unstable; urgency=medium * Upstream-provided Debian package for libayatana-common. -- cgit v1.2.3