summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2013-04-22 09:26:56 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2013-04-22 09:26:56 +0000
commit982b8f8ddf481e989a55239d0222011f1ef05ef7 (patch)
treed7b03b0fab6a97438ee49b4d63be76d16ee56628 /x11-misc
parentRevbump to fix current stable version (install binaries, bug 422687, detect t... (diff)
downloadgentoo-2-982b8f8ddf481e989a55239d0222011f1ef05ef7.tar.gz
gentoo-2-982b8f8ddf481e989a55239d0222011f1ef05ef7.tar.bz2
gentoo-2-982b8f8ddf481e989a55239d0222011f1ef05ef7.zip
Removing after last rites, bug #462472
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/google-gadgets/ChangeLog265
-rw-r--r--x11-misc/google-gadgets/Manifest30
-rw-r--r--x11-misc/google-gadgets/files/google-gadgets-0.11.2-configure_ggl_nm.patch28
-rw-r--r--x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch325
-rw-r--r--x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch25
-rw-r--r--x11-misc/google-gadgets/files/google-gadgets-0.11.2-networkmanager-0.9.patch204
-rw-r--r--x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild133
-rw-r--r--x11-misc/google-gadgets/metadata.xml11
8 files changed, 0 insertions, 1021 deletions
diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
deleted file mode 100644
index 5d5f5ac0c2be..000000000000
--- a/x11-misc/google-gadgets/ChangeLog
+++ /dev/null
@@ -1,265 +0,0 @@
-# ChangeLog for x11-misc/google-gadgets
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.51 2013/03/02 23:48:49 hwoarang Exp $
-
- 02 Mar 2013; Markos Chandras <hwoarang@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Move Qt dependencies to the new category
-
- 16 Jul 2012; Michael Palimaka <kensington@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Add missing slot dependencies on Qt.
-
- 06 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.2.ebuild, metadata.xml:
- And webkit browser/runtime support is broken too now, removing USE-flag. This
- package will get its last rites soon
-
- 06 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.2.ebuild,
- +files/google-gadgets-0.11.2-configure_ggl_nm.patch,
- +files/google-gadgets-0.11.2-networkmanager-0.9.patch:
- Fix networkmanager detection, add support for 0.9, clean ebuild a bit. Fixes
- bug #425024
-
- 27 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.2.ebuild, +files/google-gadgets-0.11.2-gcc-4.7.patch:
- Fix compilation with GCC 4.7 with patch from Debian, bug #423021
-
- 05 May 2012; Jeff Horelick <jdhore@gentoo.org> google-gadgets-0.11.2.ebuild:
- dev-util/pkgconfig -> virtual/pkgconfig
-
- 20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
- google-gadgets-0.11.2.ebuild, +files/google-gadgets-0.11.2-glib-2.31.patch:
- Fix building with dev-libs/glib >= 2.31 as reported by rlvampire (Freenode)
-
- 15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Fix bug 385477 correctly since the change is not backwards compatible.
-
- 15 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Remove support for xulrunner wrt bugs #351659 and #403415
-
- 04 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Add support >=>=zlib-1.2.5.1-r1, bug #385477
-
- 13 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- ppc64 stable wrt #354033
-
- 01 Jun 2011; Brent Baude <ranger@gentoo.org> google-gadgets-0.11.2.ebuild:
- Marking google-gadgets-0.11.2 ppc stable for bug 354033
-
- 09 May 2011; Markos Chandras <hwoarang@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Stable on amd64 wrt bug #354033
-
- 09 May 2011; Thomas Kahle <tomka@gentoo.org> google-gadgets-0.11.2.ebuild:
- x86 stable per bug 354033
-
- 22 Mar 2011; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Also force disable smjs-script with USE=-xulrunner
-
- 21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Fix slot-deps on gnome libs
-
- 19 Jan 2011; Bernard Cafarelli <voyageur@gentoo.org>
- -google-gadgets-0.10.5.ebuild, -google-gadgets-0.11.1-r1.ebuild,
- -files/google-gadgets-0.11.1-xulrunner-1.9.2.patch,
- google-gadgets-0.11.2.ebuild:
- Do not allow xulrunner 2.0, thanks Logarithmenlord@googlemail.com in bug
- #351659. Drop old versions
-
- 07 Nov 2010; Jeroen Roovers <jer@gentoo.org> google-gadgets-0.10.5.ebuild,
- google-gadgets-0.11.1-r1.ebuild, google-gadgets-0.11.2.ebuild:
- Remove HPPA keywording (bug #239441).
-
- 29 Oct 2010; Jeroen Roovers <jer@gentoo.org>
- google-gadgets-0.11.1-r1.ebuild, google-gadgets-0.11.2.ebuild:
- Marked ~hppa (bug #272194).
-
- 23 Feb 2010; Joseph Jezak <josejx@gentoo.org>
- google-gadgets-0.11.2.ebuild:
- Marked ~ppc64 for bug #272194.
-
-*google-gadgets-0.11.2 (27 Jan 2010)
-
- 27 Jan 2010; Bernard Cafarelli <voyageur@gentoo.org>
- +google-gadgets-0.11.2.ebuild:
- Version bump, includes previous patches for gtk+-2.19 and xulrunner 1.9.2,
- among other fixes
-
- 27 Jan 2010; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.1-r1.ebuild,
- +files/google-gadgets-0.11.1-xulrunner-1.9.2.patch:
- Add upstream patch to fix compilation with xulrunner 1.9.2, bug #301908
-
- 23 Nov 2009; Mark Loeser <halcy0n@gentoo.org>
- +google-gadgets-0.10.5.ebuild:
- Adding back 0.10.5 as its the only version keyworded for hppa and ppc64
-
-*google-gadgets-0.11.1-r1 (23 Nov 2009)
-
- 23 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
- -files/google-gadgets-0.10.0-xulrunner-1.9.patch,
- -files/google-gadgets-0.10.4-gcc41.patch,
- -files/google-gadgets-0.10.4-xulrunner-1.9.1.patch,
- -google-gadgets-0.10.5.ebuild, -google-gadgets-0.11.0.ebuild,
- -google-gadgets-0.11.1.ebuild, +google-gadgets-0.11.1-r1.ebuild:
- Add gtk+-2.18 support, reported by Alexandre Rostovtsev
- <tetromino@gmail.com> in bug #294124
-
-*google-gadgets-0.11.1 (09 Sep 2009)
-
- 09 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org>
- -google-gadgets-0.10.3.ebuild, -google-gadgets-0.10.4.ebuild,
- +google-gadgets-0.11.1.ebuild:
- Version bump, bugfix release
-
- 02 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.11.0.ebuild:
- Make xulrunner optional, now that there is a webkit backend
-
-*google-gadgets-0.11.0 (01 Jun 2009)
-
- 01 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
- +google-gadgets-0.11.0.ebuild, metadata.xml:
- Version bump, performance improvement, reduced memory consumption, new
- backends for webkit-gtk and libsoup, and bugfixes. ~hppa and ~ppc64
- keywords temporarly removed pending bug #272194
-
- 11 Apr 2009; Raúl Porcel <armin76@gentoo.org>
- google-gadgets-0.10.5.ebuild:
- Add ~alpha/~ia64 wrt #260777
-
- 11 Apr 2009; Jeroen Roovers <jer@gentoo.org> google-gadgets-0.10.5.ebuild:
- Marked ~hppa (bug #260777).
-
- 16 Feb 2009; Bernard Cafarelli <voyageur@gentoo.org>
- -google-gadgets-0.10.0-r2.ebuild, -google-gadgets-0.10.2-r2.ebuild,
- google-gadgets-0.10.5.ebuild:
- Ebuild cleanup by scarabeus, remove some old versions
-
- 05 Feb 2009; Brent Baude <ranger@gentoo.org> google-gadgets-0.10.5.ebuild:
- marking google-gadgets-0.10.5 ~ppc for kde tree bustification/repair
-
- 05 Feb 2009; Brent Baude <ranger@gentoo.org> google-gadgets-0.10.5.ebuild:
- google-gadgets-0.10.5 ~ppc64 for kde borkage
-
-*google-gadgets-0.10.5 (08 Jan 2009)
-
- 08 Jan 2009; Bernard Cafarelli <voyageur@gentoo.org>
- +google-gadgets-0.10.5.ebuild:
- Version bump, mostly bugfixes and new about dialogs
-
- 30 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
- +files/google-gadgets-0.10.4-xulrunner-1.9.1.patch,
- google-gadgets-0.10.4.ebuild:
- Get ready for xulrunner 1.9.1, patch spotted by loki_val
-
- 17 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
- +files/google-gadgets-0.10.4-gcc41.patch, google-gadgets-0.10.3.ebuild,
- google-gadgets-0.10.4.ebuild:
- Fix compilation with gcc 4.1, clean warning on gcc version in 0.10.3
- (works with gcc 4.1)
-
-*google-gadgets-0.10.4 (16 Dec 2008)
-
- 16 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
- +google-gadgets-0.10.4.ebuild:
- Version bump, bugfixes and optimization, more gadgets supported including
- the new youtube gadget. Also install ChangeLog
-
- 15 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
- google-gadgets-0.10.3.ebuild:
- Fix USE=-gtk compilation, add Gentoo oem branding, thanks Robert Piasek
- <robert.piasek@member.fsf.org> and loki_val in bug #250599
-
-*google-gadgets-0.10.3 (10 Dec 2008)
-
- 10 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml,
- +google-gadgets-0.10.3.ebuild:
- Taking over maintainership, version bump and ebuild cleanups, bug #250508
-
- 26 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
- google-gadgets-0.10.2-r2.ebuild:
- !! instead of ! to block.
-
- 26 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
- google-gadgets-0.10.2-r2.ebuild:
- Add note about failure with <gcc-4.2
-
-*google-gadgets-0.10.2-r2 (26 Sep 2008)
-
- 26 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
- -google-gadgets-0.10.2.ebuild, -google-gadgets-0.10.2-r1.ebuild,
- +google-gadgets-0.10.2-r2.ebuild:
- Fix for 'undefined symbol: JS_SetOperationCallback', blocking
- spidermonkey. Shifting to EAPI 2 and losing a lot of cruft. Fix sysdeps.h
- being installed the wrong place, reported by Sput.
-
-*google-gadgets-0.10.2-r1 (24 Sep 2008)
-
- 24 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
- +google-gadgets-0.10.2-r1.ebuild:
- Fix ggl crashing on startup.
- http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=220
-
-*google-gadgets-0.10.2 (14 Sep 2008)
-
- 14 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
- -google-gadgets-0.10.0-r1.ebuild, +google-gadgets-0.10.2.ebuild:
- Bump for 0.10.2
-
- 24 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
- google-gadgets-0.10.0-r1.ebuild, google-gadgets-0.10.0-r2.ebuild:
- Remove ewarn about qt4, since qt-4.4.1 is now unmasked
-
-*google-gadgets-0.10.0-r2 (20 Jul 2008)
-
- 20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
- +files/google-gadgets-0.10.0-xulrunner-1.9.patch,
- -google-gadgets-0.10.0.ebuild, google-gadgets-0.10.0-r1.ebuild,
- +google-gadgets-0.10.0-r2.ebuild:
- Add fix to *really* build with xulrunner-1.9 plus fix ggl-gtk sometimes
- not being able to quit.
-
-*google-gadgets-0.10.0-r1 (16 Jul 2008)
-
- 16 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
- +google-gadgets-0.10.0-r1.ebuild:
- Bugfixes wrt bug 231990 (love to eva) and cleanup of ebuild.
-
-*google-gadgets-0.10.0 (11 Jul 2008)
-
- 11 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
- -files/google-gadgets-0.9.2-gcc43-test.patch,
- -google-gadgets-0.9.2-r1.ebuild, -google-gadgets-0.9.3.ebuild,
- +google-gadgets-0.10.0.ebuild:
- Bump to 0.10.0, remove old.
-
-*google-gadgets-0.9.3 (13 Jun 2008)
-
- 13 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
- +google-gadgets-0.9.3.ebuild:
- Version bump
-
- 11 Jun 2008; <welp@gentoo.org> google-gadgets-0.9.2-r1.ebuild:
- Keyword ~amd64
-
-*google-gadgets-0.9.2-r1 (08 Jun 2008)
-
- 08 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
- +files/google-gadgets-0.9.2-gcc43-test.patch,
- -google-gadgets-0.9.2.ebuild, +google-gadgets-0.9.2-r1.ebuild:
- New ebuild with Desktop entries and fix for bug 225361.
-
-*google-gadgets-0.9.2 (06 Jun 2008)
-
- 06 Jun 2008; Peter Alfredsen <loki_val@gentoo.org> +metadata.xml,
- +google-gadgets-0.9.2.ebuild:
- Initial commit.
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
deleted file mode 100644
index 5436b71b8a7c..000000000000
--- a/x11-misc/google-gadgets/Manifest
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX google-gadgets-0.11.2-configure_ggl_nm.patch 1150 SHA256 3e9d7eb8900f3fdeacde439e78501bf5e52ba1ec1e067d26902a834505924cc4 SHA512 33bd762b0b93ff653440678fa0dcc5ceb36fdcfe530dfe662808575697ea4ba218d45d81e03896ad7461702de15156b826c8cd86979c814d647ca1511c0dba04 WHIRLPOOL cf0c520673a9edcc204f6895d15f6cca4d5f3abe02431c922b42e1c1d79b50d758052ac7e01fa0dbe4c445c588c1dfe6f4969b5b1e24022914fab30e1d065381
-AUX google-gadgets-0.11.2-gcc-4.7.patch 14151 SHA256 b5f2df31bb1bdad257adc83b1298d5cdac8ca0b0f1e179a6d724480903f86dab SHA512 f96723e9e6b6dde6e5fb36df87b875ccb1b118faf4616e728aada7963f37873b21f0c95a44f6ceea8320b5a4745a7a4f342f5da418df9234ef275987afd7a11f WHIRLPOOL d08095c2952db75930ce2cb0d67f405e5397f3f51b8b6c305e8bddb4435a16ce3a480dbafc1d48c09e0f4d4421c9ab788867c1a8fa2340b2b0b394ea6d7e2335
-AUX google-gadgets-0.11.2-glib-2.31.patch 522 SHA256 44f9cb40ef7eaee7f5ff456593f81605724b5a61d21dc03bad16945cdb7605ee SHA512 70ec042d1295c2f8775e5d6a0b554019d1686d223fe45017b98110aef6b280b76562d4a59edbc0e03dc1f6fee3e120cb092950521b3f0c92b4de5fc37f319707 WHIRLPOOL 93b95d00725a2c74fd3a4bf477d52a64719bb81f8b1810e64a4e31b20a66dc670dbc16bdb107e9c449dcdb03bc179955643b0efbbb914029d0b137cbdd34d112
-AUX google-gadgets-0.11.2-networkmanager-0.9.patch 8719 SHA256 1365c2405b493753465cc4fc20f6a5f1b07a8a8259615dba19b722e4318970a4 SHA512 a5c8a873253c31d3c379e19a67c63df77efe420fd2785b2ab57a0d9b0361c9d1c13f28ff7d29170e7f454cc044e4d025828b2f2ea39931c1b926e6b6ead7b7e9 WHIRLPOOL 0220996ee0c6e0a4379dd21a9c7991978fc9a52ed26a8ac6cde1ac00bcda2477cd643b13fdc5dd842c93c128b19c6255d4225a294723ec8193db082809e1bd26
-DIST google-gadgets-for-linux-0.11.2.tar.bz2 2539750 SHA256 2f129ae6c294876b3bc29bdf66c0f02e2c1000f97aadb3540d296560a14f343f SHA512 fff017b925a036b540d15a66a1c513bc8dd63efae0c89bb5f190c86d23c1426fca25c0ef95d6cd0538a8b4819ad8e9142c9685ef9eb173ec62a7d76e063a7a1b WHIRLPOOL f3bc6200d2b80c6e82135dabe92502e469c4e8e300ac7fcb0192c383c34e1ea585926a1fe146c4c53ccf43cb6e77b3f0f0a8e4aa14dc1ca35ef661a5254ef152
-EBUILD google-gadgets-0.11.2.ebuild 3952 SHA256 f78b4d257d4e0af626c26375b5b4e7179b2790955520064ebbd995cca349ede1 SHA512 905e581c70bcb185ec8b2df157eb2f575c27ec97631b685458906b5f6124c82a30363ae665db541cb9649862f77473190c57a0fb8ee61cd5ab1626cdb63302a2 WHIRLPOOL c69fd5a063cd13f81636be0ae90fc9256db97f99067c29aabea555c5681bc2445e3f5085e6b3506da3847fc38a5f79d32707449bdd490e536df996137ce27437
-MISC ChangeLog 9952 SHA256 c5bdafae43fadd599fe34fe05074a830139c8985d5b9f441d7936344b56c84d3 SHA512 cffff0b453eccf6b5f7e7002c48e4a163c220ddf94cf1de1ea1b65077ada9522b7a7f371e79e84e3570aa491a5644df91ffded8f5437c094eb5e55c1384251a6 WHIRLPOOL 1bc18d920a2c169f8a4bbd1b32d52503ee31337ca320d35f5e4fed4a0996f48a6da4d430b42678322024d3fd7bad938c94c9f25e11d1288f5daa356b5c3c2800
-MISC metadata.xml 352 SHA256 d33a964033d4911c425a8cb38fa6d16ed6d3a84d4f61f9f42bb3a87361e5ce93 SHA512 5c78db4046c1601c9b467dbf32d0a2f526a75a40d1d4a05dd5f3274ca40a1376519c2e541bcdd01204d11fc414a52d392a394b4fd129f43c956fb8ff8076c5ff WHIRLPOOL 62530060ae125922fd777cd342c479e48cd44dd7b5b54b35683a67661d4b1661cd32220886ad64b524a37ec2eb76d4016ccddf08f3026f3cfc0cd6ed691ba37b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQJ8BAEBCABmBQJRMo/fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88QnQQAJyAamSDlsT0XO4ylLaNAulf
-wuT7H9wUk3qQ52QO//grN6D9xZq0TPQshcF+Hdjgz9z6yS4lwJnz+G14avvrIWDg
-L0ldwn2GC/DkvCZDqFxTxzF4etECYk2a+KY0iN0K4CFKuExmtT1giV34n3C4QEMn
-6pTTItDbYxjZ4Wb5/KttLqr8w8Of44Es/Gsvkwt/OtWGTQMLW64X/UnK1qEHEDua
-vu4DuEnJQ4gFhVzA+L72pXTX0xUO3rWhemPMF9hM8Do7kfmgkBkLYAKaFNtkLVVO
-ayFt+8bhA6P1ujYpicPI6W9XksFciB2Bs6MroA8+F9IJ+2cFs8bkqEgSGWJIFPfb
-n+EniSoTz8bQIWlvk5Qc/RIbpEfsKeGBMmi6pZQMKWmgshRrGbH46nAyZoNsShV2
-386eIARpXiP09J0B2+zZwb9aOZfBveUymU2Guet/gJm8kNql8auUv2M95EOfnL+L
-bELJDODfKxPggCr/2WpTMR3CxG6aZRP5AkvPcvPrP+kupCEorNwcAQwiroSPT0B+
-pUtsB8PjhqT1cY+ZSj8znlSx+mEQ9LshuRJdkDsYcYpwjMS3qGWieJJ/9hiC61XN
-7fGMCiqGRnujE8Typtixk3vmPKR9x9KBWbJKES+0IwGbqg0AOlNfPI4zq95b4Iuw
-gQTFiBZkqDOaUF02SIWx
-=WqC+
------END PGP SIGNATURE-----
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-configure_ggl_nm.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-configure_ggl_nm.patch
deleted file mode 100644
index 9f183e7d155a..000000000000
--- a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-configure_ggl_nm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.ac.orig 2012-07-06 14:19:29.834778487 +0200
-+++ configure.ac 2012-07-06 14:22:12.174921371 +0200
-@@ -433,7 +433,7 @@
- ###########################################################
- GGL_MODULE_DIR=$libdir/$GGL_BASE_DIR/modules
- GGL_INCLUDE_DIR=$includedir/$GGL_BASE_DIR
--GGL_SYSDEPS_INCLUDE_DIR=$libdir/$GGL_BASE_DIR/include
-+GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR
- GGL_LIBEXEC_DIR=$libdir/$GGL_BASE_DIR
- GGL_RESOURCE_DIR=$datadir/$GGL_BASE_DIR
-
-@@ -895,11 +895,15 @@
-
- # Check NetworkManager
- has_network_manager=no
--PKG_CHECK_MODULES(NETWORK_MANAGER,
-+AC_ARG_WITH([networkmanager], AS_HELP_STRING([--without-networkmanager], [Build without networkmanager support (default: test)]))
-+
-+AS_IF([test "x$with_networkmanager" != "xno"], [
-+ PKG_CHECK_MODULES(NETWORK_MANAGER,
- [NetworkManager >= 0.7], [has_network_manager=yes],
- [PKG_CHECK_MODULES(NETWORK_MANAGER,
- [NetworkManager >= 0.6], [has_network_manager=old],
- [has_network_manager=no])])
-+])
-
- if test x$has_network_manager != xno; then
- PREDEFINED_MACROS="$PREDEFINED_MACROS -DHAVE_NETWORK_MANAGER"
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch
deleted file mode 100644
index 2e77e10fd552..000000000000
--- a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-Author: Pino Toscano <pino@debian.org>
-Description: Fix building with GCC 4.7
- This patch fixes the two kinds of issues that arise with GCC 4.7:
- - include <unistd.h> for functions like access(), fork(), readlink(), etc
- - fix argument-dependent lookup issues by qualifying the lookup of functions
-Forwarded: no
-Last-Update: 2012-04-04
-
---- a/ggadget/scriptable_enumerator.h
-+++ b/ggadget/scriptable_enumerator.h
-@@ -68,22 +68,22 @@
-
- protected:
- virtual void DoClassRegister() {
-- RegisterMethod("atEnd",
-+ this->RegisterMethod("atEnd",
- NewSlot(&E::AtEnd,
- &ScriptableEnumerator<E, Wrapper, Param, ClassId>
- ::enumerator_));
-- RegisterMethod("moveFirst",
-+ this->RegisterMethod("moveFirst",
- NewSlot(&E::MoveFirst,
- &ScriptableEnumerator<E, Wrapper, Param, ClassId>
- ::enumerator_));
-- RegisterMethod("moveNext",
-+ this->RegisterMethod("moveNext",
- NewSlot(&E::MoveNext,
- &ScriptableEnumerator<E, Wrapper, Param, ClassId>
- ::enumerator_));
-- RegisterMethod("item",
-+ this->RegisterMethod("item",
- NewSlot(&ScriptableEnumerator<E, Wrapper, Param, ClassId>
- ::GetItem));
-- RegisterProperty("count",
-+ this->RegisterProperty("count",
- NewSlot(&E::GetCount,
- &ScriptableEnumerator<E, Wrapper, Param, ClassId>
- ::enumerator_),
---- a/ggadget/uuid.cc
-+++ b/ggadget/uuid.cc
-@@ -24,6 +24,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <ctime>
-+#include <unistd.h>
-
- #include "string_utils.h"
-
---- a/ggadget/xml_dom.cc
-+++ b/ggadget/xml_dom.cc
-@@ -1327,15 +1327,15 @@
-
- virtual void DoClassRegister() {
- Super::DoClassRegister();
-- RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
-+ this->RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
- NewSlot(&DOMCharacterData::SetData));
-- RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
-- RegisterMethod("substringData",
-+ this->RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
-+ this->RegisterMethod("substringData",
- NewSlot(&DOMCharacterData::ScriptSubstringData));
-- RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
-- RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
-- RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
-- RegisterMethod("replaceData",
-+ this->RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
-+ this->RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
-+ this->RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
-+ this->RegisterMethod("replaceData",
- NewSlot(&DOMCharacterData::ScriptReplaceData));
- }
-
-@@ -1377,20 +1377,20 @@
- private:
- UTF16String ScriptSubstringData(size_t offset, size_t count) {
- UTF16String result;
-- CheckException(SubstringData(offset, count, &result));
-+ this->CheckException(SubstringData(offset, count, &result));
- return result;
- }
-
- void ScriptInsertData(size_t offset, const UTF16String &arg) {
-- CheckException(InsertData(offset, arg));
-+ this->CheckException(InsertData(offset, arg));
- }
-
- void ScriptDeleteData(size_t offset, size_t count) {
-- CheckException(DeleteData(offset, count));
-+ this->CheckException(DeleteData(offset, count));
- }
-
- void ScriptReplaceData(size_t offset, size_t count, const UTF16String &arg) {
-- CheckException(ReplaceData(offset, count, arg));
-+ this->CheckException(ReplaceData(offset, count, arg));
- }
-
- DOMCharacterDataImpl impl_;
-@@ -1417,10 +1417,10 @@
-
- virtual void DoClassRegister() {
- Super::DoClassRegister();
-- RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
-+ this->RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
- // Our DOMAttrs are always specified, because we don't support DTD for now.
-- RegisterConstant("specified", true);
-- RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
-+ this->RegisterConstant("specified", true);
-+ this->RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
- NewSlot(&DOMAttr::SetValue));
- // ownerElement is a DOM2 property, so not registered for now.
- }
-@@ -1516,19 +1516,19 @@
-
- virtual void DoClassRegister() {
- Super::DoClassRegister();
-- RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
-- RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
-- RegisterMethod("setAttribute",
-+ this->RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
-+ this->RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
-+ this->RegisterMethod("setAttribute",
- NewSlot(&DOMElement::ScriptSetAttribute));
-- RegisterMethod("removeAttribute",
-+ this->RegisterMethod("removeAttribute",
- NewSlot(&DOMElement::RemoveAttribute));
-- RegisterMethod("getAttributeNode",
-+ this->RegisterMethod("getAttributeNode",
- NewSlot(&DOMElement::GetAttributeNodeNotConst));
-- RegisterMethod("setAttributeNode",
-+ this->RegisterMethod("setAttributeNode",
- NewSlot(&DOMElement::ScriptSetAttributeNode));
-- RegisterMethod("removeAttributeNode",
-+ this->RegisterMethod("removeAttributeNode",
- NewSlot(&DOMElement::ScriptRemoveAttributeNode));
-- RegisterMethod("getElementsByTagName",
-+ this->RegisterMethod("getElementsByTagName",
- NewSlot(&Super::GetElementsByTagNameNotConst));
- }
-
-@@ -1696,16 +1696,16 @@
- }
-
- virtual void DoClassRegister() {
-- RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
-- RegisterMethod("getNamedItem",
-+ this->RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
-+ this->RegisterMethod("getNamedItem",
- NewSlot(&AttrsNamedMap::GetNamedItemNotConst));
-- RegisterMethod("setNamedItem",
-+ this->RegisterMethod("setNamedItem",
- NewSlot(&AttrsNamedMap::ScriptSetNamedItem));
-- RegisterMethod("removeNamedItem",
-+ this->RegisterMethod("removeNamedItem",
- NewSlot(&AttrsNamedMap::ScriptRemoveNamedItem));
-- RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
-+ this->RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
- // Microsoft compatibility.
-- RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
-+ this->RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
- }
-
- virtual DOMNodeInterface *GetNamedItem(const std::string &name) {
-@@ -1875,7 +1875,7 @@
-
- virtual void DoClassRegister() {
- Super::DoClassRegister();
-- RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
-+ this->RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
- }
-
- virtual NodeType GetNodeType() const { return TEXT_NODE; }
-@@ -2060,9 +2060,9 @@
-
- virtual void DoClassRegister() {
- Super::DoClassRegister();
-- RegisterProperty("target",
-+ this->RegisterProperty("target",
- NewSlot(&DOMProcessingInstruction::GetTarget), NULL);
-- RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
-+ this->RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
- NewSlot(&DOMProcessingInstruction::SetData));
- }
-
-@@ -2109,7 +2109,7 @@
- DEFINE_CLASS_ID(0xd23149a89cf24e12, DOMImplementationInterface);
-
- virtual void DoClassRegister() {
-- RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
-+ this->RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
- }
-
- virtual bool HasFeature(const char *feature, const char *version) const {
-@@ -2129,13 +2129,13 @@
- void SetCode(int code) { code_ = code; }
-
- virtual void DoClassRegister() {
-- RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
-- RegisterConstant("filepos", 0);
-- RegisterConstant("line", 0);
-- RegisterConstant("linepos", 0);
-- RegisterConstant("reason", "");
-- RegisterConstant("srcText", "");
-- RegisterConstant("url", "");
-+ this->RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
-+ this->RegisterConstant("filepos", 0);
-+ this->RegisterConstant("line", 0);
-+ this->RegisterConstant("linepos", 0);
-+ this->RegisterConstant("reason", "");
-+ this->RegisterConstant("srcText", "");
-+ this->RegisterConstant("url", "");
- }
-
- private:
-@@ -2180,45 +2180,45 @@
-
- virtual void DoClassRegister() {
- Super::DoClassRegister();
-- RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
-- RegisterConstant("implementation", &dom_implementation_);
-- RegisterProperty("documentElement",
-+ this->RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
-+ this->RegisterConstant("implementation", &dom_implementation_);
-+ this->RegisterProperty("documentElement",
- NewSlot(&DOMDocument::GetDocumentElementNotConst), NULL);
-- RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
-- RegisterMethod("createElement",
-+ this->RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
-+ this->RegisterMethod("createElement",
- NewSlot(&DOMDocument::ScriptCreateElement));
-- RegisterMethod("createDocumentFragment",
-+ this->RegisterMethod("createDocumentFragment",
- NewSlot(&DOMDocument::CreateDocumentFragment));
-- RegisterMethod("createTextNode",
-+ this->RegisterMethod("createTextNode",
- NewSlot(&DOMDocument::CreateTextNode));
-- RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
-- RegisterMethod("createCDATASection",
-+ this->RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
-+ this->RegisterMethod("createCDATASection",
- NewSlot(&DOMDocument::CreateCDATASection));
-- RegisterMethod("createProcessingInstruction",
-+ this->RegisterMethod("createProcessingInstruction",
- NewSlot(&DOMDocument::ScriptCreateProcessingInstruction));
-- RegisterMethod("createAttribute",
-+ this->RegisterMethod("createAttribute",
- NewSlot(&DOMDocument::ScriptCreateAttribute));
-- RegisterMethod("createEntityReference",
-+ this->RegisterMethod("createEntityReference",
- NewSlot(&DOMDocument::ScriptCreateEntityReference));
-- RegisterMethod("getElementsByTagName",
-+ this->RegisterMethod("getElementsByTagName",
- NewSlot(&Super::GetElementsByTagNameNotConst));
-- RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
-+ this->RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
- // Compatibility with Microsoft DOM.
-- RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
-- RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
-- RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
-- RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
-- RegisterProperty("preserveWhiteSpace",
-+ this->RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
-+ this->RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
-+ this->RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
-+ this->RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
-+ this->RegisterProperty("preserveWhiteSpace",
- NewSlot(&DOMDocument::PreservesWhiteSpace),
- NewSlot(&DOMDocument::SetPreserveWhiteSpace));
-- RegisterMethod("getProperty", NewSlot(DummyGetProperty));
-- RegisterMethod("setProperty", NewSlot(DummySetProperty));
-+ this->RegisterMethod("getProperty", NewSlot(DummyGetProperty));
-+ this->RegisterMethod("setProperty", NewSlot(DummySetProperty));
- // Compatibility with Microsoft DOM: XMLHttpRequest functions.
-- RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
-+ this->RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
- NewSlot(&DOMDocument::SetAsync));
-- RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
-- RegisterMethod("load", NewSlot(&DOMDocument::Load));
-- RegisterClassSignal("onreadystatechange",
-+ this->RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
-+ this->RegisterMethod("load", NewSlot(&DOMDocument::Load));
-+ this->RegisterClassSignal("onreadystatechange",
- &DOMDocument::onreadystatechange_signal_);
- }
-
---- a/ggadget/xdg/icon_theme.cc
-+++ b/ggadget/xdg/icon_theme.cc
-@@ -16,6 +16,7 @@
- #include <sys/time.h>
- #include <time.h>
- #include <cstdlib>
-+#include <unistd.h>
-
- #include <map>
- #include <vector>
---- a/extensions/qt_system_framework/qt_system_framework.cc
-+++ b/extensions/qt_system_framework/qt_system_framework.cc
-@@ -32,6 +32,7 @@
- #include <ggadget/xdg/desktop_entry.h>
- #include <ggadget/xdg/icon_theme.h>
- #include <ggadget/xdg/utilities.h>
-+#include <unistd.h>
-
- #define Initialize qt_system_framework_LTX_Initialize
- #define Finalize qt_system_framework_LTX_Finalize
---- a/extensions/linux_system_framework/process.cc
-+++ b/extensions/linux_system_framework/process.cc
-@@ -17,6 +17,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <cstdlib>
-+#include <unistd.h>
-
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
---- a/gadgets/designer/designer_script_utils.cc
-+++ b/gadgets/designer/designer_script_utils.cc
-@@ -39,6 +39,7 @@
- #include <ggadget/system_utils.h>
- #include <ggadget/uuid.h>
- #include <ggadget/view_interface.h>
-+#include <unistd.h>
-
- namespace ggadget {
- namespace designer {
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch
deleted file mode 100644
index 61de05162886..000000000000
--- a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-glib-2.31.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ggadget/gtk/main_loop.cc
-+++ ggadget/gtk/main_loop.cc
-@@ -16,9 +16,8 @@
-
- #include <fcntl.h>
- #include <stdint.h>
--#include <glib/ghash.h>
-+#include <glib.h>
- #include <gtk/gtk.h>
--#include <glib/gthread.h>
- #include <ggadget/common.h>
- #include "main_loop.h"
- #include "utilities.h"
---- hosts/gtk/main.cc
-+++ hosts/gtk/main.cc
-@@ -14,8 +14,8 @@
- limitations under the License.
- */
-
-+#include <glib.h>
- #include <gtk/gtk.h>
--#include <glib/gthread.h>
- #include <locale.h>
- #include <signal.h>
- #include <unistd.h>
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-networkmanager-0.9.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-networkmanager-0.9.patch
deleted file mode 100644
index 45b3a27a05f3..000000000000
--- a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-networkmanager-0.9.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Description: Update for NetworkManager 0.9 API changes
- This patch updates the code for a few NM 0.9 API changes.
- It builds, but I have not extensively tested the functionality.
- NM 0.9 has added a few new connection and device states, and renumbered the
- existing ones.
- This means it's possible to keep compatibility with both old and new versions
- of NM since the state numbers don't conflict.
- The patch does this by removing some usage of defines from NetworkManager.h.
- .
- Furthermore, the device enums aren't going to get renumbered so I added them
- to the code instead of using the defines. They've been the same since the
- beginning.
-Author: danielcbwilliams@gmail.com
-Bug: http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=377
-
-diff -up google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc.nm09 google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc.nm09 2009-03-14 23:12:42.000000000 -0500
-+++ google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2011-03-25 10:58:29.022771149 -0500
-@@ -23,19 +23,21 @@ namespace ggadget {
- namespace framework {
- namespace linux_system {
-
--#ifdef NM_DEVICE_TYPE_WIFI
--static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
--
--#ifdef NM_DEVICE_TYPE_ETHERNET
--static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
--
- static const int kDeviceTypeUnknown = 0;
-+static const int kDeviceTypeEthernet = 1;
-+static const int kDeviceTypeWifi = 2;
-+
-+// 0.6, 0.7, and 0.8 connected state
-+static const int kOldConnected = 3;
-+// New 0.9 connected states
-+static const int kConnectedLocal = 50;
-+static const int kConnectedSite = 60;
-+static const int kConnectedGlobal = 70;
-+
-+// 0.6, 0.7, and 0.8 activated device state
-+static const int kOldDeviceStateActivated = 8;
-+// New 0.9 activated device state
-+static const int kDeviceStateActivated = 100;
-
- Network::Network()
- : is_new_api_(false),
-@@ -59,14 +61,14 @@ Network::Network()
- is_new_api_ = true;
- int state;
- if (network_manager_->GetProperty("State").v().ConvertToInt(&state)) {
-- is_online_ = (state == NM_STATE_CONNECTED);
-+ is_online_ = IsOnlineState(state);
- }
- } else {
- DLOG("network manager 0.6.x might be used.");
- DBusIntReceiver result;
- if (network_manager_->CallMethod("state", true, kDefaultDBusTimeout,
- result.NewSlot(), MESSAGE_TYPE_INVALID)) {
-- is_online_ = (result.GetValue() == NM_STATE_CONNECTED);
-+ is_online_ = IsOnlineState(result.GetValue());
- }
- }
-
-@@ -87,14 +89,21 @@ Network::~Network() {
- delete network_manager_;
- }
-
-+bool Network::IsOnlineState(int state) {
-+ return (state == kOldConnected ||
-+ state == kConnectedLocal ||
-+ state == kConnectedSite ||
-+ state == kConnectedGlobal);
-+}
-+
- void Network::OnSignal(const std::string &name, int argc, const Variant *argv) {
- DLOG("Got signal from network manager: %s", name.c_str());
- bool need_update = false;
-- // nm 0.6.x uses "StateChange", 0.7.x uses "StateChanged".
-+ // nm 0.6.x uses "StateChange", 0.7.x and later use "StateChanged".
- if (name == "StateChange" || name == "StateChanged") {
- int state;
- if (argc >= 1 && argv[0].ConvertToInt(&state)) {
-- is_online_ = (state == NM_STATE_CONNECTED);
-+ is_online_ = IsOnlineState(state);
- DLOG("Network is %s.", is_online_ ? "connected" : "disconnected");
- if (is_online_) {
- need_update = true;
-@@ -133,7 +142,8 @@ void Network::Update() {
- if (is_new_api_) {
- int state;
- if (dev->GetProperty("State").v().ConvertToInt(&state))
-- active = (state == 8); // NM_DEVICE_STATE_ACTIVATED
-+ active = (state == kOldDeviceStateActivated ||
-+ state == kDeviceStateActivated);
- } else {
- DBusBooleanReceiver result;
- if (dev->CallMethod("getLinkActive", true, kDefaultDBusTimeout,
-diff -up google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.h.nm09 google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.h
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.h.nm09 2011-03-25 10:51:31.120995640 -0500
-+++ google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.h 2011-03-25 10:52:03.881586075 -0500
-@@ -55,6 +55,7 @@ class Network : public NetworkInterface
- private:
- void OnSignal(const std::string &name, int argc, const Variant *argv);
- void Update();
-+ bool IsOnlineState(int state);
-
- private:
- // true if using nm 0.7 or above, false if using nm 0.6.x
-diff -up google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc.nm09 google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc.nm09 2011-03-25 10:53:42.462353647 -0500
-+++ google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2011-03-25 11:01:53.707212241 -0500
-@@ -28,11 +28,10 @@
- #include <ggadget/string_utils.h>
- #include <ggadget/slot.h>
-
--// defined in <linux/wireless.h>, but we don't want to introduce such
--// dependency.
--#define IW_MODE_AUTO 0
--#define IW_MODE_ADHOC 1
--#define IW_MODE_INFRA 2
-+// Define them anyway for all versions of NM
-+static const int kNmWifiModeUnknown = 0;
-+static const int kNmWifiModeAdhoc = 1;
-+static const int kNmWifiModeInfra = 2;
-
- #if !defined(NM_DBUS_SERVICE) || !defined(NM_DBUS_PATH) || \
- !defined(NM_DBUS_INTERFACE)
-@@ -77,15 +76,15 @@ namespace linux_system {
-
- using namespace ggadget::dbus;
-
--#ifdef NM_DEVICE_TYPE_WIFI
--static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-+static const int kDeviceTypeWifi = 2;
-
- // Defined in nm 0.7
--static const int kDeviceStateActivated = 8;
--static const int kDeviceStateFailed = 9;
-+static const int kOldDeviceStateActivated = 8;
-+static const int kOldDeviceStateFailed = 9;
-+// New 0.9 activated device state
-+static const int kDeviceStateActivated = 100;
-+static const int kDeviceStateDeactivating = 110;
-+static const int kDeviceStateFailed = 120;
-
- class Wireless::Impl {
- class WirelessAccessPoint : public WirelessAccessPointInterface {
-@@ -191,7 +190,7 @@ class Wireless::Impl {
-
- void UpdateInfo() {
- if (ap_) {
-- int mode = IW_MODE_AUTO;
-+ int mode = kNmWifiModeUnknown;
- if (new_api_) { // nm 0.7.x
- ResultVariant prop = ap_->GetProperty("Ssid");
- if (prop.v().type() == Variant::TYPE_SCRIPTABLE) {
-@@ -223,9 +222,9 @@ class Wireless::Impl {
- }
- }
-
-- if (mode == IW_MODE_ADHOC)
-+ if (mode == kNmWifiModeAdhoc)
- type_ = WIRELESS_TYPE_INDEPENDENT;
-- else if (mode == IW_MODE_INFRA)
-+ else if (mode == kNmWifiModeInfra)
- type_ = WIRELESS_TYPE_INFRASTRUCTURE;
- else
- type_ = WIRELESS_TYPE_ANY;
-@@ -404,9 +403,13 @@ class Wireless::Impl {
- } else if (signal == "StateChanged") { // nm 0.7.x
- int new_state;
- if (argc >= 1 && argv[0].ConvertToInt(&new_state)) {
-- connected_ = (new_state == kDeviceStateActivated);
-+ connected_ = (new_state == kDeviceStateActivated ||
-+ new_state == kOldDeviceStateActivated);
- connect_performed = (new_state == kDeviceStateActivated ||
-- new_state == kDeviceStateFailed);
-+ new_state == kDeviceStateDeactivating ||
-+ new_state == kDeviceStateFailed ||
-+ new_state == kOldDeviceStateActivated ||
-+ new_state == kOldDeviceStateFailed);
- }
- } else if (signal == "AccessPointAdded") { // nm 0.7.x
- std::string ap_path;
-@@ -441,7 +444,9 @@ class Wireless::Impl {
- if (new_api_ && dev_ && dev_wireless_) {
- ResultVariant prop = dev_->GetProperty("State");
- if (prop.v().type() == Variant::TYPE_INT64) {
-- connected_ = (VariantValue<int>()(prop.v()) == kDeviceStateActivated);
-+ int state = VariantValue<int>()(prop.v());
-+ connected_ = (state == kDeviceStateActivated ||
-+ state == kOldDeviceStateActivated);
- }
- } else if (!new_api_ && dev_) {
- DBusBooleanReceiver bool_receiver;
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
deleted file mode 100644
index 595610a8ebee..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.21 2013/03/02 23:48:49 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils fdo-mime multilib
-
-MY_PN=${PN}-for-linux
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cool gadgets from Google for your Desktop"
-HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/"
-SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 x86"
-IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager soup startup-notification"
-REQUIRED_USE="|| ( gtk qt4 )"
-
-# Weird things happen when we start mix-n-matching, so for the time being
-# I've just locked the deps to the versions I had as of Summer 2008. With any
-# luck, they'll be stable when we get to stabling this package.
-
-RDEPEND="
- >=dev-libs/libxml2-2.6.32:2
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- dbus? ( sys-apps/dbus )
- gstreamer? (
- >=media-libs/gstreamer-0.10.19:0.10
- >=media-libs/gst-plugins-base-0.10.19:0.10
- )
- gtk? (
- >=dev-libs/atk-1.22.0
- gnome-base/librsvg:2
- >=net-misc/curl-7.18.2
- >=x11-libs/cairo-1.6.4
- >=x11-libs/gtk+-2.12.10:2
- >=x11-libs/pango-1.20.3
- dbus? ( >=dev-libs/dbus-glib-0.74 )
- )
- networkmanager? ( net-misc/networkmanager )
- qt4? (
- >=dev-qt/qtcore-4.4.0:4
- >=dev-qt/qtopengl-4.4.0:4
- >=dev-qt/qtscript-4.4.0:4
- >=dev-qt/qtwebkit-4.4.0:4
- >=dev-qt/qtxmlpatterns-4.4.0:4
- dbus? ( >=dev-qt/qtdbus-4.4.0:4 )
- )
- soup? ( >=net-libs/libsoup-2.26:2.4 )
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="test"
-
-DOCS="ChangeLog README"
-
-pkg_setup() {
- if ! use gstreamer; then
- ewarn "Disabling gstreamer disables the multimedia functions of ${PN}."
- ewarn "This is not recommended. To enable gstreamer, do:"
- ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-configure_ggl_nm.patch
- epatch "${FILESDIR}"/${P}-glib-2.31.patch
- epatch "${FILESDIR}"/${P}-gcc-4.7.patch
- epatch "${FILESDIR}"/${P}-networkmanager-0.9.patch
-
- # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 385477.
- has_version '>=sys-libs/zlib-1.2.5.1-r1' && sed -i -e \
- '1i#define OF(x) x' third_party/unzip/ioapi.h
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-update-desktop-database \
- --disable-update-mime-database \
- --disable-werror \
- --enable-libxml2-xml-parser \
- --with-browser-plugins-dir=/usr/$(get_libdir)/nsbrowser/plugins \
- --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
- --with-oem-brand=Gentoo \
- $(use_enable debug) \
- $(use_enable dbus libggadget-dbus) \
- $(use_enable gstreamer gst-audio-framework) \
- $(use_enable gstreamer gst-video-element) \
- $(use_with networkmanager) \
- $(use_enable soup soup-xml-http-request) \
- $(use_enable gtk gtk-host) \
- $(use_enable gtk libggadget-gtk ) \
- $(use_enable gtk gtk-edit-element) \
- $(use_enable gtk gtk-flash-element) \
- $(use_enable gtk gtk-system-framework) \
- $(use_enable gtk curl_xml_http_request) \
- $(use_enable qt4 qt-host) \
- $(use_enable qt4 libggadget-qt) \
- $(use_enable qt4 qt-edit-framework) \
- $(use_enable qt4 qt-system-framework) \
- $(use_enable qt4 qtwebkit-browser-element) \
- $(use_enable qt4 qt-xml-http-request) \
- $(use_enable qt4 qt-script-runtime) \
- --disable-gtkmoz-browser-element \
- --disable-smjs-script-runtime \
- --disable-gtkwebkit-browser-element \
- --disable-webkit-script-runtime
-}
-
-src_test() {
- #If someone wants to guarantee that emake will not make
- #tests fail promiscuosly, please do, otherwise we're using make.
- make check &> "${WORKDIR}"/check
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
diff --git a/x11-misc/google-gadgets/metadata.xml b/x11-misc/google-gadgets/metadata.xml
deleted file mode 100644
index fcb1a3857332..000000000000
--- a/x11-misc/google-gadgets/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>voyageur@gentoo.org</email>
- <name>Bernard Cafarelli</name>
- </maintainer>
- <use>
- <flag name="soup">Enables XML HTTP request extension based on <pkg>net-libs/libsoup</pkg></flag>
- </use>
-</pkgmetadata>