From 98a496542c02d7775a6fb5ec45851d3bc5009f2e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Feb 2008 02:55:49 +0000 Subject: gnome-doc-utils: add libxslt-native to DEPENDS and reorder some fields according to StyleGuide --- packages/gnome/gnome-doc-utils_0.10.3.bb | 6 +++--- packages/gnome/gnome-doc-utils_0.12.0.bb | 8 ++++---- packages/gnome/gnome-doc-utils_0.7.1.bb | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'packages/gnome') diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb index 315cdbd160..c5390128cf 100644 --- a/packages/gnome/gnome-doc-utils_0.10.3.bb +++ b/packages/gnome/gnome-doc-utils_0.10.3.bb @@ -1,5 +1,5 @@ LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt" +DEPENDS = "libxml2 libxslt libxslt-native" PR = "r0" @@ -7,10 +7,10 @@ inherit gnome EXTRA_OECONF = "--disable-scrollkeeper" -FILES_${PN} += "${datadir}/xml*" - do_stage() { mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ autotools_stage_all } + +FILES_${PN} += "${datadir}/xml*" diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb index f190a5ae13..ff62257aa8 100644 --- a/packages/gnome/gnome-doc-utils_0.12.0.bb +++ b/packages/gnome/gnome-doc-utils_0.12.0.bb @@ -1,5 +1,5 @@ -LICENSE = "GPL/LGPL" -DEPENDS = "libxml2 libxslt" +LICENSE = "GPL LGPL" +DEPENDS = "libxml2 libxslt libxslt-native" PR = "r1" @@ -7,10 +7,10 @@ inherit gnome EXTRA_OECONF = "--disable-scrollkeeper" -FILES_${PN} += "${datadir}/xml*" - do_stage() { mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ autotools_stage_all } + +FILES_${PN} += "${datadir}/xml*" diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 86a36c4bd7..ff62257aa8 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -1,5 +1,5 @@ LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt" +DEPENDS = "libxml2 libxslt libxslt-native" PR = "r1" @@ -7,10 +7,10 @@ inherit gnome EXTRA_OECONF = "--disable-scrollkeeper" -FILES_${PN} += "${datadir}/xml*" - do_stage() { mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ autotools_stage_all } + +FILES_${PN} += "${datadir}/xml*" -- cgit v1.2.3 From 0066592ec6273dfe870fa877ca315ba45e636da2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Feb 2008 03:00:16 +0000 Subject: gnome-doc-utils: unify --- packages/gnome/gnome-doc-utils.inc | 16 ++++++++++++++++ packages/gnome/gnome-doc-utils_0.10.3.bb | 15 +-------------- packages/gnome/gnome-doc-utils_0.12.0.bb | 15 +-------------- packages/gnome/gnome-doc-utils_0.7.1.bb | 15 +-------------- 4 files changed, 19 insertions(+), 42 deletions(-) create mode 100644 packages/gnome/gnome-doc-utils.inc (limited to 'packages/gnome') diff --git a/packages/gnome/gnome-doc-utils.inc b/packages/gnome/gnome-doc-utils.inc new file mode 100644 index 0000000000..ff62257aa8 --- /dev/null +++ b/packages/gnome/gnome-doc-utils.inc @@ -0,0 +1,16 @@ +LICENSE = "GPL LGPL" +DEPENDS = "libxml2 libxslt libxslt-native" + +PR = "r1" + +inherit gnome + +EXTRA_OECONF = "--disable-scrollkeeper" + +do_stage() { + mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ + cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ + autotools_stage_all +} + +FILES_${PN} += "${datadir}/xml*" diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb index c5390128cf..cfb4788076 100644 --- a/packages/gnome/gnome-doc-utils_0.10.3.bb +++ b/packages/gnome/gnome-doc-utils_0.10.3.bb @@ -1,16 +1,3 @@ -LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt libxslt-native" +require gnome-doc-utils.inc PR = "r0" - -inherit gnome - -EXTRA_OECONF = "--disable-scrollkeeper" - -do_stage() { - mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ - cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ - autotools_stage_all -} - -FILES_${PN} += "${datadir}/xml*" diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb index ff62257aa8..2499ac36e4 100644 --- a/packages/gnome/gnome-doc-utils_0.12.0.bb +++ b/packages/gnome/gnome-doc-utils_0.12.0.bb @@ -1,16 +1,3 @@ -LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt libxslt-native" +require gnome-doc-utils.inc PR = "r1" - -inherit gnome - -EXTRA_OECONF = "--disable-scrollkeeper" - -do_stage() { - mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ - cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ - autotools_stage_all -} - -FILES_${PN} += "${datadir}/xml*" diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index ff62257aa8..2499ac36e4 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -1,16 +1,3 @@ -LICENSE = "GPL LGPL" -DEPENDS = "libxml2 libxslt libxslt-native" +require gnome-doc-utils.inc PR = "r1" - -inherit gnome - -EXTRA_OECONF = "--disable-scrollkeeper" - -do_stage() { - mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/ - cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/ - autotools_stage_all -} - -FILES_${PN} += "${datadir}/xml*" -- cgit v1.2.3 From 0c576349f827441d562ac51bc4f1d5258e49a002 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Feb 2008 03:28:52 +0000 Subject: gnome-desktop: unify --- packages/gnome/gnome-desktop.inc | 16 ++++++++++++++++ packages/gnome/gnome-desktop_2.10.2.bb | 16 +++------------- packages/gnome/gnome-desktop_2.16.1.bb | 20 +++----------------- packages/gnome/gnome-desktop_2.18.3.bb | 21 ++++----------------- packages/gnome/gnome-desktop_2.7.90.bb | 13 ++++--------- 5 files changed, 30 insertions(+), 56 deletions(-) create mode 100644 packages/gnome/gnome-desktop.inc (limited to 'packages/gnome') diff --git a/packages/gnome/gnome-desktop.inc b/packages/gnome/gnome-desktop.inc new file mode 100644 index 0000000000..aeabf4f41e --- /dev/null +++ b/packages/gnome/gnome-desktop.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPL" +DEPENDS = "gnome-common libgnomeui" + +EXTRA_OECONF = "--disable-scrollkeeper" + +do_configure_prepend () { + cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} +} + +do_stage () { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/gnome-about" diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index b8e098f40c..55add53cce 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -1,17 +1,7 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r1" -DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome pkgconfig -DEPENDS = "gnome-common libgnomeui" +inherit gnome pkgconfig EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - -do_stage () { -autotools_stage_all -} diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 69de709350..292984ab7d 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -1,25 +1,11 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r2" -DESCRIPTION = "GNOME library for reading .desktop files" inherit gnome pkgconfig -DEPENDS = "gnome-common gnome-doc-utils libgnomeui" +DEPENDS += "gnome-doc-utils" SRC_URI += "file://scrollkeeper.patch;patch=1 \ file://no-desktop-docs.patch;patch=1;pnum=0" -EXTRA_OECONF = "--disable-scrollkeeper" - EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - -FILES_${PN} += "${datadir}/gnome-about" - - -do_stage () { - autotools_stage_all -} diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb index c2888bf2a4..7b9a5932e1 100644 --- a/packages/gnome/gnome-desktop_2.18.3.bb +++ b/packages/gnome/gnome-desktop_2.18.3.bb @@ -1,23 +1,10 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r2" -DESCRIPTION = "GNOME library for reading .desktop files" + inherit gnome pkgconfig -DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui" +DEPENDS += "gnome-doc-utils gnome-vfs" SRC_URI += "file://scrollkeeper.patch;patch=1 \ file://no-desktop-docs.patch;patch=1;pnum=0" - -EXTRA_OECONF = "--disable-scrollkeeper" - -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - -FILES_${PN} += "${datadir}/gnome-about" - - -do_stage () { - autotools_stage_all -} diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb index c7fd61470d..53b70245ca 100644 --- a/packages/gnome/gnome-desktop_2.7.90.bb +++ b/packages/gnome/gnome-desktop_2.7.90.bb @@ -1,17 +1,12 @@ -LICENSE = "GPL" -SECTION = "x11/gnome" +require gnome-desktop.inc + PR = "r0" -DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome -DEPENDS = "gnome-common libgnomeui" +inherit gnome +EXTRA_OECONF = "" EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" -do_configure_prepend () { - cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} -} - do_stage () { install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/ # install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ -- cgit v1.2.3 From 03b5351cd7dc2bc54de804036ba8d5aa542828a3 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Feb 2008 04:12:46 +0000 Subject: gnome-desktop: remove EXTRA_AUTORECONF from 2.10 and 2.16 recipe * same thing that got 2.18 version to compile in 4f51dba47b3fab8347a4183dda20e0be798b3928 * version 2.7.90 still does not compile successfully, leaving unchanged --- packages/gnome/gnome-desktop_2.10.2.bb | 2 -- packages/gnome/gnome-desktop_2.16.1.bb | 2 -- 2 files changed, 4 deletions(-) (limited to 'packages/gnome') diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index 55add53cce..2bf249ddb6 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -3,5 +3,3 @@ require gnome-desktop.inc PR = "r1" inherit gnome pkgconfig - -EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 292984ab7d..fb45b134ae 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -7,5 +7,3 @@ DEPENDS += "gnome-doc-utils" SRC_URI += "file://scrollkeeper.patch;patch=1 \ file://no-desktop-docs.patch;patch=1;pnum=0" - -EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros" -- cgit v1.2.3