File gnome-shell-linking.patch of Package gnome-shell

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-shell-linking.patch of Package gnome-shell (Revision 05edcd2e2486e7d995a7af3c71acf657)

Currently displaying revision 05edcd2e2486e7d995a7af3c71acf657 , Show latest

From 1819d1fdadcf51a0443598a802b1a0eb46e6c7ee Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 13 Jul 2016 18:03:58 +0200
Subject: [PATCH] build: Add necessary rpath to the private gnome-shell
 libraries

Since mutter cloned some libraries (cogl, clutter) and installs them
in a private directory, gnome-shell's libraries need to have information
where to load them from.

This is done using -rpath, but as libtool does not like multiple -rpath
in the command line (and it adds one on its own for linking our own libs)
we pass the 'libtool' variant for -rpath: -R

The linking / runtime issue only surfaces when users/distros build using
-Wl,--as-needed. Otherwise some of the parent libs seem to pull in the
needed rpath as well.
---
 src/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index e9aacfe..1e59b23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -321,14 +321,14 @@ libgnome_shell_libadd =		\
 	gvc/libgvc.la		\
 	$(NULL)
 
-libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags)
+libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags) -R$(MUTTER_TYPELIB_DIR)
 libgnome_shell_menu_la_LIBADD = $(GNOME_SHELL_LIBS)
 libgnome_shell_menu_la_CPPFLAGS = $(GNOME_SHELL_CFLAGS)
 
 libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
 libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
 
-libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
+libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags) -R$(MUTTER_TYPELIB_DIR)
 libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
 libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
 
-- 
2.9.0

From 6e0e37519d485a64b3a332f25e45f8cc13dd61e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 25 Jul 2016 18:46:59 +0200
Subject: calendar-server: Add back missing return value

In commit 7e0e224e0, when moving from e_cal_recur_generate_instances()
to e_cal_client_generate_instances(), the return value of the
ECalRecurInstanceFn callback was accidentally removed; add it
back.

https://bugzilla.gnome.org/show_bug.cgi?id=769156
---
 src/calendar-server/gnome-shell-calendar-server.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/calendar-server/gnome-shell-calendar-server.c b/src/calendar-server/gnome-shell-calendar-server.c
index 5ff12f2..57bc71b 100644
--- a/src/calendar-server/gnome-shell-calendar-server.c
+++ b/src/calendar-server/gnome-shell-calendar-server.c
@@ -443,6 +443,8 @@ generate_instances_cb (ECalComponent *comp,
   occurrence->rid        = e_cal_component_get_recurid_as_string (comp);
 
   appointment->occurrences = g_slist_append (appointment->occurrences, occurrence);
+
+  return TRUE;
 }
 
 
-- 
cgit v0.12

Places

File gnome-shell-linking.patch of Package gnome-shell (Revision 05edcd2e2486e7d995a7af3c71acf657)

Places