Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (c002288c917f8b2830b5a59df5d9cc25717b638c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c002288c917f8b2830b5a59df5d9cc25717b638c)
  • Date: Fri, 1 Jun 2012 16:37:10 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

gnome2-libs/gnome-python-desktop/HISTORY | 4 +
gnome2-libs/gnome-python-desktop/PRE_BUILD | 4 +
gnome2-libs/gnome-python-desktop/metacity-2.34.2.patch | 45
+++++++++++++++++
3 files changed, 53 insertions(+)

New commits:
commit c002288c917f8b2830b5a59df5d9cc25717b638c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-python-desktop: Fix compilation with metacity 2.34.2+

diff --git a/gnome2-libs/gnome-python-desktop/HISTORY
b/gnome2-libs/gnome-python-desktop/HISTORY
index a33803f..893f401 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 AT 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 AT 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 0000000..2efd5fc
--- /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 0000000..b2ca105
--- /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 AT 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")
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c002288c917f8b2830b5a59df5d9cc25717b638c), Eric Sandall, 06/01/2012

Archive powered by MHonArc 2.6.24.

Top of Page