- rediffed
[packages/openchange.git] / openchange-link.patch
1 --- openchange-openchange-2.3-VULCAN/config.mk.in.orig  2015-05-22 23:30:25.141933097 +0200
2 +++ openchange-openchange-2.3-VULCAN/config.mk.in       2015-05-22 23:30:28.665266286 +0200
3 @@ -68,7 +68,7 @@
4  TALLOC_LIBS=@TALLOC_LIBS@
5  
6  CFLAGS+=$(SAMBA_CFLAGS) $(LDB_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) $(THREAD_CFLAGS) $(NANOMSG_CFLAGS)
7 -LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS)
8 +LIBS+=$(SAMBA_LIBS) $(LDB_LIBS) $(TALLOC_LIBS) $(THREAD_LIBS) -ltevent-util -lsamba-errors ${libdir}/samba/libcli-ldap-common-samba4.so ${libdir}/samba/libcliauth-samba4.so ${libdir}/samba/libdcerpc-samba-samba4.so ${libdir}/samba/libldbsamba-samba4.so ${libdir}/samba/libndr-samba-samba4.so ${libdir}/samba/libsamba-debug-samba4.so ${libdir}/samba/libsamba-security-samba4.so ${libdir}/samba/libsamdb-common-samba4.so
9  LDFLAGS+=@LDFLAGS@
10  
11  THREAD_LIBS=@THREAD_LIBS@
12 --- openchange-openchange-2.3-VULCAN/Makefile.orig      2015-05-16 17:22:04.000000000 +0200
13 +++ openchange-openchange-2.3-VULCAN/Makefile   2021-03-26 18:48:45.049437480 +0100
14 @@ -368,6 +368,9 @@
15         @echo "Linking $@"
16         @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) 
17  
18 +libmapipp.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
19 +       ln -fs $< $@
20 +
21  libmapixx-installpc:
22         @echo "[*] install: libmapi++ pc files"
23         $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
24 @@ -858,8 +861,7 @@
25                                                         mapiproxy/libmapiserver/libmapiserver_oxorule.po        \
26                                                         mapiproxy/libmapiserver/libmapiserver_oxcperm.po        \
27                                                         mapiproxy/libmapiserver/libmapiserver_oxcdata.po        \
28 -                                                       ndr_mapi.po                             \
29 -                                                       gen_ndr/ndr_exchange.po
30 +                                                       libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
31         @echo "Linking $@"
32         @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ $(LIBS)
33  
34 @@ -1887,9 +1889,11 @@
35  
36  libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION):      \
37         qt/lib/foldermodel.o                    \
38 -       qt/lib/messagesmodel.o
39 +       qt/lib/messagesmodel.o                  \
40 +       libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) \
41 +       libmapi.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION)
42         @echo "Linking $@"
43 -       @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION) -o $@ $^ $(LIBS)
44 +       @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION) -o $@ $^ -lQtGui -lQtCore $(LIBS)
45  
46  
47  qt/demo/demoapp: qt/demo/demoapp.o                             \
This page took 0.133603 seconds and 3 git commands to generate.