seafile-server: remove random leftofvers from seafile, https://github.com/haiwen/seafile-server/issues/235

This commit is contained in:
blshkv 2019-06-15 23:47:49 +08:00
parent 164c3a2d48
commit 36d37d11ae
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
2 changed files with 37 additions and 4 deletions

View file

@ -0,0 +1,30 @@
--- a/lib/Makefile.am.orig 2019-05-30 20:37:43.000000000 +0800
+++ b/lib/Makefile.am 2019-06-15 23:22:15.800991293 +0800
@@ -1,7 +1,3 @@
-pcfiles = libseafile.pc
-pkgconfig_DATA = $(pcfiles)
-pkgconfigdir = $(libdir)/pkgconfig
-
AM_CPPFLAGS = @GLIB2_CFLAGS@ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/common \
@@ -20,7 +16,7 @@
valac_gen = ${seafile_object_gen} seafile-object.h
-EXTRA_DIST = ${seafile_object_define} rpc_table.py $(pcfiles) vala.stamp
+EXTRA_DIST = ${seafile_object_define} rpc_table.py vala.stamp
utils_headers = net.h bloom-filter.h utils.h db.h
@@ -77,10 +73,3 @@
rm -f rpc_table.stamp
rm -f rpc_table.tmp
rm -f vala.tmp vala.stamp ${valac_gen}
-
-install-data-local:
-if MACOS
- sed -i '' -e "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
-else
- ${SED} -i "s|(DESTDIR)|${DESTDIR}|g" $(pcfiles)
-endif

View file

@ -41,15 +41,18 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-server"
src_prepare() {
#https://github.com/haiwen/seafile-server/issues/181
#https://github.com/haiwen/ccnet-server/issues/19
#https://github.com/haiwen/seafile-server/issues/67#issuecomment-337904800
eapply "${FILESDIR}/libevhtp-1.2.18.patch"
#do not overlap files with seafile
#https://github.com/haiwen/seafile-server/issues/235
eapply "${FILESDIR}/remove_pc.patch"
sed -i '/seafile_HEADERS/d' lib/Makefile.am || die
sed -i -e 's|seafile ||' python/Makefile.am || die
sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
python_fix_shebang tools/seafile-admin
sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
eautoreconf
vala_src_prepare
eapply_user