main/eggdrop: fix inline functions

2 files changed, 90 insertions, 8 deletions

diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index ce58ddc3d1..0e2545a789 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=eggdrop
 pkgver=1.6.21
-pkgrel=1
+pkgrel=2
 pkgdesc="World's most popular Open Source IRC bot"
 url="http://www.eggheads.org/"
 arch="all"
@@ -13,7 +13,8 @@ subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen"
 source="ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/${pkgname}${pkgver}.tar.bz2
 	eggdrop-langdir.patch
 	gseen.mod.patch
-	logs2html.mod.patch"
+	logs2html.mod.patch
+	fix-inline-functions.patch"
 
 _builddir="$srcdir/${pkgname}${pkgver}"
 
@@ -28,7 +29,7 @@ prepare() {
 }
 
 build() {
-	cd "$_builddir"	
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -41,7 +42,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"	
+	cd "$_builddir"
 	make -j1 INSTALL="install -p" DEST="$pkgdir"/usr/share/eggdrop install \
 		|| return 1
 	rm -rf "$pkgdir"/usr/share/eggdrop/README \
@@ -55,7 +56,7 @@ package() {
 	install -D -m 755 eggdrop "$pkgdir"/usr/bin/eggdrop || return 1
 	install -D -m 644 doc/man1/eggdrop.1 \
 		"$pkgdir"/usr/share/man/man1/eggdrop.1 || return 1
-	
+
 	#move modules to /usr/lib
 	mkdir "$pkgdir"/usr/lib
 	mv "$pkgdir"/usr/share/eggdrop/modules-* \
@@ -68,7 +69,7 @@ package() {
 		-e 's@help/@/usr/share/eggdrop/help/@g' \
 		-e 's@modules/@/usr/lib/eggdrop/@g' \
 		eggdrop.conf
-	
+
 	mkdir -p "$pkgdir"/usr/share/doc/eggdrop
 	cp -a \
 		COPYING FEATURES NEWS README doc/Changes1.6 eggdrop.conf \
@@ -94,7 +95,7 @@ logs2html() {
 		"$subpkgdir"/usr/lib/eggdrop/ || return 1
 
 	mkdir -p "$subpkgdir"/usr/share/eggdrop/log2html
-	
+
 	for files in logs2html.conf top100.tpl user.css readme.txt chan.list; do
 		cp src/mod/logs2html.mod/${files} "$subpkgdir"/usr/share/eggdrop/log2html/ || return 1
 	done
@@ -121,4 +122,15 @@ gseen() {
 md5sums="5663b2daecc790e6e9237e1d5a2caa50  eggdrop1.6.21.tar.bz2
 fdc2a01f611f14a8132225c8294f5039  eggdrop-langdir.patch
 853a8526472ee964a8c94046cb9ae8b8  gseen.mod.patch
-8b12435d0944b47898758d74bb227778  logs2html.mod.patch"
+8b12435d0944b47898758d74bb227778  logs2html.mod.patch
+648a3827438060f1a977a59d761a6300  fix-inline-functions.patch"
+sha256sums="75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754  eggdrop1.6.21.tar.bz2
+85d1cc18ebb002755e6d4a2996ff6f12768df3e0412001011db695a982887510  eggdrop-langdir.patch
+a0597de68d9b0a8d2adeb7cfaf6ffa1e248a6e21df709d3d887e6a4519562462  gseen.mod.patch
+197c73af2e6d484ea78796faeb4290c6ce557aa641291d496c6878daf5454e16  logs2html.mod.patch
+a5c1c06b7c07d5a1f0943a1df73c2e262b28d98921ea4aa2353b826b6775c8c7  fix-inline-functions.patch"
+sha512sums="9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653  eggdrop1.6.21.tar.bz2
+e8b36fb3c444bd884def46082f2c4f0683d1ba8bf05015344e1a2cf634955c8f1e8ccef62c3c2d93958151cf2ce1595adc352c0de3c76ceed7b89c28f48ea96f  eggdrop-langdir.patch
+b7bc853b73a9a86ed19dae2cb9edaededbeaa0c163034dc8106239818b8d1fb7c7381fa933fda786cb1c5026283821ec6e3a85a1bbc73db736668f1615dfe2f7  gseen.mod.patch
+8380c414d5193f7a48b5b91384c0181b472dd6cd541a3e9921453b945af3a959d6f58e6bfdcc311ba7b1ed15a44b2225c1d0f1a00526da75cacd4b8650591229  logs2html.mod.patch
+bbe12761c35298604ffeb90a1dfb1c928fa7b83e6366578e8f1b298dda72dea19931812c70b6f9475b7b0449b0e799fd9cbee52e8d40be04eb33484274589340  fix-inline-functions.patch"
diff --git a/main/eggdrop/fix-inline-functions.patch b/main/eggdrop/fix-inline-functions.patch
new file mode 100644
index 0000000000..3856be1f48
--- /dev/null
+++ b/main/eggdrop/fix-inline-functions.patch
@@ -0,0 +1,70 @@
+Description: fix inline functions to build with clang-3.5. See
+  http://clang.llvm.org/compatibility.html#inline
+Author: Arthur Marble <arthur@info9.net>
+
+--- a/src/match.c
++++ b/src/match.c
+@@ -367,7 +367,7 @@
+ /* Inline for cron_match (obviously).
+  * Matches a single field of a crontab expression.
+  */
+-inline int cron_matchfld(char *mask, int match)
++static inline int cron_matchfld(char *mask, int match)
+ {
+   int skip = 0, f, t;
+   char *p, *q;
+--- a/src/tclhash.c
++++ b/src/tclhash.c
+@@ -109,7 +109,7 @@
+   nfree(tl);
+ }
+ 
+-inline void garbage_collect_tclhash(void)
++void garbage_collect_tclhash(void)
+ {
+   tcl_bind_list_t *tl, *tl_next, *tl_prev;
+   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
+--- a/src/tclhash.h
++++ b/src/tclhash.h
+@@ -75,7 +75,7 @@
+ 
+ #ifndef MAKING_MODS
+ 
+-inline void garbage_collect_tclhash(void);
++void garbage_collect_tclhash(void);
+ 
+ void init_bind(void);
+ void kill_bind(void);
+--- a/src/net.c
++++ b/src/net.c
+@@ -564,7 +564,7 @@
+ /* Returns a socket number for a listening socket that will accept any
+  * connection -- port # is returned in port
+  */
+-inline int open_listen(int *port)
++int open_listen(int *port)
+ {
+   return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
+ }
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -271,7 +271,7 @@
+ void killsock(int);
+ void killtclsock(int);
+ int answer(int, char *, unsigned long *, unsigned short *, int);
+-inline int open_listen(int *);
++int open_listen(int *);
+ int open_address_listen(IP addr, int *);
+ int open_telnet(char *, int);
+ int open_telnet_dcc(int, char *, char *);
+--- a/src/userrec.c
++++ b/src/userrec.c
+@@ -77,7 +77,7 @@
+ #endif
+ }
+ 
+-inline int expmem_mask(struct maskrec *m)
++static inline int expmem_mask(struct maskrec *m)
+ {
+   int result = 0;
+