Merge branch 'master' of ssh://git.gnome.org/git/metacity

NEWS

@@ -1,3 +1,75 @@
+==============
+Version 2.34.0
+==============
+
+ - Update keybindings when XKB keyboard layout changes (Derek Poon, Owen
+   Taylor)
+ - Unify keymap-reloading code branches (Owen Taylor, Thomas Thurman)
+ - Fix drawing of <arc> elements (Nickolas Lloyd)
+ - Add an "Above_Tab" pseudo-keysym (Owen Taylor)
+ - Fix default workspace names (Thomas Thurman)
+ - Log error if writing fail when handling SIGTERM (Christian Kirbach)
+ - Rework keybinding configuration files (William Jon McCann)
+ - Honour _NET_RESTACK_WINDOW and sibling-relative stacking (Christian Hammond)
+ - Allow applications to raise windows when raise_on_click is off (Owen Taylor)
+ - Allow explicit raises from same client, not just same app (Owen Taylor)
+ - Set RestartStyleHint to RestartIfRunning when replaced (Owen Taylor)
+ - Fix background functions for non-default layouts (Florian Müllner)
+ - Use GNOME 3 theme defaults (Matthias Clasen)
+ - Do not use an icon menu on the titlebar (William Jon McCann)
+ - Disable 'Show desktop' keybinding by default (Matthias Clasen)
+ - Make color constants work without warnings (Owen Taylor)
+ - Small bug fixes (Marcus Carlson, Sascha Silbe, Xu Li, Thomas Thurman, Colin
+   Walters)
+ - Make it possible to build without libcanberra (Michael Smith)
+ - Build fixes for Solaris (Brian Cameron)
+
+Translations:
+    Khaled Hosny (ar)
+    Nilamdyuti Goswami (as)
+    Alexander Shopov (bg)
+    David Planella (ca)
+    David Planella (ca@valencia)
+    Marek Černocký (cs)
+    Ask Hjorth Larsen (da)
+    Mario Blättermann (de)
+    Jennie Petoumenou (el)
+    Bruce Cowan (en_GB)
+    Jorge González (es)
+    Ivar Smolin (et)
+    Iñaki Larrañaga Murgoitio (eu)
+    Mahyar Moghimi (fa)
+    Alain Lojewski (fr)
+    Fran Diéguez (gl)
+    Sweta Kothari (gu)
+    Yaron Shahrabani (he)
+    Gabor Kelemen (hu)
+    Dirgita (id)
+    Luca Ferretti (it)
+    Changwoo Ryu (ko)
+    Gintautas Miliauskas (lt)
+    Rudolfs (lv)
+    Kjartan Maraas (nb)
+    Wouter Bolsterlee (nl)
+    Manoj Kumar Giri (or)
+    A S Alam (pa)
+    Piotr Drąg (pl)
+    Duarte Loreto (pt)
+    Krix Apolinário (pt_BR)
+    Lucian Adrian Grijincu (ro)
+    Yuri Myaseodov (ru)
+    Matej Urbančič (sl)
+    Мирослав Николић (sr)
+    Miroslav Nikolić (sr@latin)
+    Daniel Nylander (sv)
+    Dr.T.Vasudevan (ta)
+    Gheyret Kenji (ug)
+    Korostil Daniel (uk)
+    Clytie Siddall (vi)
+    Lele Long (zh_CN)
+    Chao-Hsiung Liao (zh_HK)
+    Chao-Hsiung Liao (zh_TW)
+
 2.30.3
 ======
 

configure.in

@@ -1,10 +1,10 @@
 AC_PREREQ(2.50)
 
 m4_define([metacity_major_version], [2])
-m4_define([metacity_minor_version], [32])
+m4_define([metacity_minor_version], [34])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [0])
+m4_define([metacity_micro_version], [1])
 
 m4_define([metacity_version],
           [metacity_major_version.metacity_minor_version.metacity_micro_version])
@@ -107,27 +107,12 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  AC_HELP_STRING([--with-gtk=2.0|3.0],
-                 [which gtk+ version to compile against (default: 2.0)]),
-  [case "$with_gtk" in
-      2.0|3.0) ;;
-      *) AC_MSG_ERROR([invalid gtk+ version specified]);;
-  esac],
-  [with_gtk=2.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  2.0) GTK_API_VERSION=2.0
-       GTK_MIN_VERSION=2.20.0
-       CANBERRA_GTK=libcanberra-gtk
-       ;;
-  3.0) GTK_API_VERSION=3.0
-       GTK_MIN_VERSION=2.90.0
-       CANBERRA_GTK=libcanberra-gtk3
-       ;;
-esac
+dnl This used to purport to allow compilation against gtk3, but it doesn't actually
+dnl work; see https://bugzilla.gnome.org/show_bug.cgi?id=650513
+with_gtk=2.0
+GTK_API_VERSION=2.0
+GTK_MIN_VERSION=2.20.0
+CANBERRA_GTK=libcanberra-gtk
 
 METACITY_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0"
 AC_SUBST(GTK_API_VERSION)
@@ -533,9 +518,6 @@ fi
 # Warnings are there for a reason
 if test "x$GCC" = "xyes"; then
   CFLAGS="$CFLAGS -Wall -ansi"
-  if test "x$enable_maintainer_mode" = "xyes"; then
-    CFLAGS="$CFLAGS -Werror"
-  fi
 fi
 
 # Use gnome-doc-utils: