diff --git a/haiku-apps/bepdf/bepdf-1.2.0.recipe b/haiku-apps/bepdf/bepdf-1.2.0.recipe index d8caae803..6f2ef6652 100644 --- a/haiku-apps/bepdf/bepdf-1.2.0.recipe +++ b/haiku-apps/bepdf/bepdf-1.2.0.recipe @@ -4,9 +4,6 @@ annotating and user-defined bookmarking for unencrypted PDFs. It's fully \ localized for 20 languages at the moment with additional languages being \ easily added via text files." HOMEPAGE="http://haikuarchives.github.io/BePDF/" -SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/v1.2.0.tar.gz" -CHECKSUM_SHA256="663c8819db01b49227165cfd3f68ba1f659ae004b96f0bac5a7e52f773aed405" -SOURCE_DIR="BePDF-1.2.0" COPYRIGHT=" 1997 Benoit Triquet 1999-2000 Hubert Figuiere @@ -15,6 +12,10 @@ COPYRIGHT=" " LICENSE="GNU GPL v2" REVISION="1" +SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/v1.2.0.tar.gz" +CHECKSUM_SHA256="663c8819db01b49227165cfd3f68ba1f659ae004b96f0bac5a7e52f773aed405" +SOURCE_DIR="BePDF-1.2.0" + ARCHITECTURES="x86_gcc2 x86" SOURCE_URI_2="http://haikuarchives.github.io/BePDF/English.pdf#noarchive" @@ -39,6 +40,7 @@ REQUIRES=" lib:libbz2 lib:libpng " + BUILD_REQUIRES=" haiku_devel devel:liblayout diff --git a/haiku-apps/bepdf/bepdf-2.0.0.recipe b/haiku-apps/bepdf/bepdf-2.0.0.recipe index 739887489..5113f9ebe 100644 --- a/haiku-apps/bepdf/bepdf-2.0.0.recipe +++ b/haiku-apps/bepdf/bepdf-2.0.0.recipe @@ -2,16 +2,20 @@ 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/" -SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="6e36c1607c5bc13daadd63d87fe55653159b672a6480be5ccf43fbc91d350b43" -SOURCE_DIR="BePDF-$portVersion" COPYRIGHT="1997 Benoit Triquet 1999-2000 Hubert Figuiere 2000-2011 Michael Pfeiffer 2013-2016 waddlesplash" LICENSE="GNU GPL v2" -REVISION="1" -ARCHITECTURES="!x86_gcc2 x86" +REVISION="2" +SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="6e36c1607c5bc13daadd63d87fe55653159b672a6480be5ccf43fbc91d350b43" +SOURCE_DIR="BePDF-$portVersion" +if [ "$effectiveTargetArchitecture" = x86_64 ]; then + PATCHES="bepdf-$portVersion.patchset" +fi + +ARCHITECTURES="!x86_gcc2 x86 x86_64" SOURCE_URI_2="https://haikuarchives.github.io/BePDF/English.pdf#noarchive" CHECKSUM_SHA256_2="963fd77bad6f2018e68724d2904f5a5bed922491e281af57a6fdd7854eecb3ab" @@ -33,6 +37,7 @@ REQUIRES=" lib:libbz2 lib:libpng16 " + BUILD_REQUIRES=" haiku_devel devel:libfreetype diff --git a/haiku-apps/bepdf/bepdf-2.0.1~beta1.recipe b/haiku-apps/bepdf/bepdf-2.0.1~beta1.recipe index 300c8781b..bfddd2850 100644 --- a/haiku-apps/bepdf/bepdf-2.0.1~beta1.recipe +++ b/haiku-apps/bepdf/bepdf-2.0.1~beta1.recipe @@ -2,17 +2,21 @@ 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/" -COMMIT="38b4cb53f073024f9b2e47f56d2feb9bcd91ddca" -SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/$COMMIT.tar.gz" -CHECKSUM_SHA256="d2f9f81b8b43a37f52dbda12967cc67eabd6c0f7812e85b33d6dc6a2319463ca" -SOURCE_DIR="BePDF-$COMMIT" COPYRIGHT="1997 Benoit Triquet 1999-2000 Hubert Figuiere 2000-2011 Michael Pfeiffer 2013-2016 waddlesplash" LICENSE="GNU GPL v2" -REVISION="1" -ARCHITECTURES="!x86_gcc2 x86" +REVISION="2" +COMMIT="38b4cb53f073024f9b2e47f56d2feb9bcd91ddca" +SOURCE_URI="https://github.com/HaikuArchives/BePDF/archive/$COMMIT.tar.gz" +CHECKSUM_SHA256="d2f9f81b8b43a37f52dbda12967cc67eabd6c0f7812e85b33d6dc6a2319463ca" +SOURCE_DIR="BePDF-$COMMIT" +if [ "$effectiveTargetArchitecture" = x86_64 ]; then + PATCHES="bepdf-$portVersion.patchset" +fi + +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -26,6 +30,7 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix lib:libpng16$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix diff --git a/haiku-apps/bepdf/patches/bepdf-2.0.0.patchset b/haiku-apps/bepdf/patches/bepdf-2.0.0.patchset new file mode 100644 index 000000000..16c8b2fe6 --- /dev/null +++ b/haiku-apps/bepdf/patches/bepdf-2.0.0.patchset @@ -0,0 +1,39 @@ +From 524ac50c7e64b0a5a3ce223f9d3d0764fbf55d6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 1 Jan 2017 16:43:52 +0100 +Subject: [PATCH] Haiku x86_64 patches + +--- + bepdf/Makefile | 2 +- + bepdf/beos/BepdfApplication.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bepdf/Makefile b/bepdf/Makefile +index d3871be..8392b8d 100644 +--- a/bepdf/Makefile ++++ b/bepdf/Makefile +@@ -150,7 +150,7 @@ SYMBOLS := + DEBUGGER := + + # Specify any additional compiler flags to be used. +-COMPILER_FLAGS = -Wno-write-strings ++COMPILER_FLAGS = -Wno-write-strings -fpermissive + + # Specify any additional linker flags to be used. + LINKER_FLAGS = $(shell freetype-config --libs) +diff --git a/bepdf/beos/BepdfApplication.cpp b/bepdf/beos/BepdfApplication.cpp +index b45a84b..e60eb25 100644 +--- a/bepdf/beos/BepdfApplication.cpp ++++ b/bepdf/beos/BepdfApplication.cpp +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include +-- +2.11.0 + diff --git a/haiku-apps/bepdf/patches/bepdf-2.0.1~beta1.patchset b/haiku-apps/bepdf/patches/bepdf-2.0.1~beta1.patchset new file mode 100644 index 000000000..88e122c97 --- /dev/null +++ b/haiku-apps/bepdf/patches/bepdf-2.0.1~beta1.patchset @@ -0,0 +1,25 @@ +From 241d6ddcf8af313d39c79a1c53654eb868eacf4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 1 Jan 2017 17:13:55 +0100 +Subject: [PATCH] Haiku x64 patch + +--- + bepdf/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bepdf/Makefile b/bepdf/Makefile +index 6ba6403..fe907b5 100644 +--- a/bepdf/Makefile ++++ b/bepdf/Makefile +@@ -150,7 +150,7 @@ SYMBOLS := + DEBUGGER := + + # Specify any additional compiler flags to be used. +-COMPILER_FLAGS = -Wno-write-strings ++COMPILER_FLAGS = -Wno-write-strings -fpermissive + + # Specify any additional linker flags to be used. + LINKER_FLAGS = $(shell freetype-config --libs) +-- +2.11.0 +