* [gentoo-commits] repo/proj/guru:dev commit in: gnome-extra/extension-manager/files/, gnome-extra/extension-manager/
@ 2023-06-03 18:01 Yuan Liao
0 siblings, 0 replies; 3+ messages in thread
From: Yuan Liao @ 2023-06-03 18:01 UTC (permalink / raw
To: gentoo-commits
commit: eab57b2ecae661d7a5bab86bd0c7157d3dcbcbc3
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Sat Jun 3 17:40:10 2023 +0000
Commit: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Sat Jun 3 17:40:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eab57b2e
gnome-extra/extension-manager: Add patch to remove libbacktrace dep
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
...99.ebuild => extension-manager-0.4.1-r1.ebuild} | 10 +-
.../extension-manager-9999.ebuild | 10 +-
...er-0.4.1-exm-backtrace.c-include-stdint.h.patch | 31 +++++
...-manager-0.4.1-make-libbacktrace-optional.patch | 153 +++++++++++++++++++++
4 files changed, 202 insertions(+), 2 deletions(-)
diff --git a/gnome-extra/extension-manager/extension-manager-9999.ebuild b/gnome-extra/extension-manager/extension-manager-0.4.1-r1.ebuild
similarity index 88%
copy from gnome-extra/extension-manager/extension-manager-9999.ebuild
copy to gnome-extra/extension-manager/extension-manager-0.4.1-r1.ebuild
index 273d091d9..bed7abdeb 100644
--- a/gnome-extra/extension-manager/extension-manager-9999.ebuild
+++ b/gnome-extra/extension-manager/extension-manager-0.4.1-r1.ebuild
@@ -33,17 +33,25 @@ RDEPEND="
>=gui-libs/libadwaita-1.2.0:1[introspection]
gui-libs/text-engine
net-libs/libsoup:3.0
- sys-libs/libbacktrace
"
DEPEND="
${RDEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.4.1-exm-backtrace.c-include-stdint.h.patch"
+ "${FILESDIR}/${PN}-0.4.1-make-libbacktrace-optional.patch"
+)
+
src_configure() {
local emesonargs=(
-Dpackage="ebuild"
-Ddistributor="Gentoo GURU <guru-bugs@gentoo.org>"
+
+ # sys-libs/libbacktrace has been last-rited in ::gentoo
+ # and is thus unavailable
+ -Dbacktrace=false
)
if has live ${PROPERTIES}; then
# Produce a development build for live ebuild
diff --git a/gnome-extra/extension-manager/extension-manager-9999.ebuild b/gnome-extra/extension-manager/extension-manager-9999.ebuild
index 273d091d9..bed7abdeb 100644
--- a/gnome-extra/extension-manager/extension-manager-9999.ebuild
+++ b/gnome-extra/extension-manager/extension-manager-9999.ebuild
@@ -33,17 +33,25 @@ RDEPEND="
>=gui-libs/libadwaita-1.2.0:1[introspection]
gui-libs/text-engine
net-libs/libsoup:3.0
- sys-libs/libbacktrace
"
DEPEND="
${RDEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.4.1-exm-backtrace.c-include-stdint.h.patch"
+ "${FILESDIR}/${PN}-0.4.1-make-libbacktrace-optional.patch"
+)
+
src_configure() {
local emesonargs=(
-Dpackage="ebuild"
-Ddistributor="Gentoo GURU <guru-bugs@gentoo.org>"
+
+ # sys-libs/libbacktrace has been last-rited in ::gentoo
+ # and is thus unavailable
+ -Dbacktrace=false
)
if has live ${PROPERTIES}; then
# Produce a development build for live ebuild
diff --git a/gnome-extra/extension-manager/files/extension-manager-0.4.1-exm-backtrace.c-include-stdint.h.patch b/gnome-extra/extension-manager/files/extension-manager-0.4.1-exm-backtrace.c-include-stdint.h.patch
new file mode 100644
index 000000000..bc0e27b57
--- /dev/null
+++ b/gnome-extra/extension-manager/files/extension-manager-0.4.1-exm-backtrace.c-include-stdint.h.patch
@@ -0,0 +1,31 @@
+From 49186450ff33e4a75d966cee51bcb6446fae3639 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 3 Jun 2023 09:59:11 -0700
+Subject: [PATCH 1/2] exm-backtrace.c: Explicitly include stdint.h for
+ uintptr_t usage
+
+The file uses type uintptr_t from stdint.h, which is indirectly included
+by backtrace.h. Even so, the file should unconditionally include
+stdint.h just in case backtrace.h no longer includes stdint.h in the
+future.
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/exm-backtrace.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/exm-backtrace.c b/src/exm-backtrace.c
+index 56b253a..4951394 100644
+--- a/src/exm-backtrace.c
++++ b/src/exm-backtrace.c
+@@ -21,6 +21,7 @@
+ #include "exm-backtrace.h"
+
+ #include <glib.h>
++#include <stdint.h>
+
+ #include <backtrace-supported.h>
+ #include <backtrace.h>
+--
+2.39.3
+
diff --git a/gnome-extra/extension-manager/files/extension-manager-0.4.1-make-libbacktrace-optional.patch b/gnome-extra/extension-manager/files/extension-manager-0.4.1-make-libbacktrace-optional.patch
new file mode 100644
index 000000000..66c1a20c0
--- /dev/null
+++ b/gnome-extra/extension-manager/files/extension-manager-0.4.1-make-libbacktrace-optional.patch
@@ -0,0 +1,153 @@
+From 6365d56e120c7522bc5a2ba515a3cd6efac1b184 Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Sat, 3 Jun 2023 09:55:38 -0700
+Subject: [PATCH 2/2] Make libbacktrace an optional dependency
+
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ meson.build | 1 +
+ meson_options.txt | 5 +++++
+ src/exm-application.c | 2 ++
+ src/exm-backtrace.c | 17 +++++++++++++++++
+ src/meson.build | 9 ++++++---
+ 5 files changed, 31 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 536cd97..d7b0eb5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -25,6 +25,7 @@ config_h.set_quoted('PKG_NAME', get_option('package'))
+ config_h.set_quoted('PKG_DISTRIBUTOR', get_option('distributor'))
+ config_h.set10('IS_OFFICIAL', get_option('official'))
+ config_h.set10('IS_DEVEL', get_option('development'))
++config_h.set10('WITH_BACKTRACE', get_option('backtrace'))
+ configure_file(
+ output: 'exm-config.h',
+ configuration: config_h,
+diff --git a/meson_options.txt b/meson_options.txt
+index b604dda..3f54b77 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,6 +8,11 @@ option('official',
+ value: false,
+ description: 'Whether this is an official upstream package')
+
++option('backtrace',
++ type: 'boolean',
++ value: true,
++ description: 'Whether the package is built with backtrace support')
++
+ # Will be shown in error messages
+ option('package',
+ type: 'string',
+diff --git a/src/exm-application.c b/src/exm-application.c
+index 5b56295..d062627 100644
+--- a/src/exm-application.c
++++ b/src/exm-application.c
+@@ -201,11 +201,13 @@ exm_application_show_about (GSimpleAction *action,
+ GTK_LICENSE_MPL_2_0,
+ NULL);
+
++#if WITH_BACKTRACE
+ adw_about_window_add_legal_section (ADW_ABOUT_WINDOW (about_window),
+ "libbacktrace",
+ "Copyright (C) 2012-2016 Free Software Foundation, Inc.",
+ GTK_LICENSE_BSD_3,
+ NULL);
++#endif
+
+ adw_about_window_add_legal_section (ADW_ABOUT_WINDOW (about_window),
+ "blueprint",
+diff --git a/src/exm-backtrace.c b/src/exm-backtrace.c
+index 4951394..3cf09b7 100644
+--- a/src/exm-backtrace.c
++++ b/src/exm-backtrace.c
+@@ -18,15 +18,21 @@
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
++#include "exm-config.h"
++
+ #include "exm-backtrace.h"
+
+ #include <glib.h>
+ #include <stdint.h>
+
++#if WITH_BACKTRACE
+ #include <backtrace-supported.h>
+ #include <backtrace.h>
++#endif
+
++#if WITH_BACKTRACE
+ static struct backtrace_state *state = NULL;
++#endif
+
+ static void
+ exm_backtrace_error_cb (void *data,
+@@ -54,6 +60,8 @@ exm_backtrace_full_cb (GString *string_builder,
+ void
+ exm_backtrace_init (char *filename)
+ {
++#if WITH_BACKTRACE
++
+ #ifdef BACKTRACE_SUPPORTED
+ state = backtrace_create_state (filename, 0,
+ exm_backtrace_error_cb,
+@@ -61,11 +69,16 @@ exm_backtrace_init (char *filename)
+ #else
+ g_warning ("Backtraces are not supported.\n");
+ #endif
++
++#else
++ g_warning ("Backtraces were not enabled at build time.\n");
++#endif
+ }
+
+ char *
+ exm_backtrace_print ()
+ {
++#if WITH_BACKTRACE
+ GString *string_builder;
+
+ if (!state)
+@@ -82,4 +95,8 @@ exm_backtrace_print ()
+ string_builder);
+
+ return g_string_free (string_builder, FALSE);
++#else
++ g_critical ("Backtraces were not enabled at build time.\n");
++ return NULL;
++#endif
+ }
+diff --git a/src/meson.build b/src/meson.build
+index 8599a8f..2adde2d 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -29,7 +29,7 @@ exm_sources = [
+ ]
+
+ cc = meson.get_compiler('c')
+-libbacktrace_dep = cc.find_library('backtrace', required: true)
++libbacktrace_dep = cc.find_library('backtrace', required: get_option('backtrace'))
+
+ exm_deps = [
+ dependency('gtk4'),
+@@ -37,10 +37,13 @@ exm_deps = [
+ dependency('gio-unix-2.0'),
+ dependency('json-glib-1.0'),
+ dependency('libsoup-3.0'),
+- dependency('text-engine-0.1'),
+- libbacktrace_dep
++ dependency('text-engine-0.1')
+ ]
+
++if libbacktrace_dep.found()
++ exm_deps += libbacktrace_dep
++endif
++
+ gnome = import('gnome')
+
+ subdir('local')
+--
+2.39.3
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gnome-extra/extension-manager/files/, gnome-extra/extension-manager/
@ 2023-07-19 14:59 Yuan Liao
0 siblings, 0 replies; 3+ messages in thread
From: Yuan Liao @ 2023-07-19 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 584f63bd9e3a74b0cefd86f6c44ec96274c2fd77
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Wed Jul 19 14:54:54 2023 +0000
Commit: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Wed Jul 19 14:54:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=584f63bd
gnome-extra/extension-manager: Drop 0.4.1-r1
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
| 1 -
.../extension-manager-0.4.1-r1.ebuild | 88 ----------------------
...er-0.4.1-exm-backtrace.c-include-stdint.h.patch | 31 --------
3 files changed, 120 deletions(-)
--git a/gnome-extra/extension-manager/Manifest b/gnome-extra/extension-manager/Manifest
index 7311d0047..136d1ab26 100644
--- a/gnome-extra/extension-manager/Manifest
+++ b/gnome-extra/extension-manager/Manifest
@@ -1,3 +1,2 @@
DIST extension-manager-0.3.2.tar.gz 1447521 BLAKE2B 55d09b54219804c1910a572953d7fee4b8a9131085260db1d4ef014bccf8b13fa2da0a8673c0d78643841d603878183c2b573b084bcd5cb1818721e8194c871b SHA512 84ff2f246d582cdae06a12e5e88309d67ae32502e9885675c08d75dc686fdea28b53bffa37d396ffface8515712f0b990603b5832704ae722342f0ad49748150
-DIST extension-manager-0.4.1.tar.gz 1490668 BLAKE2B ca7c4dabc100d4a8aba8a41ecdec3c88676764b81c2e5fdb64785ca5031a31749d058c1a670867fd1028ae13721d8de0c648fd397f63a56871e11899bca4d4f5 SHA512 3da3ff3f42117ad52eecd99e92d65d8d72b95e07a5488f7184577ab10f749b1cee08a3322316bf2a92a8e2b878ca18e94ce7d986331688eafb520cdb8a0bbf1c
DIST extension-manager-0.4.2.tar.gz 1469519 BLAKE2B 070016a50f48a89d39c760c7ec60fabc856dcdd7a8fc4a779253ede2354f7d9d6744fa7620e55a92f9ed671a00b8aff1fd9246d7dc919727893215d2f05e0658 SHA512 777c0d83f26064372a721681092ef7990ade028ea2d6bb8bb64aa8a4630cea60f2af07c1cf7d733a8f100fe5d7de5b1aeac2b99d8a585dc715ee469a874c0148
diff --git a/gnome-extra/extension-manager/extension-manager-0.4.1-r1.ebuild b/gnome-extra/extension-manager/extension-manager-0.4.1-r1.ebuild
deleted file mode 100644
index bed7abdeb..000000000
--- a/gnome-extra/extension-manager/extension-manager-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson xdg
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mjakeman/extension-manager.git"
-else
- SRC_URI="https://github.com/mjakeman/extension-manager/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A native tool for browsing, installing, and managing GNOME Shell Extensions"
-HOMEPAGE="https://mjakeman.github.io/extension-manager/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-BDEPEND="
- dev-libs/glib:2
- dev-util/blueprint-compiler
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/json-glib
- gui-libs/gtk:4[introspection]
- >=gui-libs/libadwaita-1.2.0:1[introspection]
- gui-libs/text-engine
- net-libs/libsoup:3.0
-"
-
-DEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.4.1-exm-backtrace.c-include-stdint.h.patch"
- "${FILESDIR}/${PN}-0.4.1-make-libbacktrace-optional.patch"
-)
-
-src_configure() {
- local emesonargs=(
- -Dpackage="ebuild"
- -Ddistributor="Gentoo GURU <guru-bugs@gentoo.org>"
-
- # sys-libs/libbacktrace has been last-rited in ::gentoo
- # and is thus unavailable
- -Dbacktrace=false
- )
- if has live ${PROPERTIES}; then
- # Produce a development build for live ebuild
- emesonargs+=( -Ddevelopment=true )
- fi
- meson_src_configure
-}
-
-# Tests are skipped because as of version 0.3.0, the tests only validate
-# resource files and do not verify any functionality of the program. Those
-# validations are either already handled by QA checks or not relevant on
-# Gentoo. For more information about the rationale, please refer to:
-# https://github.com/gentoo/guru/commit/f896bee213fbb62c70e818c1bf503fee2a41919a#comments
-#
-# If tests are to be executed in the future because the upstream adds
-# functionality tests or for other reasons, and should there be no convenient
-# way to skip the validations, the following variable values need to be set:
-#
-# IUSE="test"
-# RESTRICT="!test? ( test )"
-# BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )"
-src_test() {
- :
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-extra/extension-manager/files/extension-manager-0.4.1-exm-backtrace.c-include-stdint.h.patch b/gnome-extra/extension-manager/files/extension-manager-0.4.1-exm-backtrace.c-include-stdint.h.patch
deleted file mode 100644
index bc0e27b57..000000000
--- a/gnome-extra/extension-manager/files/extension-manager-0.4.1-exm-backtrace.c-include-stdint.h.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 49186450ff33e4a75d966cee51bcb6446fae3639 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 3 Jun 2023 09:59:11 -0700
-Subject: [PATCH 1/2] exm-backtrace.c: Explicitly include stdint.h for
- uintptr_t usage
-
-The file uses type uintptr_t from stdint.h, which is indirectly included
-by backtrace.h. Even so, the file should unconditionally include
-stdint.h just in case backtrace.h no longer includes stdint.h in the
-future.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/exm-backtrace.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/exm-backtrace.c b/src/exm-backtrace.c
-index 56b253a..4951394 100644
---- a/src/exm-backtrace.c
-+++ b/src/exm-backtrace.c
-@@ -21,6 +21,7 @@
- #include "exm-backtrace.h"
-
- #include <glib.h>
-+#include <stdint.h>
-
- #include <backtrace-supported.h>
- #include <backtrace.h>
---
-2.39.3
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: gnome-extra/extension-manager/files/, gnome-extra/extension-manager/
@ 2024-04-29 18:23 Yuan Liao
0 siblings, 0 replies; 3+ messages in thread
From: Yuan Liao @ 2024-04-29 18:23 UTC (permalink / raw
To: gentoo-commits
commit: b86cfc65f686d6994f3e93faa52735b20a800f6b
Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
AuthorDate: Mon Apr 29 17:13:47 2024 +0000
Commit: Yuan Liao <liaoyuan <AT> gmail <DOT> com>
CommitDate: Mon Apr 29 18:22:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b86cfc65
gnome-extra/extension-manager: Add 0.5.1
Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com>
| 1 +
.../extension-manager-0.5.1.ebuild | 87 ++++++++++++++++++++++
...ension-manager-0.5.1-frames_omitted_count.patch | 56 ++++++++++++++
3 files changed, 144 insertions(+)
--git a/gnome-extra/extension-manager/Manifest b/gnome-extra/extension-manager/Manifest
index 214884f857..e33f88fc3e 100644
--- a/gnome-extra/extension-manager/Manifest
+++ b/gnome-extra/extension-manager/Manifest
@@ -1 +1,2 @@
DIST extension-manager-0.5.0.tar.gz 2246539 BLAKE2B 650033c0a61d7ee4b3b752c12d8474398990f86cdc66c02681c2a1255b4c3afb12db874e8591df6bb4749bf17f322cd20094b0cce35600f82fa6f2cf4ae3f752 SHA512 975f71c072b12358760439ab9254ed8967cfb9c9c8cd38e93d38db0fb8138e4911a7a63c924f8a62b46fbedc83246e156765f3be9e092096d8647d78a0e7717f
+DIST extension-manager-0.5.1.tar.gz 2248071 BLAKE2B 44fbd22961c462d1d3047e790e0054b77508476b927ae83b9677b7ad60df854287901c66a671c9c05d5a1f7857cf2f4dbad662604bed6322e8e02340880fa2d5 SHA512 7f5fc64adda0ea8c0d505c29d2a9037e565a42a66a2c151f5ed21267c715aa1738b94b075704fe4479961356a255c9aea450155b969a60cb78edf40ae448681f
diff --git a/gnome-extra/extension-manager/extension-manager-0.5.1.ebuild b/gnome-extra/extension-manager/extension-manager-0.5.1.ebuild
new file mode 100644
index 0000000000..771c31ed39
--- /dev/null
+++ b/gnome-extra/extension-manager/extension-manager-0.5.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mjakeman/extension-manager.git"
+else
+ SRC_URI="https://github.com/mjakeman/extension-manager/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A native tool for browsing, installing, and managing GNOME Shell Extensions"
+HOMEPAGE="https://mattjakeman.com/apps/extension-manager"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+ dev-libs/glib:2
+ dev-util/blueprint-compiler
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ gui-libs/gtk:4[introspection]
+ >=gui-libs/libadwaita-1.5.0:1[introspection]
+ gui-libs/text-engine
+ net-libs/libsoup:3.0
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.5.1-frames_omitted_count.patch"
+)
+
+src_configure() {
+ local emesonargs=(
+ -Dpackage="ebuild"
+ -Ddistributor="Gentoo GURU <guru-bugs@gentoo.org>"
+
+ # sys-libs/libbacktrace has been last-rited in ::gentoo
+ # and is thus unavailable
+ -Dbacktrace=false
+ )
+ if has live ${PROPERTIES}; then
+ # Produce a development build for live ebuild
+ emesonargs+=( -Ddevelopment=true )
+ fi
+ meson_src_configure
+}
+
+# Tests are skipped because as of version 0.3.0, the tests only validate
+# resource files and do not verify any functionality of the program. Those
+# validations are either already handled by QA checks or not relevant on
+# Gentoo. For more information about the rationale, please refer to:
+# https://github.com/gentoo/guru/commit/f896bee213fbb62c70e818c1bf503fee2a41919a#comments
+#
+# If tests are to be executed in the future because the upstream adds
+# functionality tests or for other reasons, and should there be no convenient
+# way to skip the validations, the following variable values need to be set:
+#
+# IUSE="test"
+# RESTRICT="!test? ( test )"
+# BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )"
+src_test() {
+ :
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-extra/extension-manager/files/extension-manager-0.5.1-frames_omitted_count.patch b/gnome-extra/extension-manager/files/extension-manager-0.5.1-frames_omitted_count.patch
new file mode 100644
index 0000000000..62b2e2f82b
--- /dev/null
+++ b/gnome-extra/extension-manager/files/extension-manager-0.5.1-frames_omitted_count.patch
@@ -0,0 +1,56 @@
+From f3768fb0227c714d7ed0613a28142613aa4a9c6b Mon Sep 17 00:00:00 2001
+From: Yuan Liao <liaoyuan@gmail.com>
+Date: Mon, 29 Apr 2024 13:40:41 -0400
+Subject: [PATCH] backtrace: Define static functions only if `WITH_BACKTRACE`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The static functions are internal to file exm-backtrace.c and are only
+used to facilitate backtrace collection. In build configurations with
+backtraces disabled ('meson setup -Dbacktrace=false'),
+exm_backtrace_print() will not call the static functions, so they are
+unused and thus need not be defined.
+
+Previously, due to how the preprocessor macros were arranged, the static
+variables in this file would not be defined when backtraces are
+disabled; if any static functions use them, then builds with backtraces
+disabled would fail due to a compiler error like:
+
+ ../extension-manager-0.5.1/src/exm-backtrace.c: In function ‘exm_backtrace_full_cb’:
+ ../extension-manager-0.5.1/src/exm-backtrace.c:58:9: error: ‘frames_omitted_count’ undeclared (first use in this function)
+ 58 | frames_omitted_count++;
+ |
+
+This commit fixes such errors when backtraces are disabled.
+
+Fixes: dcc312e (Make libbacktrace an optional dependency, 2023-06-03)
+Fixes: d63d301 (backtrace: Collate 'null' messages, 2024-04-01)
+Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
+---
+ src/exm-backtrace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/exm-backtrace.c b/src/exm-backtrace.c
+index b6c3ae3..e7a449a 100644
+--- a/src/exm-backtrace.c
++++ b/src/exm-backtrace.c
+@@ -33,7 +33,6 @@
+ #if WITH_BACKTRACE
+ static struct backtrace_state *state = NULL;
+ static int frames_omitted_count = 0;
+-#endif
+
+ static void
+ exm_backtrace_error_cb (void *data,
+@@ -71,6 +70,7 @@ exm_backtrace_full_cb (GString *string_builder,
+
+ return 0;
+ }
++#endif
+
+ void
+ exm_backtrace_init (char *filename)
+--
+2.43.2
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-29 18:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-19 14:59 [gentoo-commits] repo/proj/guru:dev commit in: gnome-extra/extension-manager/files/, gnome-extra/extension-manager/ Yuan Liao
-- strict thread matches above, loose matches on Subject: below --
2024-04-29 18:23 Yuan Liao
2023-06-03 18:01 Yuan Liao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox