diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-02-16 04:44:25 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-02-16 04:44:25 +0000 |
| commit | baf6b25e1557a9db5fd83370d2e2d64a1e2302eb (patch) | |
| tree | e18b0079026a2eab55c0eb0e40838cca2fd2023f /graphics/djview4 | |
| parent | 02ee7ce77c2af908866cf6325d1cfb2fd9102d39 (diff) | |
| download | pkgsrc-baf6b25e1557a9db5fd83370d2e2d64a1e2302eb.tar.gz | |
Fix PR pkg/45884
Function swap had been conflicted with Qt 4.8.
Diffstat (limited to 'graphics/djview4')
| -rw-r--r-- | graphics/djview4/distinfo | 3 | ||||
| -rw-r--r-- | graphics/djview4/patches/patch-src_qdjvuwidget.cpp | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/graphics/djview4/distinfo b/graphics/djview4/distinfo index 7eb8092b454..f12f18ca189 100644 --- a/graphics/djview4/distinfo +++ b/graphics/djview4/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.3 2011/10/27 10:36:50 ryoon Exp $ +$NetBSD: distinfo,v 1.4 2012/02/16 04:44:25 ryoon Exp $ SHA1 (djview-4.8.tar.gz) = 266d207afb63a1ee63eed054190bf88888fda572 RMD160 (djview-4.8.tar.gz) = a1ae72440d13c6da57325571cf304882de3825b7 Size (djview-4.8.tar.gz) = 883481 bytes SHA1 (patch-aa) = 0362d5c89e1e9facd2cc1a0bc48b63ce94848508 SHA1 (patch-ab) = 35c8954f49e087669495d1defae9ad2e819aaeab +SHA1 (patch-src_qdjvuwidget.cpp) = c8666e41f5ae9a8ccc9118e18b0bae7b15f54674 diff --git a/graphics/djview4/patches/patch-src_qdjvuwidget.cpp b/graphics/djview4/patches/patch-src_qdjvuwidget.cpp new file mode 100644 index 00000000000..b916883bd95 --- /dev/null +++ b/graphics/djview4/patches/patch-src_qdjvuwidget.cpp @@ -0,0 +1,40 @@ +$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 */ |