From 080cfa981d2ccd4bdf9167f8085d1ae04285d40e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 26 Sep 2018 15:22:22 +0300 Subject: [PATCH] BePDF: bump commit --- haiku-apps/bepdf/bepdf-2.0.2.recipe | 67 ----------------------------- haiku-apps/bepdf/bepdf-2.1.0.recipe | 16 +++---- 2 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 haiku-apps/bepdf/bepdf-2.0.2.recipe diff --git a/haiku-apps/bepdf/bepdf-2.0.2.recipe b/haiku-apps/bepdf/bepdf-2.0.2.recipe deleted file mode 100644 index 8d9163be2..000000000 --- a/haiku-apps/bepdf/bepdf-2.0.2.recipe +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY="The PDF viewer for Haiku" -DESCRIPTION="BePDF is a PDF viewer for Haiku. Besides viewing, it supports \ -annotating and user-defined bookmarking for unencrypted PDFs." -HOMEPAGE="https://haikuarchives.github.io/BePDF/" -COPYRIGHT="1997 Benoit Triquet - 1999-2000 Hubert Figuiere - 2000-2011 Michael Pfeiffer - 2013-2017 Augustin Cavalier" -LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="7c7c11123f83d6c4a6b1e5b470437dfd0db0a303e932bf448a57dacb1ef84fca" -SOURCE_DIR="BePDF-$portVersion" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - bepdf = $portVersion - app:BePDF = $portVersion - " -REQUIRES=" - haiku - lib:libbz2 - lib:libfreetype - lib:libpng16 - lib:libz - " - -BUILD_REQUIRES=" - haiku_devel - devel:libbz2 - devel:libfreetype - devel:libpng16 - devel:libz - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:freetype_config - cmd:gcc - cmd:htmldoc - cmd:make - #cmd:ps2pdf # Ghostscript is not ported yet, so we can't generate PDF docs. - " - -BUILD() -{ - pushd xpdf - make $@ - popd - pushd bepdf - make $@ - make bindcatalogs - popd - - pushd docs - sh make.sh - popd -} - -INSTALL() -{ - mkdir -p $appsDir - cp -dR dist $appsDir/BePDF - cp -r docs-build $appsDir/BePDF/docs - - addAppDeskbarSymlink $appsDir/BePDF/BePDF -} diff --git a/haiku-apps/bepdf/bepdf-2.1.0.recipe b/haiku-apps/bepdf/bepdf-2.1.0.recipe index 516a3ed02..41f2e018c 100644 --- a/haiku-apps/bepdf/bepdf-2.1.0.recipe +++ b/haiku-apps/bepdf/bepdf-2.1.0.recipe @@ -5,12 +5,13 @@ HOMEPAGE="https://haikuarchives.github.io/BePDF/" COPYRIGHT="1997 Benoit Triquet 1999-2000 Hubert Figuiere 2000-2011 Michael Pfeiffer - 2013-2017 Augustin Cavalier" + 2013-2018 Augustin Cavalier" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="2ffad477a0e7ffc3914a227f99918f3a1255da6d5da6f17f6bfd0cf0846d97c6" -SOURCE_DIR="BePDF-$portVersion" +REVISION="3" +srcGitRev="930309cb16c9ddd8ad2931a174be83f8a77bc230" +SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="48b2fef5c49699dea961033bdcad7fc4900aa7a40272cad8e06d90160fda0d15" +SOURCE_DIR="BePDF-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -42,11 +43,6 @@ BUILD_PREREQUIRES=" # cmd:ps2pdf " -PATCH() -{ - sed -i 's/long GAtomicCounter/int32 GAtomicCounter/' xpdf/goo/GMutex.h -} - BUILD() { pushd xpdf