[oe-commits] org.oe.dev merge of 'a41270f197c19482f466d5e12850e9c76c7358b5'

[hrw commit]

merge of 'a41270f197c19482f466d5e12850e9c76c7358b5'
     and 'f3edd5c73b71cef16fcff1594f21d2d1af16cf3a'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: e1913143dfc35023662303272bee489b1f3f361a
ViewMTN: http://monotone.openembedded.org/revision/info/e1913143dfc35023662303272bee489b1f3f361a
Files:
1
packages/kdepimpi/files/gcc42.patch
packages/kdepimpi/kdepimpi_2.2.7.bb
packages/gnome/gconf-dbus_svn.bb
packages/libowl/libowl_svn.bb
Diffs:

#
# mt diff -ra41270f197c19482f466d5e12850e9c76c7358b5 -re1913143dfc35023662303272bee489b1f3f361a
#
# 
# 
# add_file "packages/kdepimpi/files/gcc42.patch"
#  content [af202c7b5a77e0f373d182f75dd9ef7763999d40]
# 
# patch "packages/kdepimpi/kdepimpi_2.2.7.bb"
#  from [0349a4cb14b6823831790a11e39cfeff149c58a3]
#    to [6829b6cdb42d14509e8415925657c5297cf50ddb]
# 
============================================================
--- packages/kdepimpi/files/gcc42.patch	af202c7b5a77e0f373d182f75dd9ef7763999d40
+++ packages/kdepimpi/files/gcc42.patch	af202c7b5a77e0f373d182f75dd9ef7763999d40
@@ -0,0 +1,13 @@
+diff --git a/kabc/secrecy.h b/kabc/secrecy.h
+index 21e22f2..3011ae9 100644
+--- a/kabc/secrecy.h
++++ b/kabc/secrecy.h
+@@ -98,5 +98,8 @@ private:
+   int mType;
+ };
+ 
++QDataStream& operator<<(QDataStream& s,const Secrecy &secrecy);
++QDataStream& operator>>(QDataStream& s,Secrecy &secrecy);
++
+ }
+ #endif
============================================================
--- packages/kdepimpi/kdepimpi_2.2.7.bb	0349a4cb14b6823831790a11e39cfeff149c58a3
+++ packages/kdepimpi/kdepimpi_2.2.7.bb	6829b6cdb42d14509e8415925657c5297cf50ddb
@@ -1,6 +1,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimp
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
            file://gcc4.patch;patch=1 \
-	   file://qt-mt.patch;patch=1"
+	   file://qt-mt.patch;patch=1 \
+	   file://gcc42.patch;patch=1"
 
 require kdepimpi-base.inc
 


#
# mt diff -rf3edd5c73b71cef16fcff1594f21d2d1af16cf3a -re1913143dfc35023662303272bee489b1f3f361a
#
# 
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [736ff2e0f199bacf3c0368448f9d7fcbd6de5973]
#    to [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
# 
# patch "packages/libowl/libowl_svn.bb"
#  from [d5d85a76511d0833f4f28984af1609606a459337]
#    to [de6095a1f1373fa2e02f7b7388d6b6fb4fed0483]
# 
============================================================
--- packages/gnome/gconf-dbus_svn.bb	736ff2e0f199bacf3c0368448f9d7fcbd6de5973
+++ packages/gnome/gconf-dbus_svn.bb	cfb0cd440b4736752691aef4cc9761eb15e6a9e4
@@ -7,7 +7,7 @@ PV = "2.16.0+svnr${SRCREV}"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
 	   file://69gconfd-dbus"
@@ -35,6 +35,4 @@ do_install_append () {
 do_install_append () {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
-        install -d ${D}/${datadir}/dbus-1.0/services/
-        install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
 }
============================================================
--- packages/libowl/libowl_svn.bb	d5d85a76511d0833f4f28984af1609606a459337
+++ packages/libowl/libowl_svn.bb	de6095a1f1373fa2e02f7b7388d6b6fb4fed0483
@@ -11,10 +11,10 @@ SECTION = "libs"
 HOMEPAGE = "http://www.o-hand.com"
 LICENSE = "LGPL"
 SECTION = "libs"
-PR = "r3"
+DEPENDS = "gtk+"
 PV = "0.0+svnr${SRCREV}"
+PR = "r3"
 
-DEPENDS = "gtk+ glib-2.0"
 PACKAGES = ""
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
@@ -37,12 +37,3 @@ do_stage() {
 	done
 	install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
 }
-
-do_install() {
-}
-
-do_package() {
-}
-
-do_package_write() {
-}