3 patches: lzo, libxfont, distro_tracking_fields.inc
cover 3 patches: lzo, libxfont, distro_tracking_fields.inc
The following changes since commit 9d6790c4409dee4d08fe6a47450125c406d0ba32:
cooker.py: Allow the -e option to work with virtual classes and -b (2011-12-01 23:14:05 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/distro
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/distro
Dexuan Cui (3):
libxfont: remove the unused no-scalable-crash.patch
lzo: remove the uncessary autoconf.patch distro_tracking_fields.inc: update the info
.../conf/distro/include/distro_tracking_fields.inc | 65 ++++++++++--------- .../xorg-lib/libxfont/no-scalable-crash.patch | 24 ------- meta/recipes-support/lzo/lzo-2.06/autoconf.patch | 28 --------- meta/recipes-support/lzo/lzo_2.06.bb | 3 +- 4 files changed, 35 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch delete mode 100644 meta/recipes-support/lzo/lzo-2.06/autoconf.patch
Signature · 1 line
1.7.6
PATCH 1/3 libxfont: remove the unused no-scalable-crash.patch
--- .../xorg-lib/libxfont/no-scalable-crash.patch | 24 -------------------- 1 files changed, 0 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch deleted +0 -24
@@ -1,24 +0,0 @@ -Upstream-Status: Pending - ---- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200 -+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200 -@@ -695,6 +695,11 @@ - */ - if (isscale) - { -+ /* If the fontname says it is scalable, make sure that the -+ * renderer supports OpenScalable and GetInfoScalable. -+ */ -+ if (renderer->OpenScalable && renderer->GetInfoScalable) -+ { - if (vals.values_supplied & SIZE_SPECIFY_MASK) - { - bzero((char *)&zeroVals, sizeof(zeroVals)); -@@ -794,6 +799,7 @@ - bitmap->name.name); - } - } -+ } - } - return TRUE; - }
Signature · 1 line
1.7.6
PATCH 2/3 lzo: remove the uncessary autoconf.patch
In reply to Dexuan CuiNow we already have autoconf-2.68 that is newer than 2.67 that is required by lzo. So the patch is not needed any longer.
Thanks Khem Raj for pointing this out!
--- meta/recipes-support/lzo/lzo-2.06/autoconf.patch | 28 ---------------------- meta/recipes-support/lzo/lzo_2.06.bb | 3 +- 2 files changed, 1 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-support/lzo/lzo-2.06/autoconf.patch
meta/recipes-support/lzo/lzo-2.06/autoconf.patch deleted +0 -28
@@ -1,28 +0,0 @@ -Date: 12/31/2010 -Didn't find 2.67 specific features, so lower the requirement -to pass build - -Upstream-Status: Inappropriate [workaround] - -Signed-off-by: Qing He <[email protected]> - - - -Wed Nov 30 14:42:01 CST 2011 -Rebase to lzo-2.06. -Signed-off-by: Dexuan Cui <[email protected]> - ---- -diff --git a/configure.ac b/configure.ac -index 650749a..2a78845 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -36,7 +36,7 @@ All Rights Reserved. - This configure script may be copied, distributed and modified under the - terms of the GNU General Public License; see COPYING for more details.]) - --AC_PREREQ(2.67) -+AC_PREREQ(2.65) - AC_INIT([LZO],[2.06],[[email protected]],[lzo],[http://www.oberhumer.com/opensource/lzo/]) - AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION]) - AC_CONFIG_SRCDIR(src/lzo_init.c)
meta/recipes-support/lzo/lzo_2.06.bb +1 -2
@@ -4,10 +4,9 @@ SECTION = "libs" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/lzo_init.c;beginline=23;endline=40;md5=924a0f71f5394f6d404be3b458474769" -PR = "r0" +PR = "r1" SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ - file://autoconf.patch \ file://acinclude.m4 \ "
Signature · 1 line
1.7.6
PATCH 3/3 distro_tracking_fields.inc: update the info
In reply to Dexuan CuiThey are
pixman
libxrandr
lzo
libxfont
libxcursor
xcb-util
inputproto
liberation-fonts
--- .../conf/distro/include/distro_tracking_fields.inc | 65 ++++++++++--------- 1 files changed, 34 insertions(+), 31 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +34 -31
@@ -453,11 +453,13 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gnutls = "4 months" RECIPE_COMMENTS_pn-gnutls = "requires libtasn1, but has an internal copy" RECIPE_STATUS_pn-lzo = "green" -RECIPE_LAST_UPDATE_pn-lzo = "Dec 31, 2010" +RECIPE_LATEST_VERSION_pn-lzo = "2.06" +RECIPE_NO_OF_PATCHES_pn-lzo="0" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-lzo="4 months" +RECIPE_LATEST_RELEASE_DATE_pn-lzo = "Aug 12, 2011" +RECIPE_LAST_UPDATE_pn-lzo = "Nov 30, 2011" RECIPE_MAINTAINER_pn-lzo = "Dexuan Cui <[email protected]>" -RECIPE_LATEST_VERSION_pn-lzo = "2.04" RECIPE_INTEL_SECTION_pn-lzo = "base libs" -RECIPE_LATEST_RELEASE_DATE_pn-lzo = "Oct 01, 2010" RECIPE_STATUS_pn-libtasn1 = "green" RECIPE_LATEST_VERSION_pn-libtasn1 = "2.11"
@@ -3948,13 +3950,14 @@ RECIPE_MAINTAINER_pn-glproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-inputproto = "green" DISTRO_PN_ALIAS_pn-inputproto = "Meego=xorg-x11-proto-inputproto" RECIPE_DEPENDENCY_CHECK_pn-inputproto = "not done" -RECIPE_LATEST_VERSION_pn-inputproto = "2.0.2" +RECIPE_LATEST_VERSION_pn-inputproto = "2.1.99.2" RECIPE_NO_OF_PATCHES_pn-inputproto = "0" +RECIPE_NO_UPDATE_REASON_pn-inputproto = "Do not upgrade to version: 2.1.99.2 that has unstable code. 2.2 would be the next stable release." RECIPE_INTEL_SECTION_pn-inputproto = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-inputproto = "7 months" -RECIPE_LATEST_RELEASE_DATE_pn-inputproto = "Jun 7, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-inputproto = "2 months" +RECIPE_LATEST_RELEASE_DATE_pn-inputproto = "Nov 10, 2011" RECIPE_COMMENTS_pn-inputproto = "" -RECIPE_LAST_UPDATE_pn-inputproto = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-inputproto = "Nov 30, 2011" RECIPE_MAINTAINER_pn-inputproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-kbproto = "green"
@@ -4265,15 +4268,15 @@ RECIPE_MAINTAINER_pn-xproto = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-liberation-fonts = "green" RECIPE_DEPENDENCY_CHECK_pn-liberation-fonts = "not done" -RECIPE_LATEST_VERSION_pn-liberation-fonts = "1.07.0" -RECIPE_MANUAL_CHECK_DATE_pn-liberation-fonts = "Jun 13, 2011" -RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "Do not upgrade to version: 1.07.0 because before doing that, we need adding new native packages like libungif_4.1.3, libspiro and fontforge first" +RECIPE_LATEST_VERSION_pn-liberation-fonts = "1.07.1" +RECIPE_MANUAL_CHECK_DATE_pn-liberation-fonts = "Nov 30, 2011" +RECIPE_NO_UPDATE_REASON_pn-liberation-fonts = "Do not upgrade to version: 1.07.1 because before doing that, we need adding new native packages like libungif_4.1.3, libspiro and fontforge first" RECIPE_NO_OF_PATCHES_pn-liberation-fonts = "0" RECIPE_INTEL_SECTION_pn-liberation-fonts = "x11/fonts" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liberation-fonts = "10 months" -RECIPE_LATEST_RELEASE_DATE_pn-liberation-fonts = "May 30, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-liberation-fonts = "4 months" +RECIPE_LATEST_RELEASE_DATE_pn-liberation-fonts = "Sep 21, 2011" RECIPE_COMMENTS_pn-liberation-fonts = "current version 1.04 released open source under GPLv2 with exceptions" -RECIPE_LAST_UPDATE_pn-liberation-fonts = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-liberation-fonts = "Nov 30, 2011" RECIPE_MAINTAINER_pn-liberation-fonts = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libfontenc = "green"
@@ -4289,13 +4292,13 @@ RECIPE_MAINTAINER_pn-libfontenc = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libxfont = "green" RECIPE_DEPENDENCY_CHECK_pn-libxfont = "not done" -RECIPE_LATEST_VERSION_pn-libxfont = "1.4.2" +RECIPE_LATEST_VERSION_pn-libxfont = "1.4.4" RECIPE_NO_OF_PATCHES_pn-libxfont = "0" RECIPE_INTEL_SECTION_pn-libxfont = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxfont = "8 months" -RECIPE_LATEST_RELEASE_DATE_pn-libxfont = "Oct 01, 2009" -RECIPE_COMMENTS_pn-libxfont = "the recipe file has a commented-out no-scalable-crash.patch" -RECIPE_LAST_UPDATE_pn-libxfont = "Nov 24, 2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxfont = "10 months" +RECIPE_LATEST_RELEASE_DATE_pn-libxfont = "Aug 10, 2011" +RECIPE_COMMENTS_pn-libxfont = "" +RECIPE_LAST_UPDATE_pn-libxfont = "Nov 30, 2011" RECIPE_MAINTAINER_pn-libxfont = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libice = "green"
@@ -4369,13 +4372,13 @@ RECIPE_MAINTAINER_pn-libxcomposite = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libxrandr = "green" RECIPE_DEPENDENCY_CHECK_pn-libxrandr = "not done" -RECIPE_LATEST_VERSION_pn-libxrandr = "1.3.0" +RECIPE_LATEST_VERSION_pn-libxrandr = "1.3.2" RECIPE_NO_OF_PATCHES_pn-libxrandr = "0" RECIPE_INTEL_SECTION_pn-libxrandr = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxrandr = "4 months" -RECIPE_LATEST_RELEASE_DATE_pn-libxrandr = "Mar 01, 2009" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxrandr = "8 months" +RECIPE_LATEST_RELEASE_DATE_pn-libxrandr = "Jun 29, 2011" RECIPE_COMMENTS_pn-libxrandr = "" -RECIPE_LAST_UPDATE_pn-libxrandr = "Nov 24, 2010" +RECIPE_LAST_UPDATE_pn-libxrandr = "Nov 30, 2011" RECIPE_MAINTAINER_pn-libxrandr = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libxrender = "green"
@@ -4457,13 +4460,13 @@ RECIPE_MAINTAINER_pn-libxxf86vm = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libxcursor = "green" RECIPE_DEPENDENCY_CHECK_pn-libxcursor = "not done" -RECIPE_LATEST_VERSION_pn-libxcursor = "1.1.10" +RECIPE_LATEST_VERSION_pn-libxcursor = "1.1.12" RECIPE_NO_OF_PATCHES_pn-libxcursor = "0" RECIPE_INTEL_SECTION_pn-libxcursor = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxcursor = "2 years" -RECIPE_LATEST_RELEASE_DATE_pn-libxcursor = "Aug 01, 2009" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libxcursor = "8 months" +RECIPE_LATEST_RELEASE_DATE_pn-libxcursor = "Jun 30, 2011" RECIPE_COMMENTS_pn-libxcursor = "" -RECIPE_LAST_UPDATE_pn-libxcursor = "Nov 24, 2010" +RECIPE_LAST_UPDATE_pn-libxcursor = "Nov 30, 2011" RECIPE_MAINTAINER_pn-libxcursor = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-libxdamage = "green"
@@ -4535,13 +4538,13 @@ RECIPE_MAINTAINER_pn-libxkbfile = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-pixman = "green" RECIPE_DEPENDENCY_CHECK_pn-pixman = "not done" -RECIPE_LATEST_VERSION_pn-pixman = "0.22.0" +RECIPE_LATEST_VERSION_pn-pixman = "0.24.0" RECIPE_NO_OF_PATCHES_pn-pixman = "0" RECIPE_INTEL_SECTION_pn-pixman = "x11/libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pixman = "14 days" -RECIPE_LATEST_RELEASE_DATE_pn-pixman = "May 2, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pixman = "8 days" +RECIPE_LATEST_RELEASE_DATE_pn-pixman = "Nov 06, 2011" RECIPE_COMMENTS_pn-pixman = "" -RECIPE_LAST_UPDATE_pn-pixman = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-pixman = "Nov 30, 2011" RECIPE_MAINTAINER_pn-pixman = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-xtrans = "green"
@@ -4712,7 +4715,7 @@ RECIPE_INTEL_SECTION_pn-xcb-util = "x11/libs" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xcb-util = "1+ years" RECIPE_LATEST_RELEASE_DATE_pn-xcb-util = "Apr 25, 2011" RECIPE_COMMENTS_pn-xcb-util = "" -RECIPE_LAST_UPDATE_pn-xcb-util = "Jun 13, 2011" +RECIPE_LAST_UPDATE_pn-xcb-util = "Nov 30, 2011" RECIPE_MAINTAINER_pn-xcb-util = "Dexuan Cui <[email protected]>" RECIPE_STATUS_pn-startup-notification = "green"
Signature · 1 line
1.7.6
Richard Purdie
AppliedQuoted 4 lines · Dexuan Cui
The following changes since commit
9d6790c4409dee4d08fe6a47450125c406d0ba32:
cooker.py: Allow the -e option to work with virtual classes and -b (2011-12-01 23:14:05 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribdcui/distro
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/distroDexuan Cui (3):
libxfont: remove the unused no-scalable-crash.patch
lzo: remove the uncessary autoconf.patch distro_tracking_fields.inc: update the info
Merged to master, thanks.
Richard