diff options
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce')
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch | 29 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb (renamed from meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb) | 9 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb | 9 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb | 2 |
6 files changed, 31 insertions, 41 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch index 076477581..8c950299f 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch @@ -1,6 +1,6 @@ From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 28 Mar 2013 23:41:03 +0100 +Date: Sat, 4 May 2019 14:50:11 +0200 Subject: [PATCH] reduce build to exo-csource only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -16,11 +16,11 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- Makefile.am | 10 +--------- - configure.ac | 22 ---------------------- - 2 files changed, 1 insertion(+), 31 deletions(-) + configure.ac | 20 -------------------- + 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 62ad18d..bdc5fae 100644 +index 62ad18d..8934f1f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,7 @@ @@ -41,10 +41,10 @@ index 62ad18d..bdc5fae 100644 distclean-local: rm -rf *.cache *~ diff --git a/configure.ac b/configure.ac -index 3f92d1b..0d4cc38 100644 +index 4e4eb5e..237184c 100644 --- a/configure.ac +++ b/configure.ac -@@ -116,15 +116,6 @@ AC_PROG_CC() +@@ -120,15 +120,6 @@ AC_PROG_CC() AM_PROG_CC_C_O() AC_PROG_INSTALL() IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml]) @@ -60,26 +60,31 @@ index 3f92d1b..0d4cc38 100644 dnl *************************************** dnl *** Check for standard header files *** -@@ -171,19 +162,6 @@ dnl *********************************** +@@ -175,12 +166,6 @@ dnl *********************************** dnl *** Check for required packages *** dnl *********************************** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) --XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) --XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) -- + + dnl *********************************************************** + dnl *** Optional support for a GTK+2 version of the library *** +@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2], + [GTK+ 2 support]) + AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"]) + -dnl ********************* -dnl *** Check for X11 *** -dnl ********************* -XDT_CHECK_LIBX11_REQUIRE() - +- dnl ************************* dnl *** Check for gtk-doc *** + dnl ************************* -- -2.14.3 +2.20.1 diff --git a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb index 7b7edfe1b..7d61e8f83 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.5.bb @@ -20,15 +20,16 @@ SRC_URI_append_class-native = " \ file://reduce-build-to-exo-csource-only.patch \ " -SRC_URI[md5sum] = "962bbccb38db0aecd4151ca97f6a39bc" -SRC_URI[sha256sum] = "b0af60816bdb572ce53f19462fb1f3a5895a04017a878893dc03c166ea2050af" +SRC_URI[md5sum] = "1de1d539262847d49474d20cbebc78ea" +SRC_URI[sha256sum] = "e8f434d6436ae647dd1614e8a24aba23c83f70cb14037b5bc98652f558be43e8" PACKAGES =+ "exo-csource" # Note: python bindings did not work in oe-dev and are about to be moved to # pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 -FILES_${PN} += "${datadir}/xfce4/ \ - ${libdir}/xfce4/exo-1 \ +FILES_${PN} += " \ + ${datadir}/xfce4/ \ + ${libdir}/xfce4/exo* \ " FILES_exo-csource += "${bindir}/exo-csource" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb index 8a385baeb..df4b25c52 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.13.4.bb @@ -18,6 +18,7 @@ EXTRA_OECONF += "--with-vendor-info=${DISTRO}" PACKAGECONFIG ??= "" PACKAGECONFIG[gladeui] = "--enable-gladeui,--disable-gladeui,glade3" +PACKAGECONFIG[gladeui2] = "--enable-gladeui2,--disable-gladeui2,glade" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" PACKAGES =+ "${PN}-gtk2 ${PN}-gtk3" @@ -25,8 +26,12 @@ FILES_${PN}-gtk2 += "${libdir}/libxfce4ui-1.so.* ${libdir}/libxfce4kbd-private-2 FILES_${PN}-gtk3 += "${libdir}/libxfce4ui-2.so.* ${libdir}/libxfce4kbd-private-3.so.*" PACKAGES += "${PN}-glade" -FILES_${PN}-glade = "${libdir}/glade3 \ - ${datadir}/glade3" +FILES_${PN}-glade = " \ + ${libdir}/glade \ + ${libdir}/glade3 \ + ${datadir}/glade \ + ${datadir}/glade3 \ +" RDEPENDS_${PN}-gtk2 = "${PN}" RDEPENDS_${PN}-gtk3 = "${PN}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb deleted file mode 100644 index c79197445..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Meta package adding machine name to known hosts" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -ALLOW_EMPTY_${PN} = "1" - -LOCALHOSTMACHINE = "127.0.0.1 ${MACHINE}" - -# on some machines starting applications as xfce4-terminal take ages without -# machine name in hosts -pkg_postinst_${PN} () { -if ! grep -q '${LOCALHOSTMACHINE}' $D/etc/hosts ; then - echo '${LOCALHOSTMACHINE}' >> $D/etc/hosts -fi -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb index b11aaa4fe..3b9525fff 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb @@ -26,9 +26,3 @@ FILES_${PN} += " \ ${datadir}/themes/Default/balou/* \ ${datadir}/polkit-1 \ " - -FILES_${PN} += " \ - ${libdir}/xfce4/session/splash-engines/*.la \ -" - -RDEPENDS_${PN} += "machine-host" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb index 2667ff947..ded3c44e5 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.13.6.bb @@ -16,3 +16,5 @@ FILES_${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${datadir}/dbus-1/services/org.xfce.Xfconf.service" FILES_${PN}-dev += "${libdir}/gio/modules/libxfconfgsettingsbackend.la" + +PACKAGECONFIG[gsettings-backend] = "--enable-gsettings-backend,--disable-gsettings-backend," |