diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-11-10 08:59:12 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-11-10 08:59:12 +0000 |
| commit | efbc3d0ae66da2b4b997f9b960c40d61c1aae532 (patch) | |
| tree | cc170bddc2261f040516448a369233b3a69e6c44 /gnome-base/gnome-control-center | |
| parent | ditto 2013.2.9999, viable test phase added to the live (diff) | |
| download | historical-efbc3d0ae66da2b4b997f9b960c40d61c1aae532.tar.gz historical-efbc3d0ae66da2b4b997f9b960c40d61c1aae532.tar.bz2 historical-efbc3d0ae66da2b4b997f9b960c40d61c1aae532.zip | |
Version bump, drop old
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'gnome-base/gnome-control-center')
13 files changed, 57 insertions, 1348 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog index 45125f359f24..b17cf1e439c6 100644 --- a/gnome-base/gnome-control-center/ChangeLog +++ b/gnome-base/gnome-control-center/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for gnome-base/gnome-control-center # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.136 2013/10/08 15:24:51 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.137 2013/11/10 08:59:08 pacho Exp $ + +*gnome-control-center-3.8.6 (10 Nov 2013) + + 10 Nov 2013; Pacho Ramos <pacho@gentoo.org> + +files/gnome-control-center-3.8.6-flickr-linking.patch, + +gnome-control-center-3.8.6.ebuild, + -files/gnome-control-center-3.5.91-gentoo-paths.patch, + -files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch, + -files/gnome-control-center-3.5.91-optional-kerberos.patch, + -files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch, + -files/gnome-control-center-3.7.4-optional-kerberos.patch, + -files/gnome-control-center-3.8.0-optional-r1.patch, + -files/gnome-control-center-3.8.1.5-optional-modemmanager.patch, + -files/gnome-control-center-3.8.4-optional-kerberos.patch, + -gnome-control-center-3.6.3-r1.ebuild, -gnome-control-center-3.8.5.ebuild: + Version bump, drop old *gnome-control-center-3.8.5-r1 (08 Oct 2013) diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index c67a97ff751e..052779959e18 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -6,34 +6,22 @@ AUX gnome-control-center-2.32.1-erase-background.patch 1899 SHA256 95bc536d5b081 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd SHA512 990849500fd5317ec6fbf58e03db3754c5e9111757d28d83bd4f7655068efb25fbe793f9d5171f227070dfde7b688163eab8c011edacb5435b4a788e8349aee6 WHIRLPOOL 8683316623e0059cec6278b7f0b0a23ea46dff73ca4ad2bc9ffe14b139072bfb4ea2589a76b74ccfb14170cff9cd756f1772ae356cdaa6779aee930907553130 AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d SHA512 ea81dc45ef7f2b5c14e9a094a9a8601c6631ad1df60a9316ea2f2fe8c922979bbb23e1a3a13adb3ca909eed1b489a7eb521b85cf7bd0dd7e09ce528c0a38d751 WHIRLPOOL 1b8450b5073ddb44b30964373024005c6fadd58f3246cdf37290e8350cc3d9ca54754c6ac1eca5fcedbd06e288495e8657102d8c8200e30e83c07702eb34531a AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 SHA512 c4a59d44853ce81c067626d1a51f3566a3cf754e98584d1a836072d8ea6b8a89fb6542f92b2237a4675c1f5cc296c76d28e39fb3e441cb8d6cc7f42877304307 WHIRLPOOL 20e47d5aa6670bee3a3e1dee8cd176e9c3909de2d60614b8d058a3c09b929e32761abd345592dc92f6cab32e2fb677ed4d87dfc63fc9b231a902b5dc4b3ed822 -AUX gnome-control-center-3.5.91-gentoo-paths.patch 3674 SHA256 18197aa12c0f3f83df2306484870e42a72f67f57f2bc1c1b86cd790b42d1825c SHA512 7633c11f3f002e1a2d389fa39f3f69996c12ea47a33b1e1f698a7aeb1791fec27986adfec55f050fc1341c240f873f8f15983d791eb45e04dbf16306fe4adcf7 WHIRLPOOL ad8f24c03fd7396486661b5c71c73220a22d8dc0bfa3e59cea7a9fb1c1b5876259d491252d7535995a014aa5707342266ed43f8d9c151c7419e7a9f67d8b886b -AUX gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch 5989 SHA256 ede7822e6ae989661cd873107922f7301843dfc3a4020fd7a01ed67d33109aca SHA512 2c8d0e0fde3e967698f3b8e87a41de1565fc84e9aaa98aa28272836c345e53d24e797890b3639d3fe53f4e40e0c5d127e57da83d9cb1b21428295048a353eb45 WHIRLPOOL d3c23851c15584d603fa021bc8635c11d0d0060cb4d895c215c8c3a52180f4cdff9c827210a6ead5d050afc951e034c2960a5532c9afb3f8009fd2a127017dcc -AUX gnome-control-center-3.5.91-optional-kerberos.patch 7920 SHA256 49bc7820c9c5b3ee8171111d9ec37c878554e22b61badece23abf1e2bd09548a SHA512 960743771dab2b929fb1071e1c532e78eb87d4c902f0e72e4c2c99fc01e838022b84394c7e52a202f4c22f96061681d2fe82194cfa23651320cc96c8e29bad92 WHIRLPOOL d4db5288d848631f1cc6a3935ad4455fcb026857b043299af609b070c93d8e5f878d727d6e3049c6b273131ae15b11b9d514d80c7e58b39215e378fbda9db427 -AUX gnome-control-center-3.6.3-pulseaudio-3-fix.patch 1605 SHA256 cd02aad43cf34a91b2449ab1d583169449ca2a6cea057a1ff205b2b6f1e6463f SHA512 d29dc4ed8ead058c9a5fd94d14c2f1fb3d3287872057d605d4ccecf7146fa6f80a2fd292761ce1420689172e90ec74da8835241bb4f48f36502388da84319d2d WHIRLPOOL d4b294af571aadc5c6915f131c22c2d38ffc5617f7a8d19d8d8615123d5cead41b3d19323cf169c25bc03f57106580cc6f3f63f304b46dd09fece919e09ead89 -AUX gnome-control-center-3.7.4-optional-kerberos.patch 6668 SHA256 7e4807b03c7f5d97294e5a9f933c1764a6a281a4e984c3f03e67fc8b14d80497 SHA512 154284f795f564396a3e30e963e268f39684e526e35d2f4354f12ae5f0660907f44c8ce7cb23ef22930f9e131312a29a88073ea48c69afd5baec0637fecc362d WHIRLPOOL 4fc87d4aef26ea0433cfa65a948c2ce5e7c9f960f823be9d7f5ab3b1ebf697da1c9b97787e6821ee2fc17f61ab2a46a49c0c4137c69be8376690cc6af3b50239 -AUX gnome-control-center-3.8.0-optional-r1.patch 9577 SHA256 9234128cb2c733f46fbbe0f2ec2e1854ac9bc7dae35eb945b3114ad510e50e79 SHA512 e10c6d54db275fe1d8ad774f041c00568be4dd5e5582c0350ba11362a6a007487f8ec7fc9750665ec8a9bb7952325bd758ff7bb8df6e0c369390bbcd51a8a835 WHIRLPOOL 13de899453bafcab1d8f2cc756db6200358f97cd7bda875ad3b8bdbdf224b6f89d335a8023f963fcc8f5ca605acc29d2844c5fa9cb77a9e976a19ab13558cd24 AUX gnome-control-center-3.8.0-paths-makefiles.patch 865 SHA256 65deb3482fddbef130b8bcdf67150a8e2ed6775b68922b2958ce0d03556e6101 SHA512 6a4ec4bb5c80ae3ee40a75fb7985a890822ed7e4c53f24263054b016ae59eef4670091d257a5f6eb0e87b5c5cdd40c8b36d0036a59accbe28e2e1c080bffd2eb WHIRLPOOL 9a70893a8edd3bfbd03bebe3ec45246b7a90db1d748421d8ff561acd2bc4f4a845151bb95ef65dc5696daf75d4e66ec067bd19dc114c08c1528d2464297bad7d AUX gnome-control-center-3.8.0-paths.patch 2178 SHA256 3c8e3a8232262cb92d0416bd27ed47b157354b6ee4d9b31f5ef0705ff4ce96e3 SHA512 ad64242b6c4c822ea973d938307105c12c41a9cf27fa0f7d9974fdfd3cd5945a02f110db7649bdd2dd95add31ff758a3c0a9b0228f7826b7f135bacd16a5dfe6 WHIRLPOOL a8b0c092da3812b9398e1eacccb5dbf6c899ace1a1b130cd0047f8d7e542c440c9550cc1e4a35384581aadf8cbaab683b21da0a02d431f80304137dde98a86ca -AUX gnome-control-center-3.8.1.5-optional-modemmanager.patch 1082 SHA256 21bf87ddd13a0615084115c5e09b6a8358bf597899b66c46a885672f2293a63f SHA512 60880c161b5fd0fc96b9748af336b805d9b41d5e58cb676355381a3c2c2fa7354b68c10b676829bee5e35f3c4c2b06a6b101a0c17ac7020744fee9ae980eb0e0 WHIRLPOOL a68e6b0ae5f9d6f1c48164901dc2a7d17330540e1b0b54735360436311d049f4d104f23d684d2339bb9bc9c678e4ba0dbb21a108a7da5ea2260f0a0c5ce04f12 -AUX gnome-control-center-3.8.4-optional-kerberos.patch 3161 SHA256 006b656afe65f0b2bf6fd2780ae4f876ff6c1cd4f846a5ca52cd6e7df7193c06 SHA512 665122f0dd30e911c3c1b1e2fd11239563d5a8467aae43e9a913c66087bdf44a4a8c0a39045022df4d6ecd062a7dc23f57e7ae1f61cfb8234ce47c5124a383b0 WHIRLPOOL 603dfb6708f9afef61527ddd8b4590af3c42c025cc29a21cf3203a72a003d57e4ac58fb6dda5acb5f1f1dee97763c38179db07246c7c902c11c69444094dc109 AUX gnome-control-center-3.8.5-optional.patch 14242 SHA256 2aa4729552adc055053cb697157735bf5dff9df2932d7f7023871e1603b6bd91 SHA512 5b7f87163fe9d4adbdef9bd6ca6495aa4a1487ebd884d4a6a0cd3c4682425460f67ce4010b2f265463bb9d46edb99bda0319e539618ee7b129651948150b8205 WHIRLPOOL a5f2174bc6a8ae151dc00d75b102317bb48b1b27faef85e548c3df710ed9a73abf1c869f059377885dd37ea17d71e31031552d9a456098c6f2737b2662a82a42 +AUX gnome-control-center-3.8.6-flickr-linking.patch 911 SHA256 cc3d0f3c5c9c458393f0a8f2d949db207bc725b3e17f92381148215d4fd383a0 SHA512 9582c25a4bc3f7438130ee4b54d9dee69bcfd8355460eb704655b1c48be2366836b2b67431d0c1f0c45e612ba36aeabb5ea5323824cd9c48b22c7523c6cd220f WHIRLPOOL b9a4c80958290912fa6dcef00476f20c175a6af4615b82a748f45016e55ef4a37faf2f20a1a3d5053a1c6ada2191b8e4cbf802692d9724aa8b32f0716beec2d7 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4 -DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb SHA512 77cd68349dc7f58714fbd121a34ec73a5c3e67c7a42a08c20a8dfdcfc9cefdec47af0f09130b7e3f0407cb7a786234b2619fdb76462c3bdb2bbc548294bfd444 WHIRLPOOL bf4ba1b6c9cb17f6b5f22003ee89af051ad152dd5671ffe01ba5cc0339d51659a8af7c629755726d305caf75c1fe4629b268fc269862751bc24317d323395697 DIST gnome-control-center-3.8.5.tar.xz 6925968 SHA256 efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2 SHA512 5023a859756fe94334632ee2cf6206fbaed5c612d30ba230da52e7d62d95b94002f03adf0b39af18b5489428d559cc9ec6baf95698b894f275a5eaa86ff670b5 WHIRLPOOL 9ae8d2971ea793533bd3a2875f39b33b123a83c25ced2a241e8a7cdc4dd9f34f4547472e60bdffbdad34e09ca7867441a2a2fcd841b2ebbbcf45734a36607944 +DIST gnome-control-center-3.8.6.tar.xz 6723440 SHA256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a SHA512 7c917d9527b178352148eb746a4e99aa154d3c2aa13973e0e638cd4a6d977b1f4448ee010897617d4d06faa568c6cda43bcd334c014352b3d8f68df75cdb880a WHIRLPOOL bc8de5b336862640f66c883e0da8e02c8bb4f16b6557ce351e27c9e10d93dcfd449bf33d0c1d6ce09c4cd6f19b50c9b8478bc1143ccce61418bb1ec2c2ff7e24 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a -EBUILD gnome-control-center-3.6.3-r1.ebuild 4559 SHA256 d532e2601572d312f367ee885aedf2f9b057b2ea1151bbf4bb2051f5633bb892 SHA512 db7dd4fdc00654669da0c0213714eb9a966f4a5ac1d98b5455eb1470fdb31c5d31ace30793c2e32f9fecf42adc58aac6e2d2e581e9f73e6eb3d9e6618447d2dd WHIRLPOOL c5bf7f6bcc5ee2eda5bc351975ed9143f9b31a14af3f250cdfc8d82189485eeea5db5f236b29be74ea59914151500d4a3841854146a8f163b58f45228ffd5db8 EBUILD gnome-control-center-3.8.5-r1.ebuild 5402 SHA256 66e1b04bd4098f7ab817597113c398ea7064e7a012ce332b4397c8b2d183ddd8 SHA512 e44522c8f6bcc7387ccb93ebfa00a7c1ec96f11caf605293faa1045f9ac7d306c29847693cae193b96149fad7058fc207f49b7b85b0d253b344a04bb9d02e3c8 WHIRLPOOL 6292675813b513e613d80dbf417f3eb3e18ab2a41c2ec005a61ca2e2b167f4001569798b0bcc98eab1645fc9310d6a6dbee4727b7fbcac836e1a8a2bef40aefa -EBUILD gnome-control-center-3.8.5.ebuild 5594 SHA256 b3a7b1c8eed7c58f567eda05952964ed27d449de3eeb92f5639beab6b3b68aab SHA512 6b7b4f39bef7215e1a23bc319fa206b17a3b316d21b5f3638a0a674d7d777a228669e0b6490a65de6f660e70d876a557496adfa1b2cc8bae1f51f4b70c7e48da WHIRLPOOL 45e5847748acc45290439d836023221c5867f7effa0bb6ece7de4a13a4d36c5f6105903891616f843e083399c00c4b0516216c0abbc2f7d636ba2251e424c13f -MISC ChangeLog 65443 SHA256 c4eeccf0b04cbc439d28820ed2c471316dcf741934a16f55f48275b4a215e017 SHA512 1d3818e9502120053c69ccadff49eeb1486b59db901ce5374bf30b5aa78cd91873781fe665c862a643d8ba0bd41aff0a4ea5e7493e1908bfc2200d6e0c9e98d8 WHIRLPOOL c315f54526c018f3693ca1b316307126737da68abfcf4ab6f800d4aed4e24d79f91511dc8d5324f3eb8ca86c7f89c94b4f03289c75141accb112d9a6ffbf5de2 +EBUILD gnome-control-center-3.8.6.ebuild 5510 SHA256 040fdc0f92352cd9ef3854d26113ad5b2ab57ebbc077e6ec5a381aa00708275d SHA512 180c54b9476ccfa5794af454eeb8790aead803a3a342e889a21feffb3d7f1a7d0e907c6f44a2f2a1c35c3185464af931886783b8e464b940be4deda76241c07a WHIRLPOOL 4427ac07c66cf72396435b7b691e4efce80d88b8bce97910ce9e671960fe61db1c5896f6227d7fb153006518d99073b2acb7321b5ed5338a0e7619148614fcfb +MISC ChangeLog 66223 SHA256 b14354d9cc4cf0d009b8ef9b83504b932955db69b9490a1c1aab5bc42e31ea8a SHA512 f4032f2383316e8613d0235b3e162b0ac0f81c43f063c8673b78a320b63f39401d93b3c11d37ef8b4466b130a4267a2f18c118c2b90f971de566843a26c6ac7d WHIRLPOOL 7f2e4acbd6532359bb505733a19d092b8d1bf59a827a34d87917fd0db814292c92be93ab3f983078f20be5b05758f028a17167f9cbbd81f09ea5812e9b92945d MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSVCPDAAoJEJ0WA1zPCt1h/3kIAKtcC8EcNaj7swObpW8SW+Fo -GA4JZQ2dbzYTpW7GdadJXPublYksLygXk57LdOiYcuhVb6y4TCVGhjPy3kf4ibSy -cUbqy5cISB0SfpnJzd+d9X829n05Vad8KjtAqcy6dakDvvrUqPfJvfikGDx4NuA7 -NgNcYkbS2KQjDXeK/ISE4GgnX9gENb8LBFNA+ao8Tqm7/KBZn4nzLxoG0F1W0FcL -7WdZLTS+/4/V5M/TyxhOBhnk54wV4dEyNsXtOfv2+NH6KQHjciNCk8JYAYeIgEID -muJLoqO8eLaevPbhsUOal7dI6ECgUoALQ1oGdgs8aQQUBCY0wzfXDI/yJJFti8E= -=Hrjp +iEYEAREIAAYFAlJ/St0ACgkQCaWpQKGI+9QmbgCfRk7/1Qu/rETN5mMrCSeJ82ay +zRgAn2dSrTNGa9mcSKJWtif/4b5Os4wA +=rzYe -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch deleted file mode 100644 index 64b992db6616..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch +++ /dev/null @@ -1,116 +0,0 @@ -Use Gentoo-appropriate absolute paths - -Original author: Alexandre Rostovtsev <tetromino@gentoo.org> ---- ---- a/panels/common/Makefile.am -+++ b/panels/common/Makefile.am -@@ -9,7 +9,7 @@ - $(LIBLANGUAGE_CFLAGS) \ - -DDATADIR=\""$(datadir)"\" \ - -DUIDIR=\""$(pkgdatadir)/ui"\" \ -- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ -+ -DLIBLOCALEDIR=\""$(libdir)/locale"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" - ---- a/panels/datetime/Makefile.am -+++ b/panels/datetime/Makefile.am -@@ -72,6 +72,7 @@ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ - -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DDATADIR="\"$(uidir)\"" \ -+ -DREALDATADIR="\"$(datadir)\"" \ - $(NULL) - - noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone ---- a/panels/datetime/test-endianess.c -+++ b/panels/datetime/test-endianess.c -@@ -38,11 +38,11 @@ - return 0; - } - -- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); -+ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL); - if (dir == NULL) { - /* Try with /usr/share/locale/ - * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ -- dir = g_dir_open ("/usr/share/locale/", 0, NULL); -+ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL); - if (dir == NULL) { - return 1; - } ---- a/panels/datetime/test-timezone.c -+++ b/panels/datetime/test-timezone.c -@@ -1,7 +1,7 @@ - #include <gtk/gtk.h> - #include "cc-timezone-map.h" - --#define TZ_DIR "/usr/share/zoneinfo/" -+#define TZ_DIR REALDATADIR "/zoneinfo/" - - static GList * - get_timezone_list (GList *tzs, ---- a/panels/datetime/tz.h -+++ b/panels/datetime/tz.h -@@ -29,9 +29,9 @@ - #include <glib.h> - - #ifndef __sun --# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" -+# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab" - #else --# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" -+# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab" - #endif - - typedef struct _TzDB TzDB; ---- a/panels/printers/Makefile.am -+++ b/panels/printers/Makefile.am -@@ -12,6 +12,9 @@ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ - -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DDATADIR="\"$(uidir)\"" \ -+ -DREALDATADIR="\"$(datadir)\"" \ -+ -DPREFIX="\"$(prefix)\"" \ -+ -DLIBEXECDIR="\"$(libexecdir)\"" \ - $(NULL) - - ccpanelsdir = $(PANELS_DIR) ---- a/panels/printers/cc-printers-panel.c -+++ b/panels/printers/cc-printers-panel.c -@@ -2199,8 +2199,8 @@ - - if (printer_name) - { -- const gchar *const dirs[] = { "/usr/share/cups", -- "/usr/local/share/cups", -+ const gchar *const dirs[] = { REALDATADIR "/cups", -+ PREFIX "/local/share/cups", - NULL }; - const gchar *testprint[] = { "%s/data/testprint", - "%s/data/testprint.ps", ---- a/panels/printers/pp-host.c -+++ b/panels/printers/pp-host.c -@@ -251,7 +251,7 @@ - data->devices->devices = NULL; - - argv = g_new0 (gchar *, 3); -- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); -+ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp"); - argv[1] = g_strdup (priv->hostname); - - /* Use SNMP to get printer's informations */ ---- a/panels/user-accounts/Makefile.am -+++ b/panels/user-accounts/Makefile.am -@@ -10,7 +10,7 @@ - AM_CPPFLAGS = \ - -DDATADIR=\""$(datadir)"\" \ - -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \ -- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ -+ -DLIBLOCALEDIR=\""$(libdir)/locale"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \ - -I$(srcdir)/../common/ \ --- -1.7.8.6 - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch deleted file mode 100644 index aab50aa0d3ea..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch +++ /dev/null @@ -1,183 +0,0 @@ -Make wacom, colord, goa optional - -Original author: Alexandre Rostovtsev <tetromino@gentoo.org> ---- configure.ac -+++ configure.ac -@@ -137,10 +137,48 @@ - PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) --PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ -+build_online_accounts=false -+AC_ARG_ENABLE(goa, -+ AC_HELP_STRING([--disable-goa], -+ [disable online accounts management panel]), -+ [case "${enableval}" in -+ yes) WANT_ONLINE_ACCOUNTS=yes ;; -+ no) WANT_ONLINE_ACCOUNTS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; -+ esac], -+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value -+ -+if test x$WANT_ONLINE_ACCOUNTS = xyes; then -+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ build_online_accounts=true -+fi -+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) -+ - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+ -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+ build_color=true -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) -+ - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES -@@ -174,10 +212,24 @@ - fi - AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) - --# Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5, -- [have_bluetooth=yes], have_bluetooth=no) --AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) -+have_bluetooth=false -+AC_ARG_ENABLE(bluetooth, -+ AC_HELP_STRING([--disable-bluetooth], -+ [disable bluetooth management panel]), -+ [case "${enableval}" in -+ yes) WANT_BLUETOOTH=yes ;; -+ no) WANT_BLUETOOTH=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; -+ esac], -+ [WANT_BLUETOOTH=yes]) dnl Default value -+ -+if test x$WANT_BLUETOOTH = xyes; then -+ # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5) -+ have_bluetooth=true -+fi -+ -+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue]) - - # Check for CUPS 1.4 or newer - AC_ARG_ENABLE([cups], -@@ -237,11 +289,23 @@ - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -- have_wacom=yes -+ AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+ if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ have_wacom=yes -+ fi - fi - ;; - *) -@@ -509,6 +573,11 @@ - else - AC_MSG_NOTICE([ Bluetooth panel disabled]) - fi -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** colord (Color panel)]) -+else -+ AC_MSG_NOTICE([ Color panel disabled]) -+fi - if test "x$enable_cups" = "xyes"; then - AC_MSG_NOTICE([** CUPS (Printers panel)]) - else -@@ -519,6 +588,11 @@ - else - AC_MSG_NOTICE([ Users panel webcam support disabled]) - fi -+if test "x$build_online_accounts" = "xtrue"; then -+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) -+else -+ AC_MSG_NOTICE([ Online Accounts panel disabled]) -+fi - if test "x$with_libsocialweb" = "xyes"; then - AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)]) - else -@@ -529,6 +603,11 @@ - else - AC_MSG_NOTICE([ Using ConsoleKit for session tracking]) - fi -+if test "x$build_wacom" = "xtrue"; then -+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) -+else -+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) -+fi - if test "x$have_wacom" = "xyes"; then - AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) - else ---- panels/Makefile.am -+++ panels/Makefile.am -@@ -3,10 +3,8 @@ - background \ - screen \ - power \ -- color \ - display \ - mouse \ -- online-accounts \ - region \ - info \ - sound \ -@@ -15,6 +13,10 @@ - user-accounts \ - datetime - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ - if BUILD_WACOM - SUBDIRS += wacom - endif -@@ -31,4 +33,8 @@ - SUBDIRS += bluetooth - endif - -+if BUILD_ONLINE_ACCOUNTS -+SUBDIRS += online-accounts -+endif -+ - -include $(top_srcdir)/git.mk diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch deleted file mode 100644 index aba709475c52..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 88e3f2146b0740161dc3b2095dcf05c538b67e36 Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Mon, 10 Sep 2012 18:49:43 +0300 -Subject: [PATCH] Crappy patch to allow disabling kerberos requirement - -https://bugzilla.gnome.org/show_bug.cgi?id=686840 ---- - configure.ac | 22 ++++++++++++++-------- - panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++---- - panels/user-accounts/um-realm-manager.c | 2 ++ - 3 files changed, 42 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa4b12f..c1e188f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -321,16 +321,22 @@ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes - ISO_CODES=iso-codes - - # Kerberos kerberos support --AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) --if test "$KRB5_CONFIG" = "no"; then -- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) --fi - --AC_MSG_CHECKING(for krb5 libraries and flags) --KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" --KRB5_LIBS="`$KRB5_CONFIG --libs`" --AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+AC_ARG_ENABLE([kerberos], -+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, -+ [enable_kerberos=yes]) -+ -+if test x"$enable_kerberos" != x"no" ; then -+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) -+ if test "$KRB5_CONFIG" = "no"; then -+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) -+ fi - -+ AC_MSG_CHECKING(for krb5 libraries and flags) -+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" -+ KRB5_LIBS="`$KRB5_CONFIG --libs`" -+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+fi - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - -diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c -index 9dbda5c..6b82980 100644 ---- a/panels/user-accounts/um-account-dialog.c -+++ b/panels/user-accounts/um-account-dialog.c -@@ -26,10 +26,13 @@ - #include <gtk/gtk.h> - - #include "um-account-dialog.h" --#include "um-realm-manager.h" - #include "um-user-manager.h" - #include "um-utils.h" - -+#ifdef KERBEROS -+#include "um-realm-manager.h" -+#endif -+ - typedef enum { - UM_LOCAL, - UM_ENTERPRISE, -@@ -41,6 +44,7 @@ static void mode_change (UmAccountDialog *self, - - static void dialog_validate (UmAccountDialog *self); - -+#ifdef KERBEROS - static void on_join_login (GObject *source, - GAsyncResult *result, - gpointer user_data); -@@ -48,6 +52,7 @@ static void on_join_login (GObject *source, - static void on_realm_joined (GObject *source, - GAsyncResult *result, - gpointer user_data); -+#endif - - #define UM_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \ - UmAccountDialogClass)) -@@ -83,6 +88,7 @@ struct _UmAccountDialog { - gboolean enterprise_domain_chosen; - GtkEntry *enterprise_login; - GtkEntry *enterprise_password; -+#ifdef KERBEROS - UmRealmManager *realm_manager; - UmRealmObject *selected_realm; - -@@ -92,6 +98,7 @@ struct _UmAccountDialog { - GtkEntry *join_name; - GtkEntry *join_password; - gboolean join_prompted; -+#endif - }; - - struct _UmAccountDialogClass { -@@ -292,6 +299,7 @@ local_prepare (UmAccountDialog *self) - gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0); - } - -+#ifdef KERBEROS - static gboolean - enterprise_validate (UmAccountDialog *self) - { -@@ -461,7 +469,6 @@ on_join_response (GtkDialog *dialog, - on_join_login, - g_object_ref (self)); - } -- - static void - join_show_prompt (UmAccountDialog *self, - GError *error) -@@ -839,6 +846,7 @@ enterprise_prepare (UmAccountDialog *self) - gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), ""); - gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), ""); - } -+#endif - - static void - dialog_validate (UmAccountDialog *self) -@@ -849,9 +857,11 @@ dialog_validate (UmAccountDialog *self) - case UM_LOCAL: - valid = local_validate (self); - break; -+#ifdef KERBEROS - case UM_ENTERPRISE: - valid = enterprise_validate (self); - break; -+#endif - default: - valid = FALSE; - break; -@@ -937,12 +947,14 @@ on_local_toggle (GtkToggleButton *toggle, - mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL); - } - -+#ifdef KERBEROS - static void - on_enterprise_toggle (GtkToggleButton *toggle, - gpointer user_data) - { - mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE); - } -+#endif - - static void - mode_init (UmAccountDialog *self, -@@ -954,15 +966,18 @@ mode_init (UmAccountDialog *self, - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area"); - self->mode_areas[UM_LOCAL] = widget; -+#ifdef KERBEROS - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area"); - self->mode_areas[UM_ENTERPRISE] = widget; -- -+#endif - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button"); - g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self); - self->mode_buttons[UM_LOCAL] = widget; -+#ifdef KERBEROS - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button"); - g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self); - self->mode_buttons[UM_ENTERPRISE] = widget; -+#endif - } - - static void -@@ -1022,8 +1037,10 @@ um_account_dialog_init (UmAccountDialog *self) - self->container_widget = widget; - - local_init (self, builder); -+#ifdef KERBEROS - enterprise_init (self, builder); - join_init (self, builder); -+#endif - mode_init (self, builder); - - g_object_unref (builder); -@@ -1041,9 +1058,11 @@ um_account_dialog_response (GtkDialog *dialog, - case UM_LOCAL: - local_create_user (self); - break; -+#ifdef KERBEROS - case UM_ENTERPRISE: - enterprise_add_user (self); - break; -+#endif - default: - g_assert_not_reached (); - } -@@ -1064,6 +1083,7 @@ um_account_dialog_dispose (GObject *obj) - if (self->cancellable) - g_cancellable_cancel (self->cancellable); - -+#ifdef KERBEROS - if (self->realmd_watch) - g_bus_unwatch_name (self->realmd_watch); - self->realmd_watch = 0; -@@ -1075,7 +1095,7 @@ um_account_dialog_dispose (GObject *obj) - g_object_unref (self->realm_manager); - self->realm_manager = NULL; - } -- -+#endif - G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj); - } - -@@ -1128,7 +1148,9 @@ um_account_dialog_show (UmAccountDialog *self, - self->cancellable = g_cancellable_new (); - - local_prepare (self); -+#ifdef KERBEROS - enterprise_prepare (self); -+#endif - mode_change (self, UM_LOCAL); - dialog_validate (self); - -diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c -index 301c905..25c055c 100644 ---- a/panels/user-accounts/um-realm-manager.c -+++ b/panels/user-accounts/um-realm-manager.c -@@ -22,6 +22,7 @@ - - #include "config.h" - -+#ifdef KERBEROS - #include "um-realm-manager.h" - - #include <krb5/krb5.h> -@@ -826,3 +827,4 @@ um_realm_login_finish (GAsyncResult *result, - - return TRUE; - } -+#endif --- -1.7.12 - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch deleted file mode 100644 index 80dc65315783..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 -From: David Henningsson <david.henningsson@canonical.com> -Date: Fri, 7 Dec 2012 16:22:09 +0530 -Subject: [PATCH] sound: Fix port handling for the unknown availability case - -The current code assumes that port availability transitions will be -between YES and NO, and doesn't account for the fact that it may also be -UNKNOWN. This causes spurious entries if the port availability -transitions between YES and UNKNOWN. ---- - panels/sound/gvc-mixer-control.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c -index 34ddc0c..2f6cf34 100644 ---- a/panels/sound/gvc-mixer-control.c -+++ b/panels/sound/gvc-mixer-control.c -@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, - else { - for (i = 0; i < info->n_ports; i++) { - if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { -- if (card_port->available != info->ports[i]->available) { -+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { - card_port->available = info->ports[i]->available; - g_debug ("sync port availability on card %i, card port name '%s', new available value %i", - gvc_mixer_card_get_index (card), --- -1.8.0 - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch deleted file mode 100644 index 38088aa2425d..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch +++ /dev/null @@ -1,203 +0,0 @@ -From 75c944a788beb749a28086025876406b7864baf5 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> -Date: Tue, 19 Feb 2013 16:40:37 +0330 -Subject: [PATCH] gnome-control-center-3.7.4-optional-kerberos -originaly by Priit Laes <pleas@plaes.org> -Crappy patch to allow disabling kerberos requirement -https://bugzilla.gnome.org/show_bug.cgi?id=686840 ---- - panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++---- - panels/user-accounts/um-realm-manager.c | 2 ++ - 2 files changed, 28 insertions(+), 4 deletions(-) - -diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c -index 88dff99..5f50087 100644 ---- a/panels/user-accounts/um-account-dialog.c -+++ b/panels/user-accounts/um-account-dialog.c -@@ -27,9 +27,12 @@ - #include <act/act.h> - - #include "um-account-dialog.h" --#include "um-realm-manager.h" - #include "um-utils.h" - -+#ifdef KERBEROS -+#include "um-realm-manager.h" -+#endif -+ - typedef enum { - UM_LOCAL, - UM_ENTERPRISE, -@@ -41,6 +44,7 @@ static void mode_change (UmAccountDialog *self, - - static void dialog_validate (UmAccountDialog *self); - -+#ifdef KERBEROS - static void on_join_login (GObject *source, - GAsyncResult *result, - gpointer user_data); -@@ -48,6 +52,7 @@ static void on_join_login (GObject *source, - static void on_realm_joined (GObject *source, - GAsyncResult *result, - gpointer user_data); -+#endif - - #define UM_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \ - UmAccountDialogClass)) -@@ -83,6 +88,7 @@ struct _UmAccountDialog { - gboolean enterprise_domain_chosen; - GtkEntry *enterprise_login; - GtkEntry *enterprise_password; -+#ifdef KERBEROS - UmRealmManager *realm_manager; - UmRealmObject *selected_realm; - -@@ -92,6 +98,7 @@ struct _UmAccountDialog { - GtkEntry *join_name; - GtkEntry *join_password; - gboolean join_prompted; -+#endif - }; - - struct _UmAccountDialogClass { -@@ -300,6 +307,7 @@ local_prepare (UmAccountDialog *self) - gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0); - } - -+#ifdef KERBEROS - static gboolean - enterprise_validate (UmAccountDialog *self) - { -@@ -504,7 +512,6 @@ on_join_response (GtkDialog *dialog, - on_join_login, - g_object_ref (self)); - } -- - static void - join_show_prompt (UmAccountDialog *self, - GError *error) -@@ -892,6 +899,7 @@ enterprise_prepare (UmAccountDialog *self) - gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), ""); - gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), ""); - } -+#endif - - static void - dialog_validate (UmAccountDialog *self) -@@ -902,9 +910,11 @@ dialog_validate (UmAccountDialog *self) - case UM_LOCAL: - valid = local_validate (self); - break; -+#ifdef KERBEROS - case UM_ENTERPRISE: - valid = enterprise_validate (self); - break; -+#endif - default: - valid = FALSE; - break; -@@ -990,12 +1000,14 @@ on_local_toggle (GtkToggleButton *toggle, - mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL); - } - -+#ifdef KERBEROS - static void - on_enterprise_toggle (GtkToggleButton *toggle, - gpointer user_data) - { - mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE); - } -+#endif - - static void - mode_init (UmAccountDialog *self, -@@ -1007,15 +1019,18 @@ mode_init (UmAccountDialog *self, - - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area"); - self->mode_areas[UM_LOCAL] = widget; -+#ifdef KERBEROS - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area"); - self->mode_areas[UM_ENTERPRISE] = widget; -- -+#endif - widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button"); - g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self); - self->mode_buttons[UM_LOCAL] = widget; -+#ifdef KERBEROS - widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button"); - g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self); - self->mode_buttons[UM_ENTERPRISE] = widget; -+#endif - } - - static void -@@ -1073,8 +1088,10 @@ um_account_dialog_init (UmAccountDialog *self) - self->container_widget = widget; - - local_init (self, builder); -+#ifdef KERBEROS - enterprise_init (self, builder); - join_init (self, builder); -+#endif - mode_init (self, builder); - - g_object_unref (builder); -@@ -1092,9 +1109,11 @@ um_account_dialog_response (GtkDialog *dialog, - case UM_LOCAL: - local_create_user (self); - break; -+#ifdef KERBEROS - case UM_ENTERPRISE: - enterprise_add_user (self); - break; -+#endif - default: - g_assert_not_reached (); - } -@@ -1115,6 +1134,7 @@ um_account_dialog_dispose (GObject *obj) - if (self->cancellable) - g_cancellable_cancel (self->cancellable); - -+#ifdef KERBEROS - if (self->realmd_watch) - g_bus_unwatch_name (self->realmd_watch); - self->realmd_watch = 0; -@@ -1126,7 +1146,7 @@ um_account_dialog_dispose (GObject *obj) - g_object_unref (self->realm_manager); - self->realm_manager = NULL; - } -- -+#endif - G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj); - } - -@@ -1179,7 +1199,9 @@ um_account_dialog_show (UmAccountDialog *self, - self->cancellable = g_cancellable_new (); - - local_prepare (self); -+#ifdef KERBEROS - enterprise_prepare (self); -+#endif - mode_change (self, UM_LOCAL); - dialog_validate (self); - -diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c -index 59d57b3..d3390f4 100644 ---- a/panels/user-accounts/um-realm-manager.c -+++ b/panels/user-accounts/um-realm-manager.c -@@ -21,6 +21,7 @@ - - #include "config.h" - -+#ifdef KERBEROS - #include "um-realm-manager.h" - - #include <krb5/krb5.h> -@@ -899,3 +900,4 @@ um_realm_login_finish (GAsyncResult *result, - - return TRUE; - } -+#endif --- -1.8.1.2 - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch deleted file mode 100644 index e7fe8dc8d776..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch +++ /dev/null @@ -1,271 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b3df2dd..6b10ce4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,13 +143,57 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) - PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0) --PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ -+build_online_accounts=false -+AC_ARG_ENABLE(goa, -+ AC_HELP_STRING([--disable-goa], -+ [disable online accounts management panel]), -+ [case "${enableval}" in -+ yes) WANT_ONLINE_ACCOUNTS=yes ;; -+ no) WANT_ONLINE_ACCOUNTS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; -+ esac], -+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value -+ -+if test x$WANT_ONLINE_ACCOUNTS = xyes; then -+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ build_online_accounts=true -+fi -+if test "x$build_online_accounts" = xtrue ; then -+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) -+fi -+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) -+ - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -- colord >= $COLORD_REQUIRED_VERSION -- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -+ colord >= $COLORD_REQUIRED_VERSION -+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ build_color=true -+fi -+if test "x$build_color" = xtrue ; then -+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) -+ - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) -@@ -210,9 +254,22 @@ else - fi - AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes") - --# Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5, -- [have_bluetooth=yes], have_bluetooth=no) -+have_bluetooth=no -+AC_ARG_ENABLE(bluetooth, -+ AC_HELP_STRING([--disable-bluetooth], -+ [disable bluetooth management panel]), -+ [case "${enableval}" in -+ yes) WANT_BLUETOOTH=yes ;; -+ no) WANT_BLUETOOTH=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; -+ esac], -+ [WANT_BLUETOOTH=yes]) dnl Default value -+ -+if test x$WANT_BLUETOOTH = xyes; then -+ # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5) -+ have_bluetooth=yes -+fi - if test "x$have_bluetooth" = xyes ; then - AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) - fi -@@ -289,12 +346,23 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) -- have_wacom=yes -+ AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+ if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ have_wacom=yes -+ fi - fi - ;; - *) -@@ -555,6 +623,11 @@ if test "x$have_bluetooth" = "xyes"; then - else - AC_MSG_NOTICE([ Bluetooth panel disabled]) - fi -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** colord (Color panel)]) -+else -+ AC_MSG_NOTICE([ Color panel disabled]) -+fi - if test "x$enable_cups" = "xyes"; then - AC_MSG_NOTICE([** CUPS (Printers panel)]) - else -@@ -565,11 +638,21 @@ if test "x$have_cheese" = "xyes"; then - else - AC_MSG_NOTICE([ Users panel webcam support disabled]) - fi -+if test "x$build_online_accounts" = "xtrue"; then -+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) -+else -+ AC_MSG_NOTICE([ Online Accounts panel disabled]) -+fi - if test "x$with_libsocialweb" = "xyes"; then - AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)]) - else - AC_MSG_NOTICE([ Background panel Flickr support disabled]) - fi -+if test "x$build_wacom" = "xtrue"; then -+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) -+else -+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) -+fi - if test "x$have_wacom" = "xyes"; then - AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) - else -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 9961c25..0c54622 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -2,11 +2,9 @@ SUBDIRS= \ - common \ - background \ - power \ -- color \ - display \ - mouse \ - notifications \ -- online-accounts \ - region \ - info \ - sound \ -@@ -18,6 +16,10 @@ SUBDIRS= \ - privacy \ - sharing - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ - if BUILD_WACOM - SUBDIRS += wacom - endif -@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH - SUBDIRS += bluetooth - endif - -+if BUILD_ONLINE_ACCOUNTS -+SUBDIRS += online-accounts -+endif -+ - -include $(top_srcdir)/git.mk -diff --git a/shell/Makefile.am b/shell/Makefile.am -index f9f9070..094aca1 100644 ---- a/shell/Makefile.am -+++ b/shell/Makefile.am -@@ -51,14 +51,12 @@ gnome_control_center_LDADD = \ - $(top_builddir)/libgd/libgd.la \ - $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/panels/background/libbackground.la \ -- $(top_builddir)/panels/color/libcolor.la \ - $(top_builddir)/panels/datetime/libdate_time.la \ - $(top_builddir)/panels/display/libdisplay.la \ - $(top_builddir)/panels/info/libinfo.la \ - $(top_builddir)/panels/keyboard/libkeyboard.la \ - $(top_builddir)/panels/mouse/libmouse-properties.la \ - $(top_builddir)/panels/notifications/libnotifications.la \ -- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ - $(top_builddir)/panels/power/libpower.la \ - $(top_builddir)/panels/privacy/libprivacy.la \ - $(top_builddir)/panels/region/libregion.la \ -@@ -84,6 +82,14 @@ if BUILD_BLUETOOTH - gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la - endif - -+if BUILD_COLOR -+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la -+endif -+ -+if BUILD_ONLINE_ACCOUNTS -+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la -+endif -+ - AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" - - sysdir = $(datadir)/applications -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 20a5262..1cef85d 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); - #ifdef BUILD_BLUETOOTH - extern GType cc_bluetooth_panel_get_type (void); - #endif /* BUILD_BLUETOOTH */ -+#ifdef BUILD_COLOR - extern GType cc_color_panel_get_type (void); -+#endif /* BUILD_COLOR */ - extern GType cc_date_time_panel_get_type (void); - extern GType cc_display_panel_get_type (void); - extern GType cc_info_panel_get_type (void); -@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); - extern GType cc_network_panel_get_type (void); - #endif /* BUILD_NETWORK */ - extern GType cc_notifications_panel_get_type (void); -+#ifdef BUILD_ONLINE_ACCOUNTS - extern GType cc_goa_panel_get_type (void); -+#endif /* BUILD_ONLINE_ACCOUNTS */ - extern GType cc_power_panel_get_type (void); - #ifdef BUILD_PRINTERS - extern GType cc_printers_panel_get_type (void); -@@ -77,7 +81,9 @@ static struct { - #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), - #endif -+#ifdef BUILD_COLOR - PANEL_TYPE("color", cc_color_panel_get_type ), -+#endif - PANEL_TYPE("datetime", cc_date_time_panel_get_type ), - PANEL_TYPE("display", cc_display_panel_get_type ), - PANEL_TYPE("info", cc_info_panel_get_type ), -@@ -87,7 +93,9 @@ static struct { - PANEL_TYPE("network", cc_network_panel_get_type ), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type), -+#ifdef BUILD_ONLINE_ACCOUNTS - PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type ), - #ifdef BUILD_PRINTERS - PANEL_TYPE("printers", cc_printers_panel_get_type ), diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch deleted file mode 100644 index cf40dca5004a..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- gnome-control-center-3.8.1.5-orig/configure.ac 2013-05-06 18:32:26.000000000 +0200 -+++ gnome-control-center-3.8.1.5-dev/configure.ac 2013-05-11 22:57:47.955153458 +0200 -@@ -200,8 +200,25 @@ - fi - - # Check for libmm-glib for ModemManager1 support --PKG_CHECK_MODULES(MM_GLIB, mm-glib, -- [have_libmm_glib=yes], have_libmm_glib=no) -+build_modemmanager=false -+AC_ARG_ENABLE(modemmanager, -+ AC_HELP_STRING([--disable-modemmanager], -+ [disable modemmanager support]), -+ [case "${enableval}" in -+ yes) WANT_MODEMMANAGER=yes ;; -+ no) WANT_MODEMMANAGER=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-modemmanager) ;; -+ esac], -+ [WANT_MODEMMANAGER=no]) dnl Default value -+ -+if test "x$WANT_MODEMMANAGER" = xyes ; then -+ PKG_CHECK_MODULES(MM_GLIB, mm-glib, -+ [have_libmm_glib=yes], -+ AC_MSG_ERROR(No ModemManager1 support (libmm-glib) not found)) -+else -+ have_libmm_glib=no -+fi -+ - if test "x$have_libmm_glib" = xno ; then - AC_MSG_WARN(*** Network panel will not be built with ModemManager1 support (libmm-glib not found) ***) - else diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.4-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.4-optional-kerberos.patch deleted file mode 100644 index 16c5b42e5c91..000000000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.4-optional-kerberos.patch +++ /dev/null @@ -1,98 +0,0 @@ -From fd99663ac20c7c09517a316197f16fc1e2564d1b Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sun, 28 Jul 2013 14:23:39 -0400 -Subject: [PATCH] Make kerberos optional - -https://bugzilla.gnome.org/show_bug.cgi?id=686840 ---- - configure.ac | 24 +++++++++++++++--------- - panels/user-accounts/um-realm-manager.c | 9 +++++++++ - 2 files changed, 24 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0c0098c..7d09daf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -312,16 +312,22 @@ esac - AM_CONDITIONAL(BUILD_WACOM, [test x"$have_wacom" = x"yes"]) - - # Kerberos kerberos support --AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) --if test "$KRB5_CONFIG" = "no"; then -- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) --fi -- --AC_MSG_CHECKING(for krb5 libraries and flags) --KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" --KRB5_LIBS="`$KRB5_CONFIG --libs`" --AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+AC_ARG_ENABLE([kerberos], -+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, -+ [enable_kerberos=yes]) -+ -+if test x"$enable_kerberos" != x"no" ; then -+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) -+ if test "$KRB5_CONFIG" = "no"; then -+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) -+ fi - -+ AC_MSG_CHECKING(for krb5 libraries and flags) -+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" -+ KRB5_LIBS="`$KRB5_CONFIG --libs`" -+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) -+fi - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - -diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c -index 1fd41ad..ce0988e 100644 ---- a/panels/user-accounts/um-realm-manager.c -+++ b/panels/user-accounts/um-realm-manager.c -@@ -23,7 +23,9 @@ - - #include "um-realm-manager.h" - -+#ifdef HAVE_KERBEROS - #include <krb5/krb5.h> -+#endif - - #include <glib.h> - #include <glib/gi18n.h> -@@ -697,6 +699,7 @@ login_closure_free (gpointer data) - g_slice_free (LoginClosure, login); - } - -+#ifdef HAVE_KERBEROS - static krb5_error_code - login_perform_kinit (krb5_context k5, - const gchar *realm, -@@ -760,12 +763,14 @@ login_perform_kinit (krb5_context k5, - - return code; - } -+#endif /* HAVE_KERBEROS */ - - static void - kinit_thread_func (GSimpleAsyncResult *async, - GObject *object, - GCancellable *cancellable) - { -+#ifdef HAVE_KERBEROS - LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); - krb5_context k5 = NULL; - krb5_error_code code; -@@ -843,6 +848,10 @@ kinit_thread_func (GSimpleAsyncResult *async, - - if (k5) - krb5_free_context (k5); -+#else /* HAVE_KERBEROS */ -+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, -+ _("gnome-control-center was built without kerberos support")); -+#endif - } - - void --- -1.8.3.2 - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch new file mode 100644 index 000000000000..aac9c529b4ca --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch @@ -0,0 +1,22 @@ +diff -burN gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1.new/panels/background/Makefile.am +--- gnome-control-center-3.10.1/panels/background/Makefile.am 2013-10-11 06:19:22.000000000 -0500 ++++ gnome-control-center-3.10.1.new/panels/background/Makefile.am 2013-10-24 13:38:07.801957723 -0500 +@@ -38,7 +38,9 @@ + bg-wallpapers-source.c \ + bg-wallpapers-source.h \ + bg-colors-source.c \ +- bg-colors-source.h ++ bg-colors-source.h \ ++ bg-flickr-source.c \ ++ bg-flickr-source.h + + libbackground_la_SOURCES = \ + cc-background-panel.c \ +@@ -47,6 +49,7 @@ + libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la + + if WITH_LIBSOCIALWEB ++libbackground_chooser_la_LIBADD = $(SOCIALWEB_LIBS) + libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h + INCLUDES += $(SOCIALWEB_CFLAGS) + libbackground_la_LIBADD += $(SOCIALWEB_LIBS) diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild deleted file mode 100644 index 742ced54044e..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild,v 1.8 2013/02/02 22:33:47 ago Exp $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen - -inherit autotools eutils gnome2 - -DESCRIPTION="GNOME Desktop Configuration Tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +networkmanager +socialweb systemd v4l" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" - -# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released -# -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 -COMMON_DEPEND=" - >=dev-libs/glib-2.31:2 - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.5.13:3 - >=gnome-base/gsettings-desktop-schemas-3.5.91 - >=gnome-base/gnome-desktop-3.5.91:3= - >=gnome-base/gnome-settings-daemon-3.6[colord?,policykit] - >=gnome-base/libgnomekbd-2.91.91 - - app-text/iso-codes - dev-libs/libpwquality - dev-libs/libxml2:2 - gnome-base/gnome-menus:3 - gnome-base/libgtop:2 - media-libs/fontconfig - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.9.1 - >=x11-libs/libnotify-0.7.3 - - x11-apps/xmodmap - x11-libs/libX11 - x11-libs/libXxf86misc - >=x11-libs/libXi-1.2 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= ) - colord? ( >=x11-misc/colord-0.1.8 ) - cups? ( >=net-print/cups-1.4[dbus] ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) - i18n? ( >=app-i18n/ibus-1.4.99 ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.6 - >=x11-libs/libXi-1.2 ) - kerberos? ( virtual/krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-0.9.1.90 - >=net-misc/networkmanager-0.8.997 ) - socialweb? ( net-libs/libsocialweb ) - systemd? ( >=sys-apps/systemd-31 ) - v4l? ( - media-libs/gstreamer:1.0 - media-libs/clutter-gtk:1.0 - >=media-video/cheese-3.5.91 ) -" -# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x -RDEPEND="${COMMON_DEPEND} - gnome-base/gnome-settings-daemon[input_devices_wacom?] - sys-apps/accountsservice - x11-themes/gnome-icon-theme-symbolic - colord? ( >=gnome-extra/gnome-color-manager-3 ) - cups? ( - >=app-admin/system-config-printer-gnome-1.3.5 - net-print/cups-pk-helper ) - !systemd? ( - app-admin/openrc-settingsd - sys-auth/consolekit ) - - !<gnome-base/gdm-2.91.94 - !<gnome-extra/gnome-color-manager-3.1.2 - !gnome-extra/gnome-media[pulseaudio] - !<gnome-extra/gnome-media-2.32.0-r300 - !<net-wireless/gnome-bluetooth-3.3.2 -" -# PDEPEND to avoid circular dependency -PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" -DEPEND="${COMMON_DEPEND} - x11-proto/xproto - x11-proto/xf86miscproto - x11-proto/kbproto - - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - cups? ( sys-apps/sed ) - - gnome-base/gnome-common -" -# Needed for autoreconf -# gnome-base/gnome-common - -src_prepare() { - # Make some panels optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch" - # https://bugzilla.gnome.org/show_bug.cgi?id=686840 - epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch" - # Fix some absolute paths to be appropriate for Gentoo - epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch" - # Needed for g-c-c 3.6.3 and PulseAudio >2.1. Remove in 3.6.4. - epatch "${FILESDIR}/${P}-pulseaudio-3-fix.patch" - eautoreconf - - gnome2_src_prepare - - # panels/datetime/Makefile.am gets touched as a result of something in our - # src_prepare(). We need to touch timedated{c,h} to prevent them from being - # regenerated (bug #415901) - [[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h - [[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c -} - -src_configure() { - G2CONF="${G2CONF} - --disable-update-mimedb - --disable-static - --enable-documentation - $(use_enable bluetooth) - $(use_enable colord color) - $(use_enable cups) - $(use_enable gnome-online-accounts goa) - $(use_enable i18n ibus) - $(use_enable input_devices_wacom wacom) - $(use_with socialweb libsocialweb) - $(use_enable systemd) - $(use_with v4l cheese)" - # XXX: $(use_with kerberos) # for 3.7.x - if ! use kerberos; then - G2CONF+=" KRB5_CONFIG=$(type -P true)" - fi - DOCS="AUTHORS ChangeLog NEWS README TODO" - gnome2_src_configure -} diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild index 4397416df6d3..72104a39bb10 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild,v 1.2 2013/09/22 22:57:29 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild,v 1.1 2013/11/10 08:59:08 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -121,19 +121,18 @@ src_prepare() { sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ shell/Makefile.am || die "sed completiondir failed" - # Make some panels optional; requires eautoreconf - # https://bugzilla.gnome.org/697478 - epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch" - - # https://bugzilla.gnome.org/686840 - epatch "${FILESDIR}/${PN}-3.8.4-optional-kerberos.patch" + # Make some panels and dependencies optional; requires eautoreconf + # https://bugzilla.gnome.org/686840, 697478, 700145 + epatch "${FILESDIR}/${PN}-3.8.5-optional.patch" # Fix some absolute paths to be appropriate for Gentoo epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch" epatch "${FILESDIR}/${PN}-3.8.0-paths.patch" - # Make modemmanager optional, bug 463852, upstream bug #700145 - epatch "${FILESDIR}/${PN}-3.8.1.5-optional-modemmanager.patch" + # Fix linking, upstream bug #710829 + epatch "${FILESDIR}"/${PN}-3.8.6-flickr-linking.patch + + epatch_user # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to # avoid libtoolize "We've already been run in this tree" warning, bug #484988 @@ -144,7 +143,6 @@ src_prepare() { popd > /dev/null done elibtoolize --force - epatch_user # panels/datetime/Makefile.am gets touched as a result of something in our # src_prepare(). We need to touch timedated{c,h} to prevent them from being @@ -153,6 +151,8 @@ src_prepare() { # (https://bugzilla.gnome.org/704822) [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c + + gnome2_src_prepare } src_configure() { |