DELTA 380963 0 24 SVNLRj]m4OI1.0portsbison ENDREP DELTA 380963 51 135 SVNvuu1.0.tar.gz) = 0450d85d5065d22e87ae600571e3be23a5ff2000f533c15f819a5bd77164a1be SIZE (recoll-1.21.0.tar.gz) = 2234834 ENDREP DELTA SVNIKII--- mk/commondefs.orig 2015-07-16 19:52:37 UTC +++ mk/commondefs @@ -15,7 +15,7 @@ COMMONCXXFLAGS = -I. \ # the sys file or localdefs SYSPICFLAGS = -fPIC -DPIC -LIBRECOLL = -L$(depth)/lib -lrecoll -Wl,-rpath=$(libdir)/recoll +LIBRECOLL = -L$(depth)/lib -lrecoll -liconv -Wl,-rpath=$(libdir)/recoll RANLIB = test -f AR=ar ENDREP DELTA SVN-/----- query/Makefile.orig 2015-07-16 19:59:24 UTC +++ query/Makefile @@ -13,7 +13,7 @@ wasaparse.tab.cpp : wasaparse.y XADUMP_OBJS= xadump.o xadump : $(XADUMP_OBJS) $(CXX) $(ALL_CXXFLAGS) -o xadump $(XADUMP_OBJS) \ - $(depth)/lib/librecoll.a $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) + $(depth)/lib/librecoll.a -liconv $(LIBICONV) $(LIBXAPIAN) $(LIBSYS) xadump.o : xadump.cpp $(CXX) $(ALL_CXXFLAGS) -c xadump.cpp ENDREP DELTA SVNegee--- utils/Makefile.orig 2015-07-16 19:56:54 UTC +++ utils/Makefile @@ -4,7 +4,7 @@ include $(depth)/mk/sysconf # Use a static link for some of the utility programs so that they can be # executed independantly of the installed version of recoll. None of them # are part of the official distrib anyway -LIBRECOLL = ../lib/librecoll.a +LIBRECOLL = ../lib/librecoll.a -liconv PROGS = pxattr trclosefrom trecrontab \ trnetcon trcopyfile trcircache trmd5 trreadfile trfileudi \ ENDREP DELTA SVN{}{{--- utils/md5.h.orig 2015-07-16 19:46:26 UTC +++ utils/md5.h @@ -19,6 +19,10 @@ #define MD5_DIGEST_LENGTH 16 #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) +typedef uint32_t u_int32_t; +typedef uint64_t u_int64_t; +typedef uint8_t u_int8_t; + typedef struct MD5Context { u_int32_t state[4]; /* state */ u_int64_t count; /* number of bits, mod 2^64 */ ENDREP DELTA 150612 1443 252 SVNc&8S7kv_kKsx^Ko0 >[.@nM6`'Ch[^#q'`OQiZYczeW# T q{A>Ȳ￧ߞlTNӻsx29?Lʻק,{uQYr}Yf&tjU~m:o Ӄַd xƋ,u<IFP4/Gt%ѫ$)* #b #lUעD'8%k6m/ЄӤmMh;.4[¨Nc~{3yRi*gybDΝƨE18tDnTs!̒ mvBr i3q<&*\]{s_85l̘ ,HS~z(2^;b~QE`\c@g YvuBVsV8AџE@(Zp :guC 4 E:EF36#EK!\OkC8VzPVcL!0gA(){D2l(]V`Y.Q˫.ȵzW,3'+N׸ZZ{-%oiКo=5U~ǚ\8Uow<űKѦO~?l~*?0 18JJV:<6%Ԯւh:t`l}㬉gXѧZ`R1 cTy~⨨CR[fW͉*̒b.T12HCT CTQA*3h6 QA!zi/I