From ae8ea03c449f3cb3df3b85cd78d1ecfd7e1aec94 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 7 Apr 2023 17:17:19 +0800 Subject: xfce4-notifyd: 0.6.3 -> 0.8.2 Update xfce4-notifyd from 0.6.3 to 0.8.2 * update HOMEPAGE that goodies.xfce.org has been decommissioned * the content of license file has been updated but license not changed * patch for configure.ac to get the absolute path of pkg-config variables * drop dependencies dbus and dbus-glib that xfce4-notifyd has been ported to gdbus Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../files/xfce4-notifyd-get-var-abs-path.patch | 41 ++++++++++++++++++++++ .../xfce4-notifyd/xfce4-notifyd_0.6.3.bb | 33 ----------------- .../xfce4-notifyd/xfce4-notifyd_0.8.2.bb | 35 ++++++++++++++++++ 3 files changed, 76 insertions(+), 33 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch delete mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb 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 new file mode 100644 index 0000000000..719267fd16 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch @@ -0,0 +1,41 @@ +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.6.3.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb deleted file mode 100644 index 6086608110..0000000000 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = " \ - dbus \ - dbus-glib \ - libnotify \ - libxfce4util \ - libxfce4ui \ - xfconf \ - xfce4-panel \ -" - -inherit xfce-app - -SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f" - -# Avoid trouble with other desktops e.g KDE which also ships dbus service named -# org.freedesktop.Notifications -EXTRA_OECONF = "--disable-dbus-start-daemon" - -do_compile:prepend() { - mkdir -p xfce4-notifyd xfce4-notifyd-config -} - -FILES:${PN} += " \ - ${systemd_user_unitdir} \ - ${datadir}/xfce4 \ - ${datadir}/themes \ - ${datadir}/dbus-1 \ - ${libdir}/xfce4 \ -" 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.8.2.bb new file mode 100644 index 0000000000..7dbd90c188 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb @@ -0,0 +1,35 @@ +SUMMARY = "Easily themable notification daemon with transparency effects" +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + glib-2.0-native \ + libnotify \ + libxfce4util \ + libxfce4ui \ + xfconf \ + xfce4-panel \ +" + +inherit xfce-app + +SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" + +SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" + +# Avoid trouble with other desktops e.g KDE which also ships dbus service named +# org.freedesktop.Notifications +EXTRA_OECONF = "--disable-dbus-start-daemon" + +do_compile:prepend() { + mkdir -p xfce4-notifyd xfce4-notifyd-config +} + +FILES:${PN} += " \ + ${systemd_user_unitdir} \ + ${datadir}/xfce4 \ + ${datadir}/themes \ + ${datadir}/dbus-1 \ + ${libdir}/xfce4 \ +" -- cgit v1.2.3-54-g00ecf