diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2009-10-18 23:49:34 +0200 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2009-10-18 23:49:34 +0200 |
| commit | a68d9efc0fed843873d8e88b97ff4121d333eb4c (patch) | |
| tree | b39f0ee663ce391f1d16591d08a2f33404a2e46c /sys-apps | |
| parent | gnome-extra/gnome-power-manager: QAed (diff) | |
| download | gnome-a68d9efc0fed843873d8e88b97ff4121d333eb4c.tar.gz gnome-a68d9efc0fed843873d8e88b97ff4121d333eb4c.tar.bz2 gnome-a68d9efc0fed843873d8e88b97ff4121d333eb4c.zip | |
sys-apps/devicekit-power: fix typos and remove old patches
Diffstat (limited to 'sys-apps')
4 files changed, 4 insertions, 70 deletions
diff --git a/sys-apps/devicekit-power/Manifest b/sys-apps/devicekit-power/Manifest index 2a548619..34cf83f2 100644 --- a/sys-apps/devicekit-power/Manifest +++ b/sys-apps/devicekit-power/Manifest @@ -1,4 +1,2 @@ -AUX devicekit-power-007-maintainer-cflags.patch 1286 RMD160 4d9f55caa936969ffe5df1dfdc6dfd00639322d4 SHA1 95dedce5b49dfcb06c935c0dcf5f1c8b23670534 SHA256 a87bdb4703e1c238949d951b1c7fbfedfce95af66ea9334bbaeb21a5e06d274c -AUX devicekit-power-009-build-gcc-4.1.2.patch 392 RMD160 1dd85f5341aca85372e3f2e77e73b8381c5c56c9 SHA1 decbd6d042a5439e399166ebaebd58aacb076908 SHA256 f1613aece0da2af8d5ad8a67493bab8030f418ccf51f655617c0e21254f891e0 DIST DeviceKit-power-011.tar.gz 521445 RMD160 632a16f8b51621fa2723cdc46a6939919d0b54e8 SHA1 c5158e51eebb5eeaa22453e730284156d8c95fc1 SHA256 8f5b9f43c17a43574cd9026d0ff7b2f6b05d2d0e25d2033b8fdd92021fd4383d -EBUILD devicekit-power-011.ebuild 1465 RMD160 c21365e2739942cb876bfa594ac3fca849014f8a SHA1 7d45c06e56b3cbe147043ac76758ade899c901d5 SHA256 3ef85c5c2fbcb28a6834b264e72e5f3dd1ab9acab5472ccc6cb8bdeb3d61a050 +EBUILD devicekit-power-011.ebuild 1292 RMD160 a79bddc84c8511530521d31fa5f02466525cfb1b SHA1 d5af48150cf33de8072110cdfffebf905051f4fe SHA256 0e2364c6a22b2f2aa730414928f1a48bf894425697fe990966d215f61a0a8180 diff --git a/sys-apps/devicekit-power/devicekit-power-011.ebuild b/sys-apps/devicekit-power/devicekit-power-011.ebuild index 876caabd..f3044be8 100644 --- a/sys-apps/devicekit-power/devicekit-power-011.ebuild +++ b/sys-apps/devicekit-power/devicekit-power-011.ebuild @@ -4,7 +4,7 @@ EAPI="2" -inherit eutils gnome2 autotools linux-info +inherit gnome2 linux-info MY_PN="DeviceKit-power" @@ -54,13 +54,9 @@ pkg_setup() { } src_prepare() { - # Fix build with older gcc, bug #266987 - epatch "${FILESDIR}/${PN}-009-build-gcc-4.1.2.patch" + gnome2_src_prepare # Fix crazy cflags - sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ + sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \ || die "sed failed" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf } diff --git a/sys-apps/devicekit-power/files/devicekit-power-007-maintainer-cflags.patch b/sys-apps/devicekit-power/files/devicekit-power-007-maintainer-cflags.patch deleted file mode 100644 index 7f661731..00000000 --- a/sys-apps/devicekit-power/files/devicekit-power-007-maintainer-cflags.patch +++ /dev/null @@ -1,43 +0,0 @@ - configure.ac | 24 +++++++++++++++++++----- - 1 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b8d43d5..d114bd7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,16 +56,30 @@ dnl --------------------------------------------------------------------------- - dnl - Extra verbose warning switches, disable if needed - dnl --------------------------------------------------------------------------- - if test "$GCC" = "yes"; then -- CPPFLAGS="$CPPFLAGS -Werror -Wcast-align -Wno-uninitialized" -- CPPFLAGS="$CPPFLAGS -Wall -Wformat-security" -+ CPPFLAGS="$CPPFLAGS -Wall" - # CPPFLAGS="$CPPFLAGS -Wall" - fi - --if test "x$GCC" = "xyes"; then -+if test "x${USE_MAINTAINER_MODE}" = "xyes" -a "x$GCC" = "xyes"; then - changequote(,)dnl - case " $CFLAGS " in -- *[\ \ ]-Wall[\ \ ]*) ;; -- *) CFLAGS="$CFLAGS -Wall" ;; -+ *[\ \ ]-Werror[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -Werror" ;; -+ esac -+ -+ case " $CFLAGS " in -+ *[\ \ ]-Wcast-align[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -Wcast-align" ;; -+ esac -+ -+ case " $CFLAGS " in -+ *[\ \ ]-Wno-uninitialized[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -Wno-uninitialized" ;; -+ esac -+ -+ case " $CFLAGS " in -+ *[\ \ ]-Wcast-align[\ \ ]*) ;; -+ *) CFLAGS="$CFLAGS -Wformat-security" ;; - esac - - case " $CFLAGS " in diff --git a/sys-apps/devicekit-power/files/devicekit-power-009-build-gcc-4.1.2.patch b/sys-apps/devicekit-power/files/devicekit-power-009-build-gcc-4.1.2.patch deleted file mode 100644 index 5f7a4eab..00000000 --- a/sys-apps/devicekit-power/files/devicekit-power-009-build-gcc-4.1.2.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix build with older gcc, bug #266987 - --- ---- src/dkp-device-supply.c -+++ src/dkp-device-supply.c -@@ -262,9 +262,9 @@ - gboolean is_present; - gdouble energy; - gdouble energy_full; -- gdouble energy_full_design; -+ gdouble energy_full_design = 0.0f; - gdouble energy_rate; -- gdouble capacity; -+ gdouble capacity = 0.0f; - gdouble percentage = 0.0f; - gdouble voltage; - guint64 time_to_empty; |