all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 70c96b320cf8dcb95a3bd88a145c9efd0f12502f 1479 bytes (raw)
name: gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
 
From a3c3c1ae0ec15f3ca5ea7696d92958ecf68688a7 Mon Sep 17 00:00:00 2001
From: Saku Laesvuori <saku@laesvuori.fi>
Date: Sun, 26 Nov 2023 12:22:27 +0200
Subject: [PATCH] Unbundle cppgir

---
 external/glib/CMakeLists.txt        | 8 --------
 external/glib/generate_cppgir.cmake | 2 ++
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/external/glib/CMakeLists.txt b/external/glib/CMakeLists.txt
index 3c6fe4b..ee057a4 100644
--- a/external/glib/CMakeLists.txt
+++ b/external/glib/CMakeLists.txt
@@ -7,14 +7,6 @@
 add_library(external_glib INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_glib ALIAS external_glib)
 
-function(add_cppgir) # isolate scope
-    set(BUILD_TESTING OFF)
-    set(BUILD_DOC OFF)
-    set(BUILD_EXAMPLES OFF)
-    add_subdirectory(cppgir EXCLUDE_FROM_ALL)
-endfunction()
-add_cppgir()
-
 include(generate_cppgir.cmake)
 generate_cppgir(external_glib Gio-2.0)
 
diff --git a/external/glib/generate_cppgir.cmake b/external/glib/generate_cppgir.cmake
index c9872a6..7925cf4 100644
--- a/external/glib/generate_cppgir.cmake
+++ b/external/glib/generate_cppgir.cmake
@@ -4,6 +4,8 @@
 # For license and copyright information please follow this link:
 # https://github.com/desktop-app/legal/blob/master/LEGAL
 
+find_package(CppGir REQUIRED gi)
+
 function(generate_cppgir target_name gir)
     # cppgir generates all the dependent headers everytime, better to have a global folder
     set(gen_dst ${CMAKE_BINARY_DIR}/gen)
-- 
2.41.0


debug log:

solving 70c96b320c ...
found 70c96b320c in https://yhetil.org/guix/2736ef6da09a9e8e88f8643d2090cf294dab72a5.1701112690.git.saku@laesvuori.fi/ ||
	https://yhetil.org/guix/b5398989cfbc1bc4ce87e618ae714b4e45b2a626.1701236254.git.saku@laesvuori.fi/

applying [1/1] https://yhetil.org/guix/2736ef6da09a9e8e88f8643d2090cf294dab72a5.1701112690.git.saku@laesvuori.fi/
diff --git a/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch b/gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch
new file mode 100644
index 0000000000..70c96b320c

1:24: trailing whitespace.
 
1:35: trailing whitespace.
 
1:43: trailing whitespace.
 
1:49: trailing whitespace.
-- 
Checking patch gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch...
1:51: new blank line at EOF.
+
Applied patch gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch cleanly.
warning: 5 lines add whitespace errors.

skipping https://yhetil.org/guix/b5398989cfbc1bc4ce87e618ae714b4e45b2a626.1701236254.git.saku@laesvuori.fi/ for 70c96b320c
index at:
100644 70c96b320cf8dcb95a3bd88a145c9efd0f12502f	gnu/packages/patches/telegram-desktop-unbundle-cppgir.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.