diff mbox series

[meta-xfce,1/4] xfce4-notifyd: 0.6.3 -> 0.8.2

Message ID 20230407091722.5576-1-kai.kang@windriver.com
State Under Review
Headers show
Series [meta-xfce,1/4] xfce4-notifyd: 0.6.3 -> 0.8.2 | expand

Commit Message

Kai April 7, 2023, 9:17 a.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

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 <kai.kang@windriver.com>
---
 .../xfce4-notifyd-get-var-abs-path.patch      | 41 +++++++++++++++++++
 ...otifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} | 12 +++---
 2 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch
 rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} (66%)

Comments

Khem Raj April 7, 2023, 3:42 p.m. UTC | #1 
On Fri, Apr 7, 2023 at 2:17 AM Kai Kang <kai.kang@eng.windriver.com> wrote:
>
> From: Kai Kang <kai.kang@windriver.com>
>
> 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 <kai.kang@windriver.com>
> ---
>  .../xfce4-notifyd-get-var-abs-path.patch      | 41 +++++++++++++++++++
>  ...otifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} | 12 +++---
>  2 files changed, 48 insertions(+), 5 deletions(-)
>  create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch
>  rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} (66%)
>
> 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 000000000..719267fd1
> --- /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]

I think this patch could be submitted upstream unless its regressing
something in normal build.
it is enhancing the search for a tool

> +
> +Signed-off-by: Kai Kang <kai.kang@windriver.com>
> +---
> + 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.8.2.bb
> similarity index 66%
> rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb
> rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb
> index 608660811..7dbd90c18 100644
> --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb
> +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb
> @@ -1,10 +1,10 @@
>  SUMMARY = "Easily themable notification daemon with transparency effects"
> -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd"
> +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start"
>  LICENSE = "GPL-2.0-only"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> +
>  DEPENDS = " \
> -    dbus \
> -    dbus-glib \
> +    glib-2.0-native \
>      libnotify \
>      libxfce4util \
>      libxfce4ui \
> @@ -14,7 +14,9 @@ DEPENDS = " \
>
>  inherit xfce-app
>
> -SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f"
> +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
> --
> 2.17.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101979): https://lists.openembedded.org/g/openembedded-devel/message/101979
> Mute This Topic: https://lists.openembedded.org/mt/98121602/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Kai April 10, 2023, 5:33 a.m. UTC | #2 
On 4/7/23 23:42, Khem Raj wrote:
> On Fri, Apr 7, 2023 at 2:17 AM Kai Kang <kai.kang@eng.windriver.com> wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 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 <kai.kang@windriver.com>
>> ---
>>   .../xfce4-notifyd-get-var-abs-path.patch      | 41 +++++++++++++++++++
>>   ...otifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} | 12 +++---
>>   2 files changed, 48 insertions(+), 5 deletions(-)
>>   create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch
>>   rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} (66%)
>>
>> 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 000000000..719267fd1
>> --- /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]
> I think this patch could be submitted upstream unless its regressing
> something in normal build.
> it is enhancing the search for a tool

The value of

GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0`

is absolute path '/usr/bin/gdbus-codegen' on build host such as ubuntu.

But for oe, it is just the basename 'gdbus-codegen'.

Regards,
Kai


>
>> +
>> +Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> +---
>> + 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.8.2.bb
>> similarity index 66%
>> rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb
>> rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb
>> index 608660811..7dbd90c18 100644
>> --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb
>> +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb
>> @@ -1,10 +1,10 @@
>>   SUMMARY = "Easily themable notification daemon with transparency effects"
>> -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd"
>> +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start"
>>   LICENSE = "GPL-2.0-only"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>> +
>>   DEPENDS = " \
>> -    dbus \
>> -    dbus-glib \
>> +    glib-2.0-native \
>>       libnotify \
>>       libxfce4util \
>>       libxfce4ui \
>> @@ -14,7 +14,9 @@ DEPENDS = " \
>>
>>   inherit xfce-app
>>
>> -SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f"
>> +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
>> --
>> 2.17.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#101979): https://lists.openembedded.org/g/openembedded-devel/message/101979
>> Mute This Topic: https://lists.openembedded.org/mt/98121602/1997914
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

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 000000000..719267fd1
--- /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 <kai.kang@windriver.com>
+---
+ 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.8.2.bb
similarity index 66%
rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb
rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb
index 608660811..7dbd90c18 100644
--- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb
+++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb
@@ -1,10 +1,10 @@ 
 SUMMARY = "Easily themable notification daemon with transparency effects"
-HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd"
+HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
 DEPENDS = " \
-    dbus \
-    dbus-glib \
+    glib-2.0-native \
     libnotify \
     libxfce4util \
     libxfce4ui \
@@ -14,7 +14,9 @@  DEPENDS = " \
 
 inherit xfce-app
 
-SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f"
+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