[oe-commits] org.oe.dev merge of '1d2da7c2a64cb6782d396f30259020ad4254cf69'

[xora commit]

merge of '1d2da7c2a64cb6782d396f30259020ad4254cf69'
     and 'fd6c3104412672124350e987af3ff8736304f817'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 81c1ca19a24db9495de03956421cdf6ea0ad4e93
ViewMTN: http://monotone.openembedded.org/revision/info/81c1ca19a24db9495de03956421cdf6ea0ad4e93
Files:
1
packages/meta/slugos-packages.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
Diffs:

#
# mt diff -r1d2da7c2a64cb6782d396f30259020ad4254cf69 -r81c1ca19a24db9495de03956421cdf6ea0ad4e93
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [f0c762b44a0bab705cdd75211c3ce4fe78b03a3c]
#    to [c7013eacc72de83c038d4af1c8c1b1d6b83413de]
# 
============================================================
--- packages/meta/slugos-packages.bb	f0c762b44a0bab705cdd75211c3ce4fe78b03a3c
+++ packages/meta/slugos-packages.bb	c7013eacc72de83c038d4af1c8c1b1d6b83413de
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r39"
+PR = "r40"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -50,6 +50,8 @@ SLUGOS_PACKAGES = "\
 	cron \
 	ctorrent \
 	ctrlproxy \
+	cups \
+	curl \
 	cvs \
 	cyrus-imapd \
 	cyrus-sasl \


#
# mt diff -rfd6c3104412672124350e987af3ff8736304f817 -r81c1ca19a24db9495de03956421cdf6ea0ad4e93
#
# 
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  from [7ac42702123875fa07b391881bfde6f56531dd93]
#    to [83b84a6976c32c4c094913143c9ed28a2b37c610]
# 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb	7ac42702123875fa07b391881bfde6f56531dd93
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb	83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -26,6 +26,7 @@ do_configure() {
 EXTRA_OEMAKE = " "
 
 do_configure() {
+	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
 	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }