x11-apps/grandr: get grandr to install

5 files changed, 6 insertions, 93 deletions

diff --git a/x11-apps/grandr/Manifest b/x11-apps/grandr/Manifest
index 3b7d21e..07357eb 100644
--- a/x11-apps/grandr/Manifest
+++ b/x11-apps/grandr/Manifest
@@ -1,4 +1,4 @@
 AUX fix-license-display.patch 2347 RMD160 b7f75933531b5df5989f1c3ee2c9b71c782b1915 SHA1 85d6d8f4c318ec71bdbfc98375a9e5bf33ab2371 SHA256 05d96989e0e98b7bd6ff11a22c0489a65374d990a1f5739cbd8505daf48bb462
 AUX fix-segfault-without-gconf-value.patch 543 RMD160 17ace72eb7ae8c7f9bc768f5e6f5306f8fc4cd38 SHA1 eac3b0269bc970addef555e48899438b7ad990c3 SHA256 616b9eeaaca2abcc18fea35e279cd6c3101f2b1677e180c9c89d03d96ccf65d1
 AUX outpus.patch 1151 RMD160 cfc02be443503e295cde261c211b48fd78d19ceb SHA1 fb2bd7cfa398cb91eb5454c55b72a228a044a1f5 SHA256 5440966cc2958c13c41d618a0e8f2abe921a0863b5ca36098afa69e5c29559b0
-EBUILD grandr-9999.ebuild 580 RMD160 06d10f18b3c7ab77cf5acf9fc99a604ee7fd6fad SHA1 3cdecb4be7319e8df403d627669b24b45f9c12e6 SHA256 7624be826f521a93df919cae22f191d47044c819b13cde39b34fcd10bd11c6ab
+EBUILD grandr-9999.ebuild 507 RMD160 5b49f9110f0e6c3393c71009d21e31214ba9d80e SHA1 f800b801c46efcf8e2e3e25e88e0519b13054ac8 SHA256 3b575be0737c52422792aaff18bb0c3dcfd07ad4fe8426963227d5a0f8ea71b4
diff --git a/x11-apps/grandr/files/fix-license-display.patch b/x11-apps/grandr/files/fix-license-display.patch
deleted file mode 100644
index 8ce24f3..0000000
--- a/x11-apps/grandr/files/fix-license-display.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/fix-segfault-without-gconf-value.patch b/x11-apps/grandr/files/fix-segfault-without-gconf-value.patch
deleted file mode 100644
index fe4cad7..0000000
--- a/x11-apps/grandr/files/fix-segfault-without-gconf-value.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/outpus.patch b/x11-apps/grandr/files/outpus.patch
deleted file mode 100644
index c5ea6f5..0000000
--- a/x11-apps/grandr/files/outpus.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/grandr-9999.ebuild b/x11-apps/grandr/grandr-9999.ebuild
index 669e8c3..41b05ae 100644
--- a/x11-apps/grandr/grandr-9999.ebuild
+++ b/x11-apps/grandr/grandr-9999.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-
 inherit x-modular
 
 DESCRIPTION="GTK+-based tool to configure the X output using the RandR 1.2 extension"
@@ -10,9 +9,11 @@ LICENSE="MIT"
 RDEPEND="=x11-libs/gtk+-2*
 	>=x11-libs/libXrandr-1.2"
 DEPEND="${RDEPEND}"
-PATCHES="${FILESDIR}/fix-license-display.patch
-	${FILESDIR}/outpus.patch
-	${FILESDIR}/fix-segfault-without-gconf-value.patch"
+
+src_unpack() {
+	x-modular_src_unpack
+	./autogen.sh
+}
 
 src_install() {
 	x-modular_src_install