diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:13:44 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-10 10:13:44 +0000 |
| commit | 3217e1c5c3ac5de108998007b40abdbe5bc51a7f (patch) | |
| tree | b3d1eabfa53e3b473dc712684909ce15bcc13a68 /pkgs/applications/graphics/djview | |
| parent | f9c551a41f111ab7608464da90649021e669f7cb (diff) | |
| download | nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.tar nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.tar.gz nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.tar.bz2 nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.tar.lz nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.tar.xz nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.tar.zst nixpkgs-3217e1c5c3ac5de108998007b40abdbe5bc51a7f.zip | |
djview-4.8, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32171
Diffstat (limited to 'pkgs/applications/graphics/djview')
| -rw-r--r-- | pkgs/applications/graphics/djview/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/graphics/djview/djview4-qt-4.8.patch | 38 |
2 files changed, 47 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 85388ffa601..0ac499f2681 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -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"; }; diff --git a/pkgs/applications/graphics/djview/djview4-qt-4.8.patch b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch new file mode 100644 index 00000000000..ce3694197f6 --- /dev/null +++ b/pkgs/applications/graphics/djview/djview4-qt-4.8.patch @@ -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 */ |