pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove unnecessary patches.



Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sat Feb 25 16:09:54 2017 +0000
Changeset:	679e0c178526f26b423b8f1316ccb2dbe3afdca8

Removed Files:
	seafile-gui/patches/patch-configure.ac
	seafile-gui/patches/patch-daemon_Makefile.am
	seafile-gui/patches/patch-lib_Makefile.am

Log Message:
Remove unnecessary patches.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=679e0c178526f26b423b8f1316ccb2dbe3afdca8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 seafile-gui/patches/patch-configure.ac       | 102 ---------------------------
 seafile-gui/patches/patch-daemon_Makefile.am |  24 -------
 seafile-gui/patches/patch-lib_Makefile.am    |  32 ---------
 3 files changed, 158 deletions(-)

diffs:
diff --git a/seafile-gui/patches/patch-configure.ac b/seafile-gui/patches/patch-configure.ac
deleted file mode 100644
index adff8ef7fc..0000000000
--- a/seafile-gui/patches/patch-configure.ac
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD$
-Patch for BSD detection with kvm & libinotify.
---- configure.ac.orig	2017-01-14 21:53:11.062111383 +0000
-+++ configure.ac	2017-01-14 21:35:50.000000000 +0000
-@@ -43,6 +43,15 @@
-   AC_MSG_RESULT(no)
- fi
- 
-+AC_MSG_CHECKING(for BSD)
-+if test `uname | grep -e BSD -e DragonFly | wc -l` = "1"; then
-+  bbsd=true
-+  AC_MSG_RESULT(compile in BSD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+
-+
- AC_MSG_CHECKING(for Mac)
- if test "$(uname)" = "Darwin"; then
-   bmac=true
-@@ -52,7 +61,7 @@
- fi
- 
- AC_MSG_CHECKING(for Linux)
--if test "$bmac" != "true" -a "$bwin32" != "true"; then
-+if test "$bmac" != "true" -a "$bwin32" != "true"; -a "$bbsd" != "true"; then
-   blinux=true
-   AC_MSG_RESULT(compile in linux)
- else
-@@ -62,7 +71,7 @@
- AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
- AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
- AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
--
-+AM_CONDITIONAL([BSD], [test "$bbsd" = "true"])
- 
- # check libraries
- if test "$bwin32" != true; then
-@@ -91,6 +100,11 @@
- fi
- AC_SUBST(CONSOLE)
- 
-+if test "$bbsd" = true; then
-+    AC_ARG_ENABLE(fuse, AC_HELP_STRING([--enable-fuse], [enable fuse virtual file system]),
-+	[compile_fuse=$enableval],[compile_fuse="no"])
-+fi
-+
- if test "$bwin32" = true; then
-   LIB_WS32=-lws2_32
-   LIB_GDI32=-lgdi32
-@@ -105,6 +119,8 @@
-   LIB_MAC=
-   MSVC_CFLAGS="-D__MSVCRT__ -D__MSVCRT_VERSION__=0x0601"
-   LIB_CRYPT32=-lcrypt32
-+  LIB_INOTIFY=
-+  LIB_KVM=
- elif test "$bmac" = true ; then
-   LIB_WS32=
-   LIB_GDI32=
-@@ -119,6 +135,24 @@
-   LIB_MAC="-framework CoreServices"
-   LIB_CRYPT32=
-   LIB_ICONV=-liconv
-+  LIB_INOTIFY=
-+  LIB_KVM=
-+elif test "$bbsd" = true ; then
-+  LIB_WS32=
-+  LIB_GDI32=
-+  LIB_RT=
-+  LIB_INTL=
-+  LIB_RESOLV=
-+  LIB_UUID=-luuid
-+  LIB_IPHLPAPI=
-+  LIB_SHELL32=
-+  LIB_PSAPI=
-+  LIB_MAC=
-+  MSVC_FLAGS=
-+  LIB_CRYPT32=
-+  LIB_ICONV=-liconv
-+  LIB_INOTIFY=-linotify
-+  LIB_KVM=-lkvm
- else
-   LIB_WS32=
-   LIB_GDI32=
-@@ -132,6 +166,8 @@
-   LIB_MAC=
-   MSVC_CFLAGS=
-   LIB_CRYPT32=
-+  LIB_INOTIFY=-linotify
-+  LIB_KVM=
- fi
- 
- AC_SUBST(LIB_WS32)
-@@ -144,6 +180,8 @@
- AC_SUBST(LIB_SHELL32)
- AC_SUBST(LIB_PSAPI)
- AC_SUBST(LIB_MAC)
-+AC_SUBST(LIB_INOTIFY)
-+AC_SUBST(LIB_KVM)
- AC_SUBST(MSVC_CFLAGS)
- AC_SUBST(LIB_CRYPT32)
- AC_SUBST(LIB_ICONV)
diff --git a/seafile-gui/patches/patch-daemon_Makefile.am b/seafile-gui/patches/patch-daemon_Makefile.am
deleted file mode 100644
index 9859f5a630..0000000000
--- a/seafile-gui/patches/patch-daemon_Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-Add search path for libinotify and BSD detection.
---- daemon/Makefile.am.orig	2017-01-05 08:05:21.000000000 +0000
-+++ daemon/Makefile.am	2017-01-14 21:13:15.269922292 +0000
-@@ -57,6 +57,10 @@
- 	change-set.h \
- 	$(proc_headers)
- 
-+if BSD
-+wt_monitor_src = wt-monitor.c wt-monitor-linux.c wt-monitor-structs.c
-+endif
-+
- if LINUX
- wt_monitor_src = wt-monitor.c wt-monitor-linux.c wt-monitor-structs.c
- endif
-@@ -124,6 +128,7 @@
- 	@LIB_RT@ @LIB_UUID@ -lsqlite3 @LIBEVENT_LIBS@ \
- 	$(top_builddir)/common/cdc/libcdc.la \
- 	$(top_builddir)/common/index/libindex.la @LIB_WS32@ @LIB_CRYPT32@ \
--	@SEARPC_LIBS@ @CCNET_LIBS@ @JANSSON_LIBS@ @LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@ @BPWRAPPER_LIBS@
-+	@SEARPC_LIBS@ @CCNET_LIBS@ @JANSSON_LIBS@ \
-+	@LIB_MAC@ @ZLIB_LIBS@ @CURL_LIBS@ @LIB_INOTIFY@ @BPWRAPPER_LIBS@
- 
- seaf_daemon_LDFLAGS = @CONSOLE@
diff --git a/seafile-gui/patches/patch-lib_Makefile.am b/seafile-gui/patches/patch-lib_Makefile.am
deleted file mode 100644
index 5ee6d8e709..0000000000
--- a/seafile-gui/patches/patch-lib_Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-BSD 
---- lib/Makefile.am.orig	2017-01-14 21:40:30.827480934 +0000
-+++ lib/Makefile.am	2017-01-14 21:45:01.144554752 +0000
-@@ -53,6 +53,7 @@
- libseafile_common_la_LDFLAGS = -no-undefined
- libseafile_common_la_LIBADD = @GLIB2_LIBS@  @GOBJECT_LIBS@ @LIB_GDI32@ \
- 				     @LIB_UUID@ @LIB_WS32@ @LIB_PSAPI@ -lsqlite3 \
-+				     @LIB_KVM@ \
- 					 @LIBEVENT_LIBS@ @SEARPC_LIBS@ @LIB_SHELL32@ \
- 	@ZLIB_LIBS@
- 
-@@ -74,7 +75,7 @@
- 	rm -f ${seafile_object_gen}
- 	@rm -f vala.tmp
- 	@touch vala.tmp
--	valac -C --pkg posix $^
-+	valac -C --pkg posix ${seafile_object_define}
- 	@mv -f vala.tmp $@
- 
- ${seafile_object_gen}: vala.stamp
-@@ -90,5 +91,9 @@
- if MACOS
- 	sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
- else
-+if BSD
-+	sed -i '' "s|(DESTDIR)|${PREFIX}|g" $(pcfiles)
-+else
- 	${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
- endif
-+endif
-\ No newline at end of file


Home | Main Index | Thread Index | Old Index