blob: 7eb0916c0d9d820e672c249959a50beec48d1611 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
require 'formula'
class Xchat < Formula
homepage 'http://xchat.org'
url 'http://xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2'
md5 '6775c44f38e84d06c06c336b32c4a452'
depends_on 'pkg-config' => :build
depends_on 'gettext'
depends_on 'gtk+'
depends_on :x11
# Adjust to newer glib include conventions
# Reported at https://sourceforge.net/tracker/?func=detail&aid=3446968&group_id=239&atid=100239
def patches; DATA; end
def install
ENV.append 'LDFLAGS', '-lgmodule-2.0'
args = %W[--prefix=#{prefix}
--disable-dependency-tracking
--enable-openssl
--disable-python
--disable-xlib
--disable-perl
--disable-plugin]
# Fails on 32-bit core solo without this
args << "--disable-mmx" unless MacOS.prefer_64_bit?
system "./configure", *args
system "make install"
rm_rf share+"applications"
rm_rf share+"pixmaps"
end
end
__END__
diff --git a/src/common/servlist.c b/src/common/servlist.c
index 1728928..0829c99 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
#include "cfgfiles.h"
#include "fe.h"
diff --git a/src/common/text.c b/src/common/text.c
index a219851..6b11174 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -28,7 +28,7 @@
#include <sys/mman.h>
#include "xchat.h"
-#include <glib/ghash.h>
+#include <glib.h>
#include "cfgfiles.h"
#include "chanopt.h"
#include "plugin.h"
diff --git a/src/common/util.c b/src/common/util.c
index 49517ec..5a0ab6c 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -39,7 +39,7 @@
#include <errno.h>
#include "xchat.h"
#include "xchatc.h"
-#include <glib/gmarkup.h>
+#include <glib.h>
#include <ctype.h>
#include "util.h"
#include "../../config.h"
diff --git a/src/common/xchat.h b/src/common/xchat.h
index 013d6a1..e3f15a8 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -1,10 +1,6 @@
#include "../../config.h"
-#include <glib/gslist.h>
-#include <glib/glist.h>
-#include <glib/gutils.h>
-#include <glib/giochannel.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <time.h> /* need time_t */
|
