diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch deleted file mode 100644 index 719267fd16..0000000000 --- a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch +++ /dev/null @@ -1,41 +0,0 @@ -Native pkg_config only return basename of the variable queried. Invoke `which` -to get the absolute path. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Kai Kang ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0f49e2b..a589147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,7 +116,7 @@ AC_MSG_CHECKING([for gdbus-codegen]) - if test x"$GDBUS_CODEGEN" = x""; then - GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` - fi --if test -x "$GDBUS_CODEGEN"; then -+if test -x "$(which $GDBUS_CODEGEN)"; then - AC_MSG_RESULT([$GDBUS_CODEGEN]) - else - AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run -@@ -129,7 +129,7 @@ AC_MSG_CHECKING([for glib-compile-resources]) - if test x"$GLIB_COMPILE_RESOURCES" = x""; then - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` - fi --if test -x "$GLIB_COMPILE_RESOURCES"; then -+if test -x "$(which $GLIB_COMPILE_RESOURCES)"; then - AC_MSG_RESULT([$GLIB_COMPILE_RESOURCES]) - else - AC_MSG_ERROR([could not find glib-compile-resources in \$PATH. You can run -@@ -142,7 +142,7 @@ AC_MSG_CHECKING([for glib-genmarshal]) - if test x"$GLIB_GENMARSHAL" = x""; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - fi --if test -x "$GLIB_GENMARSHAL"; then -+if test -x "$(which $GLIB_GENMARSHAL)"; then - AC_MSG_RESULT([$GLIB_GENMARSHAL]) - else - AC_MSG_ERROR([could not find glib-genmarshal in \$PATH. You can run diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.4.bb similarity index 62% rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.4.bb index 96cfd32f7b..987735e763 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.9.4.bb @@ -16,13 +16,16 @@ DEPENDS = " \ inherit xfce-app inherit python3native -SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" - -SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" +SRC_URI[sha256sum] = "ae6c128c055c44bd07202f73ae69ad833c5e4754f3530696965136e4d9ea7818" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications -EXTRA_OECONF = "--disable-dbus-start-daemon" +EXTRA_OECONF = "--disable-dbus-start-daemon \ + GDBUS_CODEGEN=${STAGING_BINDIR_NATIVE}/gdbus-codegen \ + GLIB_COMPILE_RESOURCES=${STAGING_BINDIR_NATIVE}/glib-compile-resources \ + GLIB_GENMARSHAL=${STAGING_BINDIR_NATIVE}/glib-genmarshal \ + GLIB_MKENUMS=${STAGING_BINDIR_NATIVE}/glib-mkenums \ + " do_compile:prepend() { mkdir -p xfce4-notifyd xfce4-notifyd-config