diff options
| author | Zhang Peng <peng.zhang1.cn@windriver.com> | 2026-03-24 20:59:27 +0800 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-03-24 09:13:52 -0700 |
| commit | f3a7f4cee0328efc0b882725df6f8009a684c6bd (patch) | |
| tree | 50e3c0a02f4c658f3e9a047fe6c45b8f722c4e2f /meta-xfce/recipes-apps/xfce-polkit | |
| parent | b94c5bcfaaffe8e241a2f90982dde760ebc63586 (diff) | |
| download | meta-openembedded-f3a7f4cee0328efc0b882725df6f8009a684c6bd.tar.gz | |
xfce-polkit: fix link failure by adding missing gtk+-3.0 dependency
After libxfce4ui upgrade to 4.21.x, its pkgconfig moves gtk+-3.0
to Requires.private, so the linker no longer automatically pulls in
libgtk-3. This causes an undefined reference to 'gtk_combo_box_set_model'
when linking xfce-polkit.
Add patch for explicit PKG_CHECK_MODULES for gtk+-3.0 in configure.ac and wire
GTK3_CFLAGS/GTK3_LIBS into src/Makefile.am.
Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-xfce/recipes-apps/xfce-polkit')
| -rw-r--r-- | meta-xfce/recipes-apps/xfce-polkit/files/0001-configure.ac-add-missing-direct-dependency-on-gtk-3.patch | 52 | ||||
| -rw-r--r-- | meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb | 7 |
2 files changed, 56 insertions, 3 deletions
diff --git a/meta-xfce/recipes-apps/xfce-polkit/files/0001-configure.ac-add-missing-direct-dependency-on-gtk-3.patch b/meta-xfce/recipes-apps/xfce-polkit/files/0001-configure.ac-add-missing-direct-dependency-on-gtk-3.patch new file mode 100644 index 0000000000..bc20d2f854 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce-polkit/files/0001-configure.ac-add-missing-direct-dependency-on-gtk-3.patch | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | From a89bd475c3cf7dc39618bcc9979fc618d7acd537 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Zhang Peng <peng.zhang1.cn@windriver.com> | ||
| 3 | Date: Mon, 23 Mar 2026 16:52:58 +0800 | ||
| 4 | Subject: [PATCH] configure.ac: add missing direct dependency on gtk+-3.0 | ||
| 5 | |||
| 6 | xfce-polkit sources directly call GTK+ symbols (gtk_combo_box_set_model, | ||
| 7 | gtk_widget_show, etc.), but only libxfce4ui-2 was listed as a dependency. | ||
| 8 | Since libxfce4ui-2 correctly places gtk+-3.0 in Requires.private, the | ||
| 9 | client must declare its own direct dependency on gtk+-3.0. | ||
| 10 | |||
| 11 | See https://people.freedesktop.org/~dbn/pkg-config-guide.html#writing | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/ncopa/xfce-polkit/pull/14] | ||
| 14 | |||
| 15 | Signed-off-by: Zhang Peng <peng.zhang1.cn@windriver.com> | ||
| 16 | --- | ||
| 17 | configure.ac | 1 + | ||
| 18 | src/Makefile.am | 2 ++ | ||
| 19 | 2 files changed, 3 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/configure.ac b/configure.ac | ||
| 22 | index 88f2432..15c09c9 100644 | ||
| 23 | --- a/configure.ac | ||
| 24 | +++ b/configure.ac | ||
| 25 | @@ -4,6 +4,7 @@ AC_PROG_CC | ||
| 26 | |||
| 27 | PKG_CHECK_MODULES([GLIB], [glib-2.0]) | ||
| 28 | PKG_CHECK_MODULES([LIBXFCE4UI], [libxfce4ui-2]) | ||
| 29 | +PKG_CHECK_MODULES([GTK3], [gtk+-3.0]) | ||
| 30 | PKG_CHECK_MODULES([POLKIT_AGENT], [polkit-agent-1]) | ||
| 31 | |||
| 32 | AC_CONFIG_FILES([ | ||
| 33 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
| 34 | index 514605a..f13e4cb 100644 | ||
| 35 | --- a/src/Makefile.am | ||
| 36 | +++ b/src/Makefile.am | ||
| 37 | @@ -10,11 +10,13 @@ xfce_polkit_SOURCES = \ | ||
| 38 | |||
| 39 | xfce_polkit_CFLAGS = @GLIB_CFLAGS@ \ | ||
| 40 | @LIBXFCE4UI_CFLAGS@ \ | ||
| 41 | + @GTK3_CFLAGS@ \ | ||
| 42 | @POLKIT_AGENT_CFLAGS@ | ||
| 43 | |||
| 44 | |||
| 45 | xfce_polkit_LDADD = @GLIB_LIBS@ \ | ||
| 46 | @LIBXFCE4UI_LIBS@ \ | ||
| 47 | + @GTK3_LIBS@ \ | ||
| 48 | @POLKIT_AGENT_LIBS@ | ||
| 49 | |||
| 50 | |||
| 51 | -- | ||
| 52 | 2.50.0 | ||
diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 880e73849c..167cc538b9 100644 --- a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb +++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb | |||
| @@ -7,7 +7,8 @@ DEPENDS = "libxfce4ui polkit" | |||
| 7 | inherit xfce-app features_check | 7 | inherit xfce-app features_check |
| 8 | REQUIRED_DISTRO_FEATURES = "polkit" | 8 | REQUIRED_DISTRO_FEATURES = "polkit" |
| 9 | 9 | ||
| 10 | SRC_URI = " \ | 10 | SRC_URI = "\ |
| 11 | git://github.com/ncopa/${BPN}.git;branch=master;protocol=https \ | 11 | git://github.com/ncopa/${BPN}.git;branch=master;protocol=https \ |
| 12 | " | 12 | file://0001-configure.ac-add-missing-direct-dependency-on-gtk-3.patch \ |
| 13 | " | ||
| 13 | SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" | 14 | SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" |
