xcursor-transparent-theme: install index.theme explicitly

PATCH NAK [email protected] 3 participants 5 messages Apr 10, 2013 – Apr 11, 2013

lore

Share & tools

lore

[email protected]

author

2013-04-10 03:44 UTC #0 lore raw

cover xcursor-transparent-theme: install index.theme explicitly

From: Wenzong Fan <[email protected]>

xcursor-transparent-theme: install index.theme explicitly

The xcursor-transparent-theme doesn't install index.theme by default, this might cause below command fails on target:

    $ gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
    Error: "gtk-update-icon-cache: No theme index file"

Just install index.theme explicitly to remove those error, its content is from xcursor-transparent-theme's README file.

[YOCTO #4234]

The following changes since commit 307e860860badd4420a01ed781c6c845fc9bf603:

udev: fix init script for the location of udevd (2013-04-09 18:09:14 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/4234
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/4234

Wenzong Fan (1):
xcursor-transparent-theme: install index.theme explicitly

 .../xcursor-transparent-theme-0.1.1/index.theme       |    2 ++
 .../xcursor-transparent-theme_0.1.1.bb                |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/index.theme

Signature · 1 line

1.7.10.4

[email protected]

author

2013-04-10 03:44 UTC #1 lore raw

PATCH 1/1 xcursor-transparent-theme: install index.theme explicitly

The xcursor-transparent-theme doesn't install index.theme by default, this might cause below command fails on target:

    $ gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
    Error: "gtk-update-icon-cache: No theme index file"

Just install index.theme explicitly to remove those error, its content is from xcursor-transparent-theme's README file.

[YOCTO #4234]

Signed-off-by Wenzong Fan <[email protected]>

---
 .../xcursor-transparent-theme-0.1.1/index.theme       |    2 ++
 .../xcursor-transparent-theme_0.1.1.bb                |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/index.theme

meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/index.theme new file +2 -0

new file mode 100644
index 0000000..5300850
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=xcursor-transparent

meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +14 -3

index fecc8ea..93770c1 100644
@@ -6,14 +6,25 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SECTION = "x11/base"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch \
-	   file://fix_watch_cursor.patch"
+	   file://fix_watch_cursor.patch \
+	   file://index.theme"
 
 SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
 SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
-FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/* \
+	   ${datadir}/icons/xcursor-transparent/index.theme"
 
 inherit autotools allarch
+
+# This package doesn't provide index.theme by default, this might cause
+# below command fails on target with error: "No theme index file".
+#
+#    gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
+#
+do_install_append(){
+    install -m 0644 -D ${WORKDIR}/index.theme ${D}${datadir}/icons/xcursor-transparent/index.theme
+}

Signature · 1 line

1.7.10.4

Martin Jansa

2013-04-10 08:17 UTC #2 lore raw

Quoted 8 lines · On Wed, Apr 10, 2013 at 11:26:35AM +0800, [email protected] wrote:

The xcursor-transparent-theme doesn't install index.theme by default, this might cause below command fails on target:
    $ gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
    Error: "gtk-update-icon-cache: No theme index file"
Just install index.theme explicitly to remove those error, its content is from xcursor-transparent-theme's README file.

Wasn't this discussed and fixed before? IIRC the conclusion was that postinst should check if there is index.theme or ignore it missing, not adding index.theme.

Quoted 59 lines

[YOCTO #4234]

Signed-off-by Wenzong Fan <[email protected]>

---
 .../xcursor-transparent-theme-0.1.1/index.theme       |    2 ++
 .../xcursor-transparent-theme_0.1.1.bb                |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/index.theme

meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/index.theme new file +2 -0

new file mode 100644
index 0000000..5300850
@@ -0,0 +1,2 @@
+[Icon Theme]
+Inherits=xcursor-transparent

meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +14 -3

index fecc8ea..93770c1 100644
@@ -6,14 +6,25 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SECTION = "x11/base"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \
 	   file://use-relative-symlinks.patch \
-	   file://fix_watch_cursor.patch"
+	   file://fix_watch_cursor.patch \
+	   file://index.theme"
 
 SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23"
 SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4"
-FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/* \
+	   ${datadir}/icons/xcursor-transparent/index.theme"
 
 inherit autotools allarch
+
+# This package doesn't provide index.theme by default, this might cause
+# below command fails on target with error: "No theme index file".
+#
+#    gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
+#
+do_install_append(){
+    install -m 0644 -D ${WORKDIR}/index.theme ${D}${datadir}/icons/xcursor-transparent/index.theme
+}

Signature · 7 lines

1.7.10.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Burton, Ross

NAK

2013-04-10 09:35 UTC #3 lore raw

Quoted 7 lines · Martin Jansa

Quoted 6 lines · On Wed, Apr 10, 2013 at 11:26:35AM +0800, [email protected] wrote:
The xcursor-transparent-theme doesn't install index.theme by default, this might cause below command fails on target:
    $ gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
    Error: "gtk-update-icon-cache: No theme index file"

Quoted 6 lines

Quoted 2 lines
Just install index.theme explicitly to remove those error, its content is from xcursor-transparent-theme's README file.
Wasn't this discussed and fixed before? IIRC the conclusion was that postinst should check if there is index.theme or ignore it missing, not adding index.theme.

NACK.

Martin is right, the gtk-icon-cache class uses -t when updating the caches:

--ignore-theme-index, -t
Don't check for the existence of 'index.theme' in the icon theme directory. Without this option, gtk-update-icon-cache refuses to create an icon cache in a directory which does not appear to be the toplevel directory of an icon theme.

If someone is not using gtk-icon-cache.bbclass they either should, or have a good reason and also use -t.

Ross

wenzong fan

author

2013-04-11 06:56 UTC #4 lore raw

Quoted 19 lines · Ross

Quoted 7 lines · Martin Jansa
Quoted 6 lines · On Wed, Apr 10, 2013 at 11:26:35AM +0800, [email protected] wrote:
The xcursor-transparent-theme doesn't install index.theme by default, this might cause below command fails on target:
     $ gtk-update-icon-cache -q /usr/share/icons/xcursor-transparent
     Error: "gtk-update-icon-cache: No theme index file"
Quoted 6 lines
Quoted 2 lines
Just install index.theme explicitly to remove those error, its content is from xcursor-transparent-theme's README file.
Wasn't this discussed and fixed before? IIRC the conclusion was that postinst should check if there is index.theme or ignore it missing, not adding index.theme.
NACK.
Martin is right, the gtk-icon-cache class uses -t when updating the caches:

Quoted 8 lines

--ignore-theme-index, -t
Don't check for the existence of 'index.theme' in the icon theme directory. Without this option, gtk-update-icon-cache refuses to create an icon cache in a directory which does not appear to be the toplevel directory of an icon theme.
If someone is not using gtk-icon-cache.bbclass they either should, or have a good reason and also use -t.

Oh, I did think I missed something about the discussion of index.theme & gtk-update-icon-cache. I recall this patch and sorry for the noise.

I appreciate your clarifications!

Thanks
Wenzong

Quoted 3 lines

Ross