diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-07-15 23:44:16 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2007-07-15 23:44:16 +0000 |
| commit | b5da5388d3816b879cb70a53d70a74ae0285087e (patch) | |
| tree | a22830d7fa5a6267cceb2a40ed7da158a8cfc76e /packages | |
| parent | e99aaf7a96140262b6fb1fab34a946861f10825b (diff) | |
| parent | 7b91a4c2b93b761cb651be442b013ac92956e5ba (diff) | |
merge of '6c16fb38b0e12103704f2bd628944f23673cd55e'
and 'a90a8d2ce8fe66cb43f748e3b5dfef9416878951'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/micro-emacs/micro-emacs-20060909/.mtn2git_empty (renamed from packages/micro-emacs/micro-emacs-20040301/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/micro-emacs/micro-emacs-20060909/zaurus_make.patch (renamed from packages/micro-emacs/micro-emacs-20040301/zaurus_make.patch) | 4 | ||||
| -rw-r--r-- | packages/micro-emacs/micro-emacs_20060909.bb (renamed from packages/micro-emacs/micro-emacs_20040301.bb) | 6 | ||||
| -rw-r--r-- | packages/python/python-pyqt_3.13.bb | 5 | ||||
| -rw-r--r-- | packages/xorg-app/xterm_207.bb | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/packages/micro-emacs/micro-emacs-20040301/.mtn2git_empty b/packages/micro-emacs/micro-emacs-20060909/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/micro-emacs/micro-emacs-20040301/.mtn2git_empty +++ b/packages/micro-emacs/micro-emacs-20060909/.mtn2git_empty diff --git a/packages/micro-emacs/micro-emacs-20040301/zaurus_make.patch b/packages/micro-emacs/micro-emacs-20060909/zaurus_make.patch index f6994cceb7..eeb76964de 100644 --- a/packages/micro-emacs/micro-emacs-20040301/zaurus_make.patch +++ b/packages/micro-emacs/micro-emacs-20060909/zaurus_make.patch @@ -3,8 +3,8 @@ # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # ---- me040301/src/zaurus.gmk~zaurus_make 2004-03-27 10:02:09.000000000 -0700 -+++ me040301/src/zaurus.gmk 2004-03-29 17:23:12.000000000 -0700 +--- me060909/src/zaurus.gmk~zaurus_make 2004-03-27 10:02:09.000000000 -0700 ++++ me060909/src/zaurus.gmk 2004-03-29 17:23:12.000000000 -0700 @@ -67,7 +67,7 @@ # termcap test = $(shell echo "main() { printf(\"HW\n\"); }" > _t.c ; $(LD) $(LDFLAGS) -o /dev/null -ltermcap _t.c 2>&1 ; rm _t.c) diff --git a/packages/micro-emacs/micro-emacs_20040301.bb b/packages/micro-emacs/micro-emacs_20060909.bb index e8c494794b..f980b368b1 100644 --- a/packages/micro-emacs/micro-emacs_20040301.bb +++ b/packages/micro-emacs/micro-emacs_20060909.bb @@ -4,10 +4,10 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ncurses" -S = "${WORKDIR}/me040301" +S = "${WORKDIR}/me060909" -SRC_URI = "http://www.jasspa.com/release_040301/jasspa-mesrc-20040301.tar.gz \ - http://www.jasspa.com/release_040301/jasspa-memacros-20040301.tar.gz \ +SRC_URI = "http://www.jasspa.com/release_${PV}/jasspa-mesrc-${PV}-2.tar.gz \ + http://www.jasspa.com/release_${PV}/jasspa-memacros-${PV}.tar.gz \ file://${FILESDIR}/zaurus_make.patch;patch=1" do_compile () { diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index 00d8f32fe3..42c2d15467 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libqte2 virtual/libqpe1" RDEPENDS = "python-core python-sip" SRCNAME = "pyqt" -PR = "ml4" +PR = "r5" SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://qt2-fix.patch;patch=1 \ @@ -55,4 +55,5 @@ do_install() { done } -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/.debug" diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb index 5d02234b35..8c940bd2e8 100644 --- a/packages/xorg-app/xterm_207.bb +++ b/packages/xorg-app/xterm_207.bb @@ -11,7 +11,7 @@ inherit autotools pkgconfig FILES_${PN} += " /usr/lib/X11" #EXTRA_OERECONF = " -I${S}/xterm.m4" -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_DIR}/${BUILD_SYS}/bin/freetype-config" +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_DIR}/${BUILD_SYS}/bin/freetype-config --disable-imake" #do_configure_prepend () { # mv ${S}/aclocal.m4 ${S}/xterm.m4 |