diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2019-08-13 05:21:10 -0400 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-08-14 16:03:43 -0700 |
| commit | 348829309b0549f0f612854afc35c7aa26e5ea44 (patch) | |
| tree | ad2906764eeec25ac28e0b7e15fcabf59480400e /meta-xfce | |
| parent | 42355258db35c5c35e6193448a1beb4ec3fd715d (diff) | |
| download | meta-openembedded-contrib-348829309b0549f0f612854afc35c7aa26e5ea44.tar.gz | |
tumbler: 0.2.0 -> 0.2.7
Update tumbler from 0.2.0 to 0.2.7
* remove patch which has been fixed in upstream
* remove dbus-glib* from DEPENDS that tumbler ports gdbus. glib-2.0
provides gdbus and already in tumbler's dependency chains.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce')
| -rw-r--r-- | meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch | 45 | ||||
| -rw-r--r-- | meta-xfce/recipes-xfce/tumbler/tumbler_0.2.7.bb (renamed from meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb) | 9 |
2 files changed, 4 insertions, 50 deletions
diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch b/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch deleted file mode 100644 index 5ecc35e37a..0000000000 --- a/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f5c283b1251ad005da7342e654cd2ec5ae9e5fb2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 26 Sep 2014 13:44:36 +0200 -Subject: [PATCH] configure: use pkg-config for freetype2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - acinclude.m4 | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 66e79d1..4c70b00 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -52,21 +52,7 @@ if test x"$ac_tumbler_font_thumbnailer" = x"yes"; then - PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], - [ - dnl Check for FreeType 2.x -- FREETYPE_LIBS="" -- FREETYPE_CFLAGS="" -- AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no]) -- if test x"$FREETYPE_CONFIG" != x"no"; then -- AC_MSG_CHECKING([FREETYPE_CFLAGS]) -- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" -- AC_MSG_RESULT([$FREETYPE_CFLAGS]) -- -- AC_MSG_CHECKING([FREETYPE_LIBS]) -- FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" -- AC_MSG_RESULT([$FREETYPE_LIBS]) -- else -- dnl We can only build the font thumbnailer if FreeType 2.x is available -- ac_tumbler_font_thumbnailer=no -- fi -+ PKG_CHECK_MODULES(FREETYPE, freetype2, , [ac_tumbler_font_thumbnailer=no]) - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) - ], [ac_tumbler_font_thumbnailer=no]) --- -1.8.3.1 - diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.7.bb index 9d2669475f..434f8741af 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.7.bb @@ -1,14 +1,13 @@ -DESCRIPTION="Thumbnail service implementing the thumbnail management D-Bus specification" +DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" SECTION = "x11/libs" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "dbus-glib dbus-glib-native freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" +DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" inherit xfce gtk-doc -SRC_URI[md5sum] = "dd5f9bae6a2470eb5fff0dc9edd3ea09" -SRC_URI[sha256sum] = "4e27a59694b0a5cc69ebccbdb00c724e670b5b7c30bc4dc0b461aac93f234fac" -SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" +SRC_URI[md5sum] = "a59b2a545c9c128dbd2b960a7779dec0" +SRC_URI[sha256sum] = "f704c35f16716cbee3c94883cee2a8d865e9cf2535d0e84f57e1c8cce00314e4" INSANE_SKIP_${PN} = "dev-so" |