From 42c409d56dfbc126513b0f5b10d04d030706ec25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 12 Sep 2013 17:31:34 -0300
Subject: hexchat-libre: fix building issues

---
 libre/hexchat-libre/PKGBUILD                         | 15 ++++++---------
 libre/hexchat-libre/no-firefox.patch                 | 16 ----------------
 libre/hexchat-libre/remove-non-free-suggestion.patch | 12 ------------
 3 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 libre/hexchat-libre/no-firefox.patch
 delete mode 100644 libre/hexchat-libre/remove-non-free-suggestion.patch

(limited to 'libre')

diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index f29f1d5b8..242c4dcb3 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -21,22 +21,19 @@ install=${_pkgname}.install
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz"
-        'remove-non-free-suggestion.patch'
-        'no-firefox.patch')
-sha256sums=('eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0'
-            '61040cb2a369b1b8801509c88019d68d1ab4c2505b1dfd859de1a4c22503f02d'
-            'de338821e1a8790a6fbdba2ce41d323002f51e3ae3e99ee8d815fcf087197e45')
+source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz")
+sha256sums=('eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0')
 
 build() {
   cd ${_pkgname}-${pkgver}
 
 # Rebrand to Parabola
-  sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
+  sed -i 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
 
 # Remove nonfree browser references
-  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
-  patch -p1 -i "${srcdir}/no-firefox.patch"
+  sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c
+  sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n";\n		"NAME Open Link in Private Icecat Window\\n"		"CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c
+  sed -i '\|NAME Open Link in Private Iceweasel Window| s|%s\\n\\n";|%s\\n\\n"\\|' src/common/hexchat.c
 
   ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe,xft}
   make
diff --git a/libre/hexchat-libre/no-firefox.patch b/libre/hexchat-libre/no-firefox.patch
deleted file mode 100644
index 998ff4dca..000000000
--- a/libre/hexchat-libre/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c hexchat-2.9.4/src/fe-gtk/fe-gtk.c
---- hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/fe-gtk/fe-gtk.c	2013-01-30 23:06:38.670239405 -0200
-@@ -1039,8 +1039,10 @@
- 			return;
- 	}
- 
--	/* everything failed, what now? just try firefox */
--	if (try_browser ("firefox", NULL, url))
-+	/* everything failed, what now? just try iceweasel or icecat */
-+	if (try_browser ("iceweasel", NULL, url))
-+		return;
-+	if (try_browser ("icecat", NULL, url))
- 		return;
- 
- 	/* fresh out of ideas... */
diff --git a/libre/hexchat-libre/remove-non-free-suggestion.patch b/libre/hexchat-libre/remove-non-free-suggestion.patch
deleted file mode 100644
index a83a71f17..000000000
--- a/libre/hexchat-libre/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/common/hexchat.c hexchat-2.9.4/src/common/hexchat.c
---- hexchat-2.9.4.orig/src/common/hexchat.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/common/hexchat.c	2013-01-30 23:02:12.884864062 -0200
-@@ -618,7 +618,7 @@
- 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
- 
- static char defaultconf_urlhandlers[] =
--		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		""		"";
- 
- #ifdef USE_SIGACTION
- /* Close and open log files on SIGUSR1. Usefull for log rotating */
-- 
cgit v1.2.3-2-g168b