-
Notifications
You must be signed in to change notification settings - Fork 0
/
libappindicator-fixes.patch
182 lines (177 loc) · 5.2 KB
/
libappindicator-fixes.patch
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
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
diff -ru .flatpak-builder/build/appindicator-3/configure.ac .flatpak-builder/build/appindicator-3/configure-patched.ac
--- appindicator-3/configure.ac 2012-07-11 14:28:51.115114265 -0300
+++ appindicator-patch/configure.ac 2017-07-29 02:35:53.396285118 -0300
@@ -100,114 +100,6 @@
AM_PROG_VALAC([0.14.0])
AM_CONDITIONAL(HAVE_VALAC, [test "x$VALAC" != "x"])
-###########################
-# Check for Mono support
-###########################
-
-MONO_REQUIRED_VERSION=1.0
-PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
-AM_CONDITIONAL(HAS_MONO, [test "x$has_mono" = "xtrue"])
-
-AC_PATH_PROG(AL, al, no)
-if test "x$AL" = "xno" ; then
- AC_MSG_NOTICE([No al tool found. You need to install Mono.])
-fi
-
-if test "x$has_mono" = "xtrue" ; then
- GENERATED_SOURCES=generated/*.cs
- AC_PATH_PROG(RUNTIME, mono, no)
-
- if test "x$RUNTIME" != "no" ; then
- RUNTIME=mono
- fi
-
- AC_PATH_PROG(CSC, gmcs, no)
- LIB_PREFIX=.so
- LIB_SUFFIX=
-fi
-
-if test "x$CSC" = "xno" ; then
- AC_MSG_NOTICE([No Mono compiler found.])
-fi
-
-AC_PATH_PROG(GACUTIL, gacutil, no)
-if test "x$GACUTIL" = "xno" ; then
- AC_MSG_NOTICE([No gacutil tool found])
-fi
-
-AC_SUBST(RUNTIME)
-AC_SUBST(CSC)
-AC_SUBST(GACUTIL)
-AC_SUBST(LIB_PREFIX)
-AC_SUBST(LIB_SUFFIX)
-AC_SUBST(GENERATED_SOURCES)
-
-GLIB_SHARP_REQ_VERSION=2.12.1
-GTK_SHARP_REQ_VERSION=2.12
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION, has_gtksharp=true, has_gtksharp=false)
-
-PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION, has_gapi=true, has_gapi=false)
-AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no)
-AC_SUBST(GAPI_PARSER)
-AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
-AC_SUBST(GAPI_CODEGEN)
-AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
-AC_SUBST(GAPI_FIXUP)
-
-# Check for nunit
-AC_ARG_ENABLE([mono-test],
- AC_HELP_STRING([--disable-mono-test], [Disable mono test]),,
- [enable_mono_test=auto])
-
-if test x"$enable_mono_test" != x"no" ; then
- PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7,
- [have_nunit=yes],
- [PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit,
- [have_nunit=yes],
- [have_nunit=no])
- ])
- if test x${enable_mono_test} = xyes && test x${have_nunit} = xno; then
- AC_MSG_ERROR([Mono test configured but nunit not found])
- fi
-else
- have_nunit=no
-fi
-AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
-
-###########################
-# Check to see if we're local
-###########################
-
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
-
-###########################
-# Python
-###########################
-
-PYGTK_REQUIRED=2.14.0
-PYGOBJECT_REQUIRED=0.22
-
-AM_PATH_PYTHON(2.3.5)
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-
-PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
- [
- pygtk-2.0 >= $PYGTK_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
- pygobject-2.0 >= $PYGOBJECT_REQUIRED
- ])
-
-AC_MSG_CHECKING(for pygtk defs)
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFSDIR)
-AC_MSG_RESULT($PYGTK_DEFSDIR)
-
-AC_MSG_CHECKING(for pygtk codegen)
-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-AC_SUBST(PYGTK_CODEGEN)
-AC_MSG_RESULT($PYGTK_CODEGEN)
-
#########################
# Check if build tests
#########################
@@ -239,8 +131,6 @@
src/appindicator-0.1.pc
src/appindicator3-0.1.pc
bindings/Makefile
-bindings/python/Makefile
-bindings/python/appindicator.override
bindings/vala/Makefile
bindings/vala/examples/Makefile
tests/Makefile
@@ -251,17 +141,6 @@
docs/reference/libappindicator-docs.sgml
])
-if test "x$has_mono" = "xtrue" ; then
- AC_CONFIG_FILES([
- bindings/mono/Makefile
- bindings/mono/appindicator-sharp.dll.config
- bindings/mono/appindicator-sharp-0.1.pc
- bindings/mono/app-indicator.sources.xml
- bindings/mono/examples/Makefile
- bindings/mono/examples/indicator-example
- ])
-fi
-
AC_OUTPUT
###########################
@@ -274,8 +153,6 @@
Prefix: $prefix
GTK+ Version: $with_gtk
- Mono: $has_mono
Tests: $enable_tests
- Mono tests: $have_nunit
gcov: $use_gcov
])
diff -ru .flatpak-builder/build/appindicator-3/bindings/Makefile.am .flatpak-builder/build/appindicator-3/bindings/Makefile-patrched.am
--- appindicator-3/bindings/Makefile.am 2012-07-11 14:28:34.415113869 -0300
+++ appindicator-patched/bindings/Makefile.am 2017-07-29 02:43:31.455570768 -0300
@@ -1,12 +1,4 @@
if USE_GTK3
SUBDIRS = \
vala
-else
-SUBDIRS = \
- python \
- vala
-endif
-
-if HAS_MONO
-SUBDIRS += mono
endif
diff -ru .flatpak-builder/build/libappindicator-3/src/Makefile.am .flatpak-builder/build/libappindicator-3/src/Makefile-patched.am
--- libappindicator-7/src/Makefile.am 2012-07-11 13:28:34.415113869 -0400
+++ libappindicator-patched/src/Makefile.am 2017-05-06 22:44:57.719587973 -0400
@@ -76,7 +76,7 @@
libappindicator_la_CFLAGS = \
$(LIBRARY_CFLAGS) \
$(COVERAGE_CFLAGS) \
- -Wall -Werror \
+ -Wall \
-DG_LOG_DOMAIN=\"libappindicator\"
libappindicator_la_LIBADD = \