From 154f7d76cb9f241edf2d06bd7d07a391ae0d7f72 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Fri, 31 Aug 2007 15:03:02 +0000
Subject: Upgrade libart-lgpl to 2.3.19

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2615 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gnome/libart-lgpl/Makefile.am.patch | 12 +++------
 meta/packages/gnome/libart-lgpl_2.3.16.bb         | 30 -----------------------
 meta/packages/gnome/libart-lgpl_2.3.19.bb         | 30 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 39 deletions(-)
 delete mode 100644 meta/packages/gnome/libart-lgpl_2.3.16.bb
 create mode 100644 meta/packages/gnome/libart-lgpl_2.3.19.bb

(limited to 'meta')

diff --git a/meta/packages/gnome/libart-lgpl/Makefile.am.patch b/meta/packages/gnome/libart-lgpl/Makefile.am.patch
index 749de32e2a..edeed0a6e5 100644
--- a/meta/packages/gnome/libart-lgpl/Makefile.am.patch
+++ b/meta/packages/gnome/libart-lgpl/Makefile.am.patch
@@ -1,13 +1,7 @@
 --- libart_lgpl-2.3.16/Makefile.am.old	2004-06-26 18:57:07.000000000 +0100
 +++ libart_lgpl-2.3.16/Makefile.am	2004-06-26 18:57:12.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- BUILT_SOURCES = art_config.h
- 
--art_config.h:	gen_art_config
+@@ -5,2 +5,2 @@
+-art_config.h:	gen_art_config$(EXEEXT)
 -	./gen_art_config > art_config.h
-+#art_config.h:	gen_art_config
++#art_config.h:	gen_art_config$(EXEEXT)
 +#	./gen_art_config > art_config.h
- 
- EXTRA_DIST = 			\
- 	libart-config.in	\
diff --git a/meta/packages/gnome/libart-lgpl_2.3.16.bb b/meta/packages/gnome/libart-lgpl_2.3.16.bb
deleted file mode 100644
index 8028c8ef3f..0000000000
--- a/meta/packages/gnome/libart-lgpl_2.3.16.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Library of functions for 2D graphics"
-SECTION = "x11/gnome"
-LICENSE = "LGPL"
-PR = "r2"
-ART_CONFIG = "${HOST_ARCH}/art_config.h"
-
-# can't use gnome.oeclass due to _ in filename
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
-       file://${ART_CONFIG} \
-       file://Makefile.am.patch;patch=1"
-
-inherit autotools pkgconfig
-
-DEPENDS = ""
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += "${bindir}/libart2-config"
-
-S = "${WORKDIR}/libart_lgpl-${PV}"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
-}
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_stage() {
-	autotools_stage_includes
-	oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
-}
diff --git a/meta/packages/gnome/libart-lgpl_2.3.19.bb b/meta/packages/gnome/libart-lgpl_2.3.19.bb
new file mode 100644
index 0000000000..a37b392593
--- /dev/null
+++ b/meta/packages/gnome/libart-lgpl_2.3.19.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+
+ART_CONFIG = "${HOST_ARCH}/art_config.h"
+
+# can't use gnome.oeclass due to _ in filename
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
+       file://${ART_CONFIG} \
+       file://Makefile.am.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS = ""
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/libart2-config"
+
+S = "${WORKDIR}/libart_lgpl-${PV}"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
+}
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	autotools_stage_includes
+	oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
+}
-- 
cgit v1.2.3