diff options
19 files changed, 65 insertions, 25 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass index efbc13633f..9bac65fd9c 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -30,4 +30,5 @@ export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config" PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev" FILES_${PN} += "${libdir}/lib*.so.*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" -FILES_${PN}-dev += "${includedir}" +FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so" + diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 9b0345a5b8..808bf2eaae 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -48,6 +48,5 @@ do_stage_append () { } PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples" -FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${includedir}" +FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" FILES_${PN}-examples = "${bindir} ${datadir}" - diff --git a/conf/checksums.ini b/conf/checksums.ini index 175a4ec09d..dbd255ea49 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4258,6 +4258,10 @@ sha256=4ebece4bb752e22b2f15a9fe24e83aec59a3a41b67a9fa9ffd6b805c519e90ba md5=7cf1a436882a62d420a0fa00ace02a55 sha256=04aed43abc77fccf20e91b1ba3659c0870c50091d9ce3472ac73a40a704c2fe2 +[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.35/intltool-0.35.5.tar.bz2] +md5=f52d5fa7f128db94e884cd21dd45d2e2 +sha256=38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8 + [http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.3.tar.bz2] md5=39640ea026d81e721b0c78a8aaeb7d59 sha256=808cd8e7b499a3519f8492a5bda75c55e770f976c98b2c2c21edcca4b9c30168 diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index 631303b55b..a6c042333f 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -2,6 +2,8 @@ # This script takes the last 1000 revs and writes a ChangeLog +mkdir logs + export REV_NOW=`mtn automate heads |head -n1` for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \ @@ -9,22 +11,32 @@ for i in `mtn log --brief --no-graph --no-merges --from l:"1 week ago" --to ${RE export AUTHOR=`echo $i | awk -F: '{print $1}'` export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : ' '{ print $2 }'` if test -n "${CL}" ; then - echo " ${CL}" >> ${AUTHOR} + echo " ${CL}" >> logs/${AUTHOR} fi done -for i in *@* ; do \ - echo $i: >> ChangeLog - cat $i >> ChangeLog - echo >> ChangeLog +cd logs +for i in * ; do \ + echo $i: >> ../ChangeLog + cat $i >> ../ChangeLog + echo >> ../ChangeLog done +cd .. + +wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O logs/resolved-bugs.csv >& /dev/null + +wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bugidtype=include&chfield=%5BBug%20creation%5D&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW&value0-0-0=&ctype=csv" -O logs/new-bugs.csv &>/dev/null -echo "Bug fixed:" >> ChangeLog +NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`" +RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`" -wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bugidtype=include&chfieldfrom=7d&chfieldto=Now&chfieldvalue=&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&known_name=1WFixed&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=RESOLVED%2CVERIFIED%2CCLOSED&value0-0-0=&ctype=csv' -O bugs.csv >& /dev/null +echo -e "\n\nBugs fixed:" >> ChangeLog +cat logs/resolved-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog -cat bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog +echo -e "\n\nBugs opened:" >> ChangeLog +cat logs/new-bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog +echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog -rm `ls | grep -v ChangeLog | grep -v mtn2cl` +rm -Rf logs diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb index 8a08a6c1ce..f8e88a0217 100644 --- a/packages/classpath/classpath-minimal-native_0.93.bb +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -1,8 +1,9 @@ require classpath.inc DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" +PR = "r1" -SRC_URI += "file://gconf_version.patch;patch=1" +S = "${WORKDIR}/classpath-${PV}" inherit native diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index e66f5d7456..1d684c0557 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -8,6 +8,7 @@ RPROVIDES = "classpath" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ file://disable-automake-checks.patch;patch=1 \ + file://gconf_version.patch;patch=1 \ file://fix-endian-arm-floats.patch;patch=1" inherit autotools diff --git a/packages/gaim/pidgin.inc b/packages/gaim/pidgin.inc index b1c4087989..64eb6bd143 100644 --- a/packages/gaim/pidgin.inc +++ b/packages/gaim/pidgin.inc @@ -63,6 +63,11 @@ python populate_packages_prepend () { description='Libpurple protocol plugin for %s', prepend=True, extra_depends='') + do_split_packages(d, purple, '^(ssl-.*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='libpurple-plugin-ssl') + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', output_pattern='libpurple-plugin-%s', description='libpurple plugin %s', diff --git a/packages/gaim/pidgin_2.0.1.bb b/packages/gaim/pidgin_2.0.1.bb index 411b49ff4b..961467ad95 100644 --- a/packages/gaim/pidgin_2.0.1.bb +++ b/packages/gaim/pidgin_2.0.1.bb @@ -5,4 +5,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://gconf-no-errors.patch;patch=1 \ " -PR = "r2" +PR = "r3" diff --git a/packages/icewm/icewm-1.2.26/.mtn2git_empty b/packages/icewm/icewm-1.2.30/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/icewm/icewm-1.2.26/.mtn2git_empty +++ b/packages/icewm/icewm-1.2.30/.mtn2git_empty diff --git a/packages/icewm/icewm-1.2.26/configure.patch b/packages/icewm/icewm-1.2.30/configure.patch index ade427d5e0..ade427d5e0 100644 --- a/packages/icewm/icewm-1.2.26/configure.patch +++ b/packages/icewm/icewm-1.2.30/configure.patch diff --git a/packages/icewm/icewm-1.2.26/makefile.patch b/packages/icewm/icewm-1.2.30/makefile.patch index 9473c9b2a9..9473c9b2a9 100644 --- a/packages/icewm/icewm-1.2.26/makefile.patch +++ b/packages/icewm/icewm-1.2.30/makefile.patch diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.30.bb index 47d4fc8189..5266b0adb9 100644 --- a/packages/icewm/icewm_1.2.26.bb +++ b/packages/icewm/icewm_1.2.30.bb @@ -8,8 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ file://makefile.patch;patch=1 \ file://configure.patch;patch=1" -S = "${WORKDIR}/icewm-${PV}" - inherit autotools pkgconfig EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \ diff --git a/packages/intltool/intltool-native_0.35.5.bb b/packages/intltool/intltool-native_0.35.5.bb new file mode 100644 index 0000000000..ba9b90c07a --- /dev/null +++ b/packages/intltool/intltool-native_0.35.5.bb @@ -0,0 +1,9 @@ +require intltool_${PV}.bb + +inherit native +DEPENDS = "libxml-parser-perl-native" + +export PERL = "/usr/bin/env perl" +SRC_URI_append = " file://intltool-nowarn.patch;patch=1" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/intltool/intltool.inc b/packages/intltool/intltool.inc index f4de1ff4aa..410a89cfa3 100644 --- a/packages/intltool/intltool.inc +++ b/packages/intltool/intltool.inc @@ -3,7 +3,8 @@ PRIORITY = "optional" SECTION = "devel" LICENSE = "GPL" -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" +URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" +SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" S = "${WORKDIR}/intltool-${PV}" inherit autotools pkgconfig diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb new file mode 100644 index 0000000000..e13e376f12 --- /dev/null +++ b/packages/intltool/intltool_0.35.5.bb @@ -0,0 +1,10 @@ +require intltool.inc + +DEPENDS = "libxml-parser-perl-native" +#RDEPENDS = "libxml-parser-perl" + +PR = "r0" + +RRECOMMENDS = "perl-modules" + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/jamvm/jamvm_1.4.2.bb b/packages/jamvm/jamvm_1.4.5.bb index 489b4fb94b..489b4fb94b 100644 --- a/packages/jamvm/jamvm_1.4.2.bb +++ b/packages/jamvm/jamvm_1.4.5.bb diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch index a5e8b847c5..c9f40c8a5f 100644 --- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch +++ b/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch @@ -1,7 +1,5 @@ -diff --git a/devscripts/acinclude.m4.in.qt2 b/devscripts/acinclude.m4.in.qt2 -index 500e75f..e8d9758 100644 ---- a/devscripts/acinclude.m4.in.qt2 -+++ b/devscripts/acinclude.m4.in.qt2 +--- ./acinclude.m4 ++++ ./acinclude.m4 @@ -4937,31 +4937,11 @@ AC_DEFUN([KDE_SET_PREFIX], AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) diff --git a/packages/qt/qt-x11-free-common.inc b/packages/qt/qt-x11-free-common.inc index d21787786f..cb4ed12f8d 100644 --- a/packages/qt/qt-x11-free-common.inc +++ b/packages/qt/qt-x11-free-common.inc @@ -76,7 +76,7 @@ do_install() { } PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \ - qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig qt-x11-plugins-debug" + qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig" FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so" FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so" FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so" @@ -84,4 +84,4 @@ FILES_qt-x11-designer = "${bindir}/designer" FILES_qt-x11-assistant = "${bindir}/assistant" FILES_qt-x11-qvfb = "${bindir}/qvfb" FILES_qt-x11-qtconfig = "${bindir}/qtconfig" -FILES_qt-x11-plugins-debug += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug" +FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug" diff --git a/packages/wrt/wrt-imagetools-native.bb b/packages/wrt/wrt-imagetools-native.bb index cd5d802765..f9f459eea6 100644 --- a/packages/wrt/wrt-imagetools-native.bb +++ b/packages/wrt/wrt-imagetools-native.bb @@ -1,4 +1,5 @@ -SRC_URI = "cvs://anonymous@openwrt.org/openwrt;module=openwrt/target/utils/src;tag=TESTED" +#SRC_URI = "svn://svn.openwrt.org/openwrt;module=trunk/tools/firmware-utils/src;proto=https" +SRC_URI = ${SOURCEFORGE_MIRROR}/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2 S = "${WORKDIR}/src/" inherit native @@ -13,4 +14,4 @@ do_stage() { install -m 0755 ${S}/trx ${STAGING_BINDIR} install -m 0755 ${S}/motorola-bin ${STAGING_BINDIR} install -m 0755 ${S}/addpattern ${STAGING_BINDIR} -}
\ No newline at end of file +} |