Tags 379152 +pending
thanks

I have prepared a new package for stardict, that includes Mike's patch.

I also needed to include the LIBTOOL_IS_A_FOOL patch because eventhough
autogen.sh was relibtoolizing with the latest Debian version of libtool, it
still made a mess with rpath (pointing to /usr/lib64).

The package builds fine in amd64 and is lintian clean now.  I'm attaching
the full interdiff of the NMU.

-- 
Besos,          ,''`.
       Marga   : :' :
               `. `' 
                 `-  
diff -u stardict-2.4.7/debian/changelog stardict-2.4.7/debian/changelog
--- stardict-2.4.7/debian/changelog
+++ stardict-2.4.7/debian/changelog
@@ -1,3 +1,14 @@
+stardict (2.4.7-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload to Fix Failure To Build From Source due to a
+    compilation problem in 64bit architectures.
+  * Added debian/patches/fix64bit.diff.  Thanks to Mike O'Connor for the
+    patch. (Closes: #379152)
+  * Added debian/patches/libtool_is_a_fool.diff, that fixes the rpath problem
+    of libtool for stardict.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]>  Wed,  2 Aug 2006 12:56:13 -0300
+
 stardict (2.4.7-2) unstable; urgency=low
 
   * FTBFS: Forgot to add bzip2 build-dependency.  Thanks to Aarom Ucko
diff -u stardict-2.4.7/debian/patches/00list 
stardict-2.4.7/debian/patches/00list
--- stardict-2.4.7/debian/patches/00list
+++ stardict-2.4.7/debian/patches/00list
@@ -3,0 +4,2 @@
+fix64bit.diff
+libtool_is_a_fool.diff
only in patch2:
unchanged:
--- stardict-2.4.7.orig/debian/patches/libtool_is_a_fool.diff
+++ stardict-2.4.7/debian/patches/libtool_is_a_fool.diff
@@ -0,0 +1,21 @@
+--- stardict-2.4.7/configure.in        2006-04-18 06:10:33.000000000 -0300
++++ sd-fixed/configure.in      2006-08-02 12:45:57.686406122 -0300
+@@ -24,6 +24,18 @@
+ 
+ AC_FUNC_MMAP
+ 
++dnl Turn around -rpath problem with libtool.
++dnl This define should be improbable enough to not conflict with anything
++case ${host} in
++  *-*linux*)
++    AC_MSG_RESULT([Fixing libtool for -rpath problems.])
++    sed < libtool > libtool-2 \
++    's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" 
-D__LIBTOOL_IS_A_FOOL__ "/'
++    mv libtool-2 libtool
++    chmod 755 libtool
++  ;;
++esac
++
+ 
+ dnl ================================================================
+ dnl Gettext stuff.
only in patch2:
unchanged:
--- stardict-2.4.7.orig/debian/patches/fix64bit.diff
+++ stardict-2.4.7/debian/patches/fix64bit.diff
@@ -0,0 +1,11 @@
+--- stardict-2.4.7.orig/src/lib.cpp    2006-08-02 06:51:40.000000000 +0000
++++ stardict-2.4.7/src/lib.cpp 2006-08-02 06:51:58.000000000 +0000
+@@ -505,7 +505,7 @@
+ inline const gchar *offset_index::read_first_on_page_key(glong page_idx)
+ {
+       fseek(idxfile, wordoffset[page_idx], SEEK_SET);
+-      guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
++      size_t page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
+       fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, 
idxfile); //TODO: check returned values, deal with word entry that strlen>255.
+       return wordentry_buf;
+ }

Reply via email to