Gentoo Archives: gentoo-commits

From: Nirbheek Chauhan <nirbheek@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/, x11-wm/mutter/files/
Date: Tue, 29 Mar 2011 08:36:53
Message-Id: 95fa978e2de0e8daa30227526a7b30bbbff1e54d.nirbheek@gentoo
1 commit: 95fa978e2de0e8daa30227526a7b30bbbff1e54d
2 Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 29 07:50:12 2011 +0000
4 Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 29 08:35:25 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=95fa978e
7
8 x11-wm/mutter: 2.91.92 → 2.91.93
9
10 ---
11 x11-wm/mutter/files/mutter-fix-ld-failure.patch | 39 --------------------
12 ...mutter-2.91.92.ebuild => mutter-2.91.93.ebuild} | 0
13 2 files changed, 0 insertions(+), 39 deletions(-)
14
15 diff --git a/x11-wm/mutter/files/mutter-fix-ld-failure.patch b/x11-wm/mutter/files/mutter-fix-ld-failure.patch
16 deleted file mode 100644
17 index ef36573..0000000
18 --- a/x11-wm/mutter/files/mutter-fix-ld-failure.patch
19 +++ /dev/null
20 @@ -1,39 +0,0 @@
21 -From bbd98e7b8612a1bba82a397525a673643cff3d6e Mon Sep 17 00:00:00 2001
22 -From: Rico Tzschichholz <ricotz@××××××××.de>
23 -Date: Tue, 8 Mar 2011 12:20:08 +0100
24 -Subject: [PATCH] Fix ld failure caused by several incomplete LDADD statements
25 -
26 -https://bugzilla.gnome.org/show_bug.cgi?id=644188
27 ----
28 - src/Makefile.am | 8 ++++----
29 - 1 files changed, 4 insertions(+), 4 deletions(-)
30 -
31 -diff --git a/src/Makefile.am b/src/Makefile.am
32 -index 4e02816..f87453d 100644
33 ---- a/src/Makefile.am
34 -+++ b/src/Makefile.am
35 -@@ -218,7 +218,7 @@ mutter_theme_viewer_SOURCES= \
36 - bin_PROGRAMS=mutter mutter-theme-viewer
37 -
38 - mutter_SOURCES = core/mutter.c
39 --mutter_LDADD = libmutter-wm.la
40 -+mutter_LDADD = $(MUTTER_LIBS) libmutter-wm.la
41 -
42 - if HAVE_INTROSPECTION
43 - include $(INTROSPECTION_MAKEFILE)
44 -@@ -257,9 +257,9 @@ testasyncgetprop_SOURCES = core/testasyncgetprop.c
45 -
46 - noinst_PROGRAMS=testboxes testgradient testasyncgetprop
47 -
48 --testboxes_LDADD = libmutter-wm.la
49 --testgradient_LDADD = libmutter-wm.la
50 --testasyncgetprop_LDADD = libmutter-wm.la
51 -+testboxes_LDADD = $(MUTTER_LIBS) libmutter-wm.la
52 -+testgradient_LDADD = $(MUTTER_LIBS) libmutter-wm.la
53 -+testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wm.la
54 -
55 - @INTLTOOL_DESKTOP_RULE@
56 -
57 ---
58 -1.7.3.4
59 -
60
61 diff --git a/x11-wm/mutter/mutter-2.91.92.ebuild b/x11-wm/mutter/mutter-2.91.93.ebuild
62 similarity index 100%
63 rename from x11-wm/mutter/mutter-2.91.92.ebuild
64 rename to x11-wm/mutter/mutter-2.91.93.ebuild