[oe-commits] org.oe.dev merge of '2e9e31aaab7b3cb9ec8159571920f5085524e6c9'

[jeremy_laine commit]

merge of '2e9e31aaab7b3cb9ec8159571920f5085524e6c9'
     and 'c4aee04fcf19f066a8cc1db58d3520728b043819'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: f94c84daf04e33f569fffdd3b60be112b594c750
ViewMTN: http://monotone.openembedded.org/revision/info/f94c84daf04e33f569fffdd3b60be112b594c750
Files:
1
classes/sdk.bbclass
packages/sailcut
packages/sailcut/sailcut_1.3.2.bb
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_staging.inc
Diffs:

#
# mt diff -r2e9e31aaab7b3cb9ec8159571920f5085524e6c9 -rf94c84daf04e33f569fffdd3b60be112b594c750
#
#
#
# patch "classes/sdk.bbclass"
#  from [2fd6da925d72a7d66eaa4f9817de7c4a9658126f]
#    to [5eb983812841fbe0c5b37fa5232ee672cfa15ec9]
#
============================================================
--- classes/sdk.bbclass	2fd6da925d72a7d66eaa4f9817de7c4a9658126f
+++ classes/sdk.bbclass	5eb983812841fbe0c5b37fa5232ee672cfa15ec9
@@ -4,6 +4,7 @@ PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACK
 
 OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
+STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-sdk"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
@@ -49,4 +50,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \
                     ${prefix}/bin/.debug \
                    "
 
+export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
-export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR}/${HOST_SYS}"


#
# mt diff -rc4aee04fcf19f066a8cc1db58d3520728b043819 -rf94c84daf04e33f569fffdd3b60be112b594c750
#
#
#
# add_dir "packages/sailcut"
# 
# add_file "packages/sailcut/sailcut_1.3.2.bb"
#  content [6792189217498854085324bfbbb9edcae4a90056]
# 
# patch "packages/qt4/qt4-x11-free.inc"
#  from [89c46cc5b77c68a9396f847011f40dda890459a6]
#    to [6aa64a2bb7f36ee9fabfb827932d7b47dd9f2fd6]
# 
# patch "packages/qt4/qt_staging.inc"
#  from [f74af3775f1a2c2fb8670eca49ab7c2a89d91a53]
#    to [311fad49c6f57f9d909e3aa12a9f4635e194da20]
#
============================================================
--- packages/sailcut/sailcut_1.3.2.bb	6792189217498854085324bfbbb9edcae4a90056
+++ packages/sailcut/sailcut_1.3.2.bb	6792189217498854085324bfbbb9edcae4a90056
@@ -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
+
============================================================
--- packages/qt4/qt4-x11-free.inc	89c46cc5b77c68a9396f847011f40dda890459a6
+++ packages/qt4/qt4-x11-free.inc	6aa64a2bb7f36ee9fabfb827932d7b47dd9f2fd6
@@ -5,7 +5,7 @@ PROVIDES = "qt4x11"
 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 \
============================================================
--- packages/qt4/qt_staging.inc	f74af3775f1a2c2fb8670eca49ab7c2a89d91a53
+++ packages/qt4/qt_staging.inc	311fad49c6f57f9d909e3aa12a9f4635e194da20
@@ -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"