[oe-commits] org.oe.dev merge of '9c656e60411087235cb8e41b6b3ae676447fa38a'

[Laibsch commit]

merge of '9c656e60411087235cb8e41b6b3ae676447fa38a'
     and 'df7aebb70b0a281903694dd4a1221fae63e2c7b6'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: e5687f708388bd5700f6433bd38eecc7e0f1ebd1
ViewMTN: http://monotone.openembedded.org/revision/info/e5687f708388bd5700f6433bd38eecc7e0f1ebd1
Files:
1
packages/gpe-memo
packages/gpe-memo/gpe-memo_0.2.bb
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/maemo/hildon-home
packages/nonworking/maemo/hildon-home
packages/maemo/hildon-home_0.8.20-2.bb
packages/nonworking/maemo/hildon-home_0.8.20-2.bb
packages/nonworking/maemo
packages/python/python-pycap_0.1.6.bb
Diffs:

#
# mt diff -r9c656e60411087235cb8e41b6b3ae676447fa38a -re5687f708388bd5700f6433bd38eecc7e0f1ebd1
#
#
#
# add_dir "packages/gpe-memo"
# 
# add_file "packages/gpe-memo/gpe-memo_0.2.bb"
#  content [388b2fac728542b4c47ba5fa38942475892fd5e8]
# 
# patch "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
#  from [3665eb673cea6a75e2df36a17daa87464aeb50c4]
#    to [7586b901cf335cd8829daea1fe516b43468ba635]
#
============================================================
--- packages/gpe-memo/gpe-memo_0.2.bb	388b2fac728542b4c47ba5fa38942475892fd5e8
+++ packages/gpe-memo/gpe-memo_0.2.bb	388b2fac728542b4c47ba5fa38942475892fd5e8
@@ -0,0 +1,9 @@
+DESCRIPTION = "GPE Voice Notes Recorder"
+SECTION = "gpe/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libgsm gpe-soundserver"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe autotools
+
============================================================
--- packages/maemo4/osso-gnome-vfs2_2.16.3.bb	3665eb673cea6a75e2df36a17daa87464aeb50c4
+++ packages/maemo4/osso-gnome-vfs2_2.16.3.bb	7586b901cf335cd8829daea1fe516b43468ba635
@@ -26,6 +26,9 @@ do_configure_prepend() {
 	# remove Werror from VFS_CFLAGS
 	sed -i s:-Werror::g configure.in
 
+	# G_GNUC_FUNCTION is deprecated
+	sed -i -e s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDE, */Makefile.am
+
 	touch gtk-doc.make
 }
 


#
# mt diff -rdf7aebb70b0a281903694dd4a1221fae63e2c7b6 -re5687f708388bd5700f6433bd38eecc7e0f1ebd1
#
#
#
# rename "packages/maemo/hildon-home"
#     to "packages/nonworking/maemo/hildon-home"
# 
# rename "packages/maemo/hildon-home_0.8.20-2.bb"
#     to "packages/nonworking/maemo/hildon-home_0.8.20-2.bb"
# 
# add_dir "packages/nonworking/maemo"
# 
# patch "packages/python/python-pycap_0.1.6.bb"
#  from [5c95e2aad4740b75fcf55cd0d2136e6caf2dff31]
#    to [5968e263ec11a89dcdc59e13683ea260e4e27f45]
#
============================================================
--- packages/python/python-pycap_0.1.6.bb	5c95e2aad4740b75fcf55cd0d2136e6caf2dff31
+++ packages/python/python-pycap_0.1.6.bb	5968e263ec11a89dcdc59e13683ea260e4e27f45
@@ -2,7 +2,7 @@ RDEPENDS = "python-core"
 SECTION = "devel/python"
 PRIORITY = "optional"
 RDEPENDS = "python-core"
-DEPENDS = "libpcap-0.7.2 libnet-1.1.1"
+DEPENDS = "libpcap libnet"
 SRCNAME = "pycap"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"