On Tue, Jan 04, 2005 at 03:45:50PM +0100, Andreas Jochens wrote:
> When building 'sword' on amd64 with gcc-4.0,
> I get the following error:
>
> ../bindings/flatapi.cpp:46: error: cast from 'sword::SWMgr*' to 'int' loses
> precision
(...)
> make[3]: *** [flatapi.lo] Error 1
>
> With the attached patch 'sword' can be compiled
> on amd64 using gcc-4.0.
I'm about to upload a NMU as part of the current bugsquashingpart,
including C++ transition and several fixes for serious issues with the
library package as it is (ldconfig was not run in postinst/prerm, etc).
Please find the diff attached.
Thanks,
--Jeroen
--
Jeroen van Wolffelaar
[EMAIL PROTECTED]
http://jeroen.A-Eskwadraat.nl
diff -u sword-1.5.7/debian/changelog sword-1.5.7/debian/changelog
--- sword-1.5.7/debian/changelog
+++ sword-1.5.7/debian/changelog
@@ -1,3 +1,16 @@
+sword (1.5.7-7.1) unstable; urgency=low
+
+ * Non-Maintainer Upload
+ * C++ transition: libsword4 -> libsword4c2
+ * Fix gcc4 compile error: Use intptr_t as type for pointers, not 'int'
+ (Closes: #288586)
+ * Debhelper compat level 4, to fix calls to ldconfig properly, and drop a
+ lot of manual stuff
+ * Run dh_makeshlibs *before* dh_installdeb
+ * Fix broken dh_shlibs invocation
+
+ -- Jeroen van Wolffelaar <[EMAIL PROTECTED]> Sat, 6 Aug 2005 19:42:38 +0200
+
sword (1.5.7-7) unstable; urgency=high
* Patch from security team, Closes: #291433
diff -u sword-1.5.7/debian/control sword-1.5.7/debian/control
--- sword-1.5.7/debian/control
+++ sword-1.5.7/debian/control
@@ -5,12 +5,12 @@
Maintainer: Daniel Glassey <[EMAIL PROTECTED]>
Standards-Version: 3.6.1.0
-Package: libsword4
+Package: libsword4c2
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Recommends: sword-frontend
-Replaces: libsword1, libsword2c102, libsword3, libsword-runtime,
libsword-config
+Replaces: libsword1, libsword4, libsword-runtime, libsword-config
Description: API/library for bible software
The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
MacOSX etc.) API/library for Bible software with a constantly growing list
@@ -26,7 +26,7 @@
Package: libsword-dev
Architecture: any
Section: libdevel
-Depends: libsword4 (= ${Source-Version}), libc6-dev, libz-dev, libcurl3-dev
+Depends: libsword4c2 (= ${Source-Version}), libc6-dev, libz-dev, libcurl3-dev
Provides: sword-dev
Description: Development files for libsword
This package contains the static libraries and headers for developing
diff -u sword-1.5.7/debian/libsword-dev.dirs
sword-1.5.7/debian/libsword-dev.dirs
--- sword-1.5.7/debian/libsword-dev.dirs
+++ sword-1.5.7/debian/libsword-dev.dirs
@@ -2,3 +1,0 @@
-usr/lib/pkgconfig
-usr/include/sword
-usr/share/doc/libsword-dev/html
diff -u sword-1.5.7/debian/rules sword-1.5.7/debian/rules
--- sword-1.5.7/debian/rules
+++ sword-1.5.7/debian/rules
@@ -8,15 +8,15 @@
package=sword
+# We want to use bashisms like {a,b}
+export SHELL=/bin/bash
+
version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=2
-
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -64,12 +64,13 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/tmp.
- \$(MAKE) install DESTDIR=`pwd`/debian/tmp
+ # Add here commands to install the package into debian/libsword4c2.
+ $(MAKE) install DESTDIR=$(PWD)/debian/libsword4c2
- dh_movefiles -plibsword-dev usr/lib/lib*so usr/lib/lib*.a \
- usr/lib/lib*.la usr/include/* usr/lib/pkgconfig/*
- dh_movefiles -pdiatheke usr/bin/diatheke
+ mv debian/libsword4c2/usr/lib/{lib*.{so,a,la},pkgconfig} \
+ debian/libsword-dev/usr/lib
+ mv debian/libsword4c2/usr/include debian/libsword-dev/usr
+ mv debian/libsword4c2/usr/bin/diatheke debian/diatheke/usr/bin
#dh_movefiles -plibsword-runtime usr/bin/*
#dh_movefiles -plibsword-config etc/*
usr/share/sword/mods.d/globals.conf \
# usr/share/sword/locales.d/*
@@ -101,11 +102,11 @@
dh_link
dh_compress
dh_fixperms
- dh_installdeb
- dh_makeshlibs -V 'libsword4 (>=1.5.7-1)'
+ dh_makeshlibs
dh_perl
- dh_shlibdeps -ldebian/tmp/usr/lib
+ dh_shlibdeps -L libsword4c2 -ldebian/libsword4c2/usr/lib
dh_gencontrol
+ dh_installdeb
dh_md5sums
dh_builddeb
reverted:
--- sword-1.5.7/debian/libsword4.dirs
+++ sword-1.5.7.orig/debian/libsword4.dirs
@@ -1,7 +0,0 @@
-usr/lib
-usr/bin
-etc/
-usr/share/sword
-usr/share/sword/mods.d
-usr/share/sword/modules
-usr/share/sword/locales.d
reverted:
--- sword-1.5.7/debian/libsword4.docs
+++ sword-1.5.7.orig/debian/libsword4.docs
@@ -1,2 +0,0 @@
-doc/greektrans.txt
-doc/translation-template.conf
reverted:
--- sword-1.5.7/debian/libsword4.shlibs
+++ sword-1.5.7.orig/debian/libsword4.shlibs
@@ -1 +0,0 @@
-libsword 4 libsword4 (>> 1.5.7-1)
reverted:
--- sword-1.5.7/debian/libsword4.conffiles
+++ sword-1.5.7.orig/debian/libsword4.conffiles
@@ -1 +0,0 @@
-/etc/sword.conf
only in patch2:
unchanged:
--- sword-1.5.7.orig/debian/diatheke.dirs
+++ sword-1.5.7/debian/diatheke.dirs
@@ -1,4 +1,3 @@
usr/bin
usr/lib/cgi-bin
usr/share/doc/diatheke/examples
-
only in patch2:
unchanged:
--- sword-1.5.7.orig/debian/libsword4c2.dirs
+++ sword-1.5.7/debian/libsword4c2.dirs
@@ -0,0 +1,7 @@
+usr/lib
+usr/bin
+etc/
+usr/share/sword
+usr/share/sword/mods.d
+usr/share/sword/modules
+usr/share/sword/locales.d
only in patch2:
unchanged:
--- sword-1.5.7.orig/debian/libsword4c2.docs
+++ sword-1.5.7/debian/libsword4c2.docs
@@ -0,0 +1,2 @@
+doc/greektrans.txt
+doc/translation-template.conf
only in patch2:
unchanged:
--- sword-1.5.7.orig/debian/compat
+++ sword-1.5.7/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- sword-1.5.7.orig/include/flatapi.h
+++ sword-1.5.7/include/flatapi.h
@@ -11,7 +11,7 @@
extern "C" {
-#define SWHANDLE int
+#define SWHANDLE intptr_t
//using namespace sword;
