diff options
| -rw-r--r-- | classes/qt4x11.bbclass | 1 | ||||
| -rw-r--r-- | packages/libqanava/libqanava_0.0.7.bb (renamed from packages/libqanava/libqanava_0.0.3.bb) | 12 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 1 | ||||
| -rw-r--r-- | packages/plone/plone_2.0.0.bb | 15 | ||||
| -rw-r--r-- | packages/plone/plone_2.1.2.bb (renamed from packages/plone/plone_1.0.5.bb) | 6 | ||||
| -rw-r--r-- | packages/qt/qt4-x11-free_4.1.1.bb | 2 | ||||
| -rw-r--r-- | packages/zope/zope_2.9.2.bb | 26 |
7 files changed, 37 insertions, 26 deletions
diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index f0844d81e1..afa840f5db 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -6,6 +6,7 @@ export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" +export OE_QMAKE_LINK="${CXX}" export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" export OE_QMAKE_INCDIR_QT="${QTDIR}/include" export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" diff --git a/packages/libqanava/libqanava_0.0.3.bb b/packages/libqanava/libqanava_0.0.7.bb index 85be9558c7..8562a5f112 100644 --- a/packages/libqanava/libqanava_0.0.3.bb +++ b/packages/libqanava/libqanava_0.0.7.bb @@ -1,20 +1,20 @@ -DESCRIPTION = "Qanava is a library built on top of the standard QT QCanvas \ -to enable graphical display of graphs and other relational structures." +DESCRIPTION = "Qanava is a gtaph library based on the Qt4 Arthur framework." SECTION = "x11/libs" HOMEPAGE = "http://www.libqanava.org/" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "qt3x11" +DEPENDS = "qt4x11" +# LGPL after 0.0.7 LICENSE = "GPL" -PR = "r1" +PR = "r0" SRC_URI = "http://www.libqanava.org/dl/qanava-${PV}.tar.gz" S = "${WORKDIR}/qanava-${PV}" -inherit qmake qt3x11 +inherit qmake qt4x11 PARALLEL_MAKE = "" -EXTRA_QMAKEVARS_POST = "CONFIG+=thread CONFIG-=staticlib" +EXTRA_QMAKEVARS_POST = "CONFIG+=thread CONFIG-=staticlib CONFIG-=debug" do_configure_prepend() { find . -name "Makefile"|xargs rm -f diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index f4036fe613..66c53218c3 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -69,7 +69,6 @@ SLUGOS_PACKAGES = "\ grep \ gtk-doc \ gzip \ - icecast \ ifupdown \ ipkg-utils \ iptables \ diff --git a/packages/plone/plone_2.0.0.bb b/packages/plone/plone_2.0.0.bb deleted file mode 100644 index 152acdb2b6..0000000000 --- a/packages/plone/plone_2.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Plone, a user friendly and powerful Content Management System based on the Zope Web Application Server" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -RDEPENDS = "zope" -LICENSE = "GPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/plone/CMFPlone-2.0-final.tar.gz" -S = "${WORKDIR}/CMFPlone-2.0-final" - -do_install() { - install -d ${D}${libdir}/python/Products/ - cp -pPR ${S}/* ${D}${libdir}/python/Products/ -} - -FILES_${PN} = "${libdir}/python/Products/" diff --git a/packages/plone/plone_1.0.5.bb b/packages/plone/plone_2.1.2.bb index 20b28e348b..e0b9a872a5 100644 --- a/packages/plone/plone_1.0.5.bb +++ b/packages/plone/plone_2.1.2.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Plone, a user friendly and powerful Content Management System based on the Zope Web Application Server" -SECTION = "base" +SECTION = "network/cms" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" RDEPENDS = "zope" LICENSE = "GPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/plone/CMFPlone${PV}.tar.gz" -S = "${WORKDIR}/CMFPlone-${PV}" +SRC_URI = "${SOURCEFORGE_MIRROR}/plone/Plone-${PV}.tar.gz" +S = "${WORKDIR}/Plone-${PV}" do_install() { install -d ${D}${libdir}/python/Products/ diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb index 755510cc7d..1d365c3b01 100644 --- a/packages/qt/qt4-x11-free_4.1.1.bb +++ b/packages/qt/qt4-x11-free_4.1.1.bb @@ -35,7 +35,7 @@ QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-s -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ -nosse \ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -verbose -no-stl -no-accessibility" + -verbose -stl -no-accessibility" EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ diff --git a/packages/zope/zope_2.9.2.bb b/packages/zope/zope_2.9.2.bb new file mode 100644 index 0000000000..60aa2dfeb2 --- /dev/null +++ b/packages/zope/zope_2.9.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more." +SECTION = "console/network" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "python" +RDEPENDS = "python-core python-shell" +LICENSE = "ZPL" +PR = "ml0" + +SRC_URI = "http://zope.org/Products/Zope/${PV}/Zope-${PV}.tgz" +S = "${WORKDIR}/Zope-${PV}" + +do_configure() { + ./configure --with-python=${STAGING_BINDIR}/python --prefix=${prefix} --force +} + +do_compile() { + oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} +} + +do_install() { + oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} +} + +FILES_${PN} = "${prefix}" +FILES_${PN}_doc = "${prefix}/doc" |