From: Rene Wagner Date: Sat, 12 Aug 2006 16:46:52 +0000 (+0200) Subject: gpe-bootsplash: only link against libsvg-cairo X-Git-Tag: familiar-v0.8.4~32 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d45b2da090f81fadbb0668f74e3b3cd32bed404d;p=familiar-h63xx-build.git gpe-bootsplash: only link against libsvg-cairo Signed-off-by: Rene Wagner --- diff --git a/org.handhelds.familiar/packages/gpe-bootsplash/files/svg-cairo-only.patch b/org.handhelds.familiar/packages/gpe-bootsplash/files/svg-cairo-only.patch new file mode 100644 index 0000000..d24c143 --- /dev/null +++ b/org.handhelds.familiar/packages/gpe-bootsplash/files/svg-cairo-only.patch @@ -0,0 +1,23 @@ +--- gpe-bootsplash-1.15/Makefile 2005-11-04 23:46:57.000000000 +0100 ++++ gpe-bootsplash-1.15/Makefile 2006-08-04 18:08:40.000000000 +0200 +@@ -2,7 +2,7 @@ + VERSION = 1.15 + CVSBUILD = no + +-PACKAGE_CFLAGS = `pkg-config --cflags gdk-pixbuf-2.0 libsvg-cairo` `pkg-config --libs gdk-pixbuf-2.0 libsvg-cairo` -DGTK2 ++PACKAGE_CFLAGS = `pkg-config --cflags glib-2.0 libsvg-cairo` `pkg-config --libs libsvg-cairo` + CFLAGS = -fomit-frame-pointer -Os + + SPLASH = splash2.png +--- gpe-bootsplash-1.15/splash.c.orig 2006-08-04 18:13:54.000000000 +0200 ++++ gpe-bootsplash-1.15/splash.c 2006-08-04 18:13:56.000000000 +0200 +@@ -60,7 +60,9 @@ + gboolean has_alpha, use_landscape; + int img_xres, img_yres; + ++#ifndef USE_SVG + g_type_init (); ++#endif /* USE_SVG */ + + fd = open (FB, O_RDWR); + if (fd < 0 && errno == ENOENT) diff --git a/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index 51abcfa..941ac64 100644 --- a/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/org.handhelds.familiar/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -1,13 +1,15 @@ inherit gpe -DEPENDS = "gtk+ libsvg-cairo" +DEPENDS = "glib-2.0 libsvg-cairo" MAINTAINER = "Phil Blundell " SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" -SRC_URI += "file://splash-p.svg file://splash-l.svg" +SRC_URI += "file://svg-cairo-only.patch;patch=1 \ + file://splash-p.svg \ + file://splash-l.svg" FILES_${PN} += "${datadir}/gpe"