[PATCH][morty 1/2] Revert "libwnck3: remove the recipe"

[PATCH][morty 1/2] Revert "libwnck3: remove the recipe"

[Ross Burton]

The epiphany in morty still needs libwnck3, so bring it back.

This reverts commit 129281e8557ec8d29ecf863675884713a3050f4b.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb

diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb b/meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb
new file mode 100644
index 0000000..fd4ef69
--- /dev/null
+++ b/meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Window navigation construction toolkit"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+BPN = "libwnck"
+
+SECTION = "x11/libs"
+DEPENDS = "intltool-native gtk+3 gdk-pixbuf-native libxres"
+
+PACKAGECONFIG ??= "startup-notification"
+PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
+
+inherit gnomebase gobject-introspection gtk-doc
+SRC_URI[archive.md5sum] = "487938d65d4bfae1f2501052b1bd7492"
+SRC_URI[archive.sha256sum] = "1cb03716bc477058dfdf3ebfa4f534de3b13b1aa067fcd064d0b7813291cba72"
+
+inherit distro_features_check
+# libxres means x11 only
+REQUIRED_DISTRO_FEATURES = "x11"
-- 
2.8.1

[PATCH][morty 2/2] Revert "epiphany: remove unnecessary libwnck3 dependency"

[Ross Burton]

This version of epiphany still needs libwnck3.

This reverts commit fb5c4f181176710a4cfb3c875b5edb4e5aa5df73.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
index 9115892..eba480b 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
@@ -2,10 +2,11 @@ SUMMARY = "WebKit based web browser for GNOME"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr \
+DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \
 	   gsettings-desktop-schemas gnome-desktop3 libxml2-native intltool-native"
 
 inherit gnomebase gsettings distro_features_check upstream-version-is-even
+# libwnck3 is x11 only
 REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
