head	1.2;
access;
symbols
	pkgsrc-2015Q4:1.1.0.32
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.30
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.28
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.26
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.24
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.22
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.20
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.18
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.16
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.14
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.12
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.10
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.8
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.6
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.4
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.2
	pkgsrc-2012Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2016.01.31.07.27.04;	author ryoon;	state dead;
branches;
next	1.1;
commitid	2cEyGT13OXaMs3Ty;

1.1
date	2012.02.16.04.44.26;	author ryoon;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 4.10.5

Changelog:
NEW IN VERSION 4.10
-------------------
- Bug fixes: layout, usability, preferences, locale selection
- Works with both Qt4 and Qt5
- Build uses automake/qmake hybrid (instead of autoconf/qmake).
- Layout annotations are honored in multipage mode
- Experimental OpenGL rendering
- Slideshow mode


NEW IN VERSION 4.9
------------------
- Added language selection in preference.
- Added option to override printing and saving restrictions.
- Automatic reloading of djvu documents when the file is changed.
- New chinese translations.
- Improved network code (needs Qt>=4.4.)
- Remember the last visited position for the last 50 documents.
@
text
@$NetBSD: patch-src_qdjvuwidget.cpp,v 1.1 2012/02/16 04:44:26 ryoon Exp $

Avoid conflicted name, swap.

--- src/qdjvuwidget.cpp.orig	2011-08-17 14:24:20.000000000 +0000
+++ src/qdjvuwidget.cpp
@@@@ -153,7 +153,7 @@@@ all_numbers(const char *s)
 }
 
 template<class T> static inline void 
-swap(T& x, T& y)
+swap_(T& x, T& y)
 {
   T tmp;
   tmp = x;
@@@@ -173,11 +173,12 @@@@ 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]);
+        swap_(v[lo],v[m]);
       if (v[m]>v[hi]) {
-        swap(v[m],v[hi]);
+        swap_(v[m],v[hi]);
         if (v[lo]>v[m])
-          swap(v[lo],v[m]);
+          swap_(v[lo],v[m]);
+
       }
       /* Extract pivot, place sentinel */
       pivot = v[m];
@@@@ -191,7 +192,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]); 
+        swap_(v[l],v[h]); 
         goto loop; 
       }
       /* Finish up */
@


1.1
log
@Fix PR pkg/45884

Function swap had been conflicted with Qt 4.8.
@
text
@d1 1
a1 1
$NetBSD$
@