diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-11-13 19:24:20 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-11-13 19:24:20 +0000 |
| commit | 50685cc713bdd90c6c4714939affe37f494ed55b (patch) | |
| tree | f0ed60afeefac85ceeb013c77576fcb76e2dd8e5 /gnome-base/gnome-control-center/files | |
| parent | Version bump. (diff) | |
| download | historical-50685cc713bdd90c6c4714939affe37f494ed55b.tar.gz historical-50685cc713bdd90c6c4714939affe37f494ed55b.tar.bz2 historical-50685cc713bdd90c6c4714939affe37f494ed55b.zip | |
Fix linking patch, bug #490982 by timemars and Walter Meinl
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'gnome-base/gnome-control-center/files')
| -rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch | 38 | ||||
| -rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch | 29 |
2 files changed, 49 insertions, 18 deletions
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 |