Add new GTK+-based tool to configure the X output using the RandR 1.2 extension. Includes 2 patches from upstream git, and one typo fix that isn't upstream yet.

Package-Manager: portage-2.1.2.7

4 files changed, 91 insertions, 0 deletions

diff --git a/x11-apps/grandr/files/0.1-fix-license-display.patch b/x11-apps/grandr/files/0.1-fix-license-display.patch
new file mode 100644
index 000000000000..8ce24f3d463d
--- /dev/null
+++ b/x11-apps/grandr/files/0.1-fix-license-display.patch
@@ -0,0 +1,42 @@
+diff --git a/src/callbacks.c b/src/callbacks.c
+index 788ca52..f5a4bd4 100644
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -377,17 +377,26 @@ on_about_btn_clicked                   (GtkButton       *button,
+ {
+ 	gchar *authors[] = {"Ming Lin (ming.m.lin@intel.com)", NULL};
+ 	gchar *comments = "This GUI is for RandR 1.2 setting\nming.m.lin@intel.com";
+-	gchar *license = "RandR GUI is free software; you can redistribute it and/or modify\n \
+-it under the terms of the GNU General Public License as published by\n \
+-the Free Software Foundation; either version 2 of the License, or\n \
+-(at your option) any later version.\n\n\
+-RandR GUI is distributed in the hope that it will be useful,\n \
+-but WITHOUT ANY WARRANTY; without even the implied warranty of\n \
+-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n \
+-GNU General Public License for more details.\n\n\
+-You should have received a copy of the GNU General Public License \n\
+-along with RandR GUI; if not, write to the Free Software Foundation, Inc.,\n \
+-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA";
++	gchar *license =
++"Copyright © 2007 Intel Corporation\n"
++"\n"
++"Permission is hereby granted, free of charge, to any person obtaining a copy\n"
++"of this software and associated documentation files (the “Software”), to deal\n"
++"in the Software without restriction, including without limitation the rights\n"
++"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n"
++"copies of the Software, and to permit persons to whom the Software is\n"
++"furnished to do so, subject to the following conditions:\n"
++"\n"
++"The above copyright notice and this permission notice shall be included in\n"
++"all copies or substantial portions of the Software.\n"
++"\n"
++"THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n"
++"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
++"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE\n"
++"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
++"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n"
++"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n"
++"THE SOFTWARE.";
+ 	
+ 	gtk_show_about_dialog (root_window, 
+ 								"authors", authors, 
diff --git a/x11-apps/grandr/files/0.1-fix-segfault-without-gconf-value.patch b/x11-apps/grandr/files/0.1-fix-segfault-without-gconf-value.patch
new file mode 100644
index 000000000000..fe4cad78985b
--- /dev/null
+++ b/x11-apps/grandr/files/0.1-fix-segfault-without-gconf-value.patch
@@ -0,0 +1,13 @@
+diff --git a/src/grandr.c b/src/grandr.c
+index e3e619e..8f0980b 100644
+--- a/src/grandr.c
++++ b/src/grandr.c
+@@ -1381,7 +1381,7 @@ set_hotkeys_view (GtkListStore *hotkey_store)
+ 											NULL);
+ 	command = gconf_client_get_string(client, GCONF_KEY2,
+ 											NULL);
+-	if (strcmp(key, HOTKEY) == 0 && strcmp(command, APP_NAME) == 0) {
++	if (key && strcmp(key, HOTKEY) == 0 && command && strcmp(command, APP_NAME) == 0) {
+ 		gtk_toggle_button_set_active (hotkey_cbtn, TRUE);
+ 	} else {
+ 		gtk_toggle_button_set_active (hotkey_cbtn, FALSE);
diff --git a/x11-apps/grandr/files/0.1-outpus.patch b/x11-apps/grandr/files/0.1-outpus.patch
new file mode 100644
index 000000000000..c5ea6f538aec
--- /dev/null
+++ b/x11-apps/grandr/files/0.1-outpus.patch
@@ -0,0 +1,33 @@
+# On branch master
+# Changes to be committed:
+#   (use "git reset HEAD <file>..." to unstage)
+#
+#	modified:   grandr.glade
+#	modified:   src/interface.c
+#
+diff --git a/grandr.glade b/grandr.glade
+index f1f0f91..6c21a17 100644
+--- a/grandr.glade
++++ b/grandr.glade
+@@ -202,7 +202,7 @@ THE SOFTWARE.
+ 		      <child>
+ 			<widget class="GtkLabel" id="label9">
+ 			  <property name="visible">True</property>
+-			  <property name="label" translatable="yes">Outpus     </property>
++			  <property name="label" translatable="yes">Outputs     </property>
+ 			  <property name="use_underline">False</property>
+ 			  <property name="use_markup">False</property>
+ 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+diff --git a/src/interface.c b/src/interface.c
+index 8cc1427..bee4b81 100644
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -179,7 +179,7 @@ create_main_win (void)
+   gtk_widget_show (vbox2);
+   gtk_container_add (GTK_CONTAINER (viewport1), vbox2);
+ 
+-  label9 = gtk_label_new (_("Outpus     "));
++  label9 = gtk_label_new (_("Outputs    "));
+   gtk_widget_show (label9);
+   gtk_box_pack_start (GTK_BOX (vbox2), label9, FALSE, FALSE, 0);
+ 
diff --git a/x11-apps/grandr/files/digest-grandr-0.1 b/x11-apps/grandr/files/digest-grandr-0.1
new file mode 100644
index 000000000000..aafb474169c6
--- /dev/null
+++ b/x11-apps/grandr/files/digest-grandr-0.1
@@ -0,0 +1,3 @@
+MD5 e265c8e89aab39c55cb24ad8230c3933 grandr-0.1.tar.bz2 112282
+RMD160 ea92ab98d79053be42e4b62b612d87d4413e3660 grandr-0.1.tar.bz2 112282
+SHA256 92921baaf683a9efb058962191058232ca808c3cba135575ae1eb40ea7e072be grandr-0.1.tar.bz2 112282