Hello community,

here is the log from the commit of package djvulibre-djview4 for 
openSUSE:Factory checked in at 2012-01-20 20:23:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/djvulibre-djview4 (Old)
 and      /work/SRC/openSUSE:Factory/.djvulibre-djview4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "djvulibre-djview4", Maintainer is "pgaj...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/djvulibre-djview4/djvulibre-djview4.changes      
2011-11-02 11:51:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.djvulibre-djview4.new/djvulibre-djview4.changes 
2012-01-20 20:23:20.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Dec 19 10:34:30 UTC 2011 - pgaj...@suse.com
+
+- build with qt 4.8
+  * added qt-4.8.patch
+
+-------------------------------------------------------------------

New:
----
  djview4-qt-4.8.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ djvulibre-djview4.spec ++++++
--- /var/tmp/diff_new_pack.t4sG6d/_old  2012-01-20 20:23:21.000000000 +0100
+++ /var/tmp/diff_new_pack.t4sG6d/_new  2012-01-20 20:23:21.000000000 +0100
@@ -26,6 +26,7 @@
 Url:            http://djvu.sourceforge.net
 Summary:        Portable DjVu Qt4 Based Viewer and Browser Plugin
 Source:         djview-%{version}.tar.bz2
+Patch0:         djview4-qt-4.8.patch
 # This patch is Suse specific.
 Patch1:         djview4-nsplugin_manpage.patch
 # This patch is Suse specific.
@@ -40,6 +41,7 @@
 
 %prep
 %setup -n djview-%{version}
+%patch0 -p1
 %patch1
 %patch2
 

++++++ djview4-qt-4.8.patch ++++++
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 */
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to