From ffbe139cc96fd1f387d259ee825bf48d7be8b137 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 16 Jun 2007 17:33:33 +0000 Subject: contrib/mtn2cl: use a temp dir so we catch all authors and don't litter $PWD --- contrib/mtn2cl/mtn2cl.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index 631303b55b..cba9d5cdb8 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,23 @@ 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 .. echo "Bug fixed:" >> ChangeLog -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 - -cat bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog +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/bugs.csv >& /dev/null +cat logs/bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog -rm `ls | grep -v ChangeLog | grep -v mtn2cl` +rm -Rf logs -- cgit v1.2.3 From 0f1d77c0e3079e868f9e1ff49d45362876a6cc7f Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sat, 16 Jun 2007 18:00:23 +0000 Subject: mtn2cl: Show total bugs created vs. total bugs fixed over 7 days --- contrib/mtn2cl/mtn2cl.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index cba9d5cdb8..5b736ed9f7 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -29,5 +29,13 @@ wget 'http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=a cat logs/bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog +wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bugidtype=include&chfield=bug_status&chfieldfrom=7d&chfieldto=Now&chfieldvalue=RESOLVED&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type0-0-0=noop&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 + +NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`" +RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`" + +echo -e "\nIn total $NEW_BUGS bugs have been created and $RESOLVED_BUGS bugs were closed." >> ChangeLog + rm -Rf logs -- cgit v1.2.3 From 6bf558d5065297cb8e4c0b11b7aa39779e89253b Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 16 Jun 2007 18:00:25 +0000 Subject: efl, e: update for better packaging --- classes/e.bbclass | 3 ++- classes/efl.bbclass | 3 +-- 2 files changed, 3 insertions(+), 3 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}" - -- cgit v1.2.3 From c33f385e0a9a5506a3335527bc3280d20b5fce1c Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 18:14:03 +0000 Subject: wrt-imagetools: Fix do_fetch by taking svn snapshot until OE can handle SVN by itself. Fixes 1735. --- packages/wrt/wrt-imagetools-native.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 +} -- cgit v1.2.3 From bbb314fd664b8113b69b39d933e4c6f99d6baad4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 16 Jun 2007 18:38:52 +0000 Subject: contrib/mtn2cl: print a list of new bugs as well --- contrib/mtn2cl/mtn2cl.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index 5b736ed9f7..a6c042333f 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -23,18 +23,19 @@ for i in * ; do \ done cd .. -echo "Bug fixed:" >> ChangeLog +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=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/bugs.csv >& /dev/null - -cat logs/bugs.csv | awk -F, '{print $1 " " $7 "\t " $8}' | sed s:\"::g >> ChangeLog - -wget "http://bugs.openembedded.org/buglist.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bugidtype=include&chfield=bug_status&chfieldfrom=7d&chfieldto=Now&chfieldvalue=RESOLVED&email1=&email2=&emailassigned_to1=1&emailassigned_to2=1&emailcc2=1&emailqa_contact2=1&emailreporter2=1&emailtype1=substring&emailtype2=substring&field0-0-0=noop&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&type0-0-0=noop&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 NEW_BUGS="`cat logs/new-bugs.csv | wc -l | tr -d " "`" RESOLVED_BUGS="`cat logs/resolved-bugs.csv | wc -l | tr -d " "`" +echo -e "\n\nBugs fixed:" >> ChangeLog +cat logs/resolved-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 -Rf logs -- cgit v1.2.3 From bca3fadbbd1272719a5bb92b2effb3b7582997bd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 20:49:32 +0000 Subject: icewm: update to version 1.2.30 --- packages/icewm/icewm-1.2.26/.mtn2git_empty | 0 packages/icewm/icewm-1.2.26/configure.patch | 22 ---------------------- packages/icewm/icewm-1.2.26/makefile.patch | 26 -------------------------- packages/icewm/icewm-1.2.30/.mtn2git_empty | 0 packages/icewm/icewm-1.2.30/configure.patch | 22 ++++++++++++++++++++++ packages/icewm/icewm-1.2.30/makefile.patch | 26 ++++++++++++++++++++++++++ packages/icewm/icewm_1.2.26.bb | 25 ------------------------- packages/icewm/icewm_1.2.30.bb | 23 +++++++++++++++++++++++ 8 files changed, 71 insertions(+), 73 deletions(-) delete mode 100644 packages/icewm/icewm-1.2.26/.mtn2git_empty delete mode 100644 packages/icewm/icewm-1.2.26/configure.patch delete mode 100644 packages/icewm/icewm-1.2.26/makefile.patch create mode 100644 packages/icewm/icewm-1.2.30/.mtn2git_empty create mode 100644 packages/icewm/icewm-1.2.30/configure.patch create mode 100644 packages/icewm/icewm-1.2.30/makefile.patch delete mode 100644 packages/icewm/icewm_1.2.26.bb create mode 100644 packages/icewm/icewm_1.2.30.bb diff --git a/packages/icewm/icewm-1.2.26/.mtn2git_empty b/packages/icewm/icewm-1.2.26/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/icewm/icewm-1.2.26/configure.patch b/packages/icewm/icewm-1.2.26/configure.patch deleted file mode 100644 index ade427d5e0..0000000000 --- a/packages/icewm/icewm-1.2.26/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- icewm-1.2.26/configure.in.orig 2006-07-18 15:16:37.024817360 -0600 -+++ icewm-1.2.26/configure.in 2006-07-18 15:17:32.889324664 -0600 -@@ -426,14 +426,11 @@ - AC_MSG_ERROR("xfreetype or core fonts must be enabled") - fi - if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then -- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) -- if test "${XFT_CONFIG}" == ""; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config) -- if test "${PKG_CONFIG}" != ""; then -- ${PKG_CONFIG} xft 2>/dev/null -- if test $? -eq 0 ; then -- XFT_CONFIG='pkg-config xft' -- fi -+ AC_PATH_PROG(PKG_CONFIG, pkg-config) -+ if test "${PKG_CONFIG}" != ""; then -+ ${PKG_CONFIG} xft 2>/dev/null -+ if test $? -eq 0 ; then -+ XFT_CONFIG='pkg-config xft' - fi - fi - if test "${XFT_CONFIG}" != ""; then diff --git a/packages/icewm/icewm-1.2.26/makefile.patch b/packages/icewm/icewm-1.2.26/makefile.patch deleted file mode 100644 index 9473c9b2a9..0000000000 --- a/packages/icewm/icewm-1.2.26/makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100 -+++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100 -@@ -206,10 +206,21 @@ - %.o: %.cc - @echo " CXX " $@ - @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< -- --genpref $(BINARIES): -+ -+HOSTCXX=g++ -+HOSTLD=g++ -+ -+genpref.o: genpref.cc -+ @echo " HOSTCXX " $@ -+ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< -+ -+$(BINARIES): - @echo " LD " $@ - @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) -+ -+genpref: -+ @echo " HOSTLD " $@ -+ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) - - ################################################################################ - diff --git a/packages/icewm/icewm-1.2.30/.mtn2git_empty b/packages/icewm/icewm-1.2.30/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/icewm/icewm-1.2.30/configure.patch b/packages/icewm/icewm-1.2.30/configure.patch new file mode 100644 index 0000000000..ade427d5e0 --- /dev/null +++ b/packages/icewm/icewm-1.2.30/configure.patch @@ -0,0 +1,22 @@ +--- icewm-1.2.26/configure.in.orig 2006-07-18 15:16:37.024817360 -0600 ++++ icewm-1.2.26/configure.in 2006-07-18 15:17:32.889324664 -0600 +@@ -426,14 +426,11 @@ + AC_MSG_ERROR("xfreetype or core fonts must be enabled") + fi + if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then +- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) +- if test "${XFT_CONFIG}" == ""; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config) +- if test "${PKG_CONFIG}" != ""; then +- ${PKG_CONFIG} xft 2>/dev/null +- if test $? -eq 0 ; then +- XFT_CONFIG='pkg-config xft' +- fi ++ AC_PATH_PROG(PKG_CONFIG, pkg-config) ++ if test "${PKG_CONFIG}" != ""; then ++ ${PKG_CONFIG} xft 2>/dev/null ++ if test $? -eq 0 ; then ++ XFT_CONFIG='pkg-config xft' + fi + fi + if test "${XFT_CONFIG}" != ""; then diff --git a/packages/icewm/icewm-1.2.30/makefile.patch b/packages/icewm/icewm-1.2.30/makefile.patch new file mode 100644 index 0000000000..9473c9b2a9 --- /dev/null +++ b/packages/icewm/icewm-1.2.30/makefile.patch @@ -0,0 +1,26 @@ +--- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100 ++++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100 +@@ -206,10 +206,21 @@ + %.o: %.cc + @echo " CXX " $@ + @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< +- +-genpref $(BINARIES): ++ ++HOSTCXX=g++ ++HOSTLD=g++ ++ ++genpref.o: genpref.cc ++ @echo " HOSTCXX " $@ ++ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< ++ ++$(BINARIES): + @echo " LD " $@ + @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) ++ ++genpref: ++ @echo " HOSTLD " $@ ++ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) + + ################################################################################ + diff --git a/packages/icewm/icewm_1.2.26.bb b/packages/icewm/icewm_1.2.26.bb deleted file mode 100644 index 47d4fc8189..0000000000 --- a/packages/icewm/icewm_1.2.26.bb +++ /dev/null @@ -1,25 +0,0 @@ -SECTION = "x11/wm" -DESCRIPTION = "IceWM Window Manager" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" -PR = "r0" - -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 \ - --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \ - --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir" - -pkg_postinst() { -update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10 -} - -pkg_postrm() { -update-alternatives --remove x-window-manager /usr/bin/icewm-session -} diff --git a/packages/icewm/icewm_1.2.30.bb b/packages/icewm/icewm_1.2.30.bb new file mode 100644 index 0000000000..5266b0adb9 --- /dev/null +++ b/packages/icewm/icewm_1.2.30.bb @@ -0,0 +1,23 @@ +SECTION = "x11/wm" +DESCRIPTION = "IceWM Window Manager" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender libxinerama libxpm xrandr xft mkfontdir-native" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/icewm/icewm-${PV}.tar.gz \ + file://makefile.patch;patch=1 \ + file://configure.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus \ + --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} \ + --with-mkfontdir=${STAGING_DIR}/${BUILD_SYS}/bin/mkfontdir" + +pkg_postinst() { +update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/icewm-session 10 +} + +pkg_postrm() { +update-alternatives --remove x-window-manager /usr/bin/icewm-session +} -- cgit v1.2.3 From 92e5511f8e72ff3502c99d10e68d01c2d380add4 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 16 Jun 2007 20:52:34 +0000 Subject: pidgin: make ssl-* plugins depend on ssl plugin and close bug #2480. --- packages/gaim/pidgin.inc | 5 +++++ packages/gaim/pidgin_2.0.1.bb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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" -- cgit v1.2.3 From 6c067d922445e9138fbe365be3bdd95b10e57326 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 21:22:38 +0000 Subject: qt-x11-free: Put those debug files into their proper place --- packages/qt/qt-x11-free-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.3 From 1f25670869fdf0014ad575f58e36b2a7c58847a8 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 16 Jun 2007 22:03:02 +0000 Subject: intltool: cut the versioning in SRC_URI and close #2494 --- packages/intltool/intltool.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From c89ee09bb7c25dbc6b27bc2eba8422d2938a6b7c Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 16 Jun 2007 22:11:41 +0000 Subject: intltool: and while we're at it, here goes 0.35.5 with defpref of -1 --- packages/intltool/intltool-native_0.35.5.bb | 9 +++++++++ packages/intltool/intltool_0.35.5.bb | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/intltool/intltool-native_0.35.5.bb create mode 100644 packages/intltool/intltool_0.35.5.bb 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_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" -- cgit v1.2.3 From 0dcd6cb582a839a8ba43ef3c1741cae293833c63 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 16 Jun 2007 22:15:54 +0000 Subject: conf/checksums.ini: checksums for intltool-0.35.5 --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) 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 -- cgit v1.2.3 From ec629463a3f3731653e1eb723e7d5174a9ae1679 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 16 Jun 2007 23:05:11 +0000 Subject: konqueror-embedded 20070212: adjust dont-use-kde-config.patch to not use kde-config ;-) --- .../konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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}) -- cgit v1.2.3 From 5a5b87644856b24037b3d3969a3a52758d971e77 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 16 Jun 2007 23:58:49 +0000 Subject: classpath: unb0rk classpath-minimal-native. Partly fixes 2296. --- packages/classpath/classpath-minimal-native_0.93.bb | 3 ++- packages/classpath/classpath.inc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From de3073497ca3c12f3fddb8aab7e039b7bf4bf667 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 17 Jun 2007 00:19:54 +0000 Subject: jamvm: upgrade to version 1.4.5. Partly closes 2296. --- packages/jamvm/jamvm_1.4.2.bb | 24 ------------------------ packages/jamvm/jamvm_1.4.5.bb | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 packages/jamvm/jamvm_1.4.2.bb create mode 100644 packages/jamvm/jamvm_1.4.5.bb diff --git a/packages/jamvm/jamvm_1.4.2.bb b/packages/jamvm/jamvm_1.4.2.bb deleted file mode 100644 index 489b4fb94b..0000000000 --- a/packages/jamvm/jamvm_1.4.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." -HOMEPAGE = "http://jamvm.sourceforge.net/" -LICENSE = "GPL" -PRIORITY = "optional" -SECTION = "interpreters" - -DEPENDS = "zlib classpath" -RDEPENDS = "classpath (>= 0.18) classpath-common (>= 0.18)" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ - file://jamvm-1.3.1-size-defaults.patch;patch=1" - -# This uses 32 bit arm, so force the instruction set to arm, not thumb -ARM_INSTRUCTION_SET = "arm" - -inherit autotools update-alternatives - -EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" -CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" - -PROVIDES = "virtual/java" -ALTERNATIVE_NAME = "java" -ALTERNATIVE_PATH = "${bindir}/jamvm" -ALTERNATIVE_PRIORITY = "10" diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb new file mode 100644 index 0000000000..489b4fb94b --- /dev/null +++ b/packages/jamvm/jamvm_1.4.5.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +SECTION = "interpreters" + +DEPENDS = "zlib classpath" +RDEPENDS = "classpath (>= 0.18) classpath-common (>= 0.18)" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + file://jamvm-1.3.1-size-defaults.patch;patch=1" + +# This uses 32 bit arm, so force the instruction set to arm, not thumb +ARM_INSTRUCTION_SET = "arm" + +inherit autotools update-alternatives + +EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +PROVIDES = "virtual/java" +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/jamvm" +ALTERNATIVE_PRIORITY = "10" -- cgit v1.2.3