summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Cook2009-03-24 20:08:36 -0500
committerRobin Cook2009-03-24 20:08:36 -0500
commit2b8738640b257f8dbf4ccc4d1b0399d0207efbea (patch)
tree184924ab2014845d8de544c04a6ac11dd4c82da7
parent4b77fd17a6324f147f2b70bff3ffa1c7dd50cbfe (diff)
metacity: updated to 2.26.0
-rwxr-xr-xgnome2-libs/metacity/DETAILS2
-rw-r--r--gnome2-libs/metacity/HISTORY4
-rwxr-xr-xgnome2-libs/metacity/PRE_BUILD4
-rw-r--r--gnome2-libs/metacity/metacity-2.24.0.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--gnome2-libs/metacity/metacity-2.26.0.tar.gz.sigbin0 -> 543 bytes
-rw-r--r--gnome2-libs/metacity/metacity-werror.patch12
6 files changed, 21 insertions, 1 deletions
diff --git a/gnome2-libs/metacity/DETAILS b/gnome2-libs/metacity/DETAILS
index 1d9b361ead..6644ad16e6 100755
--- a/gnome2-libs/metacity/DETAILS
+++ b/gnome2-libs/metacity/DETAILS
@@ -1,5 +1,5 @@
SPELL=metacity
- VERSION=2.24.0
+ VERSION=2.26.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index 19c6a9d90b..5d75a8ec30 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,7 @@
+2009-03-24 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 2.26.0
+ * PRE_BUILD: added to apply patch to remove -Werror compile switch
+
2008-10-01 Robin Cook <rcook@wyrms.net>
* DEPENDS: make some of the xorg libs optional_depends
diff --git a/gnome2-libs/metacity/PRE_BUILD b/gnome2-libs/metacity/PRE_BUILD
new file mode 100755
index 0000000000..6f4a0f01a9
--- /dev/null
+++ b/gnome2-libs/metacity/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/metacity-werror.patch
diff --git a/gnome2-libs/metacity/metacity-2.24.0.tar.gz.sig b/gnome2-libs/metacity/metacity-2.24.0.tar.gz.sig
deleted file mode 100644
index c35c539c52..0000000000
--- a/gnome2-libs/metacity/metacity-2.24.0.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/metacity/metacity-2.26.0.tar.gz.sig b/gnome2-libs/metacity/metacity-2.26.0.tar.gz.sig
new file mode 100644
index 0000000000..bd112c4166
--- /dev/null
+++ b/gnome2-libs/metacity/metacity-2.26.0.tar.gz.sig
Binary files differ
diff --git a/gnome2-libs/metacity/metacity-werror.patch b/gnome2-libs/metacity/metacity-werror.patch
new file mode 100644
index 0000000000..a6eac87b55
--- /dev/null
+++ b/gnome2-libs/metacity/metacity-werror.patch
@@ -0,0 +1,12 @@
+diff -u -r metacity-orig/configure metacity-2.26.0/configure
+--- metacity-orig/configure 2009-03-24 19:34:15.000000000 -0500
++++ metacity-2.26.0/configure 2009-03-24 19:35:06.000000000 -0500
+@@ -21225,7 +21225,7 @@
+
+ # Warnings are there for a reason
+ if test "x$GCC" = "xyes"; then
+- CFLAGS="$CFLAGS -Wall -Werror -ansi"
++ CFLAGS="$CFLAGS -Wall -ansi"
+ fi
+
+ # Use gnome-doc-utils: