]> git.pld-linux.org Git - packages/openchange.git/blob - openchange-link.patch
samba 4.20.0 rebuild
[packages/openchange.git] / openchange-link.patch
1 --- openchange-openchange-2.3-VULCAN.orig/configure.ac  2024-04-09 11:55:51.678247965 +0200
2 +++ openchange-openchange-2.3-VULCAN/configure.ac       2024-04-09 20:15:46.847384577 +0200
3 @@ -464,6 +464,18 @@
4  AC_CHECK_HEADER([samba/version.h],, AC_MSG_ERROR([Could not find Samba4 headers. Re-run ./configure with --with-samba=XXX where
5   XXX is the prefix that Samba4 was installed to.]))
6  
7 +AC_MSG_CHECKING(samba private libraries suffix)
8 +samba_private_libdir="$($PKG_CONFIG --variable=libdir samba-hostconfig)/samba"
9 +if test -e "$samba_private_libdir/libndr-samba-private-samba.so"; then
10 +    SMB_PRIV_LIB_SFX=private-samba
11 +elif test -e "$samba_private_libdir/libndr-samba-samba4.so"; then
12 +    SMB_PRIV_LIB_SFX=samba4
13 +else
14 +    AC_MSG_ERROR([failed])
15 +fi
16 +AC_MSG_RESULT($SMB_PRIV_LIB_SFX)
17 +AC_SUBST(SMB_PRIV_LIB_SFX)
18 +
19  . `dirname $0`/script/samba4_ver.sh
20  
21  OC_CHECK_SAMBA_VERSION([$SAMBA4_RELEASE],[$SAMBA4_GIT_VER-GIT-$SAMBA4_GIT_REV])
22 --- openchange-openchange-2.3-VULCAN.orig/config.mk.in  2024-04-09 19:08:35.278698007 +0200
23 +++ openchange-openchange-2.3-VULCAN/config.mk.in       2024-04-09 18:58:37.035533217 +0200
24 @@ -68,7 +68,8 @@
25  TALLOC_LIBS=@TALLOC_LIBS@
26  
27  CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS) $(NANOMSG_CFLAGS)
28 -LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS)
29 +SMB_PRIV_LIB_SFX=@SMB_PRIV_LIB_SFX@
30 +LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS) -ltevent-util -lsamba-errors -lndr-krb5pac ${libdir}/samba/libcli-ldap-common-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libcliauth-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libdcerpc-samba-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libldbsamba-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libndr-samba-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libsamba-debug-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libsamba-security-$(SMB_PRIV_LIB_SFX).so ${libdir}/samba/libsamdb-common-$(SMB_PRIV_LIB_SFX).so
31  LDFLAGS+=@LDFLAGS@
32  
33  THREAD_LIBS=@THREAD_LIBS@
34 --- openchange-openchange-2.3-VULCAN/Makefile.orig      2015-05-16 17:22:04.000000000 +0200
35 +++ openchange-openchange-2.3-VULCAN/Makefile   2021-03-26 18:48:45.049437480 +0100
36 @@ -368,6 +368,9 @@
37         @echo "Linking $@"
38         @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) 
39  
40 +libmapipp.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
41 +       ln -fs $< $@
42 +
43  libmapixx-installpc:
44         @echo "[*] install: libmapi++ pc files"
45         $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
46 @@ -858,8 +861,7 @@
47                                                         mapiproxy/libmapiserver/libmapiserver_oxorule.po        \
48                                                         mapiproxy/libmapiserver/libmapiserver_oxcperm.po        \
49                                                         mapiproxy/libmapiserver/libmapiserver_oxcdata.po        \
50 -                                                       ndr_mapi.po                             \
51 -                                                       gen_ndr/ndr_exchange.po
52 +                                                       libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
53         @echo "Linking $@"
54         @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ $(LIBS)
55  
56 @@ -1887,9 +1889,11 @@
57  
58  libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION):      \
59         qt/lib/foldermodel.o                    \
60 -       qt/lib/messagesmodel.o
61 +       qt/lib/messagesmodel.o                  \
62 +       libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) \
63 +       libmapi.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION)
64         @echo "Linking $@"
65 -       @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION) -o $@ $^ $(LIBS)
66 +       @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION) -o $@ $^ -lQtGui -lQtCore $(LIBS)
67  
68  
69  qt/demo/demoapp: qt/demo/demoapp.o                             \
This page took 0.082656 seconds and 4 git commands to generate.