[arch-commits] Commit in shadowsocks-libev/trunk (PKGBUILD shared-bloom.patch)

[Felix Yan]

    Date: Thursday, March 16, 2017 @ 14:46:31
  Author: felixonmars
Revision: 216721

upgpkg: shadowsocks-libev 3.0.4-2

Modified:
  shadowsocks-libev/trunk/PKGBUILD
Deleted:
  shadowsocks-libev/trunk/shared-bloom.patch

--------------------+
 PKGBUILD           |    2 -
 shared-bloom.patch |   77 ---------------------------------------------------
 2 files changed, 1 insertion(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-16 14:45:55 UTC (rev 216720)
+++ PKGBUILD	2017-03-16 14:46:31 UTC (rev 216721)
@@ -6,7 +6,7 @@
 
 pkgname=shadowsocks-libev
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A lightweight secured socks5 proxy for embedded devices and low end boxes'
 arch=('i686' 'x86_64')
 url='https://github.com/shadowsocks/shadowsocks-libev'

Deleted: shared-bloom.patch
===================================================================
--- shared-bloom.patch	2017-03-16 14:45:55 UTC (rev 216720)
+++ shared-bloom.patch	2017-03-16 14:46:31 UTC (rev 216721)
@@ -1,77 +0,0 @@
-commit 3c8ab9b46a5527bb309e30cfe51f84b84ccc591f
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Thu Mar 9 12:40:36 2017 +0800
-
-    Use system libbloom on USE_SYSTEM_SHARED_LIB
-
-diff --git a/Makefile.am b/Makefile.am
-index dc6ad6b..12a0b0b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- if USE_SYSTEM_SHARED_LIB
--SUBDIRS = src libbloom
-+SUBDIRS = src
- else
- SUBDIRS = libcork libipset libbloom src
- endif
-diff --git a/configure.ac b/configure.ac
-index 92b567d..a63d1ce 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,9 +46,9 @@ AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test x$disable_documentation = xfalse])
- 
- AM_COND_IF([ENABLE_DOCUMENTATION], [
-   AC_PATH_PROG([ASCIIDOC], [asciidoc])
--  test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.]) 
-+  test x"${ASCIIDOC}" != x || AC_MSG_ERROR([Cannot find `asciidoc` in PATH.])
-   AC_PATH_PROG([XMLTO], [xmlto])
--  test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.]) 
-+  test x"$XMLTO" != x || AC_MSG_ERROR([Cannot find `xmlto` in PATH.])
-   AC_PATH_PROG([GZIP], [gzip], [gzip])
-   AC_PATH_PROG([MV], [mv], [mv])
-   AC_PROG_SED
-@@ -231,12 +231,11 @@ AC_CHECK_LIB([ev], [ev_loop_destroy], [LIBS="-lev $LIBS"], [AC_MSG_ERROR([Couldn
- 
- AC_CONFIG_FILES([shadowsocks-libev.pc
-                  Makefile
--                 src/Makefile
--                 libbloom/Makefile])
-+                 src/Makefile])
- 
- AM_COND_IF([USE_SYSTEM_SHARED_LIB],
- 		   [AC_DEFINE([USE_SYSTEM_SHARED_LIB], [1], [Define if use system shared lib.])],
--		   [AC_CONFIG_FILES([libcork/Makefile libipset/Makefile])])
-+		   [AC_CONFIG_FILES([libbloom/Makefile libcork/Makefile libipset/Makefile])])
- 
- AM_COND_IF([ENABLE_DOCUMENTATION],
-   [AC_CONFIG_FILES([doc/Makefile])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 4d38318..1b77974 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,20 +2,20 @@ VERSION_INFO = 2:0:0
- 
- AM_CFLAGS = -g -O2 -Wall -Werror -Wno-deprecated-declarations -fno-strict-aliasing -std=gnu99 -D_GNU_SOURCE
- AM_CFLAGS += $(PTHREAD_CFLAGS)
--AM_CFLAGS += -I$(top_srcdir)/libbloom
- if !USE_SYSTEM_SHARED_LIB
-+AM_CFLAGS += -I$(top_srcdir)/libbloom
- AM_CFLAGS += -I$(top_srcdir)/libipset/include
- AM_CFLAGS += -I$(top_srcdir)/libcork/include
- endif
- AM_CFLAGS += $(LIBPCRE_CFLAGS)
- 
- SS_COMMON_LIBS = $(INET_NTOP_LIB) $(LIBPCRE_LIBS)
--SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la
- if !USE_SYSTEM_SHARED_LIB
--SS_COMMON_LIBS += $(top_builddir)/libipset/libipset.la \
-+SS_COMMON_LIBS += $(top_builddir)/libbloom/libbloom.la \
-+                  $(top_builddir)/libipset/libipset.la \
-                   $(top_builddir)/libcork/libcork.la
- else
--SS_COMMON_LIBS += -lcork -lcorkipset
-+SS_COMMON_LIBS += -lbloom -lcork -lcorkipset
- endif
- SS_COMMON_LIBS += -lev -lsodium -lm
-