diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2010-12-06 19:53:00 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2010-12-06 19:53:00 +0100 |
| commit | bc12a33320d03e06f71740d6d63c8a1946bb65bb (patch) | |
| tree | 47a92b9124066ec3edc89a091c1234574045adc3 /x11-wm | |
| parent | fix dep (diff) | |
| download | keruspe-bc12a33320d03e06f71740d6d63c8a1946bb65bb.tar.gz keruspe-bc12a33320d03e06f71740d6d63c8a1946bb65bb.tar.bz2 keruspe-bc12a33320d03e06f71740d6d63c8a1946bb65bb.zip | |
tmp fix for mutter
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/mutter/Manifest | 3 | ||||
| -rw-r--r-- | x11-wm/mutter/files/tmp.patch | 54 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-9999-r1.ebuild | 1 |
3 files changed, 57 insertions, 1 deletions
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 06cf35cb..755f0dc2 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1 +1,2 @@ -EBUILD mutter-9999-r1.ebuild 1742 RMD160 ec6f21f86f663510915a8bcd66a0c2c52be76a93 SHA1 5243b1e698867f6e82b8fdc570cc720aed15f200 SHA256 b5efef303c10ce3ccc9d15f5a62d245d4947744bd2b6fe757c78a8cd79ba1eeb +AUX tmp.patch 1994 RMD160 773d0bc636334c5358d855bbb8c65c1c692abd66 SHA1 c2a2a0ad9331c635986eddd99f6ebc0909f20420 SHA256 bf66cd5dc4d2a18da31ad4edd6fd7d845a713c159d7d594330ac4b9f390ba056 +EBUILD mutter-9999-r1.ebuild 1772 RMD160 40b48273c51e4a49b6b393660a4a489868015bb8 SHA1 aea9c05590a8aa54b166c210727ac73a820fe613 SHA256 bc3f8e5f10cb8019809b12d4c52fd4d3d2c6ed02147ecffc1b01aa9885f1f14a diff --git a/x11-wm/mutter/files/tmp.patch b/x11-wm/mutter/files/tmp.patch new file mode 100644 index 00000000..f63f798a --- /dev/null +++ b/x11-wm/mutter/files/tmp.patch @@ -0,0 +1,54 @@ +From 1fb48a2ba6d1b1e7aee1a9afc2c99a6090d52103 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Date: Mon, 6 Dec 2010 19:51:33 +0100 +Subject: [PATCH] Revert "theme: Handle new GTK+ states" + +This reverts commit 544c8edd9e06e3144e36f89e847585cfe2f779f4. +--- + src/ui/theme.c | 18 +++++------------- + 1 files changed, 5 insertions(+), 13 deletions(-) + +diff --git a/src/ui/theme.c b/src/ui/theme.c +index 1de6b62..f7ac4aa 100644 +--- a/src/ui/theme.c ++++ b/src/ui/theme.c +@@ -6089,20 +6089,16 @@ meta_gradient_type_to_string (MetaGradientType type) + GtkStateType + meta_gtk_state_from_string (const char *str) + { +- if (g_ascii_strcasecmp ("normal", str) == 0) ++ if (strcmp ("normal", str) == 0 || strcmp ("NORMAL", str) == 0) + return GTK_STATE_NORMAL; +- else if (g_ascii_strcasecmp ("prelight", str) == 0) ++ else if (strcmp ("prelight", str) == 0 || strcmp ("PRELIGHT", str) == 0) + return GTK_STATE_PRELIGHT; +- else if (g_ascii_strcasecmp ("active", str) == 0) ++ else if (strcmp ("active", str) == 0 || strcmp ("ACTIVE", str) == 0) + return GTK_STATE_ACTIVE; +- else if (g_ascii_strcasecmp ("selected", str) == 0) ++ else if (strcmp ("selected", str) == 0 || strcmp ("SELECTED", str) == 0) + return GTK_STATE_SELECTED; +- else if (g_ascii_strcasecmp ("insensitive", str) == 0) ++ else if (strcmp ("insensitive", str) == 0 || strcmp ("INSENSITIVE", str) == 0) + return GTK_STATE_INSENSITIVE; +- else if (g_ascii_strcasecmp ("inconsistent", str) == 0) +- return GTK_STATE_INCONSISTENT; +- else if (g_ascii_strcasecmp ("focused", str) == 0) +- return GTK_STATE_FOCUSED; + else + return -1; /* hack */ + } +@@ -6122,10 +6118,6 @@ meta_gtk_state_to_string (GtkStateType state) + return "SELECTED"; + case GTK_STATE_INSENSITIVE: + return "INSENSITIVE"; +- case GTK_STATE_INCONSISTENT: +- return "INCONSISTENT"; +- case GTK_STATE_FOCUSED: +- return "FOCUSED"; + } + + return "<unknown>"; +-- +1.7.3.2.343.g7d43d.dirty + diff --git a/x11-wm/mutter/mutter-9999-r1.ebuild b/x11-wm/mutter/mutter-9999-r1.ebuild index 65a425e4..d41efd80 100644 --- a/x11-wm/mutter/mutter-9999-r1.ebuild +++ b/x11-wm/mutter/mutter-9999-r1.ebuild @@ -68,5 +68,6 @@ pkg_setup() { src_prepare() { gnome2_src_prepare intltoolize --force --copy --automake || die + epatch ${FILESDIR}/tmp.patch eautoreconf } |