From 8c9b69a9025dfb05ac075f7df0ca31cb09e7a3a9 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
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 2f582bda46e84dff415b67dd376a06612afda815 Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
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