Remove unneeded patches.

(Portage version: 2.1.10.41/cvs/Linux i686)

4 files changed, 7 insertions, 212 deletions

diff --git a/app-text/epdfview/ChangeLog b/app-text/epdfview/ChangeLog
index b96de6e75a14..ccadf1683671 100644
--- a/app-text/epdfview/ChangeLog
+++ b/app-text/epdfview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/epdfview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.44 2012/01/26 21:14:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.45 2012/01/28 12:57:29 billie Exp $
+
+  28 Jan 2012; Daniel Pielmeier <billie@gentoo.org>
+  -files/epdfview-0.1.7-mouse-scrolling.patch,
+  -files/epdfview-0.1.7-poppler-changeset_r354.patch,
+  -files/epdfview-0.1.7-poppler-changeset_r357.patch:
+  Remove unneeded patches.
 
   26 Jan 2012; Markos Chandras <hwoarang@gentoo.org> epdfview-0.1.8.ebuild:
   Stable on amd64 wrt bug #400807
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
deleted file mode 100644
index 8a41b975f001..000000000000
--- a/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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 = 
diff --git a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch
deleted file mode 100644
index a2d42b964599..000000000000
--- a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r354.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: /trunk/src/PDFDocument.cxx
-===================================================================
---- /trunk/src/PDFDocument.cxx	(revision 351)
-+++ /trunk/src/PDFDocument.cxx	(revision 354)
-@@ -682,4 +682,10 @@
-     poppler_page_get_size(page, &pageWidth, &pageHeight);
- 
-+#if defined (HAVE_POPPLER_0_15_0)
-+    PopplerRectangle textRect = { rect->getX1() / getZoom(),
-+                                  rect->getY1() / getZoom(),
-+                                  rect->getX2() / getZoom(),
-+                                  rect->getY2() / getZoom()};
-+#else // !HAVE_POPPLER_0_15_0
-     //for get text we must exchange y coordinate, don't ask me where logic here.
-     PopplerRectangle textRect = { rect->getX1() / getZoom(),
-@@ -687,7 +693,11 @@
-                                   rect->getX2() / getZoom(),
-                                   (pageHeight - rect->getY1() / getZoom())};
-+#endif // HAVE_POPPLER_0_15_0
-     repairEmpty(textRect);
- 
--#if defined (HAVE_POPPLER_0_6_0)
-+#if defined (HAVE_POPPLER_0_15_0)
-+    gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
-+            &textRect);
-+#elif defined (HAVE_POPPLER_0_6_0)
-     gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
-             &textRect);
-Index: /trunk/configure.ac
-===================================================================
---- /trunk/configure.ac	(revision 344)
-+++ /trunk/configure.ac	(revision 354)
-@@ -42,15 +42,19 @@
- AC_SUBST([POPPLER_LIBS])
- dnl Check if we have poppler version 0.5.2 or higher.
--PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes])
--if test "x$have_poppler_052" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes])
-+if test "x$have_poppler_0_5_2" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
- fi
--PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
--if test "x$have_poppler_060" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes])
-+if test "x$have_poppler_0_6_0" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
- fi
--PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
--if test "x$have_poppler_080" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes])
-+if test "x$have_poppler_0_8_0" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
-+fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
-+if test "x$have_poppler_0_15_0" = "xyes"; then
-+    AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
- fi
- 
diff --git a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch b/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch
deleted file mode 100644
index e6795ec14165..000000000000
--- a/app-text/epdfview/files/epdfview-0.1.7-poppler-changeset_r357.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Index: /trunk/src/IDocument.cxx
-===================================================================
---- /trunk/src/IDocument.cxx	(revision 338)
-+++ /trunk/src/IDocument.cxx	(revision 357)
-@@ -750,4 +750,8 @@
- IDocument::getLinearized ()
- {
-+#if defined (HAVE_POPPLER_0_15_1)
-+    if ( m_Linearized ) return "Yes";
-+    else return "No";
-+#else
-     if ( NULL == m_Linearized )
-     {
-@@ -755,4 +759,5 @@
-     }
-     return m_Linearized;
-+#endif
- }
- 
-@@ -763,6 +768,13 @@
- ///                   otherwise. IDocument will free it.
- ///
--void
--IDocument::setLinearized (gchar *linearized)
-+#if defined (HAVE_POPPLER_0_15_1)
-+void
-+IDocument::setLinearized (gboolean *linearized)
-+{
-+    m_Linearized = linearized;
-+}
-+#else
-+void
-+    IDocument::setLinearized (gchar *linearized)
- {
-     g_free (m_Linearized);
-@@ -770,4 +782,5 @@
-     g_free (linearized);
- }
-+#endif
- 
- ///
-Index: /trunk/src/PDFDocument.cxx
-===================================================================
---- /trunk/src/PDFDocument.cxx	(revision 356)
-+++ /trunk/src/PDFDocument.cxx	(revision 357)
-@@ -328,5 +328,9 @@
-     gchar *keywords = NULL;
-     PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
-+#if defined (HAVE_POPPLER_0_15_1)
-+    gboolean *linearized = NULL;
-+#else
-     gchar *linearized = NULL;
-+#endif
-     GTime modDate;
-     PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
-Index: /trunk/src/IDocument.h
-===================================================================
---- /trunk/src/IDocument.h	(revision 340)
-+++ /trunk/src/IDocument.h	(revision 357)
-@@ -307,5 +307,9 @@
-             void setFormat (gchar *format);
-             const gchar *getLinearized (void);
-+#if defined (HAVE_POPPLER_0_15_1)
-+            void setLinearized (gboolean *linearized);
-+#else
-             void setLinearized (gchar *linearized);
-+#endif
-             const gchar *getCreationDate (void);
-             void setCreationDate (gchar *date);
-@@ -383,5 +387,9 @@
-             gchar *m_Keywords;
-             /// Tells if the document is linearized or not.
-+#if defined (HAVE_POPPLER_0_15_1)
-+            gboolean *m_Linearized;
-+#else
-             gchar *m_Linearized;
-+#endif
-             /// The document's modification date and time.
-             gchar *m_ModifiedDate;
-Index: /trunk/configure.ac
-===================================================================
---- /trunk/configure.ac	(revision 354)
-+++ /trunk/configure.ac	(revision 357)
-@@ -58,4 +58,9 @@
-     AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
- fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
-+if test "x$have_poppler_0_15_1" = "xyes"; then
-+    AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
-+fi
-+
- 
- AC_MSG_CHECKING([for native Win32])