[patch] corrected gnome-control-center-3.8.6-flickr-linking.patch as checekd-in by upstream

gnome-control-center-3.8.6-flickr-linking.patch (text/plain), 1.93 KB, created by Walter Meinl on 2013-11-13 08:10:32 UTC

From acd7785692109a8ad2590e19302ce34170e610f2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <[e-mail]>
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
---
(limited to 'panels/background/Makefile.am')

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
 
+libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
 libbackground_la_SOURCES =		\
 	cc-background-panel.c		\
 	cc-background-panel.h
--
cgit v0.9.2
From 97af796dd588d4cce7ef5b927fd3d956f8baa16c Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[e-mail]>
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
---
(limited to 'panels/background/Makefile.am')

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