Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openobex/files/
Date: Sat, 02 Sep 2017 14:46:17
Message-Id: 1504363562.ba0f99c57932462490077ef4feb639f5994f992c.kensington@gentoo
1 commit: ba0f99c57932462490077ef4feb639f5994f992c
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 19 13:07:03 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 2 14:46:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0f99c5
7
8 dev-libs/openobex: remove unused patch
9
10 .../openobex/files/openobex-1.5-use-flags.patch | 224 ---------------------
11 1 file changed, 224 deletions(-)
12
13 diff --git a/dev-libs/openobex/files/openobex-1.5-use-flags.patch b/dev-libs/openobex/files/openobex-1.5-use-flags.patch
14 deleted file mode 100644
15 index c2907752e83..00000000000
16 --- a/dev-libs/openobex/files/openobex-1.5-use-flags.patch
17 +++ /dev/null
18 @@ -1,224 +0,0 @@
19 -diff -Nru openobex-1.5.orig/acinclude.m4 openobex-1.5/acinclude.m4
20 ---- openobex-1.5.orig/acinclude.m4 2009-09-20 12:13:44.000000000 +0200
21 -+++ openobex-1.5/acinclude.m4 2009-09-20 12:18:38.000000000 +0200
22 -@@ -42,6 +42,52 @@
23 - fi
24 -
25 - AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}", [Directory for the configuration files])
26 -+
27 -+ fortify_enable=yes
28 -+ irda_enable=yes
29 -+ bluetooth_enable=yes
30 -+ usb_enable=yes
31 -+ glib_enable=no
32 -+ apps_enable=no
33 -+ debug_enable=no
34 -+ syslog_enable=no
35 -+ dump_enable=no
36 -+
37 -+ AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
38 -+ fortify_enable=${enableval}
39 -+ ])
40 -+
41 -+ AC_ARG_ENABLE(irda, AC_HELP_STRING([--disable-irda], [disable IrDA support]), [
42 -+ irda_enable=${enableval}
43 -+ ])
44 -+
45 -+ AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], [disable Bluetooth support]), [
46 -+ bluetooth_enable=${enableval}
47 -+ ])
48 -+
49 -+ AC_ARG_ENABLE(usb, AC_HELP_STRING([--disable-usb], [disable USB support]), [
50 -+ usb_enable=${enableval}
51 -+ ])
52 -+
53 -+ dnl AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib bindings]), [
54 -+ dnl glib_enable=${enableval}
55 -+ dnl ])
56 -+
57 -+ AC_ARG_ENABLE(apps, AC_HELP_STRING([--enable-apps], [enable test applications]), [
58 -+ apps_enable=${enableval}
59 -+ ])
60 -+
61 -+ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
62 -+ debug_enable=${enableval}
63 -+ ])
64 -+
65 -+ AC_ARG_ENABLE(syslog, AC_HELP_STRING([--enable-syslog], [enable debugging to the system logger]), [
66 -+ syslog_enable=${enableval}
67 -+ ])
68 -+
69 -+ AC_ARG_ENABLE(dump, AC_HELP_STRING([--enable-dump], [enable protocol dumping for debugging]), [
70 -+ dump_enable=${enableval}
71 -+ ])
72 - ])
73 -
74 - AC_DEFUN([AC_PATH_WIN32], [
75 -@@ -78,19 +124,21 @@
76 - ])
77 -
78 - AC_DEFUN([AC_PATH_IRDA], [
79 -- case $host in
80 -- *-*-linux*)
81 -- AC_PATH_IRDA_LINUX
82 -- ;;
83 -- *-*-mingw32*)
84 -- AC_PATH_IRDA_WIN32
85 -- ;;
86 -- *)
87 -- irda_found=no;
88 -- AC_MSG_CHECKING([for IrDA support])
89 -- AC_MSG_RESULT([$irda_found])
90 -- ;;
91 -- esac
92 -+ if (test "$irda_enable" = 'yes'); then
93 -+ case $host in
94 -+ *-*-linux*)
95 -+ AC_PATH_IRDA_LINUX
96 -+ ;;
97 -+ *-*-mingw32*)
98 -+ AC_PATH_IRDA_WIN32
99 -+ ;;
100 -+ *)
101 -+ irda_found=no;
102 -+ AC_MSG_CHECKING([for IrDA support])
103 -+ AC_MSG_RESULT([$irda_found])
104 -+ ;;
105 -+ esac
106 -+ fi
107 - ])
108 -
109 - AC_DEFUN([AC_PATH_WINBT], [
110 -@@ -130,45 +178,48 @@
111 - ])
112 -
113 - AC_DEFUN([AC_PATH_BLUETOOTH], [
114 -- case $host in
115 -- *-*-linux*)
116 -- AC_PATH_BLUEZ
117 -- ;;
118 -- *-*-freebsd*)
119 -- AC_PATH_FREEBSDBT
120 -- ;;
121 -- *-*-netbsd*)
122 -- AC_PATH_NETBSDBT
123 -- ;;
124 -- *-*-mingw32*)
125 -- AC_PATH_WINBT
126 -- ;;
127 -- esac
128 -+ if (test "$bluetooth_enable" = 'yes'); then
129 -+ case $host in
130 -+ *-*-linux*)
131 -+ AC_PATH_BLUEZ
132 -+ ;;
133 -+ *-*-freebsd*)
134 -+ AC_PATH_FREEBSDBT
135 -+ ;;
136 -+ *-*-netbsd*)
137 -+ AC_PATH_NETBSDBT
138 -+ ;;
139 -+ *-*-mingw32*)
140 -+ AC_PATH_WINBT
141 -+ ;;
142 -+ esac
143 -+ fi
144 - AC_SUBST(BLUETOOTH_CFLAGS)
145 - AC_SUBST(BLUETOOTH_LIBS)
146 - ])
147 -
148 - AC_DEFUN([AC_PATH_USB], [
149 - usb_lib_found=no
150 -- case $host in
151 -- *-*-mingw32*)
152 -- USB_CFLAGS=""
153 -- USB_LIBS="-lusb"
154 -- usb_lib_found=yes
155 -- ;;
156 -- *)
157 -- PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
158 -- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
159 -- ;;
160 -- esac
161 -- AC_SUBST(USB_CFLAGS)
162 -- AC_SUBST(USB_LIBS)
163 --
164 - usb_get_busses=no
165 -- AC_CHECK_LIB(usb, usb_get_busses, usb_get_busses=yes, AC_DEFINE(NEED_USB_GET_BUSSES, 1, [Define to 1 if you need the usb_get_busses() function.]))
166 --
167 - usb_interrupt_read=no
168 -- AC_CHECK_LIB(usb, usb_interrupt_read, usb_interrupt_read=yes, AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))
169 -+ if (test "$usb_enable" = 'yes'); then
170 -+ case $host in
171 -+ *-*-mingw32*)
172 -+ USB_CFLAGS=""
173 -+ USB_LIBS="-lusb"
174 -+ usb_lib_found=yes
175 -+ ;;
176 -+ *)
177 -+ PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
178 -+ AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
179 -+ ;;
180 -+ esac
181 -+
182 -+ AC_CHECK_LIB(usb, usb_get_busses, usb_get_busses=yes, AC_DEFINE(NEED_USB_GET_BUSSES, 1, [Define to 1 if you need the usb_get_busses() function.]))
183 -+ AC_CHECK_LIB(usb, usb_interrupt_read, usb_interrupt_read=yes, AC_DEFINE(NEED_USB_INTERRUPT_READ, 1, [Define to 1 if you need the usb_interrupt_read() function.]))
184 -+ fi
185 -+ AC_SUBST(USB_CFLAGS)
186 -+ AC_SUBST(USB_LIBS)
187 -
188 - if (test "$usb_lib_found" = "yes" && test "$usb_get_busses" = "yes" && test "$usb_interrupt_read" = "yes"); then
189 - usb_found=yes
190 -@@ -201,52 +252,6 @@
191 - ])
192 -
193 - AC_DEFUN([AC_ARG_OPENOBEX], [
194 -- fortify_enable=yes
195 -- irda_enable=yes
196 -- bluetooth_enable=yes
197 -- usb_enable=yes
198 -- glib_enable=no
199 -- apps_enable=no
200 -- debug_enable=no
201 -- syslog_enable=no
202 -- dump_enable=no
203 --
204 -- AC_ARG_ENABLE(fortify, AC_HELP_STRING([--disable-fortify], [disable compile time buffer checks]), [
205 -- fortify_enable=${enableval}
206 -- ])
207 --
208 -- AC_ARG_ENABLE(irda, AC_HELP_STRING([--disable-irda], [disable IrDA support]), [
209 -- irda_enable=${enableval}
210 -- ])
211 --
212 -- AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], [disable Bluetooth support]), [
213 -- bluetooth_enable=${enableval}
214 -- ])
215 --
216 -- AC_ARG_ENABLE(usb, AC_HELP_STRING([--disable-usb], [disable USB support]), [
217 -- usb_enable=${enableval}
218 -- ])
219 --
220 -- dnl AC_ARG_ENABLE(glib, AC_HELP_STRING([--enable-glib], [enable GLib bindings]), [
221 -- dnl glib_enable=${enableval}
222 -- dnl ])
223 --
224 -- AC_ARG_ENABLE(apps, AC_HELP_STRING([--enable-apps], [enable test applications]), [
225 -- apps_enable=${enableval}
226 -- ])
227 --
228 -- AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
229 -- debug_enable=${enableval}
230 -- ])
231 --
232 -- AC_ARG_ENABLE(syslog, AC_HELP_STRING([--enable-syslog], [enable debugging to the system logger]), [
233 -- syslog_enable=${enableval}
234 -- ])
235 --
236 -- AC_ARG_ENABLE(dump, AC_HELP_STRING([--enable-dump], [enable protocol dumping for debugging]), [
237 -- dump_enable=${enableval}
238 -- ])
239 --
240 - if (test "${fortify_enable}" = "yes"); then
241 - CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
242 - fi
Report Message
Find on MARC Find on Google Groups