From 219dd9d7778f2024fa73a4b6935b02eed4cc3ea4 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 26 Sep 2014 13:17:47 +0200 Subject: tumbler: update to 0.1.30 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * find freetype2 by packageconfig -> get out of blacklist * inherit gtk-doc to avoid | gtk-doc.make:7: error: GTK_DOC_USE_LIBTOOL does not appear in AM_CONDITIONAL | docs/reference/tumbler/Makefile.am:84: 'gtk-doc.make' included from here | gtk-doc.make:59: error: GTK_DOC_BUILD_HTML does not appear in AM_CONDITIONAL | docs/reference/tumbler/Makefile.am:84: 'gtk-doc.make' included from here | gtk-doc.make:64: error: GTK_DOC_BUILD_PDF does not appear in AM_CONDITIONAL | docs/reference/tumbler/Makefile.am:84: 'gtk-doc.make' included from here | gtk-doc.make:73: error: ENABLE_GTK_DOC does not appear in AM_CONDITIONAL | docs/reference/tumbler/Makefile.am:84: 'gtk-doc.make' included from here | gtk-doc.make:294: error: HAVE_GTK_DOC does not appear in AM_CONDITIONAL | docs/reference/tumbler/Makefile.am:84: 'gtk-doc.make' included from here | tumblerd/Makefile.am:93: warning: '%'-style pattern rules are a GNU make extension | autoreconf: automake failed with exit status: 1 Signed-off-by: Andreas Müller --- ...01-configure-use-pkg-config-for-freetype2.patch | 45 ++++++++++++++++++++++ meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb | 34 ---------------- meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb | 33 ++++++++++++++++ 3 files changed, 78 insertions(+), 34 deletions(-) create mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch delete mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb create mode 100644 meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb (limited to 'meta-xfce/recipes-xfce') 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 new file mode 100644 index 0000000000..5ecc35e37a --- /dev/null +++ b/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch @@ -0,0 +1,45 @@ +From f5c283b1251ad005da7342e654cd2ec5ae9e5fb2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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.1.29.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb deleted file mode 100644 index ed986c2e89..0000000000 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.29.bb +++ /dev/null @@ -1,34 +0,0 @@ -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 freetype gdk-pixbuf poppler curl xfce4-dev-tools-native" - -inherit xfce - -PNBLACKLIST[tumbler] = "BROKEN: needs to be updated to use freetype2 pkg-config instead of freetype2-config" - -SRC_URI[md5sum] = "f844215c5e3918eae58abdd85f146780" -SRC_URI[sha256sum] = "c3bac4ee609e22be6c7f01a4fdf6086bc6b57940d82f99570a2d9d547a32fc93" - -INSANE_SKIP_${PN} = "dev-so" - -do_install_append() { - # correct tumbler-cache-plugin.so link (see plugins/xdg-cache/Makefile.am) - ln -sf ${libdir}/tumbler-1/plugins/cache/tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so -} - -FILES_${PN} += "${datadir}/dbus-1/services \ - ${libdir}/tumbler-1/tumblerd \ - ${libdir}/tumbler-1/plugins/*.so \ - ${libdir}/tumbler-1/plugins/cache/*.so \ -" - -FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ - ${libdir}/tumbler-1/plugins/cache/*.la" -FILES_${PN}-staticdev += "${libdir}/tumbler-1/plugins/*.a \ - ${libdir}/tumbler-1/plugins/cache/*.a" -FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \ - ${libdir}/tumbler-1/plugins/.debug \ - ${libdir}/tumbler-1/plugins/cache/.debug \ -" diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb new file mode 100644 index 0000000000..8651d0003c --- /dev/null +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_0.1.30.bb @@ -0,0 +1,33 @@ +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 freetype gdk-pixbuf poppler curl xfce4-dev-tools-native" + +inherit xfce gtk-doc + +SRC_URI[md5sum] = "2524e39439c13238565160da0b6fed2d" +SRC_URI[sha256sum] = "e7c20d79c830465f8b3b792893f05e8b8d5ba90aec4973e7517e07ef31537304" +SRC_URI += "file://0001-configure-use-pkg-config-for-freetype2.patch" + +INSANE_SKIP_${PN} = "dev-so" + +do_install_append() { + # correct tumbler-cache-plugin.so link (see plugins/xdg-cache/Makefile.am) + ln -sf ${libdir}/tumbler-1/plugins/cache/tumbler-xdg-cache.so ${D}${libdir}/tumbler-1/plugins/cache/tumbler-cache-plugin.so +} + +FILES_${PN} += "${datadir}/dbus-1/services \ + ${libdir}/tumbler-1/tumblerd \ + ${libdir}/tumbler-1/plugins/*.so \ + ${libdir}/tumbler-1/plugins/cache/*.so \ +" + +FILES_${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ + ${libdir}/tumbler-1/plugins/cache/*.la" +FILES_${PN}-staticdev += "${libdir}/tumbler-1/plugins/*.a \ + ${libdir}/tumbler-1/plugins/cache/*.a" +FILES_${PN}-dbg += "${libdir}/tumbler-1/.debug \ + ${libdir}/tumbler-1/plugins/.debug \ + ${libdir}/tumbler-1/plugins/cache/.debug \ +" -- cgit 1.2.3-korg