| Message ID | 20200219115740.25272-1-dl9pf@gmx.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Armin Kuster |
| Headers | show |
diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 82b803a4d..5f25231c2 100644 --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" -DEPENDS_append_x86 = " spice spice-protocol" -DEPENDS_append_x86-64 = " spice spice-protocol" DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" @@ -23,11 +21,7 @@ inherit cmake distro_features_check # depends on avahi-ui with this restriction ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" - -EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON" -EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON" - +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" do_install_append(){ # We dont need the extra stuff form other desktop environments @@ -36,6 +30,8 @@ do_install_append(){ rm -rf ${D}/${datadir}/gnome-session } +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" + RDEPENDS_${PN} = "bash" FILES_${PN}_append = " ${datadir}/icons/hicolor/*"
Jan, On 2/19/20 3:57 AM, Jan-Simon Moeller wrote: > remmina depends on spice and spice-protocol but they are in meta-networking. > Use the PACKAGECONFIG flag to avoid hardcoding the dependency. > > Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de> > --- > meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb > index 82b803a4d..5f25231c2 100644 > --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb > +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb > @@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl" > LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" > DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret" > > -DEPENDS_append_x86 = " spice spice-protocol" > -DEPENDS_append_x86-64 = " spice spice-protocol" > > DEPENDS_append_libc-musl = " libexecinfo" > LDFLAGS_append_libc-musl = " -lexecinfo" > @@ -23,11 +21,7 @@ inherit cmake distro_features_check > # depends on avahi-ui with this restriction > ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > > -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF" > - > -EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON" > -EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON" > - > +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" > > do_install_append(){ > # We dont need the extra stuff form other desktop environments > @@ -36,6 +30,8 @@ do_install_append(){ > rm -rf ${D}/${datadir}/gnome-session > } > > +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" The above needs to be set for x86 and x86-64 systems to make this change behave as it did before and I don't see that so its not a viable zeus candidate. - armin > + > RDEPENDS_${PN} = "bash" > > FILES_${PN}_append = " ${datadir}/icons/hicolor/*" > -- > 2.11.0 >
remmina depends on spice and spice-protocol but they are in meta-networking. Use the PACKAGECONFIG flag to avoid hardcoding the dependency. Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de> --- meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) -- 2.11.0