summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-10-12 19:13:30 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-10-12 19:13:30 +0000
commit57c8db181af269b9f763554bd124a10b282d2a85 (patch)
treeb21bbd9f0a715debd8a3ee49d830224880818293 /x11-wm
parentJake is changing the trapframe/regs/ucontext structures for FreeBSD/sparc64. (diff)
Make Metacity 2.4.x the default version.
Submitted by: Franz Klammer <klammer@webonaut.com>
Notes
Notes: svn path=/head/; revision=67889
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/metacity-setup/Makefile1
-rw-r--r--x11-wm/metacity-setup/files/patch-src_callbacks.c19
-rw-r--r--x11-wm/metacity-setup/files/patch-src_interface.c13
3 files changed, 31 insertions, 2 deletions
diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile
index 0e8186f39685..62168cc19c1e 100644
--- a/x11-wm/metacity-setup/Makefile
+++ b/x11-wm/metacity-setup/Makefile
@@ -7,6 +7,7 @@
PORTNAME= metacity-setup
PORTVERSION= 0.7.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= metacity-setup
diff --git a/x11-wm/metacity-setup/files/patch-src_callbacks.c b/x11-wm/metacity-setup/files/patch-src_callbacks.c
index 544e63e4611f..88a7965fd819 100644
--- a/x11-wm/metacity-setup/files/patch-src_callbacks.c
+++ b/x11-wm/metacity-setup/files/patch-src_callbacks.c
@@ -1,5 +1,14 @@
---- src/callbacks.c.orig Tue Aug 27 15:30:54 2002
-+++ src/callbacks.c Tue Aug 27 15:30:36 2002
+--- src/callbacks.c.original Sat Oct 12 14:42:02 2002
++++ src/callbacks.c Sat Oct 12 14:50:10 2002
+@@ -35,7 +35,7 @@
+ GtkWidget *treeview1_cheat;
+ GtkWidget *install_dialog_cheat;
+ GtkWidget *refresh_button_cheat;
+-gchar *metacity_version = "2.3";
++gchar *metacity_version = "2.4";
+
+ enum
+ {
@@ -228,14 +228,25 @@
while ((filename =
@@ -28,3 +37,9 @@
{
g_ptr_array_add (themeNameHolder,
g_strdup (filename));
+@@ -690,4 +701,4 @@
+ else
+ metacity_version = "2.4";
+ on_treeview1_realize (treeview1_cheat, user_data);
+-}
++}
diff --git a/x11-wm/metacity-setup/files/patch-src_interface.c b/x11-wm/metacity-setup/files/patch-src_interface.c
new file mode 100644
index 000000000000..a4eb172a5b4d
--- /dev/null
+++ b/x11-wm/metacity-setup/files/patch-src_interface.c
@@ -0,0 +1,13 @@
+--- src/interface.c.orig Sat Oct 12 14:53:45 2002
++++ src/interface.c Sat Oct 12 15:04:53 2002
+@@ -111,8 +111,8 @@
+ gtk_widget_show (vbox3);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox3, TRUE, TRUE, 0);
+
+- version_button1 = gtk_radio_button_new_with_label(NULL, "I am using metacity 2.3.x");
+- version_button2 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (version_button1), "I am using metacity 2.4.x");
++ version_button2 = gtk_radio_button_new_with_label(NULL, "I am using metacity 2.4.x");
++ version_button1 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (version_button2), "I am using metacity 2.3.x");
+ gtk_box_pack_start (GTK_BOX (vbox3), version_button1, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox3), version_button2, TRUE, TRUE, 0);
+ gtk_widget_show (version_button1);