libphone-ui/libframeworkd-glib patches upstream now

6 files changed, 2 insertions, 69 deletions

diff --git a/sys-mobilephone/libframeworkd-glib/Manifest b/sys-mobilephone/libframeworkd-glib/Manifest
index bbc983e..0c69de1 100644
--- a/sys-mobilephone/libframeworkd-glib/Manifest
+++ b/sys-mobilephone/libframeworkd-glib/Manifest
@@ -1,5 +1,4 @@
-AUX g_error_new_call.patch 402 RMD160 9f397f10c142779e6b17b1d30d97fe1d08a2238f SHA1 e94869d8fc939961dd4175d04c21236c5ccea6ff SHA256 9828f479cd12184ec84562773e35318ff6ef40bb57cb96f848fda7d5c6b2adba
 EBUILD libframeworkd-glib-0.1.ebuild 790 RMD160 7e246c38fd058cb6ce29281a652eba14baae08e6 SHA1 23aa581add38fdb0ff4078b3e8551954ab8645e1 SHA256 a8e24acc0a04eb6b229b3ea67ec1725ab747d1d6bde5bfada43d74f656c48e97
 EBUILD libframeworkd-glib-20090227.ebuild 716 RMD160 bc629442a62df6df10e3bff92cf13c8376c4a410 SHA1 a6c18112b967b67bd7960f02b2fe78c55c032ed4 SHA256 58c2181e0e147aa2f35d3fd44ebe0f8642c794d2251cdc3cb787923d7bffc375
 EBUILD libframeworkd-glib-20090614.ebuild 716 RMD160 45c7384526a83a18b96caacf1d80d393ab4130a8 SHA1 9d002eb7859e9d4c60b3ef3f74d0a5640efb3796 SHA256 24e2fcf87b88309cf0391ee36f934dc60407ad1039bcf321ef7afb48ce909a59
-EBUILD libframeworkd-glib-99999999.ebuild 580 RMD160 352b0cb3f0a69877258f27f9c55e7de07d9acdb6 SHA1 e1c9ed3b12819cd7f550337af88a09fd04b80f90 SHA256 f0db0544fc2bfaa52be151657c5532a719fe2e05a12f4d7dd5b9124d23afd1db
+EBUILD libframeworkd-glib-99999999.ebuild 530 RMD160 c570241413e46428bada852bd321d86f82af2cf4 SHA1 1baeb0d93f959a893adcb8e89fc0288dcc3f78ab SHA256 9c27b3176e91036fb63a5c62f4658aba4325c291cec863823607f09027e2d263
diff --git a/sys-mobilephone/libframeworkd-glib/files/g_error_new_call.patch b/sys-mobilephone/libframeworkd-glib/files/g_error_new_call.patch
deleted file mode 100644
index a06dc6f..0000000
--- a/sys-mobilephone/libframeworkd-glib/files/g_error_new_call.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/frameworkd-glib-dbus.c.old	2010-01-14 00:27:12.684371769 +0000
-+++ src/frameworkd-glib-dbus.c	2010-01-14 00:27:23.704371557 +0000
-@@ -143,7 +143,7 @@
- 		lose_gerror("Unknown internal dbus error", error);
- 	}
- 	//dbus_connect_to_bus(NULL);
--	return g_error_new(FRAMEWORKD_GLIB_DBUS_ERROR, dbusError,
-+	return g_error_new(FRAMEWORKD_GLIB_DBUS_ERROR, dbusError, "%s",
- 			   error->message);
- }
- 
diff --git a/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-99999999.ebuild b/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-99999999.ebuild
index 49a7676..8671186 100644
--- a/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-99999999.ebuild
+++ b/sys-mobilephone/libframeworkd-glib/libframeworkd-glib-99999999.ebuild
@@ -10,7 +10,6 @@ HOMEPAGE="http://www.freesmartphone.org/"
 
 EGIT_REPO_URI="git://git.freesmartphone.org/libframeworkd-glib.git"
 EGIT_PROJECT="libframeworkd-glib"
