* [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist [not found] <20161028112529.28464-1-kai.iskratsch@zenotrack.com> @ 2016-10-28 14:17 ` Kai Iskratsch 2016-10-28 17:59 ` Khem Raj 2016-11-01 18:06 ` Martin Jansa 0 siblings, 2 replies; 4+ messages in thread From: Kai Iskratsch @ 2016-10-28 14:17 UTC (permalink / raw) To: openembedded-devel Zenity was blacklisted in meta-gnome, but it seems the fixes for the problem listed in blacklist reason were rather minimal, additionally the newer version of libnotify no longer has the notify_notification_new_with_status_icon function, so this had to be replaced with notify_notification_new to get the build to complete --- .../0002-fix-build-with-newer-libnotify.patch | 28 ++++++++++++++++++++++ meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb | 12 ++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch diff --git a/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch new file mode 100644 index 0000000..67501c8 --- /dev/null +++ b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch @@ -0,0 +1,28 @@ +From 87f5f2acbf4f2cad50a0d1ea389d7170fe325b4e Mon Sep 17 00:00:00 2001 +From: Kai Iskratsch <kai.iskratsch@zenotrack.com> +Date: Thu, 27 Oct 2016 13:08:40 +0200 +Subject: [PATCH] fix build with newer libnotify + +--- + src/notification.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/notification.c b/src/notification.c +index 99a2e36..3e5b320 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -184,10 +184,10 @@ zenity_notification_handle_stdin (GIOChannel *channel, + icon = freeme = g_filename_to_uri (icon_file, NULL, NULL); + } + +- notif = notify_notification_new_with_status_icon ( ++ notif = notify_notification_new ( + message[0] /* title */, + message[1] /* summary */, +- icon, status_icon); ++ gtk_status_icon_get_icon_name( status_icon)); + + g_strfreev (message); + g_free (freeme); +-- +2.10.1 diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb index 4e01c5c..bc6c9c4 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb @@ -4,18 +4,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" PR = "r2" -PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S" - -DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" +GNOME_COMPRESS_TYPE = "bz2" +DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils intltool-native" +RDEPENDS_${PN} += "perl" inherit gnomebase -SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch" +SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch \ + file://0002-fix-build-with-newer-libnotify.patch \ + " SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" EXTRA_OECONF += "--disable-scrollkeeper" # remove -I/usr/include from zenity_CPPFLAGS do_configure_prepend() { - sed -i -e '/-I$(includedir)/d' src/Makefile.am + sed -i -e '/-I$(includedir)/d' ${S}/src/Makefile.am } -- 2.10.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist 2016-10-28 14:17 ` [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist Kai Iskratsch @ 2016-10-28 17:59 ` Khem Raj 2016-11-01 18:06 ` Martin Jansa 1 sibling, 0 replies; 4+ messages in thread From: Khem Raj @ 2016-10-28 17:59 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 3736 bytes --] > On Oct 28, 2016, at 7:17 AM, Kai Iskratsch <kai.iskratsch@zenotrack.com> wrote: > > > Zenity was blacklisted in meta-gnome, but it seems the fixes for the problem listed in blacklist reason were rather minimal, > > additionally the newer version of libnotify no longer has the notify_notification_new_with_status_icon function, so this > had to be replaced with notify_notification_new to get the build to complete this looks fine > --- > .../0002-fix-build-with-newer-libnotify.patch | 28 ++++++++++++++++++++++ > meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb | 12 ++++++---- > 2 files changed, 35 insertions(+), 5 deletions(-) > create mode 100644 meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch > > diff --git a/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch > new file mode 100644 > index 0000000..67501c8 > --- /dev/null > +++ b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch > @@ -0,0 +1,28 @@ > +From 87f5f2acbf4f2cad50a0d1ea389d7170fe325b4e Mon Sep 17 00:00:00 2001 > +From: Kai Iskratsch <kai.iskratsch@zenotrack.com> > +Date: Thu, 27 Oct 2016 13:08:40 +0200 > +Subject: [PATCH] fix build with newer libnotify > + > +--- > + src/notification.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/src/notification.c b/src/notification.c > +index 99a2e36..3e5b320 100644 > +--- a/src/notification.c > ++++ b/src/notification.c > +@@ -184,10 +184,10 @@ zenity_notification_handle_stdin (GIOChannel *channel, > + icon = freeme = g_filename_to_uri (icon_file, NULL, NULL); > + } > + > +- notif = notify_notification_new_with_status_icon ( > ++ notif = notify_notification_new ( > + message[0] /* title */, > + message[1] /* summary */, > +- icon, status_icon); > ++ gtk_status_icon_get_icon_name( status_icon)); > + > + g_strfreev (message); > + g_free (freeme); > +-- > +2.10.1 > diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb > index 4e01c5c..bc6c9c4 100644 > --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb > +++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb > @@ -4,18 +4,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" > PR = "r2" > -PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S" > - > -DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" > +GNOME_COMPRESS_TYPE = "bz2" > +DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils intltool-native" > +RDEPENDS_${PN} += "perl" > inherit gnomebase > -SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch" > +SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch \ > + file://0002-fix-build-with-newer-libnotify.patch \ > + " > SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" > SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" > EXTRA_OECONF += "--disable-scrollkeeper" > # remove -I/usr/include from zenity_CPPFLAGS > do_configure_prepend() { > - sed -i -e '/-I$(includedir)/d' src/Makefile.am > + sed -i -e '/-I$(includedir)/d' ${S}/src/Makefile.am > } > -- > 2.10.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist 2016-10-28 14:17 ` [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist Kai Iskratsch 2016-10-28 17:59 ` Khem Raj @ 2016-11-01 18:06 ` Martin Jansa 2016-11-02 7:00 ` Kai Iskratsch 1 sibling, 1 reply; 4+ messages in thread From: Martin Jansa @ 2016-11-01 18:06 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 3980 bytes --] On Fri, Oct 28, 2016 at 04:17:47PM +0200, Kai Iskratsch wrote: > > Zenity was blacklisted in meta-gnome, but it seems the fixes for the > problem listed in blacklist reason were rather minimal, > > additionally the newer version of libnotify no longer has the notify_notification_new_with_status_icon function, so this > had to be replaced with notify_notification_new to get the build to complete Is this already fixed in krogoth, morty and master? I don't think so, so it needs to be fixed in master first and then it might be backported into older releases. > --- > .../0002-fix-build-with-newer-libnotify.patch | 28 ++++++++++++++++++++++ > meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb | 12 ++++++---- > 2 files changed, 35 insertions(+), 5 deletions(-) > create mode 100644 meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch > > diff --git a/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch > new file mode 100644 > index 0000000..67501c8 > --- /dev/null > +++ b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch > @@ -0,0 +1,28 @@ > +From 87f5f2acbf4f2cad50a0d1ea389d7170fe325b4e Mon Sep 17 00:00:00 2001 > +From: Kai Iskratsch <kai.iskratsch@zenotrack.com> > +Date: Thu, 27 Oct 2016 13:08:40 +0200 > +Subject: [PATCH] fix build with newer libnotify > + > +--- > + src/notification.c | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/src/notification.c b/src/notification.c > +index 99a2e36..3e5b320 100644 > +--- a/src/notification.c > ++++ b/src/notification.c > +@@ -184,10 +184,10 @@ zenity_notification_handle_stdin (GIOChannel *channel, > + icon = freeme = g_filename_to_uri (icon_file, NULL, NULL); > + } > + > +- notif = notify_notification_new_with_status_icon ( > ++ notif = notify_notification_new ( > + message[0] /* title */, > + message[1] /* summary */, > +- icon, status_icon); > ++ gtk_status_icon_get_icon_name( status_icon)); > + > + g_strfreev (message); > + g_free (freeme); > +-- > +2.10.1 > diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb > index 4e01c5c..bc6c9c4 100644 > --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb > +++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb > @@ -4,18 +4,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" > > PR = "r2" > > -PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S" > - > -DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" > +GNOME_COMPRESS_TYPE = "bz2" > +DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils intltool-native" > +RDEPENDS_${PN} += "perl" > > inherit gnomebase > -SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch" > +SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch \ > + file://0002-fix-build-with-newer-libnotify.patch \ > + " > SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" > SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" > > EXTRA_OECONF += "--disable-scrollkeeper" > # remove -I/usr/include from zenity_CPPFLAGS > do_configure_prepend() { > - sed -i -e '/-I$(includedir)/d' src/Makefile.am > + sed -i -e '/-I$(includedir)/d' ${S}/src/Makefile.am > } > > -- > 2.10.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 169 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist 2016-11-01 18:06 ` Martin Jansa @ 2016-11-02 7:00 ` Kai Iskratsch 0 siblings, 0 replies; 4+ messages in thread From: Kai Iskratsch @ 2016-11-02 7:00 UTC (permalink / raw) To: openembedded-devel At work we only use a jethro based system, when we tried updating to krogoth we were getting lots of build errors so company decission was to stay with jethro. So i doubt i will get time allocated for testing the patch with master or krogoth. So all i can do is send patches for jethro or no patches at all. The zenity receipe is unchanged in master so the patch should apply in master too, so its likely it works there too, but build could fail on new problems and I don't want to send it in for master without testing. On 2016-11-01 19:06, Martin Jansa wrote: > On Fri, Oct 28, 2016 at 04:17:47PM +0200, Kai Iskratsch wrote: >> Zenity was blacklisted in meta-gnome, but it seems the fixes for the >> problem listed in blacklist reason were rather minimal, >> >> additionally the newer version of libnotify no longer has the notify_notification_new_with_status_icon function, so this >> had to be replaced with notify_notification_new to get the build to complete > Is this already fixed in krogoth, morty and master? > > I don't think so, so it needs to be fixed in master first and then it > might be backported into older releases. > >> --- >> .../0002-fix-build-with-newer-libnotify.patch | 28 ++++++++++++++++++++++ >> meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb | 12 ++++++---- >> 2 files changed, 35 insertions(+), 5 deletions(-) >> create mode 100644 meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch >> >> diff --git a/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch >> new file mode 100644 >> index 0000000..67501c8 >> --- /dev/null >> +++ b/meta-gnome/recipes-gnome/zenity/files/0002-fix-build-with-newer-libnotify.patch >> @@ -0,0 +1,28 @@ >> +From 87f5f2acbf4f2cad50a0d1ea389d7170fe325b4e Mon Sep 17 00:00:00 2001 >> +From: Kai Iskratsch <kai.iskratsch@zenotrack.com> >> +Date: Thu, 27 Oct 2016 13:08:40 +0200 >> +Subject: [PATCH] fix build with newer libnotify >> + >> +--- >> + src/notification.c | 4 ++-- >> + 1 file changed, 2 insertions(+), 2 deletions(-) >> + >> +diff --git a/src/notification.c b/src/notification.c >> +index 99a2e36..3e5b320 100644 >> +--- a/src/notification.c >> ++++ b/src/notification.c >> +@@ -184,10 +184,10 @@ zenity_notification_handle_stdin (GIOChannel *channel, >> + icon = freeme = g_filename_to_uri (icon_file, NULL, NULL); >> + } >> + >> +- notif = notify_notification_new_with_status_icon ( >> ++ notif = notify_notification_new ( >> + message[0] /* title */, >> + message[1] /* summary */, >> +- icon, status_icon); >> ++ gtk_status_icon_get_icon_name( status_icon)); >> + >> + g_strfreev (message); >> + g_free (freeme); >> +-- >> +2.10.1 >> diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb >> index 4e01c5c..bc6c9c4 100644 >> --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb >> +++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb >> @@ -4,18 +4,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" >> >> PR = "r2" >> >> -PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S" >> - >> -DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" >> +GNOME_COMPRESS_TYPE = "bz2" >> +DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils intltool-native" >> +RDEPENDS_${PN} += "perl" >> >> inherit gnomebase >> -SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch" >> +SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch \ >> + file://0002-fix-build-with-newer-libnotify.patch \ >> + " >> SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" >> SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" >> >> EXTRA_OECONF += "--disable-scrollkeeper" >> # remove -I/usr/include from zenity_CPPFLAGS >> do_configure_prepend() { >> - sed -i -e '/-I$(includedir)/d' src/Makefile.am >> + sed -i -e '/-I$(includedir)/d' ${S}/src/Makefile.am >> } >> >> -- >> 2.10.1 >> >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-02 7:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20161028112529.28464-1-kai.iskratsch@zenotrack.com>
2016-10-28 14:17 ` [meta-gnome, jethro][PATCH] fix zenity build, and remove blacklist Kai Iskratsch
2016-10-28 17:59 ` Khem Raj
2016-11-01 18:06 ` Martin Jansa
2016-11-02 7:00 ` Kai Iskratsch
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox