diff options
Diffstat (limited to 'packages')
70 files changed, 449 insertions, 165 deletions
diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb index 4110f01930..416495a0b8 100644 --- a/packages/asterisk/asterisk_1.4.10.bb +++ b/packages/asterisk/asterisk_1.4.10.bb @@ -30,17 +30,17 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ - --with-z=${STAGING_DIR}/${TARGET_SYS}\ - --with-curl=${STAGING_DIR}/${TARGET_SYS}\ - --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ - --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ - --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ - --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ - --with-popt=${STAGING_DIR}/${TARGET_SYS}\ - --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + --with-z=${STAGING_EXECPREFIXDIR} \ + --with-curl=${STAGING_EXECPREFIXDIR} \ + --with-termcap=${STAGING_EXECPREFIXDIR} \ + --with-ogg=${STAGING_EXECPREFIXDIR} \ + --with-vorbis=${STAGING_EXECPREFIXDIR} \ + --with-sqlite=${STAGING_EXECPREFIXDIR} \ + --with-popt=${STAGING_EXECPREFIXDIR} \ + --with-gnutls=${STAGING_EXECPREFIXDIR} \ --without-curses\ - --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ + --with-ncurses=${STAGING_EXECPREFIXDIR} \ --without-imap\ --without-netsnmp\ --without-odbc\ diff --git a/packages/asterisk/asterisk_1.4.11.bb b/packages/asterisk/asterisk_1.4.11.bb index 0d4f30aef9..2f116864e4 100644 --- a/packages/asterisk/asterisk_1.4.11.bb +++ b/packages/asterisk/asterisk_1.4.11.bb @@ -32,17 +32,17 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ - --with-z=${STAGING_DIR}/${TARGET_SYS}\ - --with-curl=${STAGING_DIR}/${TARGET_SYS}\ - --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ - --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ - --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ - --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ - --with-popt=${STAGING_DIR}/${TARGET_SYS}\ - --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\ + --with-z=${STAGING_EXECPREFIXDIR}\ + --with-curl=${STAGING_EXECPREFIXDIR}\ + --with-termcap=${STAGING_EXECPREFIXDIR}\ + --with-ogg=${STAGING_EXECPREFIXDIR}\ + --with-vorbis=${STAGING_EXECPREFIXDIR}\ + --with-sqlite=${STAGING_EXECPREFIXDIR}\ + --with-popt=${STAGING_EXECPREFIXDIR}\ + --with-gnutls=${STAGING_EXECPREFIXDIR}\ --without-curses\ - --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ + --with-ncurses=${STAGING_EXECPREFIXDIR}\ --without-imap\ --without-netsnmp\ --without-odbc\ diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb index fb64581364..cecb403262 100644 --- a/packages/asterisk/asterisk_1.4.17.bb +++ b/packages/asterisk/asterisk_1.4.17.bb @@ -31,17 +31,17 @@ INITSCRIPT_PARAMS = "defaults 60" inherit autotools update-rc.d -EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\ - --with-z=${STAGING_DIR}/${TARGET_SYS}\ - --with-curl=${STAGING_DIR}/${TARGET_SYS}\ - --with-termcap=${STAGING_DIR}/${TARGET_SYS}\ - --with-ogg=${STAGING_DIR}/${TARGET_SYS}\ - --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\ - --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\ - --with-popt=${STAGING_DIR}/${TARGET_SYS}\ - --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\ +EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \ + --with-z=${STAGING_EXECPREFIXDIR} \ + --with-curl=${STAGING_EXECPREFIXDIR} \ + --with-termcap=${STAGING_EXECPREFIXDIR} \ + --with-ogg=${STAGING_EXECPREFIXDIR} \ + --with-vorbis=${STAGING_EXECPREFIXDIR} \ + --with-sqlite=${STAGING_EXECPREFIXDIR} \ + --with-popt=${STAGING_EXECPREFIXDIR} \ + --with-gnutls=${STAGING_EXECPREFIXDIR} \ --without-curses\ - --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\ + --with-ncurses=${STAGING_EXECPREFIXDIR} \ --without-imap\ --without-netsnmp\ --without-odbc\ diff --git a/packages/findutils/findutils_4.2.29.bb b/packages/findutils/findutils_4.2.29.bb index 2f40d03bd4..fcb074c185 100644 --- a/packages/findutils/findutils_4.2.29.bb +++ b/packages/findutils/findutils_4.2.29.bb @@ -1,5 +1,7 @@ require findutils.inc +EXTRA_OECONF += " ac_cv_path_SORT=/usr/bin/sort " + do_install_append () { mv ${D}${bindir}/find ${D}${bindir}/find.${PN} mv ${D}${bindir}/xargs ${D}${bindir}/xargs.${PN} diff --git a/packages/kdepimpi/files/gcc4.patch b/packages/kdepimpi/files/gcc4.patch index 70bd00c889..4f0f212ea6 100644 --- a/packages/kdepimpi/files/gcc4.patch +++ b/packages/kdepimpi/files/gcc4.patch @@ -1,3 +1,6 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + --- ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:30:53 1.1 +++ ./gammu/emb/gammu/depend/siemens/dsiemens.c 2006/04/14 23:31:08 @@ -351,7 +351,7 @@ diff --git a/packages/kdepimpi/files/gcc42.patch b/packages/kdepimpi/files/gcc42.patch index 30e425aeda..e6328eb1ee 100644 --- a/packages/kdepimpi/files/gcc42.patch +++ b/packages/kdepimpi/files/gcc42.patch @@ -1,4 +1,8 @@ -diff --git a/kabc/secrecy.h b/kabc/secrecy.h +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +diff --git +a/kabc/secrecy.h b/kabc/secrecy.h index 21e22f2..3011ae9 100644 --- a/kabc/secrecy.h +++ b/kabc/secrecy.h diff --git a/packages/kdepimpi/files/qt-mt.patch b/packages/kdepimpi/files/qt-mt.patch index c7e3f9d88a..f0a5721bd1 100644 --- a/packages/kdepimpi/files/qt-mt.patch +++ b/packages/kdepimpi/files/qt-mt.patch @@ -1,4 +1,8 @@ -diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +diff --git +a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp index cccd485..65d82e2 100644 --- a/microkde/kresources/resource.cpp +++ b/microkde/kresources/resource.cpp diff --git a/packages/kdepimpi/kdepimpi-qte.inc b/packages/kdepimpi/kdepimpi-qte.inc new file mode 100644 index 0000000000..3fa8781658 --- /dev/null +++ b/packages/kdepimpi/kdepimpi-qte.inc @@ -0,0 +1,163 @@ +DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA" +DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool" +DESCRIPTION_kopi-applet = "KDE Pim/PI applet" +DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook" +DESCRIPTION_libmicrokdelibs = "KDE Pim/PI library - microkde" +DESCRIPTION_libmicrokcal = "KDE Pim/PI library - microkcal" +DESCRIPTION_libmicrokabc = "KDE Pim/PI library - microkabc" +DESCRIPTION_libmicrokammu = "KDE Pim/PI fork of libGammu" +DESCRIPTION_kammu = "KDE Pim/PI fork of gammu" + +SECTION = "opie/pim" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/" +MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" + +# we can't build: +# kabc/plugins/sharpdtm - wants libsl (Sharp ROM 3.x closed source library) +# kabc/plugins/ldap - wants ldap libs (?) +# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE) +# kmicromail - conflict with OE libetpan, libmailwrapper/OPIE + +PARALLEL_MAKE = "" + +S = "${WORKDIR}/kdepim" + +EXTRA_QMAKEVARS_POST += " \ +INCLUDEPATH+=../ \ +OBJECTS_DIR=obj/ MOC_DIR=moc/ \ +DESTDIR=${S}/dest \ +LIBS+=-L${S}/dest/ \ +LIBS-=-lzlib \ +LIBS+=-lz \ +" +# That changes will be needed for KMicroMail/PI to get it build with OE libs +# +# LIBS-=-lkmicromailwrapper LIBS+=-lmailwrapper LIBS+=-lopiecore2 \ + +QMAKE_PROFILES= "all.pro" + +SUBDIRS="qtcompat libical/src/libical libical/src/libicalss microkde libkcal libkdepim \ + kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \ + kabc/formats/binary kabc/plugins/qtopia \ + gammu/emb/common \ + gammu/emb/gammu \ +# pwmanager/libcrypt/mpi \ +# pwmanager/libcrypt/error \ +# pwmanager/libcrypt/cipher \ +# pwmanager/libcrypt/zlib \ +# pwmanager/pwmanager \ + " + +inherit palmtop + +do_configure_prepend() { + mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro + for d in ${SUBDIRS} + do + if [ -f ${d}/`basename ${d}`E.pro ]; + then + mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro + fi + done +} + +do_compile() { + export KDEPIMDIR=${S} + oe_runmake +} + +HEADERS_DIRS = "qtcompat \ +microkde \ +microkde/kdecore \ +microkde/kdeui \ +microkde/kio \ +microkde/kresources \ +microkde/kutils \ +microkde/opie2 \ +kabc \ +libkcal \ +libkdepim " + +do_unstage() { + + for dir in ${HEADERS_DIRS}; + do + rm -rf ${STAGING_INCDIR}/kdepimpi/$dir + done + + for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat + do + rm -f ${STAGING_LIBDIR}/kdepimpi/$f* + done +} + +addtask unstage before do_configure + +do_stage() { + + for dir in ${HEADERS_DIRS}; + do + install -d ${STAGING_INCDIR}/kdepimpi/$dir + install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/ + done + + for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat + do + oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/ + done +} + +do_install() { + install -d ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/lib \ + ${D}${palmtopdir}/apps/1Pim \ + ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \ + ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \ + ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \ + ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \ + ${D}${palmtopdir}/plugins/applets + + install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}${palmtopdir}/pics/kdepim/korganizer + install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 + install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini + install -m 0644 korganizer/korganizer.desktop ${D}${palmtopdir}/apps/1Pim/korganizer.desktop + + install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}${palmtopdir}/pics/kdepim/kaddressbook + install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 + install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 + install -m 0644 kaddressbook/kaddressbook.desktop ${D}${palmtopdir}/apps/1Pim/kaddressbook.desktop + + for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia + do + oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib + done + + install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi + install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi + + install -d ${D}${bindir} ${D}${libdir} + install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu + oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir} + + for f in libkopialarmapplet + do + oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets + done +} + + +PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu" + +FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " +FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" +FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png" +FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*" +FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*" +FILES_libmicrokdelibs = "${palmtopdir}/lib/*" +FILES_kammu = "${bindir}/kammu" +FILES_libmicrokammu = "${libdir}/libmicrokammu*" diff --git a/packages/kdepimpi/kdepimpi-x11.inc b/packages/kdepimpi/kdepimpi-x11.inc new file mode 100644 index 0000000000..80c246ad7c --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11.inc @@ -0,0 +1,70 @@ +DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA - X11 version" +DESCRIPTION_kopi-x11 = "Korganizer/PI is a powerful calendar and ToDo Tool - X11 version" +DESCRIPTION_kopi-applet-x11 = "KDE Pim/PI applet - X11 version" +DESCRIPTION_kapi-x11 = "KAddressbook/PI is a port of KDE addressbook - X11 version" +DESCRIPTION_libmicrokdelibs-x11 = "KDE Pim/PI library - microkde - X11 version" +DESCRIPTION_libmicrokcal-x11 = "KDE Pim/PI library - microkcal - X11 version" +DESCRIPTION_libmicrokabc-x11 = "KDE Pim/PI library - microkabc - X11 version" +DESCRIPTION_libmicrokammu-x11 = "KDE Pim/PI fork of libGammu - X11 version" +DESCRIPTION_kammu-x11 = "KDE Pim/PI fork of gammu - X11 version" + +SECTION = "x11/pim" + +inherit qmake qt3x11 + +QMAKE_PROFILES= "kdepim-desktop.pro" + +do_install() { + oe_runmake install +} + +do_install-broken() { + install -d ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/lib \ + ${D}${palmtopdir}/apps/1Pim \ + ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \ + ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \ + ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \ + ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \ + ${D}${palmtopdir}/plugins/applets + + install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/ + install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}${palmtopdir}/pics/kdepim/korganizer + install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 + install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini + install -m 0644 korganizer/korganizer.desktop ${D}${palmtopdir}/apps/1Pim/korganizer.desktop + + install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}${palmtopdir}/pics/kdepim/kaddressbook + install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 + install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 + install -m 0644 kaddressbook/kaddressbook.desktop ${D}${palmtopdir}/apps/1Pim/kaddressbook.desktop + + for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia + do + oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib + done + + install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi + install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi + + install -d ${D}${bindir} ${D}${libdir} + install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu + oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir} + + for f in libkopialarmapplet + do + oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets + done +} + +PACKAGES = "libmicrokcal-x11 libmicrokabc-x11 kopi-applet-x11 kopi-x11 kapi-x11 libmicrokdelibs-x11 kammu-x11 libmicrokammu-x11" + +FILES_kopi-x11 = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " +FILES_kapi-x11 = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" +FILES_kopi-applet-x11 = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png" +FILES_libmicrokabc-x11 = "${palmtopdir}/lib/libmicrokabc*" +FILES_libmicrokcal-x11 = "${palmtopdir}/lib/libmicrokcal*" +FILES_libmicrokdelibs-x11 = "${palmtopdir}/lib/*" +FILES_kammu-x11 = "${bindir}/kammu" +FILES_libmicrokammu-x11 = "${libdir}/libmicrokammu*" diff --git a/packages/compositeext/.mtn2git_empty b/packages/kdepimpi/kdepimpi-x11/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/compositeext/.mtn2git_empty +++ b/packages/kdepimpi/kdepimpi-x11/.mtn2git_empty diff --git a/packages/kdepimpi/kdepimpi-x11/kabc.patch b/packages/kdepimpi/kdepimpi-x11/kabc.patch new file mode 100644 index 0000000000..1f57b855c3 --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11/kabc.patch @@ -0,0 +1,24 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- kdepim/kaddressbook/kaddressbook.pro~kabc ++++ kdepim/kaddressbook/kaddressbook.pro +@@ -31,10 +31,10 @@ + LIBS += ../libical/lib/libicalss.a + + } else { +-LIBS += ../bin/libmicrokdepim.so +-LIBS += ../bin/libmicrokde.so +-LIBS += ../bin/libmicrokabc.so +-LIBS += ../bin/libmicrokcal.so ++LIBS += $(DESTDIR)/libmicrokdepim.so ++LIBS += $(DESTDIR)/libmicrokde.so ++LIBS += $(DESTDIR)/libmicrokabc.so ++LIBS += $(DESTDIR)/libmicrokcal.so + #LIBS += -lldap + } + OBJECTS_DIR = obj/unix diff --git a/packages/kdepimpi/kdepimpi-x11/kammu.patch b/packages/kdepimpi/kdepimpi-x11/kammu.patch new file mode 100644 index 0000000000..b7ccf7c731 --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11/kammu.patch @@ -0,0 +1,18 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- kdepim/gammu/emb/gammu/gammu.pro~kammu ++++ kdepim/gammu/emb/gammu/gammu.pro +@@ -47,7 +47,7 @@ + depend/nokia/dct3trac/wmx-util.c \ + depend/nokia/dct3trac/wmx.c + unix : { +-LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so ++LIBS += $(DESTDIR)/libmicrogammu.so + # bluetooth disabled for now + #/usr/lib/libbluetooth.so /usr/lib/libsdp.so + OBJECTS_DIR = obj/unix diff --git a/packages/kdepimpi/kdepimpi-x11/korganizer.patch b/packages/kdepimpi/kdepimpi-x11/korganizer.patch new file mode 100644 index 0000000000..3537b5ca10 --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11/korganizer.patch @@ -0,0 +1,24 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- kdepim/korganizer/korganizer.pro~korganizer ++++ kdepim/korganizer/korganizer.pro +@@ -34,10 +34,10 @@ + LIBS += ../libical/lib/libical.a + LIBS += ../libical/lib/libicalss.a + } else { +-LIBS += ../bin/libmicrokdepim.so +-LIBS += ../bin/libmicrokcal.so +-LIBS += ../bin/libmicrokde.so +-LIBS += ../bin/libmicrokabc.so ++LIBS += $(DESTDIR)/libmicrokdepim.so ++LIBS += $(DESTDIR)/libmicrokcal.so ++LIBS += $(DESTDIR)/libmicrokde.so ++LIBS += $(DESTDIR)/libmicrokabc.so + #LIBS += -lbluetooth + #LIBS += -lsdp + diff --git a/packages/kdepimpi/kdepimpi-x11/libkcal.patch b/packages/kdepimpi/kdepimpi-x11/libkcal.patch new file mode 100644 index 0000000000..e226c8c02b --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11/libkcal.patch @@ -0,0 +1,16 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +--- kdepim/libkcal/libkcal.pro~paths 2005-01-30 00:23:34.000000000 +0100 ++++ kdepim/libkcal/libkcal.pro 2005-10-03 11:09:49.000000000 +0200 +@@ -11,8 +11,8 @@ + DESTDIR = ../bin + DEFINES += DESKTOP_VERSION + unix: { +-LIBS += ../libical/lib/libical.a +-LIBS += ../libical/lib/libicalss.a ++LIBS += ../dest$(LIBICAL_PATH)/libical.a ++LIBS += ../dest$(LIBICAL_PATH)/libicalss.a + OBJECTS_DIR = obj/unix + MOC_DIR = moc/unix + } diff --git a/packages/kdepimpi/kdepimpi-x11/nomail.patch b/packages/kdepimpi/kdepimpi-x11/nomail.patch new file mode 100644 index 0000000000..b37ed7badf --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11/nomail.patch @@ -0,0 +1,18 @@ +upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1898924&group_id=104103&atid=636951 +status: upstream is pretty dead + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- kdepim/kdepim-desktop.pro~nomail ++++ kdepim/kdepim-desktop.pro +@@ -15,7 +15,7 @@ + } + unix:{ + !staticlib: { +-SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager ++SUBDIRS += pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager + } + } + diff --git a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb new file mode 100644 index 0000000000..6c48baf266 --- /dev/null +++ b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb @@ -0,0 +1,10 @@ +SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ +file://libkcal.patch;patch=1 \ +file://kabc.patch;patch=1 \ +file://kammu.patch;patch=1 \ +file://korganizer.patch;patch=1 \ +file://nomail.patch;patch=1 \ +" + +include kdepimpi-base.inc +include kdepimpi-x11.inc diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kdepimpi/kphonepi_1.0.0.bb index 1f8a5d8196..1f8a5d8196 100644 --- a/packages/kphonepi/kphonepi_1.0.0.bb +++ b/packages/kdepimpi/kphonepi_1.0.0.bb diff --git a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb b/packages/kdepimpi/ktimetrackerpi_0.9.7.bb index d022dc55cc..d022dc55cc 100644 --- a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb +++ b/packages/kdepimpi/ktimetrackerpi_0.9.7.bb diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index d0f58303fa..a51dc83896 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -26,10 +26,10 @@ S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ +EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \ + --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \ --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ + --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \ --disable-altivec --disable-vis --disable-mlib \ --enable-shared --disable-static \ --disable-fb --disable-alsa --disable-vcd \ diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index db0d725aac..806f8fd4b7 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -27,10 +27,10 @@ S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ +EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \ + --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \ --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ + --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \ --disable-altivec --disable-vis --disable-mlib \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 7732eb813e..9219e5fdcd 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -31,10 +31,10 @@ S = "${WORKDIR}/xine-lib-${PV}" SOV = "1.0.7" -EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \ - --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \ +EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \ + --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \ --disable-oggtest \ - --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \ + --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \ --disable-altivec --disable-vis --disable-mlib \ --disable-fb --disable-alsa --disable-vcd \ --disable-asf --disable-faad --disable-iconv \ diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc index bd0322334d..f5e020dc68 100644 --- a/packages/mozilla/firefox.inc +++ b/packages/mozilla/firefox.inc @@ -1,4 +1,5 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop" + PACKAGES =+ "firefox-inspector" FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \ @@ -27,3 +28,11 @@ pkg_postinst_firefox() { # work around requirement for root access on first startup chmod -R a+w ${libdir}/firefox* } + +do_stage() { + autotools_stage_all + + + +} + diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb index dd4d734f89..b82dbda91e 100644 --- a/packages/mozilla/firefox_1.0.7.bb +++ b/packages/mozilla/firefox_1.0.7.bb @@ -1,4 +1,5 @@ -PR = "r0" +PR = "r2" + SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ file://xptcstubs.patch;patch=1 \ file://no-xmb.patch;patch=1 \ @@ -8,11 +9,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \ file://xptcinvoke-arm.patch;patch=1 \ file://mozilla-eabi.patch;patch=1" - S = "${WORKDIR}/mozilla" -inherit mozilla - +inherit autotools mozilla + require firefox.inc EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../" @@ -20,4 +20,3 @@ EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../" do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ } - diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb index e1fb5a996d..72c42bc074 100644 --- a/packages/mozilla/firefox_2.0.0.3.bb +++ b/packages/mozilla/firefox_2.0.0.3.bb @@ -6,38 +6,36 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://no-xmb.patch;patch=1 \ file://jsautocfg.h \ file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://eabi-fix.patch;patch=1 \ - file://eabi-fix2.patch;patch=1 \ - file://eabi-fix3.patch;patch=1 \ - file://linkage-problem.patch;patch=1 \ - " + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://eabi-fix.patch;patch=1 \ + file://eabi-fix2.patch;patch=1 \ + file://eabi-fix3.patch;patch=1 \ + file://linkage-problem.patch;patch=1 \ +" S = "${WORKDIR}/mozilla" DEFAULT_PREFERENCE = "-1" inherit mozilla - require firefox.inc do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk } do_stage() { - - install -d ${STAGING_INCDIR}/${P} + install -d ${STAGING_INCDIR}/firefox-${PV} cd dist/sdk/include + rm -rf obsolete headers=`find . -name "*.h"` for f in $headers do - install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f + install -D -m 0644 $f ${STAGING_INCDIR}/firefox-${PV}/ done # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h + sed -e '178,179d' ${STAGING_INCDIR}/firefox-${PV}/nsIServiceManager.h } diff --git a/packages/damageext/.mtn2git_empty b/packages/obsolete/compositeext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/damageext/.mtn2git_empty +++ b/packages/obsolete/compositeext/.mtn2git_empty diff --git a/packages/compositeext/compositeext_2.0.bb b/packages/obsolete/compositeext/compositeext_2.0.bb index b9b634d391..b9b634d391 100644 --- a/packages/compositeext/compositeext_2.0.bb +++ b/packages/obsolete/compositeext/compositeext_2.0.bb diff --git a/packages/compositeext/compositeext_cvs.bb b/packages/obsolete/compositeext/compositeext_cvs.bb index 8f0f4f9f46..8f0f4f9f46 100644 --- a/packages/compositeext/compositeext_cvs.bb +++ b/packages/obsolete/compositeext/compositeext_cvs.bb diff --git a/packages/damageext/damageext-1.0/.mtn2git_empty b/packages/obsolete/damageext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/damageext/damageext-1.0/.mtn2git_empty +++ b/packages/obsolete/damageext/.mtn2git_empty diff --git a/packages/damageext/files/.mtn2git_empty b/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/damageext/files/.mtn2git_empty +++ b/packages/obsolete/damageext/damageext-1.0/.mtn2git_empty diff --git a/packages/damageext/damageext-1.0/autofoo.patch b/packages/obsolete/damageext/damageext-1.0/autofoo.patch index e36fb1d74b..e36fb1d74b 100644 --- a/packages/damageext/damageext-1.0/autofoo.patch +++ b/packages/obsolete/damageext/damageext-1.0/autofoo.patch diff --git a/packages/damageext/damageext_1.0.bb b/packages/obsolete/damageext/damageext_1.0.bb index 3b431a8688..3b431a8688 100644 --- a/packages/damageext/damageext_1.0.bb +++ b/packages/obsolete/damageext/damageext_1.0.bb diff --git a/packages/damageext/damageext_cvs.bb b/packages/obsolete/damageext/damageext_cvs.bb index e9ffa7d2b1..e9ffa7d2b1 100644 --- a/packages/damageext/damageext_cvs.bb +++ b/packages/obsolete/damageext/damageext_cvs.bb diff --git a/packages/fixesext/.mtn2git_empty b/packages/obsolete/damageext/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/fixesext/.mtn2git_empty +++ b/packages/obsolete/damageext/files/.mtn2git_empty diff --git a/packages/damageext/files/autofoo.patch b/packages/obsolete/damageext/files/autofoo.patch index 48c05cd836..48c05cd836 100644 --- a/packages/damageext/files/autofoo.patch +++ b/packages/obsolete/damageext/files/autofoo.patch diff --git a/packages/kphonepi/.mtn2git_empty b/packages/obsolete/fixesext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/kphonepi/.mtn2git_empty +++ b/packages/obsolete/fixesext/.mtn2git_empty diff --git a/packages/fixesext/fixesext_2.0.1.bb b/packages/obsolete/fixesext/fixesext_2.0.1.bb index feb53d60eb..feb53d60eb 100644 --- a/packages/fixesext/fixesext_2.0.1.bb +++ b/packages/obsolete/fixesext/fixesext_2.0.1.bb diff --git a/packages/fixesext/fixesext_cvs.bb b/packages/obsolete/fixesext/fixesext_cvs.bb index 4ddbc96c64..4ddbc96c64 100644 --- a/packages/fixesext/fixesext_cvs.bb +++ b/packages/obsolete/fixesext/fixesext_cvs.bb diff --git a/packages/ktimetrackerpi/.mtn2git_empty b/packages/obsolete/panoramixext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ktimetrackerpi/.mtn2git_empty +++ b/packages/obsolete/panoramixext/.mtn2git_empty diff --git a/packages/panoramixext/panoramixext_1.1.bb b/packages/obsolete/panoramixext/panoramixext_1.1.bb index 2da504779f..2da504779f 100644 --- a/packages/panoramixext/panoramixext_1.1.bb +++ b/packages/obsolete/panoramixext/panoramixext_1.1.bb diff --git a/packages/panoramixext/panoramixext_cvs.bb b/packages/obsolete/panoramixext/panoramixext_cvs.bb index 08cc0cc51e..08cc0cc51e 100644 --- a/packages/panoramixext/panoramixext_cvs.bb +++ b/packages/obsolete/panoramixext/panoramixext_cvs.bb diff --git a/packages/panoramixext/.mtn2git_empty b/packages/obsolete/resourceext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/panoramixext/.mtn2git_empty +++ b/packages/obsolete/resourceext/.mtn2git_empty diff --git a/packages/resourceext/resourceext_1.0.bb b/packages/obsolete/resourceext/resourceext_1.0.bb index 55780b1d22..55780b1d22 100644 --- a/packages/resourceext/resourceext_1.0.bb +++ b/packages/obsolete/resourceext/resourceext_1.0.bb diff --git a/packages/resourceext/resourceext_cvs.bb b/packages/obsolete/resourceext/resourceext_cvs.bb index b0fe23392e..b0fe23392e 100644 --- a/packages/resourceext/resourceext_cvs.bb +++ b/packages/obsolete/resourceext/resourceext_cvs.bb diff --git a/packages/randrext/.mtn2git_empty b/packages/obsolete/xxf86dgaext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/randrext/.mtn2git_empty +++ b/packages/obsolete/xxf86dgaext/.mtn2git_empty diff --git a/packages/xxf86dgaext/xxf86dgaext_cvs.bb b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb index 30788049c7..30788049c7 100644 --- a/packages/xxf86dgaext/xxf86dgaext_cvs.bb +++ b/packages/obsolete/xxf86dgaext/xxf86dgaext_cvs.bb diff --git a/packages/recordext/.mtn2git_empty b/packages/obsolete/xxf86vmext/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/recordext/.mtn2git_empty +++ b/packages/obsolete/xxf86vmext/.mtn2git_empty diff --git a/packages/xxf86vmext/xxf86vmext_cvs.bb b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb index 06145e2905..06145e2905 100644 --- a/packages/xxf86vmext/xxf86vmext_cvs.bb +++ b/packages/obsolete/xxf86vmext/xxf86vmext_cvs.bb diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index 7b60122445..22309f9203 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -20,12 +20,12 @@ inherit autotools pkgconfig EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --with-libgps=${STAGING_DIR}/${HOST_SYS} \ - --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-libgps=${STAGING_EXECPREFIXDIR} \ + --with-libpcap=${STAGING_EXECPREFIXDIR} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ --without-athena --enable-dbus \ - --with-libiw=${STAGING_DIR}/${HOST_SYS}" + --with-libiw=${STAGING_EXECPREFIXDIR}" CFLAGS =+ "-I${S}/include" LDFLAGS += "-lz" diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index 29a112d95a..5bddcf31b6 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -17,7 +17,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ - --with-libpcap=${STAGING_DIR}/${HOST_SYS} \ + --with-libpcap=${STAGING_EXECPREFIXDIR} \ --with-sqlite-includes=${STAGING_INCDIR} \ --with-sqlite-libs=${STAGING_LIBDIR} \ --without-athena \ diff --git a/packages/randrext/randrext_1.0.bb b/packages/randrext/randrext_1.0.bb deleted file mode 100644 index 3fe6a442ac..0000000000 --- a/packages/randrext/randrext_1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -LICENSE= "BSD-X" -DESCRIPTION = "X Resize and Rotate extension headers" - -SRC_URI = "${XLIBS_MIRROR}/randrext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/randrext/randrext_cvs.bb b/packages/randrext/randrext_cvs.bb deleted file mode 100644 index 29cff38373..0000000000 --- a/packages/randrext/randrext_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE= "BSD-X" -SECTION = "libs" -DESCRIPTION = "X Resize and Rotate extension headers" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Randr" -S = "${WORKDIR}/Randr" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/rdesktop/rdesktop_1.3.1.bb b/packages/rdesktop/rdesktop_1.3.1.bb index 12ff1c5bcd..f54c675314 100644 --- a/packages/rdesktop/rdesktop_1.3.1.bb +++ b/packages/rdesktop/rdesktop_1.3.1.bb @@ -22,8 +22,8 @@ do_configure() { --bindir=${bindir} \ --mandir=${mandir} \ --sharedir=${datadir} \ - --with-x=${STAGING_DIR}/${HOST_SYS} \ - --with-openssl=${STAGING_DIR}/${HOST_SYS} \ + --with-x=${STAGING_EXECPREFIXDIR} \ + --with-openssl=${STAGING_EXECPREFIXDIR} \ --with-oss \ --without-debug } diff --git a/packages/rdesktop/rdesktop_1.4.1.bb b/packages/rdesktop/rdesktop_1.4.1.bb index 7581647a57..da1794b190 100644 --- a/packages/rdesktop/rdesktop_1.4.1.bb +++ b/packages/rdesktop/rdesktop_1.4.1.bb @@ -11,4 +11,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/rdesktop/rdesktop_1.5.0.bb b/packages/rdesktop/rdesktop_1.5.0.bb index de270e1025..12385c127f 100644 --- a/packages/rdesktop/rdesktop_1.5.0.bb +++ b/packages/rdesktop/rdesktop_1.5.0.bb @@ -10,4 +10,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" inherit autotools -EXTRA_OECONF = "--with-openssl=${STAGING_LIBDIR}/.. " +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/recordext/recordext_cvs.bb b/packages/recordext/recordext_cvs.bb deleted file mode 100644 index eeaae24762..0000000000 --- a/packages/recordext/recordext_cvs.bb +++ /dev/null @@ -1,17 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "BSD-X" -SECTION = "libs" -DESCRIPTION = "XRecord extension protocol bits" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=RecordExt" -S = "${WORKDIR}/RecordExt" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/renderext/.mtn2git_empty b/packages/renderext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/renderext/.mtn2git_empty +++ /dev/null diff --git a/packages/renderext/renderext_0.8.bb b/packages/renderext/renderext_0.8.bb deleted file mode 100644 index a12f7c0da5..0000000000 --- a/packages/renderext/renderext_0.8.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "libs" -LICENSE = "MIT-X" -DESCRIPTION = "X Render extension headers" - -SRC_URI = "${XLIBS_MIRROR}/renderext-${PV}.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/renderext/renderext_cvs.bb b/packages/renderext/renderext_cvs.bb deleted file mode 100644 index 08053d95b9..0000000000 --- a/packages/renderext/renderext_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -PV = "0.0+cvs${SRCDATE}" -LICENSE = "MIT-X" -SECTION = "libs" -DESCRIPTION = "X Render extension headers" -DEFAULT_PREFERENCE = "1" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Render" -S = "${WORKDIR}/Render" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/resourceext/.mtn2git_empty b/packages/resourceext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/resourceext/.mtn2git_empty +++ /dev/null diff --git a/packages/subversion/subversion_1.3.1.bb b/packages/subversion/subversion_1.3.1.bb index 1e40cd7a55..79e5e67d7b 100644 --- a/packages/subversion/subversion_1.3.1.bb +++ b/packages/subversion/subversion_1.3.1.bb @@ -9,7 +9,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://apr-regex.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb index 59f42b8c66..305b13c6a4 100644 --- a/packages/subversion/subversion_1.4.0.bb +++ b/packages/subversion/subversion_1.4.0.bb @@ -10,7 +10,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/subversion/subversion_1.4.3.bb b/packages/subversion/subversion_1.4.3.bb index 9674329f6c..4871674cc8 100644 --- a/packages/subversion/subversion_1.4.3.bb +++ b/packages/subversion/subversion_1.4.3.bb @@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/subversion/subversion_1.4.5.bb b/packages/subversion/subversion_1.4.5.bb index 1daf45bd0c..5c15d67daf 100644 --- a/packages/subversion/subversion_1.4.5.bb +++ b/packages/subversion/subversion_1.4.5.bb @@ -11,7 +11,7 @@ SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1 \ file://neon-detection.patch;patch=1" -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-berkeley-db --without-apxs --without-apache \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb index 963bc30fc8..4bf3efd786 100644 --- a/packages/tcltk/tcl_8.4.11.bb +++ b/packages/tcltk/tcl_8.4.11.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language" LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch;patch=1 \ @@ -27,6 +27,7 @@ do_stage() { oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR} oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR} sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh + sed -i "s,-L${libdir},," tclConfig.sh install -d ${STAGING_BINDIR_CROSS}/ install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS} cd .. diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index 3ec97f2a77..ca21f54f8a 100644 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -14,8 +14,11 @@ UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4" DEFAULT_PREFERENCE = "-1" +BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6" + SRC_URI = "\ - git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=3afac79ec27b91df185f090b31dad9620779f440 \ + +git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ diff --git a/packages/uclibc/elf2flt_svn.bb b/packages/uclibc/elf2flt_svn.bb index 0fac49d468..3af893a7a8 100644 --- a/packages/uclibc/elf2flt_svn.bb +++ b/packages/uclibc/elf2flt_svn.bb @@ -9,7 +9,7 @@ SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=${PN}" S = "${WORKDIR}/${PN}" -EXTRA_OECONF = " --with-libbfd=${STAGING_DIR}/${TARGET_SYS}/lib/libbfd.a \ - --with-libiberty=${STAGING_DIR}/${TARGET_SYS}/lib/libiberty.a \ - --with-bfd-include-dir=${STAGING_DIR}/${TARGET_SYS}/include \ +EXTRA_OECONF = " --with-libbfd=${STAGING_LIBDIR}/libbfd.a \ + --with-libiberty=${STAGING_LIBDIR}/libiberty.a \ + --with-bfd-include-dir=${STAGING_INCDIR} \ " diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb index c525f6299c..4d5ea6a12b 100644 --- a/packages/xmms-embedded/xmms-embedded_20040327.bb +++ b/packages/xmms-embedded/xmms-embedded_20040327.bb @@ -31,7 +31,7 @@ do_configure_prepend() { } do_compile() { - oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}" + oe_runmake "STAGING_DIR=${STAGING_EXECPREFIXDIR}" } do_install() { diff --git a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb index 40082ec816..24ff14e01a 100644 --- a/packages/xorg-app/mkbold-mkitalic-native_0.11.bb +++ b/packages/xorg-app/mkbold-mkitalic-native_0.11.bb @@ -12,10 +12,10 @@ S = "${WORKDIR}/mkbold-mkitalic-${PV}" inherit native do_stage() { - install -d ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin - install -m 755 mkbold ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ - install -m 755 mkitalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ - install -m 755 mkbolditalic ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ - install -m 755 ${WORKDIR}/makebifonts ${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}/bin/ + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 mkbold ${STAGING_BINDIR_NATIVE}/ + install -m 755 mkitalic ${STAGING_BINDIR_NATIVE}/ + install -m 755 mkbolditalic ${STAGING_BINDIR_NATIVE}/ + install -m 755 ${WORKDIR}/makebifonts ${STAGING_BINDIR_NATIVE}/ } diff --git a/packages/xxf86dgaext/.mtn2git_empty b/packages/xxf86dgaext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xxf86dgaext/.mtn2git_empty +++ /dev/null diff --git a/packages/xxf86vmext/.mtn2git_empty b/packages/xxf86vmext/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/xxf86vmext/.mtn2git_empty +++ /dev/null |