* [V3 0/4] icon-themes fixes
@ 2012-10-24 8:05 Andreas Müller
2012-10-24 8:05 ` [V3 1/4] gnome-icon-theme: fix icon mapping Andreas Müller
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Andreas Müller @ 2012-10-24 8:05 UTC (permalink / raw)
To: openembedded-core
v1->v2:
* fix sato-icon-theme
v2->v3:
* add libxml-simple-perl-native to DEPENDS
* merge sato-icon-theme.inc into recipe
The following changes since commit 06d27cf0fbcc4004e6f456880eca49893c9290bf:
xorg: remove XF86 BigFont extension (2012-10-22 14:57:26 +0100)
are available in the git repository at:
git://gitorious.org/schnitzeltony-oe-meta/oe-core.git icon-themes
Andreas Müller (4):
gnome-icon-theme: fix icon mapping
gnome-icon-theme: remove unused configure variable
sato-icon-theme: fix build
sato-icon-theme: merge sato-icon-theme.inc into recipe
.../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 10 +++----
.../sato-icon-theme/sato-icon-theme.inc | 24 -----------------
.../sato-icon-theme/sato-icon-theme_0.4.1.bb | 27 +++++++++++++++++--
3 files changed, 28 insertions(+), 33 deletions(-)
delete mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
--
1.7.6.5
^ permalink raw reply [flat|nested] 8+ messages in thread
* [V3 1/4] gnome-icon-theme: fix icon mapping
2012-10-24 8:05 [V3 0/4] icon-themes fixes Andreas Müller
@ 2012-10-24 8:05 ` Andreas Müller
2012-10-24 8:05 ` [V3 2/4] gnome-icon-theme: remove unused configure variable Andreas Müller
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2012-10-24 8:05 UTC (permalink / raw)
To: openembedded-core
Multiple errors in log.do_install as:
Can't locate XML/Simple.pm in @INC (@INC contains: /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/../libexec/icon-name-mapping line 12.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index 8e7995b..2eb5fda 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -6,10 +6,10 @@ LICENSE = "LGPLv3+ | CC-BY-SA-3.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=e7e289d90fc8bdceed5e3f142f98229e"
SECTION = "x11/gnome"
-DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
+DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native libxml-simple-perl-native"
RDEPENDS_${PN} = "hicolor-icon-theme"
RRECOMMENDS_${PN} = "librsvg-gtk"
-PR = "r3"
+PR = "r4"
FILES_${PN} += "${datadir}/*"
@@ -22,5 +22,4 @@ SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a
EXTRA_OECONF = "--disable-hicolor-check"
EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('gnome-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
-
-inherit autotools
+inherit autotools perlnative
--
1.7.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [V3 2/4] gnome-icon-theme: remove unused configure variable
2012-10-24 8:05 [V3 0/4] icon-themes fixes Andreas Müller
2012-10-24 8:05 ` [V3 1/4] gnome-icon-theme: fix icon mapping Andreas Müller
@ 2012-10-24 8:05 ` Andreas Müller
2012-10-24 8:05 ` [V3 3/4] sato-icon-theme: fix build Andreas Müller
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2012-10-24 8:05 UTC (permalink / raw)
To: openembedded-core
configure: WARNING: unrecognized options: --disable-silent-rules, --with-libtool-sysroot, --disable-hicolor-check
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
index 2eb5fda..ab541ed 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.31.0.bb
@@ -19,7 +19,6 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/2.31/${BPN}-${PV}.tar.bz2 \
SRC_URI[md5sum] = "8e727703343d4c18c73c79dd2009f8ed"
SRC_URI[sha256sum] = "ea7e05b77ead159379392b3b275ca0c9cbacd7d936014e447cc7c5e27a767982"
-EXTRA_OECONF = "--disable-hicolor-check"
-EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('gnome-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
+EXTRA_OECONF = "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('gnome-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
inherit autotools perlnative
--
1.7.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [V3 3/4] sato-icon-theme: fix build
2012-10-24 8:05 [V3 0/4] icon-themes fixes Andreas Müller
2012-10-24 8:05 ` [V3 1/4] gnome-icon-theme: fix icon mapping Andreas Müller
2012-10-24 8:05 ` [V3 2/4] gnome-icon-theme: remove unused configure variable Andreas Müller
@ 2012-10-24 8:05 ` Andreas Müller
2012-12-10 13:24 ` Eric Bénard
2012-10-24 8:05 ` [V3 4/4] sato-icon-theme: merge sato-icon-theme.inc into recipe Andreas Müller
2012-10-24 11:48 ` [V3 0/4] icon-themes fixes Richard Purdie
4 siblings, 1 reply; 8+ messages in thread
From: Andreas Müller @ 2012-10-24 8:05 UTC (permalink / raw)
To: openembedded-core
| Can't locate XML/Simple.pm in @INC (@INC contains: /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/icon-naming-utils/icon-name-mapping line 12.
| BEGIN failed--compilation aborted at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/icon-naming-utils/icon-name-mapping line 12.
| make[3]: *** [install-data-local] Error 2
| make[3]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/sato-icon-theme-0.4.1/16x16/actions'
| make[2]: *** [install-am] Error 2
| make[2]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/sato-icon-theme-0.4.1/16x16/actions'
| make[1]: *** [install-recursive] Error 1
| make[1]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/sato-icon-theme-0.4.1/16x16'
| make: *** [install-recursive] Error 1
| ERROR: oe_runmake failed
| ERROR: Function failed: do_install (see /home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/temp/log.do_install.21502 for further information)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../sato-icon-theme/sato-icon-theme.inc | 2 +-
.../sato-icon-theme/sato-icon-theme_0.4.1.bb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
index 476e925..e014a7d 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
SECTION = "x11"
DEPENDS = ""
-inherit autotools pkgconfig allarch gtk-icon-cache
+inherit autotools pkgconfig allarch gtk-icon-cache perlnative
FILES_${PN} += "${datadir}"
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index cd34cac..ead2f7d 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -1,8 +1,8 @@
require sato-icon-theme.inc
-DEPENDS += "icon-naming-utils-native"
+DEPENDS += "icon-naming-utils-native libxml-simple-perl-native"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
file://iconpath-option.patch \
--
1.7.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [V3 4/4] sato-icon-theme: merge sato-icon-theme.inc into recipe
2012-10-24 8:05 [V3 0/4] icon-themes fixes Andreas Müller
` (2 preceding siblings ...)
2012-10-24 8:05 ` [V3 3/4] sato-icon-theme: fix build Andreas Müller
@ 2012-10-24 8:05 ` Andreas Müller
2012-10-24 11:48 ` [V3 0/4] icon-themes fixes Richard Purdie
4 siblings, 0 replies; 8+ messages in thread
From: Andreas Müller @ 2012-10-24 8:05 UTC (permalink / raw)
To: openembedded-core
nothing else needs sato-icon-theme.inc
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
.../sato-icon-theme/sato-icon-theme.inc | 24 -------------------
.../sato-icon-theme/sato-icon-theme_0.4.1.bb | 25 ++++++++++++++++++-
2 files changed, 23 insertions(+), 26 deletions(-)
delete mode 100644 meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
deleted file mode 100644
index e014a7d..0000000
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Sato Icon Theme"
-HOMEPAGE = "http://www.o-hand.com"
-BUGTRACKER = "http://bugzilla.openedhand.com/"
-
-LICENSE = "CC-BY-SA-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
-
-SECTION = "x11"
-DEPENDS = ""
-
-inherit autotools pkgconfig allarch gtk-icon-cache perlnative
-
-FILES_${PN} += "${datadir}"
-
-EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
-
-# Explictly setting "Sato" as the default icon theme to avoid flickering from
-# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
-pkg_postinst_${PN} () {
- mkdir -p $D/etc/gtk-2.0
-
- grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
- echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
-}
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
index ead2f7d..cb3b68c 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
@@ -1,12 +1,33 @@
-require sato-icon-theme.inc
+DESCRIPTION = "Sato Icon Theme"
+HOMEPAGE = "http://www.o-hand.com"
+BUGTRACKER = "http://bugzilla.openedhand.com/"
-DEPENDS += "icon-naming-utils-native libxml-simple-perl-native"
+LICENSE = "CC-BY-SA-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
+SECTION = "x11"
PR = "r6"
+DEPENDS = "icon-naming-utils-native libxml-simple-perl-native"
+
SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
file://iconpath-option.patch \
file://0001-Inherit-the-GNOME-icon-theme.patch"
SRC_URI[md5sum] = "86a847f3128a43a9cf23b7029a656f50"
SRC_URI[sha256sum] = "0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732"
+
+inherit autotools pkgconfig allarch gtk-icon-cache perlnative
+
+FILES_${PN} += "${datadir}"
+
+EXTRA_OECONF += "--with-iconmap=${@d.getVar('STAGING_LIBEXECDIR_NATIVE', True).replace('sato-icon-theme', 'icon-naming-utils')}/icon-name-mapping"
+
+# Explictly setting "Sato" as the default icon theme to avoid flickering from
+# the desktop and settings daemon racing. This shouldn't be done here but in the sato image
+pkg_postinst_${PN} () {
+ mkdir -p $D/etc/gtk-2.0
+
+ grep -s -q -e ^gtk-icon-theme-name.*\"Sato\" $D/etc/gtk-2.0/gtkrc || \
+ echo 'gtk-icon-theme-name = "Sato"' >> $D/etc/gtk-2.0/gtkrc
+}
--
1.7.6.5
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [V3 0/4] icon-themes fixes
2012-10-24 8:05 [V3 0/4] icon-themes fixes Andreas Müller
` (3 preceding siblings ...)
2012-10-24 8:05 ` [V3 4/4] sato-icon-theme: merge sato-icon-theme.inc into recipe Andreas Müller
@ 2012-10-24 11:48 ` Richard Purdie
4 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2012-10-24 11:48 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-core
On Wed, 2012-10-24 at 10:05 +0200, Andreas Müller wrote:
> v1->v2:
> * fix sato-icon-theme
> v2->v3:
> * add libxml-simple-perl-native to DEPENDS
> * merge sato-icon-theme.inc into recipe
>
> The following changes since commit 06d27cf0fbcc4004e6f456880eca49893c9290bf:
>
> xorg: remove XF86 BigFont extension (2012-10-22 14:57:26 +0100)
>
> are available in the git repository at:
> git://gitorious.org/schnitzeltony-oe-meta/oe-core.git icon-themes
>
> Andreas Müller (4):
> gnome-icon-theme: fix icon mapping
> gnome-icon-theme: remove unused configure variable
> sato-icon-theme: fix build
> sato-icon-theme: merge sato-icon-theme.inc into recipe
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [V3 3/4] sato-icon-theme: fix build
2012-10-24 8:05 ` [V3 3/4] sato-icon-theme: fix build Andreas Müller
@ 2012-12-10 13:24 ` Eric Bénard
2012-12-10 16:29 ` Burton, Ross
0 siblings, 1 reply; 8+ messages in thread
From: Eric Bénard @ 2012-12-10 13:24 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-core
hi Ross,
is it possible to get this patch into danny ?
commit ID : 61233b05ad299a34b5d3c06fe3c0162cba8fb273
Thanks
Eric
Le Wed, 24 Oct 2012 10:05:16 +0200,
Andreas Müller <schnitzeltony@googlemail.com> a écrit :
> | Can't locate XML/Simple.pm in @INC (@INC contains: /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/icon-naming-utils/icon-name-mapping line 12.
> | BEGIN failed--compilation aborted at /home/andreas/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/lib/icon-naming-utils/icon-name-mapping line 12.
> | make[3]: *** [install-data-local] Error 2
> | make[3]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/sato-icon-theme-0.4.1/16x16/actions'
> | make[2]: *** [install-am] Error 2
> | make[2]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/sato-icon-theme-0.4.1/16x16/actions'
> | make[1]: *** [install-recursive] Error 1
> | make[1]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/sato-icon-theme-0.4.1/16x16'
> | make: *** [install-recursive] Error 1
> | ERROR: oe_runmake failed
> | ERROR: Function failed: do_install (see /home/andreas/tmp/oe-core-eglibc/work/all-angstrom-linux/sato-icon-theme-0.4.1-r5/temp/log.do_install.21502 for further information)
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
> .../sato-icon-theme/sato-icon-theme.inc | 2 +-
> .../sato-icon-theme/sato-icon-theme_0.4.1.bb | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> index 476e925..e014a7d 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme.inc
> @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=56a830bbe6e4697fe6cbbae01bb7c2b2"
> SECTION = "x11"
> DEPENDS = ""
>
> -inherit autotools pkgconfig allarch gtk-icon-cache
> +inherit autotools pkgconfig allarch gtk-icon-cache perlnative
>
> FILES_${PN} += "${datadir}"
>
> diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> index cd34cac..ead2f7d 100644
> --- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> +++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme_0.4.1.bb
> @@ -1,8 +1,8 @@
> require sato-icon-theme.inc
>
> -DEPENDS += "icon-naming-utils-native"
> +DEPENDS += "icon-naming-utils-native libxml-simple-perl-native"
>
> -PR = "r5"
> +PR = "r6"
>
> SRC_URI = "http://pokylinux.org/releases/sato/${BPN}-${PV}.tar.gz \
> file://iconpath-option.patch \
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [V3 3/4] sato-icon-theme: fix build
2012-12-10 13:24 ` Eric Bénard
@ 2012-12-10 16:29 ` Burton, Ross
0 siblings, 0 replies; 8+ messages in thread
From: Burton, Ross @ 2012-12-10 16:29 UTC (permalink / raw)
To: Eric Bénard; +Cc: openembedded-core
On 10 December 2012 13:24, Eric Bénard <eric@eukrea.com> wrote:
> is it possible to get this patch into danny ?
> commit ID : 61233b05ad299a34b5d3c06fe3c0162cba8fb273
Two requests on the same day, sure. Merged to danny-next.
There'll be a danny-next run tonight, if it's green then I'll submit a
merge to danny tomorrow.
Ross
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-12-10 16:44 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-24 8:05 [V3 0/4] icon-themes fixes Andreas Müller
2012-10-24 8:05 ` [V3 1/4] gnome-icon-theme: fix icon mapping Andreas Müller
2012-10-24 8:05 ` [V3 2/4] gnome-icon-theme: remove unused configure variable Andreas Müller
2012-10-24 8:05 ` [V3 3/4] sato-icon-theme: fix build Andreas Müller
2012-12-10 13:24 ` Eric Bénard
2012-12-10 16:29 ` Burton, Ross
2012-10-24 8:05 ` [V3 4/4] sato-icon-theme: merge sato-icon-theme.inc into recipe Andreas Müller
2012-10-24 11:48 ` [V3 0/4] icon-themes fixes Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.