diff options
5 files changed, 65 insertions, 27 deletions
diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog index b17cf1e439c6..6998fbc48452 100644 --- a/gnome-base/gnome-control-center/ChangeLog +++ b/gnome-base/gnome-control-center/ChangeLog @@ -1,6 +1,12 @@ # 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.137 2013/11/10 08:59:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.138 2013/11/13 19:24:15 pacho Exp $ + + 13 Nov 2013; Pacho Ramos <pacho@gentoo.org> + +files/gnome-control-center-3.8.6-flickr-linking2.patch, + files/gnome-control-center-3.8.6-flickr-linking.patch, + gnome-control-center-3.8.6.ebuild: + Fix linking patch, bug #490982 by timemars and Walter Meinl *gnome-control-center-3.8.6 (10 Nov 2013) diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 052779959e18..37ac82ff4dd4 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -9,19 +9,20 @@ AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d 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.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 +AUX gnome-control-center-3.8.6-flickr-linking.patch 801 SHA256 7c5d736a57c41c7b9982f5fed308d1097c06e6683fa1160a3ceb34f32fc4f0aa SHA512 dfbd6c7996f9aeadd3c568354ce9d3125d671b4d0c8c79da31bca2cd06a320e7c6a49a57baa3aa8278963d98244699bcc60179c86e849cb4c0ba1f0aaf633ba3 WHIRLPOOL b081330b407b75795b6c0f0484a51e806076d8c88cf6b3baee1f7f09ca548b8c1f4f3dd6524dde8ffd00da9aa0e33f74ef81b58ff97387ceb3acb971afda6fd1 +AUX gnome-control-center-3.8.6-flickr-linking2.patch 1085 SHA256 f2259e7e4c7ccf953fb3a220cd2fcec0cc517f3ebdcb8f7414a37c70bccf7459 SHA512 87591a831f351f27a78bb3a2d5f67edf9f32a862d6da05d05427aef7a59949cc4275e61f91f27bc86e29f4e944b5811de39131f120714ebe4efc6fbbbf09c480 WHIRLPOOL 3fd893bde381748c961f89193112288138fc9ef431784d380c9081fff2d6d9ffbeb626e2c89c3253e24dbb0a0300f7bc59aa01c87c4d7375410b876bc9ecbf4d DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4 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.8.5-r1.ebuild 5402 SHA256 66e1b04bd4098f7ab817597113c398ea7064e7a012ce332b4397c8b2d183ddd8 SHA512 e44522c8f6bcc7387ccb93ebfa00a7c1ec96f11caf605293faa1045f9ac7d306c29847693cae193b96149fad7058fc207f49b7b85b0d253b344a04bb9d02e3c8 WHIRLPOOL 6292675813b513e613d80dbf417f3eb3e18ab2a41c2ec005a61ca2e2b167f4001569798b0bcc98eab1645fc9310d6a6dbee4727b7fbcac836e1a8a2bef40aefa -EBUILD gnome-control-center-3.8.6.ebuild 5510 SHA256 040fdc0f92352cd9ef3854d26113ad5b2ab57ebbc077e6ec5a381aa00708275d SHA512 180c54b9476ccfa5794af454eeb8790aead803a3a342e889a21feffb3d7f1a7d0e907c6f44a2f2a1c35c3185464af931886783b8e464b940be4deda76241c07a WHIRLPOOL 4427ac07c66cf72396435b7b691e4efce80d88b8bce97910ce9e671960fe61db1c5896f6227d7fb153006518d99073b2acb7321b5ed5338a0e7619148614fcfb -MISC ChangeLog 66223 SHA256 b14354d9cc4cf0d009b8ef9b83504b932955db69b9490a1c1aab5bc42e31ea8a SHA512 f4032f2383316e8613d0235b3e162b0ac0f81c43f063c8673b78a320b63f39401d93b3c11d37ef8b4466b130a4267a2f18c118c2b90f971de566843a26c6ac7d WHIRLPOOL 7f2e4acbd6532359bb505733a19d092b8d1bf59a827a34d87917fd0db814292c92be93ab3f983078f20be5b05758f028a17167f9cbbd81f09ea5812e9b92945d +EBUILD gnome-control-center-3.8.6.ebuild 5514 SHA256 7255e5a644f39853e911847ab861ce414e2d6b8b69c739ead0fe8b8b03f3026f SHA512 d3904521ab64e481a0a5798aa80e1cf6db669ea225ec09c7ed5fc0d35bad007b98cdfe3d981bf85345763912f216bfd8cab868fbd94a542c234ac6a489f80485 WHIRLPOOL c7c228c056cafcc700741ed9a073700dd9bcd10f6b4054a627a2a070771f78b85ad787336e659e1c91b4d0dc537e11636ca1a2194e02561685887979fdd06199 +MISC ChangeLog 66485 SHA256 2446219bb56d2f8adac8d00c2e88065b7b2ad9226339abf41629f8ccf9249bd5 SHA512 48586960257ab4f84460b91636304c1a3765b270af68ff1a2c5d0ee5ed2c6e6b1c9ad53980306fcc3027c2cc28566bcf40c5283274cdf14b48c03eecfce0f47e WHIRLPOOL 10569853caefd735c85b473d7ae329f7d592e0aa9028ee8f87a7d118b2e6d841ffee94348973b9978d2a9be76b0ef830c988f427b1c6c8ce05438fb75d00386f MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlJ/St0ACgkQCaWpQKGI+9QmbgCfRk7/1Qu/rETN5mMrCSeJ82ay -zRgAn2dSrTNGa9mcSKJWtif/4b5Os4wA -=rzYe +iEYEAREIAAYFAlKD0eEACgkQCaWpQKGI+9QUcQCfZQFOzIh65HTTZAUJan/TeC6k +mTIAnRvNkTgMQp2kXfmf/KzP3b8T+s4l +=yC4f -----END PGP SIGNATURE----- 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 index aac9c529b4ca..a4c1ebc6187c 100644 --- 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 @@ -1,22 +1,24 @@ -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 \ +From acd7785692109a8ad2590e19302ce34170e610f2 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <kalevlember@gmail.com> +Date: Wed, 16 Oct 2013 10:01:36 +0000 +Subject: background: Fix test-chooser-dialog build with some linkers + +List missing libs for the libbackground-chooser.la convenience library. + +https://bugzilla.gnome.org/show_bug.cgi?id=709302 +--- +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index f24f8b3..2766207 100644 +--- a/panels/background/Makefile.am ++++ b/panels/background/Makefile.am +@@ -40,6 +40,8 @@ libbackground_chooser_la_SOURCES = \ bg-colors-source.c \ -- bg-colors-source.h -+ bg-colors-source.h \ -+ bg-flickr-source.c \ -+ bg-flickr-source.h + bg-colors-source.h ++libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) ++ 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) + cc-background-panel.h +-- +cgit v0.9.2 diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch new file mode 100644 index 000000000000..3b677f740ab1 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch @@ -0,0 +1,29 @@ +From 97af796dd588d4cce7ef5b927fd3d956f8baa16c Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Tue, 12 Nov 2013 07:45:43 +0000 +Subject: background: Fix compilation with libsocialweb support + +The flickr source files were added to the wrong internal shared +library, so that the panel could be linked, but not the test +application. + +https://bugzilla.gnome.org/show_bug.cgi?id=710829 +--- +diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am +index 2766207..58e39aa 100644 +--- a/panels/background/Makefile.am ++++ b/panels/background/Makefile.am +@@ -49,9 +49,9 @@ libbackground_la_SOURCES = \ + libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la + + if WITH_LIBSOCIALWEB +-libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h ++libbackground_chooser_la_SOURCES += bg-flickr-source.c bg-flickr-source.h + INCLUDES += $(SOCIALWEB_CFLAGS) +-libbackground_la_LIBADD += $(SOCIALWEB_LIBS) ++libbackground_chooser_la_LIBADD += $(SOCIALWEB_LIBS) + endif + + noinst_PROGRAMS = test-chooser-dialog +-- +cgit v0.9.2 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild index 72104a39bb10..444688dc1a3d 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.8.6.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.6.ebuild,v 1.1 2013/11/10 08:59:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild,v 1.2 2013/11/13 19:24:15 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -130,7 +130,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.8.0-paths.patch" # Fix linking, upstream bug #710829 - epatch "${FILESDIR}"/${PN}-3.8.6-flickr-linking.patch + epatch "${FILESDIR}"/${PN}-3.8.6-flickr-linking{,2}.patch epatch_user |