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.

(Portage version: 2.1.2.7)

8 files changed, 161 insertions, 0 deletions

diff --git a/x11-apps/grandr/ChangeLog b/x11-apps/grandr/ChangeLog
new file mode 100644
index 000000000000..87170b2af64e
--- /dev/null
+++ b/x11-apps/grandr/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for x11-apps/grandr
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/grandr/ChangeLog,v 1.1 2007/06/22 21:45:24 dberkholz Exp $
+
+*grandr-0.1 (22 Jun 2007)
+
+  22 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0.1-fix-license-display.patch,
+  +files/0.1-fix-segfault-without-gconf-value.patch,
+  +files/0.1-outpus.patch, +metadata.xml, +grandr-0.1.ebuild:
+  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.
+
diff --git a/x11-apps/grandr/Manifest b/x11-apps/grandr/Manifest
new file mode 100644
index 000000000000..29c845753bce
--- /dev/null
+++ b/x11-apps/grandr/Manifest
@@ -0,0 +1,28 @@
+AUX 0.1-fix-license-display.patch 2347 RMD160 b7f75933531b5df5989f1c3ee2c9b71c782b1915 SHA1 85d6d8f4c318ec71bdbfc98375a9e5bf33ab2371 SHA256 05d96989e0e98b7bd6ff11a22c0489a65374d990a1f5739cbd8505daf48bb462
+MD5 2457c7cd788145f12ed9d695dc1b3dd9 files/0.1-fix-license-display.patch 2347
+RMD160 b7f75933531b5df5989f1c3ee2c9b71c782b1915 files/0.1-fix-license-display.patch 2347
+SHA256 05d96989e0e98b7bd6ff11a22c0489a65374d990a1f5739cbd8505daf48bb462 files/0.1-fix-license-display.patch 2347
+AUX 0.1-fix-segfault-without-gconf-value.patch 543 RMD160 17ace72eb7ae8c7f9bc768f5e6f5306f8fc4cd38 SHA1 eac3b0269bc970addef555e48899438b7ad990c3 SHA256 616b9eeaaca2abcc18fea35e279cd6c3101f2b1677e180c9c89d03d96ccf65d1
+MD5 66e207e525cec19e02f2ce42ee7d6dc5 files/0.1-fix-segfault-without-gconf-value.patch 543
+RMD160 17ace72eb7ae8c7f9bc768f5e6f5306f8fc4cd38 files/0.1-fix-segfault-without-gconf-value.patch 543
+SHA256 616b9eeaaca2abcc18fea35e279cd6c3101f2b1677e180c9c89d03d96ccf65d1 files/0.1-fix-segfault-without-gconf-value.patch 543
+AUX 0.1-outpus.patch 1151 RMD160 cfc02be443503e295cde261c211b48fd78d19ceb SHA1 fb2bd7cfa398cb91eb5454c55b72a228a044a1f5 SHA256 5440966cc2958c13c41d618a0e8f2abe921a0863b5ca36098afa69e5c29559b0
+MD5 f3eb44a3a3627663be13d44eecf0139d files/0.1-outpus.patch 1151
+RMD160 cfc02be443503e295cde261c211b48fd78d19ceb files/0.1-outpus.patch 1151
+SHA256 5440966cc2958c13c41d618a0e8f2abe921a0863b5ca36098afa69e5c29559b0 files/0.1-outpus.patch 1151
+DIST grandr-0.1.tar.bz2 112282 RMD160 ea92ab98d79053be42e4b62b612d87d4413e3660 SHA1 906c45448bfd3c3c0d2f24d3c62ea9c7e0f4ce61 SHA256 92921baaf683a9efb058962191058232ca808c3cba135575ae1eb40ea7e072be
+EBUILD grandr-0.1.ebuild 691 RMD160 24f605c5ac96d0001cabb8141fbb84dfe94a10f3 SHA1 bbe5d9b2dadf8cb3b6d53aa3d7b7dee31c86004a SHA256 8dc38c0bdac6fe4d38a83bd06a164eb78853688db9c37a06bda46267f7f2c098
+MD5 6891b52c09fc50e2ecf334c3d79b7bba grandr-0.1.ebuild 691
+RMD160 24f605c5ac96d0001cabb8141fbb84dfe94a10f3 grandr-0.1.ebuild 691
+SHA256 8dc38c0bdac6fe4d38a83bd06a164eb78853688db9c37a06bda46267f7f2c098 grandr-0.1.ebuild 691
+MISC ChangeLog 521 RMD160 3b41d2ad8540e092e5d1b711c62f90388e51ac7a SHA1 afdef95f2332dfc27d9012a0f2474181336839da SHA256 af003f32774bbfa46406c2d5d49dbc5934f33941a1b0d947b5a804bc5e6ffa24
+MD5 2274b9f30cbb1fd251744d1a040f6133 ChangeLog 521
+RMD160 3b41d2ad8540e092e5d1b711c62f90388e51ac7a ChangeLog 521
+SHA256 af003f32774bbfa46406c2d5d49dbc5934f33941a1b0d947b5a804bc5e6ffa24 ChangeLog 521
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+MD5 27ef9a568fb57bc32d8a029385448543 files/digest-grandr-0.1 235
+RMD160 04a866bf2480ee6c30cb7c4222cc5ec9a7b12fd7 files/digest-grandr-0.1 235
+SHA256 e4a8449e45d31fb7dcb21d2a625bfbd50b777a06381b9c708a1db3117f4c05be files/digest-grandr-0.1 235
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
diff --git a/x11-apps/grandr/grandr-0.1.ebuild b/x11-apps/grandr/grandr-0.1.ebuild
new file mode 100644
index 000000000000..226612f8bcff
--- /dev/null
+++ b/x11-apps/grandr/grandr-0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/grandr/grandr-0.1.ebuild,v 1.1 2007/06/22 21:45:24 dberkholz Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="GTK+-based tool to configure the X output using the RandR 1.2 extension"
+KEYWORDS="~ppc ~x86"
+LICENSE="MIT"
+RDEPEND="=x11-libs/gtk+-2*
+	>=x11-libs/libXrandr-1.2"
+DEPEND="${RDEPEND}"
+PATCHES="${FILESDIR}/${PV}-fix-license-display.patch
+	${FILESDIR}/${PV}-outpus.patch
+	${FILESDIR}/${PV}-fix-segfault-without-gconf-value.patch"
+
+src_install() {
+	x-modular_src_install
+	dodoc NEWS
+}
diff --git a/x11-apps/grandr/metadata.xml b/x11-apps/grandr/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-apps/grandr/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>