summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xfce/recipes-extended/imsettings/imsettings/0001-remove-man-page.patch79
-rw-r--r--meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb (renamed from meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb)13
2 files changed, 89 insertions, 3 deletions
diff --git a/meta-xfce/recipes-extended/imsettings/imsettings/0001-remove-man-page.patch b/meta-xfce/recipes-extended/imsettings/imsettings/0001-remove-man-page.patch
new file mode 100644
index 0000000000..a2fe0451b0
--- /dev/null
+++ b/meta-xfce/recipes-extended/imsettings/imsettings/0001-remove-man-page.patch
@@ -0,0 +1,79 @@
1From ea6829c152c18e55cbe2a05317bc12a2be65ed65 Mon Sep 17 00:00:00 2001
2From: Liu Yiding <liuyd.fnst@fujitsu.com>
3Date: Mon, 9 Jun 2025 03:22:06 +0000
4Subject: [PATCH] remove man page
5
6Upstream-Status: Inappropriate [OE specific]
7Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
8---
9 configure.ac | 1 -
10 utils/Makefile.am | 23 +----------------------
11 2 files changed, 1 insertion(+), 23 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index b843037..224311f 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -65,7 +65,6 @@ IMSETTINGS_MODULEDIR="${libdir}/imsettings"
18 AC_SUBST(IMSETTINGS_MODULEDIR)
19
20 AM_MISSING_PROG([GIT], [git])
21-AM_MISSING_PROG([DB2MAN], [db2x_docbook2man])
22
23 dnl ======================================================================
24 dnl functions testing
25diff --git a/utils/Makefile.am b/utils/Makefile.am
26index b492532..2236257 100644
27--- a/utils/Makefile.am
28+++ b/utils/Makefile.am
29@@ -20,19 +20,11 @@ DEPS = \
30 $(NULL)
31 EXTRA_DIST = \
32 $(autostart_in_files) \
33- $(man_xml_files) \
34- $(man1_MANS) \
35 $(NULL)
36 DISTCLEANFILES = \
37 $(autostart_DATA) \
38 $(NULL)
39-BUILT_SOURCES = \
40- $(man1_MANS) \
41- $(NULL)
42-MAINTAINERCLEANFILES = \
43- $(man1_MANS) \
44- $(NULL)
45-SUFFIXES = .1.xml
46+
47
48 ##
49 # Local Rules
50@@ -50,12 +42,6 @@ bin_PROGRAMS = \
51 libexec_PROGRAMS = \
52 imsettings-check \
53 $(NULL)
54-man1_MANS = \
55- imsettings-info.1 \
56- imsettings-list.1 \
57- imsettings-reload.1 \
58- imsettings-switch.1 \
59- $(NULL)
60 #
61 autostartdir = $(sysconfdir)/xdg/autostart
62 #
63@@ -64,13 +50,6 @@ autostart_in_files = \
64 $(NULL)
65 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
66 #
67-man_xml_files = $(man1_MANS:.1=.1.xml)
68-#
69-.xml.1:
70- $(AM_V_GEN) $(DB2MAN) $<
71-.1.xml.1:
72- $(AM_V_GEN) $(DB2MAN) $<
73-#
74 imsettings_check_SOURCES = \
75 imsettings-check.c \
76 $(NULL)
77--
782.43.0
79
diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb
index 21e9b3908f..b2d74a3015 100644
--- a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.3.bb
+++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb
@@ -10,16 +10,23 @@ SECTION = "Applications/System"
10LICENSE = "LGPL-2.0-or-later" 10LICENSE = "LGPL-2.0-or-later"
11LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" 11LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
12 12
13inherit autotools gtk-doc gobject-introspection gettext features_check 13inherit autotools gettext gtk-doc gobject-introspection features_check
14 14
15DEPENDS = "autoconf-archive-native gtk+3 libnotify" 15DEPENDS = "autoconf-archive-native gtk+3 libnotify"
16 16
17REQUIRED_DISTRO_FEATURES = "x11" 17REQUIRED_DISTRO_FEATURES = "x11"
18 18
19SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ 19SRC_URI = "git://gitlab.com/tagoh/imsettings.git;protocol=https;branch=main \
20 file://imsettings-gcc10.patch \ 20 file://imsettings-gcc10.patch \
21 file://0001-remove-man-page.patch \
21 " 22 "
22SRC_URI[sha256sum] = "45986b9ca1b87b760a5dbaecd9a2b77d080adc47868a0512826077175d5b3ee3" 23SRCREV = "27d84c88831ef76397a15891ba0738ce9a83902a"
24
25S = "${WORKDIR}/git"
26
27do_configure:prepend() {
28 cp ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${AUTOTOOLS_AUXDIR}/
29}
23 30
24EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ 31EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \
25 --disable-static \ 32 --disable-static \