diff options
| -rw-r--r-- | packages/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | packages/qt4/qt_staging.inc | 1 | ||||
| -rw-r--r-- | packages/sailcut/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sailcut/sailcut_1.3.2.bb | 15 |
4 files changed, 17 insertions, 1 deletions
diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 60c266bc73..17f2fff0fe 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 1c3d69c1af..a49be4757e 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -9,6 +9,7 @@ do_stage_append() { cd ${STAGING_LIBDIR} sed -i s#"-L${S}/lib"##g libQt*.la + sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la } STAGE_TEMP = "${WORKDIR}/temp-staging" diff --git a/packages/sailcut/.mtn2git_empty b/packages/sailcut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sailcut/.mtn2git_empty diff --git a/packages/sailcut/sailcut_1.3.2.bb b/packages/sailcut/sailcut_1.3.2.bb new file mode 100644 index 0000000000..0063348e85 --- /dev/null +++ b/packages/sailcut/sailcut_1.3.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Sail design and plotting software" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "qt4-x11-free" +SRCNAME = "sailcut" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" +EXTRA_OECONF = "\ + --with-qt-includes=${STAGING_INCDIR}/qt4 \ + --with-qt-libraries=${STAGING_LIBDIR} \ + MOC=moc4 UIC=uic4" + +inherit autotools + |