@@ -21,3 +22,4 @@ do_configure_prepend() {
 FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
 RRECOMMENDS_${PN} = "ca-certificates"
+
-- 
2.8.1

Re: [PATCH][morty 2/2] Revert "epiphany: remove unnecessary libwnck3 dependency"

[Randy MacLeod]

Armin,

Probably a US Thanksgiving glitch but...

Morty needs both these patches to have an, err build epiphany.

I don't see a commit on morty or the non-existent morty-next.
What's the plan?

../Randy



Is there a plan to
On 2016-11-22 12:55 PM, Ross Burton wrote:
> This version of epiphany still needs libwnck3.
>
> This reverts commit fb5c4f181176710a4cfb3c875b5edb4e5aa5df73.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
> index 9115892..eba480b 100644
> --- a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
> +++ b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
> @@ -2,10 +2,11 @@ SUMMARY = "WebKit based web browser for GNOME"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>
> -DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr \
> +DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi libnotify gcr libwnck3 \
>  	   gsettings-desktop-schemas gnome-desktop3 libxml2-native intltool-native"
>
>  inherit gnomebase gsettings distro_features_check upstream-version-is-even
> +# libwnck3 is x11 only
>  REQUIRED_DISTRO_FEATURES = "x11"
>
>  SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
> @@ -21,3 +22,4 @@ do_configure_prepend() {
>  FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers"
>  RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
>  RRECOMMENDS_${PN} = "ca-certificates"
> +
>


-- 
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, 
Canada, K2K 2W5

Re: [PATCH][morty 2/2] Revert "epiphany: remove unnecessary libwnck3 dependency"

[akuster808]

On 11/25/2016 04:06 PM, Randy MacLeod wrote:
> Armin,
>
> Probably a US Thanksgiving glitch but...
>
> Morty needs both these patches to have an, err build epiphany.
>
> I don't see a commit on morty or the non-existent morty-next.
> What's the plan?

I will take a look and do the needful. Thanks for the pointer.

- armin
>
> ../Randy
>
>
>
> Is there a plan to
> On 2016-11-22 12:55 PM, Ross Burton wrote:
>> This version of epiphany still needs libwnck3.
>>
>> This reverts commit fb5c4f181176710a4cfb3c875b5edb4e5aa5df73.
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb 
>> b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> index 9115892..eba480b 100644
>> --- a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> +++ b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> @@ -2,10 +2,11 @@ SUMMARY = "WebKit based web browser for GNOME"
>>  LICENSE = "GPLv2+"
>>  LIC_FILES_CHKSUM = 
>> "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>>
>> -DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates 
>> avahi libnotify gcr \
>> +DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates 
>> avahi libnotify gcr libwnck3 \
>>         gsettings-desktop-schemas gnome-desktop3 libxml2-native 
>> intltool-native"
>>
>>  inherit gnomebase gsettings distro_features_check 
>> upstream-version-is-even
>> +# libwnck3 is x11 only
>>  REQUIRED_DISTRO_FEATURES = "x11"
>>
>>  SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
>> @@ -21,3 +22,4 @@ do_configure_prepend() {
>>  FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 
>> ${datadir}/gnome-shell/search-providers"
>>  RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
>>  RRECOMMENDS_${PN} = "ca-certificates"
>> +
>>
>
>

Re: [PATCH][morty 1/2] Revert "libwnck3: remove the recipe"

[akuster808]

On 11/22/2016 09:55 AM, Ross Burton wrote:
> The epiphany in morty still needs libwnck3, so bring it back.
> 
> This reverts commit 129281e8557ec8d29ecf863675884713a3050f4b.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
Merged to staging

- armin
> ---
>  meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>  create mode 100644 meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb
> 
> diff --git a/meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb b/meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb
> new file mode 100644
> index 0000000..fd4ef69
> --- /dev/null
> +++ b/meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb
> @@ -0,0 +1,19 @@
> +SUMMARY = "Window navigation construction toolkit"
> +LICENSE = "LGPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
> +
> +BPN = "libwnck"
> +
> +SECTION = "x11/libs"
> +DEPENDS = "intltool-native gtk+3 gdk-pixbuf-native libxres"
> +
> +PACKAGECONFIG ??= "startup-notification"
> +PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification"
> +
> +inherit gnomebase gobject-introspection gtk-doc
> +SRC_URI[archive.md5sum] = "487938d65d4bfae1f2501052b1bd7492"
> +SRC_URI[archive.sha256sum] = "1cb03716bc477058dfdf3ebfa4f534de3b13b1aa067fcd064d0b7813291cba72"
> +
> +inherit distro_features_check
> +# libxres means x11 only
> +REQUIRED_DISTRO_FEATURES = "x11"
> 

Re: [PATCH][morty 2/2] Revert "epiphany: remove unnecessary libwnck3 dependency"

[akuster808]

Randy,

On 11/25/2016 04:06 PM, Randy MacLeod wrote:
> Armin,
> 
> Probably a US Thanksgiving glitch but...
> 
> Morty needs both these patches to have an, err build epiphany.

> 

> I don't see a commit on morty or the non-existent morty-next.
> What's the plan?

I just updated my akuster/morty-next contib branch with this and several
security fixes.

- armin
> 
> ../Randy
> 
> 
> 
> Is there a plan to
> On 2016-11-22 12:55 PM, Ross Burton wrote:
>> This version of epiphany still needs libwnck3.
>>
>> This reverts commit fb5c4f181176710a4cfb3c875b5edb4e5aa5df73.
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> index 9115892..eba480b 100644
>> --- a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> +++ b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
>> @@ -2,10 +2,11 @@ SUMMARY = "WebKit based web browser for GNOME"
>>  LICENSE = "GPLv2+"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>>
>> -DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates
>> avahi libnotify gcr \
>> +DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates
>> avahi libnotify gcr libwnck3 \
>>         gsettings-desktop-schemas gnome-desktop3 libxml2-native
>> intltool-native"
>>
>>  inherit gnomebase gsettings distro_features_check
>> upstream-version-is-even
>> +# libwnck3 is x11 only
>>  REQUIRED_DISTRO_FEATURES = "x11"
>>
>>  SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
>> @@ -21,3 +22,4 @@ do_configure_prepend() {
>>  FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1
>> ${datadir}/gnome-shell/search-providers"
>>  RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
>>  RRECOMMENDS_${PN} = "ca-certificates"
>> +
>>
> 
>