-EGIT_PATCHES="${FILESDIR}/g_error_new_call.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-mobilephone/libphone-ui/Manifest b/sys-mobilephone/libphone-ui/Manifest
index 1b5c76f..b759fb4 100644
--- a/sys-mobilephone/libphone-ui/Manifest
+++ b/sys-mobilephone/libphone-ui/Manifest
@@ -1,2 +1 @@
-AUX check_write_and_system_calls.patch 1707 RMD160 a9c2b28c16c0b2711c56ebb4ab6988b67dc55f50 SHA1 1d7534ddf0f42607078d8879b31272beb1892093 SHA256 10a79e732ae1a396d7bc24e2e9a0f87e6757b9ef61549f2f321e86843dc9c730
-EBUILD libphone-ui-99999999.ebuild 479 RMD160 dc628071f264604e1c8074b480da49c6290bb425 SHA1 13609ce5e6e48674369ce1855ec7ad8104ab57b4 SHA256 001e010044996d4c84fdb8e1de56029cd1a4bf786446f5b100dcada9629662e8
+EBUILD libphone-ui-99999999.ebuild 417 RMD160 6992db12495161a459169b82bf09a664674b0f04 SHA1 679853ace7a3ea9d91dbbc480b84726a43c4aaf7 SHA256 5ff89cfcea6f108b1922e76d2d6b3bd2433b992cd7f5dd391750613418552da1
diff --git a/sys-mobilephone/libphone-ui/files/check_write_and_system_calls.patch b/sys-mobilephone/libphone-ui/files/check_write_and_system_calls.patch
deleted file mode 100644
index 67dc608..0000000
--- a/sys-mobilephone/libphone-ui/files/check_write_and_system_calls.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/phoneui-utils-device.c.old	2010-01-14 01:05:15.034372095 +0000
-+++ src/phoneui-utils-device.c	2010-01-14 01:10:20.124372193 +0000
-@@ -44,7 +44,8 @@
- _vibration_on(gpointer data)
- {
- 	struct VibrationData *vdata = (struct VibrationData *)data;
--	write(vdata->fd, vdata->systring, strlen(vdata->systring));
-+	ssize_t len = write(vdata->fd, vdata->systring, strlen(vdata->systring));
-+	g_assert(len != -1);
- 	g_timeout_add(vdata->duration, _vibration_off, vdata);
- 	return 0;
- }
-@@ -53,7 +54,8 @@
- _vibration_off(gpointer data)
- {
- 	struct VibrationData *vdata = (struct VibrationData *)data;
--	write(vdata->fd, "0\n", 2);
-+	ssize_t len = write(vdata->fd, "0\n", 2);
-+	g_assert(len != -1);
- 	if (vdata->repeat > 0) {
- 		vdata->repeat--;
- 		g_timeout_add(vdata->pause, _vibration_on, vdata);
-@@ -85,7 +87,8 @@
- 	vdata->repeat = repeat;
- 	vdata->pause = pause;
- 	snprintf(vdata->systring, 4, "%d\n", intensity);
--	write(fd, vdata->systring, strlen(vdata->systring));
-+	ssize_t len = write(fd, vdata->systring, strlen(vdata->systring));
-+	g_assert(len != -1);
- 	g_timeout_add(duration, _vibration_off, vdata);
- }
- 
-@@ -114,14 +117,16 @@
- phoneui_utils_device_activate_screensaver(void)
- {
- 	// FIXME: do this in a sane way!!!
--	system("xset -display localhost:0 s blank");
--	system("xset -display localhost:0 s activate");
-+	int rc1 = system("xset -display localhost:0 s blank");
-+	int rc2 = system("xset -display localhost:0 s activate");
-+	g_assert(rc1 == 0 && rc2 == 0);
- }
- 
- void
- phoneui_utils_device_deactivate_screensaver(void)
- {
- 	// FIXME: do this in a sane way!!!
--	system("xset -display localhost:0 s reset");
-+	int rc = system("xset -display localhost:0 s reset");
-+	g_assert(rc == 0);
- }
- 
diff --git a/sys-mobilephone/libphone-ui/libphone-ui-99999999.ebuild b/sys-mobilephone/libphone-ui/libphone-ui-99999999.ebuild
index dfcaf75..f6673de 100644
--- a/sys-mobilephone/libphone-ui/libphone-ui-99999999.ebuild
+++ b/sys-mobilephone/libphone-ui/libphone-ui-99999999.ebuild
@@ -10,7 +10,6 @@ HOMEPAGE=""
 
 EGIT_REPO_URI="http://shr.bearstech.com/repo/${PN}.git"
 EGIT_PROJECT="${PN}"
-EGIT_PATCHES="${FILESDIR}/check_write_and_system_calls.patch"
 
 LICENSE="GPL-3"
 SLOT="0"