[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center/files: gnome-control-center-3.8.6-flickr-linking.patch gnome-control-center-3.8.6-flickr-linking2.patch

[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center/files: gnome-control-center-3.8.6-flickr-linking.patch gnome-control-center-3.8.6-flickr-linking2.patch

[Pacho Ramos (pacho)]

pacho       13/11/13 19:24:16

  Modified:             gnome-control-center-3.8.6-flickr-linking.patch
  Added:                gnome-control-center-3.8.6-flickr-linking2.patch
  Log:
  Fix linking patch, bug #490982 by timemars and Walter Meinl
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.2                  gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch?r1=1.1&r2=1.2

Index: gnome-control-center-3.8.6-flickr-linking.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-control-center-3.8.6-flickr-linking.patch	10 Nov 2013 08:59:08 -0000	1.1
+++ gnome-control-center-3.8.6-flickr-linking.patch	13 Nov 2013 19:24:16 -0000	1.2
@@ -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



1.1                  gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking2.patch?rev=1.1&content-type=text/plain

Index: gnome-control-center-3.8.6-flickr-linking2.patch
===================================================================
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