Patchwork [10/17] fontconfig: Remove version 2.8.0

login
register
mail settings
Submitter Kim B√łndergaard
Date Oct. 4, 2013, 1:24 p.m.
Message ID <509bbd0034dc47ecb7dd0a3f88253bb8cb7b35ad.1380892944.git.kibo@prevas.dk>
Download mbox | patch
Permalink /patch/280607/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Kim B√łndergaard - Oct. 4, 2013, 1:24 p.m.
---
 recipes/fontconfig/fontconfig_2.8.0.oe     | 41 ------------------------------
 recipes/fontconfig/fontconfig_2.8.0.oe.sig |  1 -
 2 files changed, 42 deletions(-)
 delete mode 100644 recipes/fontconfig/fontconfig_2.8.0.oe
 delete mode 100644 recipes/fontconfig/fontconfig_2.8.0.oe.sig
Esben Haabendal - Oct. 14, 2013, 3:26 p.m.
I remade you upgrade, starting with moving most of the stuff to a common
.inc file, and then integrated your changes into that, with the stuff
specific to the new version in the recipe, and rest of the improvements
in the .inc file.

Pushed to master.

/Esben
Esben Haabendal - Oct. 14, 2013, 3:30 p.m.
Esben Haabendal <esben.haabendal@dev.prevas.dk> writes:

> I remade you upgrade, starting with moving most of the stuff to a common
> .inc file, and then integrated your changes into that, with the stuff
> specific to the new version in the recipe, and rest of the improvements
> in the .inc file.
>
> Pushed to master.

I also pushed a removal of 2.8.0 commit to master branch.

/Esben

Patch

diff --git a/recipes/fontconfig/fontconfig_2.8.0.oe b/recipes/fontconfig/fontconfig_2.8.0.oe
deleted file mode 100644
index 0cb178c..0000000
--- a/recipes/fontconfig/fontconfig_2.8.0.oe
+++ /dev/null
@@ -1,41 +0,0 @@ 
-DESCRIPTION = "A library for configuring and customizing font access."
-LICENSE = "BSD"
-
-inherit autotools pkgconfig c++ library
-
-DEPENDS = "libexpat libfreetype libz"
-
-SRC_URI = "http://fontconfig.org/release/${PN}-${PV}.tar.gz"
-
-S = "${SRCDIR}/${PN}-${PV}"
-
-EXTRA_OECONF = "--disable-docs --with-arch=${HOST_ARCH} --with-cache-dir=${localstatedir}/lib/${PN}"
-
-do_configure[postfuncs] += "do_configure_extra"
-do_configure_extra () {
-	for makefile in fc-case/Makefile \
-			fc-glyphname/Makefile \
-			fc-lang/Makefile \
-			fc-arch/Makefile
-	do
-		sed -i -e 's|LDFLAGS =.*|LDFLAGS =${BUILD_LDFLAGS}|' \
-		       -e 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' \
-		       -e 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' \
-		       -e 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' \
-		       $makefile
-	done
-}
-
-EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
-export HASDOCBOOK="no"
-
-PACKAGES =+ "${PN}-utils-dbg ${PN}-utils "
-RECIPE_TYPES = "machine native"
-
-FILES_${PN}-utils-dbg = "${bindir}/.debug/*"
-FILES_${PN}-utils = "${bindir}/fc*"
-FILES_${PN} += "${sysconfdir}/fonts"
-
-DEPENDS_${PN} += "libexpat libfreetype libz libc libgcc"
-RDEPENDS_${PN} += "libexpat libfreetype libz libc libgcc"
-RDEPENDS_${PN}-utils += "libfontconfig libexpat libfreetype libz libc libgcc"
diff --git a/recipes/fontconfig/fontconfig_2.8.0.oe.sig b/recipes/fontconfig/fontconfig_2.8.0.oe.sig
deleted file mode 100644
index 423f3eb..0000000
--- a/recipes/fontconfig/fontconfig_2.8.0.oe.sig
+++ /dev/null
@@ -1 +0,0 @@ 
-570fb55eb14f2c92a7b470b941e9d35dbfafa716  fontconfig-2.8.0.tar.gz