[oe-commits] Jan Lübbe : frameworkd: bump frameworkd and drop applied patch

GIT User account git at amethyst.openembedded.net
Sun Apr 19 16:26:27 UTC 2009


Module: openembedded.git
Branch: fso/milestone5.5
Commit: 192099546a0f47b04a4606319bd1f6c8c71cb0e2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=192099546a0f47b04a4606319bd1f6c8c71cb0e2

Author: Jan Lübbe <jluebbe at debian.org>
Date:   Sun Apr 19 14:21:14 2009 +0000

frameworkd: bump frameworkd and drop applied patch

---

 conf/distro/include/sane-srcrevs.inc               |    2 +-
 .../frameworkd/om-gta01/otimed.patch               |   45 --------------------
 .../frameworkd/om-gta02/otimed.patch               |   45 --------------------
 recipes/freesmartphone/frameworkd_git.bb           |    3 +-
 4 files changed, 2 insertions(+), 93 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a18aa60..a4819a0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -50,7 +50,7 @@ SRCREV_pn-epydial ?= "215"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd ?= "542c7e13e021b609ec0aa1c20615d940adfcf403"
+SRCREV_pn-frameworkd ?= "ba6708abf2b9909b086475db6cd750d8578f5cde"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
 SRCREV_pn-fso-abyss ?= "6ed342f833930474ac506cbaad705c0d8beaa71f"
diff --git a/recipes/freesmartphone/frameworkd/om-gta01/otimed.patch b/recipes/freesmartphone/frameworkd/om-gta01/otimed.patch
deleted file mode 100644
index 6897d59..0000000
--- a/recipes/freesmartphone/frameworkd/om-gta01/otimed.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- git/framework/subsystems/otimed/otimed.py.orig	2009-04-16 14:05:32.000000000 -0600
-+++ git/framework/subsystems/otimed/otimed.py	2009-04-16 14:07:49.000000000 -0600
-@@ -149,12 +149,42 @@
-             None,
-             None
-         )
-+        self.bus.add_signal_receiver(
-+            self._handleTimeZoneReport,
-+            "TimeZoneReport",
-+            "org.freesmartphone.GSM.Network",
-+            None,
-+            None
-+        )
-         proxy = bus.get_object( "org.freesmartphone.ogsmd",
-                                 "/org/freesmartphone/GSM/Server",
-                                 follow_name_owner_changes=True,
-                                 introspect=False )
-         self.gsmdata = dbus.Interface( proxy, "org.freesmartphone.GSM.Data",  )
- 
-+    def _handleTimeZoneReport( self, report ):
-+	# this can be improved - AA
-+	# if we know the country, the offset and if this zone supports daylight savings
-+	# the proper timezone can be derived.
-+	# so opreferencesd needs to have a <this zone uses daylight savings> flag
-+	# and we need a /usr/share/zoneinfo parser
-+
-+	# CTZV is offset * 4 
-+	offset = report / 4
-+	# offset need to be inverted to get the correct TZ
-+	zone = "Etc/GMT" 
-+	if offset <= 0 :
-+		zone += "+" + str( offset * -1 )
-+	else :
-+		zone += "-" + str( offset )
-+	logger.debug( "TimeZoneReport :" + str( report ) + " offset " + str( offset ) + " zone " + zone )
-+	if zone != self.zone :
-+            try:
-+                shutil.copyfile( "/usr/share/zoneinfo/"+zone, "/etc/localtime" )
-+		self.zone = zone
-+            except:
-+                logger.warning( "failed to install time zone file " + zone + " to /etc/localtime" )
-+
-     def _handleNetworkStatusChanged( self, status ):
-         if "code" in status:
-             code = str( status["code"] )
diff --git a/recipes/freesmartphone/frameworkd/om-gta02/otimed.patch b/recipes/freesmartphone/frameworkd/om-gta02/otimed.patch
deleted file mode 100644
index 6897d59..0000000
--- a/recipes/freesmartphone/frameworkd/om-gta02/otimed.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- git/framework/subsystems/otimed/otimed.py.orig	2009-04-16 14:05:32.000000000 -0600
-+++ git/framework/subsystems/otimed/otimed.py	2009-04-16 14:07:49.000000000 -0600
-@@ -149,12 +149,42 @@
-             None,
-             None
-         )
-+        self.bus.add_signal_receiver(
-+            self._handleTimeZoneReport,
-+            "TimeZoneReport",
-+            "org.freesmartphone.GSM.Network",
-+            None,
-+            None
-+        )
-         proxy = bus.get_object( "org.freesmartphone.ogsmd",
-                                 "/org/freesmartphone/GSM/Server",
-                                 follow_name_owner_changes=True,
-                                 introspect=False )
-         self.gsmdata = dbus.Interface( proxy, "org.freesmartphone.GSM.Data",  )
- 
-+    def _handleTimeZoneReport( self, report ):
-+	# this can be improved - AA
-+	# if we know the country, the offset and if this zone supports daylight savings
-+	# the proper timezone can be derived.
-+	# so opreferencesd needs to have a <this zone uses daylight savings> flag
-+	# and we need a /usr/share/zoneinfo parser
-+
-+	# CTZV is offset * 4 
-+	offset = report / 4
-+	# offset need to be inverted to get the correct TZ
-+	zone = "Etc/GMT" 
-+	if offset <= 0 :
-+		zone += "+" + str( offset * -1 )
-+	else :
-+		zone += "-" + str( offset )
-+	logger.debug( "TimeZoneReport :" + str( report ) + " offset " + str( offset ) + " zone " + zone )
-+	if zone != self.zone :
-+            try:
-+                shutil.copyfile( "/usr/share/zoneinfo/"+zone, "/etc/localtime" )
-+		self.zone = zone
-+            except:
-+                logger.warning( "failed to install time zone file " + zone + " to /etc/localtime" )
-+
-     def _handleNetworkStatusChanged( self, status ):
-         if "code" in status:
-             code = str( status["code"] )
diff --git a/recipes/freesmartphone/frameworkd/otimed.patch b/recipes/freesmartphone/frameworkd/otimed.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 363d896..ee39981 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.5.1+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit distutils update-rc.d
 
@@ -15,7 +15,6 @@ INITSCRIPT_PARAMS = "defaults 29"
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
            file://frameworkd \
            file://frameworkd.conf \
-	   file://otimed.patch;patch=1 \
 	   "
 S = "${WORKDIR}/git"
 





More information about the Openembedded-commits mailing list