diff options
| author | Eric Sandall | 2012-06-01 14:37:03 -0700 |
|---|---|---|
| committer | Vlad Glagolev | 2012-06-14 12:29:08 +0400 |
| commit | 3d89e243a670162f6e4cbcb17812fa7582dd6317 (patch) | |
| tree | 1748b0b66f5dac615a4147274ea04f3b9606abb4 | |
| parent | eaaf4a27ab56986582000deb18df87b40c40d9e9 (diff) | |
gnome-python-desktop: Fix compilation with metacity 2.34.2+
(cherry picked from commit c002288c917f8b2830b5a59df5d9cc25717b638c)
| -rw-r--r-- | gnome2-libs/gnome-python-desktop/HISTORY | 4 | ||||
| -rwxr-xr-x | gnome2-libs/gnome-python-desktop/PRE_BUILD | 4 | ||||
| -rw-r--r-- | gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch | 45 |
3 files changed, 53 insertions, 0 deletions
diff --git a/gnome2-libs/gnome-python-desktop/HISTORY b/gnome2-libs/gnome-python-desktop/HISTORY index a33803f3e2..893f4015c1 100644 --- a/gnome2-libs/gnome-python-desktop/HISTORY +++ b/gnome2-libs/gnome-python-desktop/HISTORY @@ -1,3 +1,7 @@ +2012-06-01 Eric Sandall <sandalle@sourcemage.org> + * PRE_BUILD: Apply metacity-2.34.2.patch + * metacity-2.34.2.patch: Fix compilation with metacity 2.34.2+ + 2010-09-30 Vasil Yonkov <spirtbrat@sourcemage.org> * DETAILS: updated spell to 2.32.0 diff --git a/gnome2-libs/gnome-python-desktop/PRE_BUILD b/gnome2-libs/gnome-python-desktop/PRE_BUILD new file mode 100755 index 0000000000..2efd5fcfd8 --- /dev/null +++ b/gnome2-libs/gnome-python-desktop/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +message "${MESSAGE_COLOR}Applying metacity 2.34.2+ patch...${DEFAULT_COLOR}" && +patch "${SOURCE_DIRECTORY}"/metacity/metacity.defs \ + "${SPELL_DIRECTORY}"/metacity-2.34.2.patch diff --git a/gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch b/gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch new file mode 100644 index 0000000000..b2ca105b7a --- /dev/null +++ b/gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch @@ -0,0 +1,45 @@ +# From comments in https://bugs.archlinux.org/task/29631 linking to +# http://pkgs.fedoraproject.org/gitweb/?p=gnome-python2-desktop.git;a=blob;f=gnome-python-desktop-2.32.0-metacity-build.patch +From: Daniel Drake <dsd@laptop.org> + +Fix build against metacity-2.34.2. The port to GSettings +removed these constants from the codebase. + +Index: gnome-python-desktop-2.32.0/metacity/metacity.defs +=================================================================== +--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs ++++ gnome-python-desktop-2.32.0/metacity/metacity.defs +@@ -120,32 +120,6 @@ + ) + ) + +-(define-enum FocusMode +- (in-module "Meta") +- (c-name "MetaFocusMode") +-; (gtype-id "META_TYPE_FOCUS_MODE") +- (values +- '("click" "META_FOCUS_MODE_CLICK") +- '("sloppy" "META_FOCUS_MODE_SLOPPY") +- '("mouse" "META_FOCUS_MODE_MOUSE") +- ) +-) +- +-(define-enum ActionTitlebar +- (in-module "Meta") +- (c-name "MetaActionTitlebar") +-; (gtype-id "META_TYPE_ACTION_TITLEBAR") +- (values +- '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE") +- '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE") +- '("minimize" "META_ACTION_TITLEBAR_MINIMIZE") +- '("none" "META_ACTION_TITLEBAR_NONE") +- '("lower" "META_ACTION_TITLEBAR_LOWER") +- '("menu" "META_ACTION_TITLEBAR_MENU") +- '("last" "META_ACTION_TITLEBAR_LAST") +- ) +-) +- + (define-enum FrameType + (in-module "Meta") + (c-name "MetaFrameType") + |