Run dos2unix on mouse-scrolling patch

(Portage version: 2.2_rc28/cvs/Linux x86_64)

2 files changed, 61 insertions, 61 deletions

diff --git a/app-text/epdfview/Manifest b/app-text/epdfview/Manifest
index de48f8a1de1a..0c618cd3f104 100644
--- a/app-text/epdfview/Manifest
+++ b/app-text/epdfview/Manifest
@@ -1,6 +1,6 @@
 AUX epdfview-0.1.6-gcc-4.3.patch 461 RMD160 762e02e1ec8362ec3d02ea9f66a6cd2754996b80 SHA1 31a379f94acd69ee475a718b011aaf559a5a4b55 SHA256 811b7f3226507594407e93c4509a6e4cf57a3d0d9f7caaf2f111d781e1892ae2
 AUX epdfview-0.1.6-print-segfault.patch 4188 RMD160 1688d3fc61e6f980be79c52cbf80c399d7f583f7 SHA1 04dbf1ebb27279446980a22f276553fc71f18772 SHA256 cd23bc65d175a6757eab6d5eb854ddd8c39d69bc959ba6fc7dbc27a3415b7472
-AUX epdfview-0.1.7-mouse-scrolling.patch 2128 RMD160 816673aaea630cb60a12114a20ea1385701de03a SHA1 6742c5e04bb0c87f6a39190a20dd9cb976d82d8a SHA256 17e8a88ccdebe06f268177ada114b38c600234c4de194947f147eefb0e96eeff
+AUX epdfview-0.1.7-mouse-scrolling.patch 2068 RMD160 1e9fcf00f62033827606833c1be7cd74c9964e7b SHA1 5fdeb8eb9a2b6228cc3e1a02c4fd1178426de6bc SHA256 98646c9bf343c15a98f295ee0237d3170064202fdb9c29a92469399b612fa464
 DIST epdfview-0.1.6.tar.bz2 406037 RMD160 69484cd68c1d344dfc38d321abd1e07fd22521e3 SHA1 1bb3a1d85b1d5b13c24a38c144910ddc329e0f0e SHA256 61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
 DIST epdfview-0.1.7.tar.bz2 443609 RMD160 485399d1982a3f8128322ee7e13d46225573bae3 SHA1 ff46942c285b8e2c28766a38cdfce1a018b4a015 SHA256 0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
 EBUILD epdfview-0.1.6-r1.ebuild 1132 RMD160 9e74595377771eadc4e9cefc6aabffb52dca45b4 SHA1 3589a914fbcbc7f124005a7eccb804a1305b8402 SHA256 c131af3f00fb6bb2e2e5a2eb7dc25e49667ceeb0008e76fce3f43dd42c58fd6a
diff --git a/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch b/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
index 2622a802ae30..8a41b975f001 100644
--- a/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
+++ b/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
@@ -1,60 +1,60 @@
-Index: /trunk/src/gtk/MainView.cxx

-===================================================================

---- /trunk/src/gtk/MainView.cxx (revision 325)

-+++ /trunk/src/gtk/MainView.cxx (revision 329)

-@@ -78,5 +78,5 @@

- static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);

- static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);

--static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);

-+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);

- 

- #if defined (HAVE_CUPS)

-@@ -1480,5 +1480,5 @@

- }

- 

--void 

-+gboolean 

- main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)

- {

-@@ -1487,10 +1487,17 @@

-     MainPter *pter = (MainPter *)data;

-     // Only zoom when the CTRL-Button is down...

--    if ( !(event->state & GDK_CONTROL_MASK) ) return;

--    if ( event->direction == GDK_SCROLL_UP ) {

--        pter->zoomInActivated ();

--    } else if ( event->direction == GDK_SCROLL_DOWN ) {

--        pter->zoomOutActivated ();

--    }

--}

--

-+    if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )

-+    {

-+        if ( event->direction == GDK_SCROLL_UP )

-+        {

-+            pter->zoomInActivated ();

-+        }

-+        else if ( event->direction == GDK_SCROLL_DOWN )

-+        {

-+            pter->zoomOutActivated ();

-+        }

-+        return TRUE;

-+    }

-+    return FALSE;

-+}

-+

-Index: /trunk/src/gtk/PageView.cxx

-===================================================================

---- /trunk/src/gtk/PageView.cxx (revision 325)

-+++ /trunk/src/gtk/PageView.cxx (revision 329)

-@@ -528,11 +528,4 @@

-     g_assert ( NULL != data && "The data parameter is NULL.");

- 

--    // don't scroll when the CRTL-Button is down, because then the page should

--    // actually be zoomed and not scrolled. Zooming is handelt by the MainView

--    // class.

--    if ( event->state & GDK_CONTROL_MASK )

--    {

--        return FALSE;

--    }

-     PagePter *pter = (PagePter *)data;

-     GtkAdjustment *adjustment = 

+Index: /trunk/src/gtk/MainView.cxx
+===================================================================
+--- /trunk/src/gtk/MainView.cxx (revision 325)
++++ /trunk/src/gtk/MainView.cxx (revision 329)
+@@ -78,5 +78,5 @@
+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
+ static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
+-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+ 
+ #if defined (HAVE_CUPS)
+@@ -1480,5 +1480,5 @@
+ }
+ 
+-void 
++gboolean 
+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+ {
+@@ -1487,10 +1487,17 @@
+     MainPter *pter = (MainPter *)data;
+     // Only zoom when the CTRL-Button is down...
+-    if ( !(event->state & GDK_CONTROL_MASK) ) return;
+-    if ( event->direction == GDK_SCROLL_UP ) {
+-        pter->zoomInActivated ();
+-    } else if ( event->direction == GDK_SCROLL_DOWN ) {
+-        pter->zoomOutActivated ();
+-    }
+-}
+-
++    if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
++    {
++        if ( event->direction == GDK_SCROLL_UP )
++        {
++            pter->zoomInActivated ();
++        }
++        else if ( event->direction == GDK_SCROLL_DOWN )
++        {
++            pter->zoomOutActivated ();
++        }
++        return TRUE;
++    }
++    return FALSE;
++}
++
+Index: /trunk/src/gtk/PageView.cxx
+===================================================================
+--- /trunk/src/gtk/PageView.cxx (revision 325)
++++ /trunk/src/gtk/PageView.cxx (revision 329)
+@@ -528,11 +528,4 @@
+     g_assert ( NULL != data && "The data parameter is NULL.");
+ 
+-    // don't scroll when the CRTL-Button is down, because then the page should
+-    // actually be zoomed and not scrolled. Zooming is handelt by the MainView
+-    // class.
+-    if ( event->state & GDK_CONTROL_MASK )
+-    {
+-        return FALSE;
+-    }
+     PagePter *pter = (PagePter *)data;
+     GtkAdjustment *adjustment =