diff options
author | 2020-03-30 09:24:26 +0900 | |
---|---|---|
committer | 2020-03-30 09:24:26 +0900 | |
commit | 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd (patch) | |
tree | b4bb18dcd1487dbf1ea8127e5671b7bb2eded033 /external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings | |
parent | 706ad73eb02caf8532deaf5d38995bd258725cb8 (diff) |
agl-basesystem
Diffstat (limited to 'external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings')
3 files changed, 115 insertions, 0 deletions
diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch new file mode 100644 index 00000000..67df05a7 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -0,0 +1,33 @@ +From 2218ba8a21e9f5715b652c6416c2ddb552686b14 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Sun, 20 May 2012 15:22:09 +0200 +Subject: [PATCH] xsettings.xml: Set default themes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstram status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + xfsettingsd/xsettings.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml +index 65ba1ee..9efb3cd 100644 +--- a/xfsettingsd/xsettings.xml ++++ b/xfsettingsd/xsettings.xml +@@ -1,8 +1,8 @@ + <?xml version="1.0" encoding="UTF-8"?> + <channel name="xsettings" version="1.0"> + <property name="Net" type="empty"> +- <property name="ThemeName" type="empty"/> +- <property name="IconThemeName" type="empty"/> ++ <property name="ThemeName" type="string" value="Xfce"/> ++ <property name="IconThemeName" type="string" value="Adwaita"/> + <property name="DoubleClickTime" type="int" value="400"/> + <property name="DoubleClickDistance" type="int" value="5"/> + <property name="DndDragThreshold" type="int" value="8"/> +-- +2.1.0 + diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch new file mode 100644 index 00000000..109b7b14 --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0002-Fix-linking-to-dbus-glib-bug-13633.patch @@ -0,0 +1,41 @@ +From b6e46e6a84e45f7bd954687be703987825a54c1e Mon Sep 17 00:00:00 2001 +From: Eric Koegel <eric.koegel@gmail.com> +Date: Sun, 11 Jun 2017 11:38:26 +0300 +Subject: [PATCH] Fix linking to dbus-glib (bug #13633) + +With xfconf moving to GDBus nothing provides the libs for dbus-glib +that xfce4-settings requires. This patch adds the libs back in until +settings can be ported to GDBus. + +Signed-off-by: Sean Davis <smd.seandavis@gmail.com> + +Upstream-Status: Backport +--- + xfce4-settings-editor/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am +index 5964366..c2c7c4b 100644 +--- a/xfce4-settings-editor/Makefile.am ++++ b/xfce4-settings-editor/Makefile.am +@@ -28,6 +28,7 @@ xfce4_settings_editor_CFLAGS = \ + $(LIBXFCE4UTIL_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ + $(XFCONF_CFLAGS) \ ++ $(DBUS_GLIB_CFLAGS) \ + $(PLATFORM_CFLAGS) + + xfce4_settings_editor_LDFLAGS = \ +@@ -39,7 +40,8 @@ xfce4_settings_editor_LDADD = \ + $(DBUS_GLIB_LIBS) \ + $(LIBXFCE4UTIL_LIBS) \ + $(LIBXFCE4UI_LIBS) \ +- $(XFCONF_LIBS) ++ $(XFCONF_LIBS) \ ++ $(DBUS_GLIB_LIBS) + + desktopdir = $(datadir)/applications + desktop_in_files = xfce4-settings-editor.desktop.in +-- +2.14.3 + diff --git a/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb new file mode 100644 index 00000000..a4685aed --- /dev/null +++ b/external/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb @@ -0,0 +1,41 @@ +SUMMARY = "Xfce4 settings" +SECTION = "x11/wm" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +DEPENDS = "exo exo-native garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libxcursor libxklavier upower" + +inherit xfce xfce-git distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +# schnitzeltony git repo is the mainline repo +# + datetime-setter - sent to mainline but strange response +# + minor bugfixes - sent mainline but no response +# + option to hide mousepointer for a specific (touch) input device - sent mainline but no response +SRC_URI = " \ + git://github.com/schnitzeltony/xfce4-settings.git;protocol=git;branch=for-oe-4.12.4 \ + file://0001-xsettings.xml-Set-default-themes.patch \ + file://0002-Fix-linking-to-dbus-glib-bug-13633.patch \ +" +SRCREV = "75d7c9b15e5ccce12b0864d3659ae9b6de96e245" +S = "${WORKDIR}/git" +PV = "4.12.4+git${SRCPV}" + +EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES','systemd','datetime-setter','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES','alsa','sound-setter', bb.utils.contains('DISTRO_FEATURES','pulseaudio','sound-setter','',d),d)} \ +" +PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" +PACKAGECONFIG[sound-setter] = "--enable-sound-settings, --disable-sound-settings, libcanberra, libcanberra-gtk2 sound-theme-freedesktop" + +FILES_${PN} += " \ + ${libdir}/xfce4 \ + ${datadir}/xfce4 \ +" + +RRECOMMENDS_${PN} += "adwaita-icon-theme" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','alsa','libcanberra-alsa','',d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','libcanberra-pulse','',d)}" |