diff --git a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe index 7193c120b..c23291fa9 100644 --- a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe +++ b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe @@ -3,9 +3,9 @@ DESCRIPTION="DocumentViewer is a viewer that supports PDF and DJVU Files." LICENSE="MIT" COPYRIGHT="2010-2014 Haiku, Inc" HOMEPAGE="http://github.com/HaikuArchives/DocumentViewer/" -SRC_URI="https://github.com/HaikuArchives/DocumentViewer/archive/a291aabb.tar.gz" -REVISION="1" -SOURCE_DIR="DocumentViewer-a291aabb14c2e57ceaed3686c766d3fff9b30cf1" +SRC_URI="https://github.com/HaikuArchives/DocumentViewer/archive/d7ec31b.tar.gz" +REVISION="2" +SOURCE_DIR="DocumentViewer-d7ec31bd7ce9462987e245da030d219d0355c693" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -15,7 +15,6 @@ else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" -PATCHES="documentviewer-$portVersion.patchset" PROVIDES=" documentviewer$secondaryArchSuffix = $portVersion diff --git a/haiku-apps/documentviewer/patches/documentviewer-0.3_git.patchset b/haiku-apps/documentviewer/patches/documentviewer-0.3_git.patchset deleted file mode 100644 index 9d2ea492f..000000000 --- a/haiku-apps/documentviewer/patches/documentviewer-0.3_git.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 48a40843288a9272f088e59f9e703f5430f37643 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 24 Sep 2014 13:31:43 +0200 -Subject: Fix build. - - -diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp -index af73601..2e2383e 100644 ---- a/application/MainWindow.cpp -+++ b/application/MainWindow.cpp -@@ -316,9 +316,9 @@ MainWindow::_SaveSettings(void) - - if (fDocumentLayout != nullptr) { - settings -- << "Split10" << fSplitView1->ItemWeight(0) -+ << "Split10" << fSplitView1->ItemWeight((int32)0) - << "Split11" << fSplitView1->ItemWeight(1) -- << "Split20" << fSplitView2->ItemWeight(0) -+ << "Split20" << fSplitView2->ItemWeight((int32)0) - << "Split21" << fSplitView2->ItemWeight(1) - << "RibbonTab" << fRibbon->ActiveTab() - << "SidebarTab" << fTabView1->Selection() -diff --git a/libs/columnlistview/ColumnListView.cpp b/libs/columnlistview/ColumnListView.cpp -index fe3bbcb..fd13da8 100644 ---- a/libs/columnlistview/ColumnListView.cpp -+++ b/libs/columnlistview/ColumnListView.cpp -@@ -454,7 +454,7 @@ BRow::BRow(float height) - BRow::~BRow() - { - while (true) { -- BField* field = (BField*) fFields.RemoveItem(0); -+ BField* field = (BField*) fFields.RemoveItem((int32)0); - if (field == 0) - break; - -@@ -750,7 +750,7 @@ BColumnListView::BColumnListView(const char* name, uint32 flags, - - BColumnListView::~BColumnListView() - { -- while (BColumn* column = (BColumn*)fColumns.RemoveItem(0)) -+ while (BColumn* column = (BColumn*)fColumns.RemoveItem((int32)0)) - delete column; - } - --- -1.8.3.4 -