pyrox.dev
djview: update 4.8 -> 4.10.3
Also kill tabs, remove unneeded (and failing) patch.
No qt5 yet, unfortunately.
+18
-16
pkgs/applications/graphics/djview/default.nix
+18
-16
pkgs/applications/graphics/djview/default.nix
···
1
-
{stdenv, fetchurl, djvulibre, qt4, pkgconfig }:
2
3
stdenv.mkDerivation rec {
4
-
name = "djview-4.8";
5
-
src = fetchurl {
6
-
url = "mirror://sourceforge/djvu/${name}.tar.gz";
7
-
sha256 = "17y8jvbvj98h25qwsr93v24x75famv8d0jbb0h46xjj555y6wx4c";
8
-
};
9
-
10
-
buildInputs = [djvulibre qt4];
11
12
nativeBuildInputs = [ pkgconfig ];
13
14
-
patches = [ ./djview4-qt-4.8.patch ];
15
16
passthru = {
17
mozillaPlugin = "/lib/netscape/plugins";
18
};
19
20
-
meta = {
21
-
homepage = http://djvu.sourceforge.net/djview4.html;
22
-
description = "A new portable DjVu viewer and browser plugin";
23
-
license = stdenv.lib.licenses.gpl2;
24
-
inherit (qt4.meta) platforms;
25
-
maintainers = [ stdenv.lib.maintainers.urkud ];
26
-
};
27
}
···
1
+
{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }:
2
3
+
let
4
+
qt = qt4;
5
+
# TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
6
+
in
7
stdenv.mkDerivation rec {
8
+
name = "djview-4.10.3";
9
+
src = fetchurl {
10
+
url = "mirror://sourceforge/djvu/${name}.tar.gz";
11
+
sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h";
12
+
};
13
14
nativeBuildInputs = [ pkgconfig ];
15
16
+
buildInputs = [ djvulibre qt xorg.libXt libtiff ];
17
18
passthru = {
19
mozillaPlugin = "/lib/netscape/plugins";
20
};
21
22
+
meta = with stdenv.lib; {
23
+
homepage = http://djvu.sourceforge.net/djview4.html;
24
+
description = "A portable DjVu viewer and browser plugin";
25
+
license = licenses.gpl2;
26
+
inherit (qt.meta) platforms;
27
+
maintainers = [ maintainers.urkud ];
28
+
};
29
}
-38
pkgs/applications/graphics/djview/djview4-qt-4.8.patch
-38
pkgs/applications/graphics/djview/djview4-qt-4.8.patch
···
1
-
Origin: OpenSUSE
2
-
Index: djview-4.8/src/qdjvuwidget.cpp
3
-
===================================================================
4
-
--- djview-4.8.orig/src/qdjvuwidget.cpp
5
-
+++ djview-4.8/src/qdjvuwidget.cpp
6
-
@@ -153,7 +153,7 @@ all_numbers(const char *s)
7
-
}
8
-
9
-
template<class T> static inline void
10
-
-swap(T& x, T& y)
11
-
+myswap(T& x, T& y)
12
-
{
13
-
T tmp;
14
-
tmp = x;
15
-
@@ -173,11 +173,11 @@ ksmallest(T *v, int n, int k)
16
-
/* Sort v[lo], v[m], v[hi] by insertion */
17
-
m = (lo+hi)/2;
18
-
if (v[lo]>v[m])
19
-
- swap(v[lo],v[m]);
20
-
+ myswap(v[lo],v[m]);
21
-
if (v[m]>v[hi]) {
22
-
- swap(v[m],v[hi]);
23
-
+ myswap(v[m],v[hi]);
24
-
if (v[lo]>v[m])
25
-
- swap(v[lo],v[m]);
26
-
+ myswap(v[lo],v[m]);
27
-
}
28
-
/* Extract pivot, place sentinel */
29
-
pivot = v[m];
30
-
@@ -191,7 +191,7 @@ ksmallest(T *v, int n, int k)
31
-
do ++l; while (v[l]<pivot);
32
-
do --h; while (v[h]>pivot);
33
-
if (l < h) {
34
-
- swap(v[l],v[h]);
35
-
+ myswap(v[l],v[h]);
36
-
goto loop;
37
-
}
38
-
/* Finish up */
···