djvulibre: bump version.

This commit is contained in:
Jerome Duval
2017-09-18 17:59:26 +02:00
parent 323402d55d
commit 8bf6262acf
2 changed files with 18 additions and 19 deletions

View File

@@ -7,17 +7,16 @@ COPYRIGHT="2002 Leon Bottou and Yann Le Cun.
2001 AT&T
1999-2001 LizardTech, Inc."
LICENSE="GNU GPL v2"
REVISION="4"
SOURCE_URI="http://downloads.sourceforge.net/project/djvu/DjVuLibre/3.5.25/djvulibre-3.5.25.2.tar.gz"
CHECKSUM_SHA256="619becf24cf2b9289d5102a19bb81424f68008f90ded841085f07c32e5d48158"
SOURCE_DIR="djvulibre-3.5.25"
PATCHES="djvulibre-3.5.25.patchset"
REVISION="1"
SOURCE_URI="http://downloads.sourceforge.net/project/djvu/DjVuLibre/$portVersion/djvulibre-$portVersion.tar.gz"
CHECKSUM_SHA256="e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f"
PATCHES="djvulibre-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
djvulibre$secondaryArchSuffix = $portVersion compat >= 3.5
djvulibre$secondaryArchSuffix = $portVersion
cmd:any2djvu$secondaryArchSuffix = $portVersion compat >= 3.5
cmd:bzz$secondaryArchSuffix = $portVersion compat >= 3.5
cmd:c44$secondaryArchSuffix = $portVersion compat >= 3.5
@@ -37,7 +36,7 @@ PROVIDES="
cmd:djvutoxml$secondaryArchSuffix = $portVersion compat >= 3.5
cmd:djvutxt$secondaryArchSuffix = $portVersion compat >= 3.5
cmd:djvuxmlparser$secondaryArchSuffix = $portVersion compat >= 3.5
lib:libdjvulibre$secondaryArchSuffix = $portVersion compat >= 3.5
lib:libdjvulibre$secondaryArchSuffix = 21.6.0 compat >= 21
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -47,8 +46,8 @@ REQUIRES="
"
PROVIDES_devel="
djvulibre${secondaryArchSuffix}_devel = $portVersion compat >= 3.5
devel:libdjvulibre$secondaryArchSuffix = $portVersion compat >= 3.5
djvulibre${secondaryArchSuffix}_devel = $portVersion
devel:libdjvulibre$secondaryArchSuffix = 21.6.0 compat >= 21
"
REQUIRES_devel="
djvulibre$secondaryArchSuffix == $portVersion

View File

@@ -1,27 +1,27 @@
From 41b3ce02fa610b55445cc25fc31ca8ee763adfad Mon Sep 17 00:00:00 2001
From 8654d9d893f8748a990c91550edf8ce65e8cd508 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 25 Mar 2015 10:35:25 +0300
Subject: Fix build
diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
index b0d9814..7483ade 100644
index 80ef640..4e8445e 100644
--- a/libdjvu/miniexp.cpp
+++ b/libdjvu/miniexp.cpp
@@ -1010,7 +1010,7 @@ stdio_fgetc(miniexp_io_t *io)
if (io == &miniexp_io && !CompatCounter::count)
return (*minilisp_getc)(); /* compatibility hack */
@@ -1241,7 +1241,7 @@ static int stdio_fputs(miniexp_io_t *io, const char *s) {
static int true_stdio_fgetc(miniexp_io_t *io) {
FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin;
- return ::getc(f);
+ return getc(f);
}
static int
static int compat_getc() {
return true_stdio_fgetc(&miniexp_io);
--
2.2.2
2.13.1
From f035c1e3c46ce966902cb634c82455d8859127c4 Mon Sep 17 00:00:00 2001
From 9f3b58cfbbe05e81600ed2a333e60c5b952b40e9 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 25 Mar 2015 10:45:06 +0300
Subject: Haiku: gcc2 fix
@@ -40,5 +40,5 @@ index a87a83b..86a8bfa 100644
void get_bounding_box(int shapeno, LibRect &dest);
};
--
2.2.2
2.13.1