From b3934f3a5b590424867ae3352edee9f1d8d8ec5e Mon Sep 17 00:00:00 2001
From: Saul Wold <Saul.Wold@intel.com>
Date: Wed, 24 Nov 2010 12:22:24 -0800
Subject: libart-lgpl: Update to version 2.3.21

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
---
 .../gnome/libart-lgpl/Makefile.am.patch            | 22 +++++++++++------
 meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb     | 28 ----------------------
 meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb     | 28 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb
 create mode 100644 meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb

(limited to 'meta/recipes-gnome')

diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
index edeed0a6e5..28acbe108f 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
+++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
@@ -1,7 +1,15 @@
---- 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,2 +5,2 @@
--art_config.h:	gen_art_config$(EXEEXT)
--	./gen_art_config > art_config.h
-+#art_config.h:	gen_art_config$(EXEEXT)
-+#	./gen_art_config > art_config.h
+Index: libart_lgpl-2.3.21/Makefile.am
+===================================================================
+--- libart_lgpl-2.3.21.orig/Makefile.am	2009-04-18 05:29:25.000000000 -0700
++++ libart_lgpl-2.3.21/Makefile.am	2010-11-23 23:12:32.445450075 -0800
+@@ -7,8 +7,8 @@
+ 
+ BUILT_SOURCES = art_config.h
+ 
+-art_config.h:
+-	./gen_art_config.sh > art_config.h
++#art_config.h:
++#	./gen_art_config.sh > art_config.h
+ 
+ EXTRA_DIST = 			\
+ 	libart.def		\
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb
deleted file mode 100644
index 3bdd697145..0000000000
--- a/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Library of functions for 2D graphics"
-SECTION = "x11/gnome"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r1"
-
-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"
-
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
new file mode 100644
index 0000000000..3bdd697145
--- /dev/null
+++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+PR = "r1"
+
+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"
+
-- 
cgit v1.2.3-54-g00ecf