kiwix: upstream code cleanup

[Mike Gabriel]

Hi Renaud,

On Mi 06 Jun 2012 19:40:59 CEST renaud gaudin wrote:

> On 06/06/2012 05:36 PM, Mike Gabriel wrote:
>
>> gbp:error: You have uncommitted changes in your source tree:
>> gbp:error: # On branch master
>> # Changes not staged for commit:
>> # (use "git add/rm <file>..." to update what will be committed)
>> # (use "git checkout -- <file>..." to discard changes in working directory)
>> #
>> # modified: config.guess
>> # modified: config.sub
>> # deleted: desktop/Makefile
>> # deleted: etc/Makefile
>> # deleted: kiwix/Makefile
>> # deleted: kiwix/chrome/Makefile
>> # deleted: kiwix/components/Makefile
>> # deleted: kiwix/defaults/Makefile
>> # deleted: src/components/contentManager/IContentManager.h
>> # deleted: src/components/serverManager/IServerManager.h
>> # deleted: src/components/zimAccessor/IZimAccessor.h
>> # deleted: src/components/zimCluceneIndexer/IZimCluceneIndexer.h
>> # deleted: src/components/zimXapianIndexer/IZimXapianIndexer.h
>> # modified: src/dependencies/Makefile
>> # deleted: static/Makefile
>> #
>> no changes added to commit (use "git add" and/or "git commit -a")
>> gbp:error: Use --git-ignore-new to ignore.
>
> Those files are not distributed in our tarball. We only have  
> Makefile.am and Makefile.in inside.
> Those are generated by autotools.

I also get this build error (on recent Debian sid/amd64):

/bin/bash ../../../libtool  --tag=CXX   --mode=compile g++  
-DHAVE_CONFIG_H -I.  -I../../../src/zimlib/include -D_FORTIFY_SOURCE=2  
  -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -O2  
-fstack-protector --param=ssp-buffer-size=4 -Wformat  
-Werror=format-security -std=gnu++0x -fexceptions -DMOZ_CPP_EXCEPTIONS  
-DMOZ_NO_MOZALLOC -MT libzim_la-uuid.lo -MD -MP -MF  
.deps/libzim_la-uuid.Tpo -c -o libzim_la-uuid.lo `test -f 'uuid.cpp'  
|| echo './'`uuid.cpp
libtool: compile:  g++ -DHAVE_CONFIG_H -I.  
-I../../../src/zimlib/include -D_FORTIFY_SOURCE=2 -fPIC  
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -O2 -fstack-protector  
--param=ssp-buffer-size=4 -Wformat -Werror=format-security  
-std=gnu++0x -fexceptions -DMOZ_CPP_EXCEPTIONS -DMOZ_NO_MOZALLOC -MT  
libzim_la-uuid.lo -MD -MP -MF .deps/libzim_la-uuid.Tpo -c uuid.cpp   
-fPIC -DPIC -o .libs/libzim_la-uuid.o
uuid.cpp: In static member function 'static zim::Uuid zim::Uuid::generate()':
uuid.cpp:90:78: error: 'getpid' was not declared in this scope
make[5]: *** [libzim_la-uuid.lo] Fehler 1
make[5]: Leaving directory `/home/mike/tmp/kiwix.b/src/zimlib/src'
make[4]: *** [all] Fehler 2
make[4]: Leaving directory `/home/mike/tmp/kiwix.b/src/zimlib/src'
make[3]: *** [all-recursive] Fehler 1
make[3]: Leaving directory `/home/mike/tmp/kiwix.b/src/zimlib'
make[2]: *** [all-recursive] Fehler 1
make[2]: Leaving directory `/home/mike/tmp/kiwix.b/src'
make[1]: *** [all-recursive] Fehler 1
make[1]: Leaving directory `/home/mike/tmp/kiwix.b'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Fehler 2
dpkg-buildpackage: Fehler: Fehler-Exitstatus von debian/rules build war 2
debuild: fatal error at line 1350:
dpkg-buildpackage -rfakeroot -D -us -uc -i -I failed
gbp:error: Couldn't run 'debuild -i -I -uc -us': debuild -i -I returned 29


With latest gcc versions you have to include <unistd.h>.

See:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50423

And:
http://gcc.gnu.org/gcc-4.7/changes.html

Mike

-- 

DAS-NETZWERKTEAM
mike gabriel, rothenstein 5, 24214 neudorf-bornstein
fon: +49 (1520) 1976 148

GnuPG Key ID 0xB588399B
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.alioth.debian.org/pipermail/debian-edu-pkg-team/attachments/20120606/1ddc6f6e/attachment-0001.pgp>