mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

zenity: rework recipe

Browse Source 
* "xz" is default for GNOME_COMPRESS_TYPE
* instead of patching away help-files, build them and let users decide if and
  how to pack them by inheriting gnome-help.bbclass

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
2019-10-28 00:35:32 +01:00
committed by Khem Raj
parent 5cd17f68fc
commit ccd415cdba
2 changed files with 5 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/zenity/zenity/0001-build-don-t-generate-manual.patch
-50
View File
@@ -1,50 +0,0 @@
From 38eeb345fdfca0298b11427aa942b68e627ba10e Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date: Thu, 12 Sep 2019 13:14:55 +0200
Subject: [PATCH] build: don't generate manual
We don't have yelp in yocto and even if we did it would pull in
webkitgtk just to generate help. Just remove the manual generation
altogether.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
Makefile.am | 3 +--
configure.ac | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 81ae6a7..bd073dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = src
SUBDIRS = \
src \
po \
- data \
- help
+ data
EXTRA_DIST = \
autogen.sh \
diff --git a/configure.ac b/configure.ac
index 5dccdb0..f88b2c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,11 +115,6 @@ GETTEXT_PACKAGE=zenity
AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain])
-# *******************************
-# User manual
-# *******************************
-YELP_HELP_INIT
-
# *******************************
AC_SUBST([AM_CPPFLAGS])
--
2.21.0
meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb
+5 -7
View File
@@ -4,19 +4,17 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
inherit distro_features_check gnomebase gettext
inherit gnomebase itstool gnome-help distro_features_check gettext
DEPENDS = "gtk+3"
DEPENDS = " \
yelp-tools-native \
gtk+3 \
"
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0001-build-don-t-generate-manual.patch \
"
SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a"
SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95"
GNOME_COMPRESS_TYPE="xz"
do_install_append() {
# Remove gdialog compatibility helper - we don't want to pull in perl