xpdf 3.04

Remove inline patch. Fixed upstream.

Closes #29689.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 2 insertions, 20 deletions

diff --git a/Library/Formula/xpdf.rb b/Library/Formula/xpdf.rb
index 06bfe04bc..c52999420 100644
--- a/Library/Formula/xpdf.rb
+++ b/Library/Formula/xpdf.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Xpdf < Formula
   homepage 'http://www.foolabs.com/xpdf/'
-  url 'ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz'
-  sha1 '499423e8a795e0efd76ca798239eb4d0d52fe248'
+  url 'ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz'
+  sha1 'b9b1dbb0335742a09d0442c60fd02f4f934618bd'
 
   depends_on 'lesstif'
   depends_on :x11
@@ -11,9 +11,6 @@ class Xpdf < Formula
   conflicts_with 'pdf2image', 'poppler',
     :because => 'xpdf, pdf2image, and poppler install conflicting executables'
 
-  # see: http://gnats.netbsd.org/45562
-  patch :DATA
-
   def install
     ENV.append_to_cflags "-I#{MacOS::X11.include} -I#{MacOS::X11.include}/freetype2"
     ENV.append "LDFLAGS", "-L#{MacOS::X11.lib}"
@@ -23,18 +20,3 @@ class Xpdf < Formula
     system "make install"
   end
 end
-
-__END__
-diff --git a/xpdf/XPDFViewer.cc b/xpdf/XPDFViewer.cc
-index 2de349d..e6ef7fa 100644
---- a/xpdf/XPDFViewer.cc
-+++ b/xpdf/XPDFViewer.cc
-@@ -1803,7 +1803,7 @@ void XPDFViewer::initToolbar(Widget parent) {
-   menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
-   for (i = 0; i < nZoomMenuItems; ++i) {
-     n = 0;
--    s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+    s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
-     XtSetArg(args[n], XmNlabelString, s); ++n;
-     XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
-     sprintf(buf, "zoom%d", i);