djview-4.8, fix build with qt-4.8

svn path=/nixpkgs/trunk/; revision=32171
This commit is contained in:
Yury G. Kudryashov 2012-02-10 10:13:44 +00:00
parent f9c551a41f
commit 3217e1c5c3
3 changed files with 49 additions and 6 deletions

View File

@ -1,14 +1,18 @@
{stdenv, fetchurl, djvulibre, qt4 }:
{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
stdenv.mkDerivation {
name = "djview4-4.1-2";
stdenv.mkDerivation rec {
name = "djview-4.8";
src = fetchurl {
url = mirror://sf/djvu/djview4-4.1-2.tar.gz;
sha256 = "10k0h892kab3n8xypw6vsnvhwil410hvvqj375pwiss4vlm5isv1";
url = "mirror://sourceforge/djvu/${name}.tar.gz";
sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
};
buildInputs = [djvulibre qt4];
buildNativeInputs = [ pkgconfig ];
patches = [ ./djview4-qt-4.8.patch ];
passthru = {
mozillaPlugin = "/lib/netscape/plugins";
};

View File

@ -0,0 +1,38 @@
Origin: OpenSUSE
Index: djview-4.8/src/qdjvuwidget.cpp
===================================================================
--- djview-4.8.orig/src/qdjvuwidget.cpp
+++ djview-4.8/src/qdjvuwidget.cpp
@@ -153,7 +153,7 @@ all_numbers(const char *s)
}
template<class T> static inline void
-swap(T& x, T& y)
+myswap(T& x, T& y)
{
T tmp;
tmp = x;
@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
/* Sort v[lo], v[m], v[hi] by insertion */
m = (lo+hi)/2;
if (v[lo]>v[m])
- swap(v[lo],v[m]);
+ myswap(v[lo],v[m]);
if (v[m]>v[hi]) {
- swap(v[m],v[hi]);
+ myswap(v[m],v[hi]);
if (v[lo]>v[m])
- swap(v[lo],v[m]);
+ myswap(v[lo],v[m]);
}
/* Extract pivot, place sentinel */
pivot = v[m];
@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
do ++l; while (v[l]<pivot);
do --h; while (v[h]>pivot);
if (l < h) {
- swap(v[l],v[h]);
+ myswap(v[l],v[h]);
goto loop;
}
/* Finish up */

View File

@ -6624,7 +6624,8 @@ let
djvulibre = callPackage ../applications/misc/djvulibre { };
djview4 = callPackage ../applications/graphics/djview { };
djview = callPackage ../applications/graphics/djview { };
djview4 = pkgs.djview;
dmenu = callPackage ../applications/misc/dmenu { };