haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libmwaw: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2017-11-20 20:17:11 +01:00
parent ed2ed2b82d
commit a5d866b446
2 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app-text/libmwaw/libmwaw-0.3.12.recipe → app-text/libmwaw/libmwaw-0.3.13.recipe
View File

@@ -9,7 +9,7 @@ LICENSE="MPL v2.0
GNU LGPL v2.1" GNU LGPL v2.1"
REVISION="1" REVISION="1"
SOURCE_URI="http://prdownloads.sourceforge.net/libmwaw/libmwaw-$portVersion.tar.bz2" SOURCE_URI="http://prdownloads.sourceforge.net/libmwaw/libmwaw-$portVersion.tar.bz2"
CHECKSUM_SHA256="47abdda9a81bc75ef90edde780c6669584050e93ec9f96baeab9422be2a899d8" CHECKSUM_SHA256="2c29775ffc1e33f07351b9e5c69d9d5b4065660b01ae27ba7ddf15cbb14d09ec"
PATCHES="libmwaw-$portVersion.patchset" PATCHES="libmwaw-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64" ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -24,7 +24,7 @@ PROVIDES="
cmd:mwaw2text$secondaryArchSuffix cmd:mwaw2text$secondaryArchSuffix
cmd:mwawFile$secondaryArchSuffix cmd:mwawFile$secondaryArchSuffix
cmd:mwawZip$secondaryArchSuffix cmd:mwawZip$secondaryArchSuffix
lib:libmwaw_0.3$secondaryArchSuffix = 3.0.12 compat >= 3 lib:libmwaw_0.3$secondaryArchSuffix = 3.0.13 compat >= 3
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
@@ -37,7 +37,7 @@ REQUIRES="
PROVIDES_devel=" PROVIDES_devel="
libmwaw${secondaryArchSuffix}_devel = $portVersion libmwaw${secondaryArchSuffix}_devel = $portVersion
devel:libmwaw_0.3$secondaryArchSuffix = 3.0.12 compat >= 3 devel:libmwaw_0.3$secondaryArchSuffix = 3.0.13 compat >= 3
" "
REQUIRES_devel=" REQUIRES_devel="
libmwaw$secondaryArchSuffix == $portVersion base libmwaw$secondaryArchSuffix == $portVersion base
@@ -53,23 +53,18 @@ BUILD_REQUIRES="
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
cmd:aclocal cmd:aclocal
cmd:libtoolize
cmd:autoconf cmd:autoconf
cmd:automake cmd:automake
cmd:autoheader
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make cmd:make
cmd:pkg_config$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix
" "
BUILD() BUILD()
{ {
libtoolize --force --copy --install autoreconf -fi
aclocal
autoheader
automake -a -c --foreign
autoconf
runConfigure ./configure --disable-werror runConfigure ./configure --disable-werror
make $jobArgs make $jobArgs
} }

63
app-text/libmwaw/patches/libmwaw-0.3.12.patchset → app-text/libmwaw/patches/libmwaw-0.3.13.patchset
View File

@@ -1,14 +1,14 @@
From 6ec91570c6791554153374eaf7e784d6643bcd75 Mon Sep 17 00:00:00 2001 From d5a1b2096bdcffc3f8e33478e54eea9db8ffc994 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com> From: Kacper Kasper <kacperkasper@gmail.com>
Date: Mon, 21 Jul 2014 17:18:22 +0200 Date: Mon, 21 Jul 2014 17:18:22 +0200
Subject: Haiku support Subject: Haiku support
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ee23c24..344a02a 100644 index 0463f99..61fedce 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -349,6 +349,7 @@ AC_COMPILE_IFELSE([ @@ -281,6 +281,7 @@ AC_COMPILE_IFELSE([
], [ ], [
AC_MSG_RESULT([yes, find Darwin getxattr]) AC_MSG_RESULT([yes, find Darwin getxattr])
[XATTR_CFLAGS="-DWITH_EXTENDED_FS=1"] [XATTR_CFLAGS="-DWITH_EXTENDED_FS=1"]
@@ -16,7 +16,7 @@ index ee23c24..344a02a 100644
], [ ], [
AC_COMPILE_IFELSE([ AC_COMPILE_IFELSE([
AC_LANG_PROGRAM( AC_LANG_PROGRAM(
@@ -359,12 +360,15 @@ AC_COMPILE_IFELSE([ @@ -291,12 +292,15 @@ AC_COMPILE_IFELSE([
], [ ], [
AC_MSG_RESULT([yes, find Linux getxattr]) AC_MSG_RESULT([yes, find Linux getxattr])
[XATTR_CFLAGS="-DWITH_EXTENDED_FS=2"] [XATTR_CFLAGS="-DWITH_EXTENDED_FS=2"]
@@ -33,67 +33,67 @@ index ee23c24..344a02a 100644
# ========= # =========
# Find zlib # Find zlib
diff --git a/src/conv/csv/Makefile.am b/src/conv/csv/Makefile.am diff --git a/src/conv/csv/Makefile.am b/src/conv/csv/Makefile.am
index 80284b7..438979f 100644 index 6e165e2..10070a9 100644
--- a/src/conv/csv/Makefile.am --- a/src/conv/csv/Makefile.am
+++ b/src/conv/csv/Makefile.am +++ b/src/conv/csv/Makefile.am
@@ -16,7 +16,7 @@ else @@ -16,7 +16,7 @@ else
mwaw2csv_LDADD = \ mwaw2csv_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \ ../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2CSV_WIN32_RESOURCE@ - ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2CSV_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2CSV_WIN32_RESOURCE@ + ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2CSV_WIN32_RESOURCE@
endif endif
diff --git a/src/conv/html/Makefile.am b/src/conv/html/Makefile.am diff --git a/src/conv/html/Makefile.am b/src/conv/html/Makefile.am
index 9151e15..5012006 100644 index 0540d4d..d0f77b7 100644
--- a/src/conv/html/Makefile.am --- a/src/conv/html/Makefile.am
+++ b/src/conv/html/Makefile.am +++ b/src/conv/html/Makefile.am
@@ -16,7 +16,7 @@ else @@ -16,7 +16,7 @@ else
mwaw2html_LDADD = \ mwaw2html_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \ ../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2HTML_WIN32_RESOURCE@ - ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2HTML_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2HTML_WIN32_RESOURCE@ + ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2HTML_WIN32_RESOURCE@
endif endif
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index a49b894..41684a8 100644 index bec7db5..ad429b5 100644
--- a/src/conv/raw/Makefile.am --- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am +++ b/src/conv/raw/Makefile.am
@@ -16,7 +16,7 @@ else @@ -16,7 +16,7 @@ else
mwaw2raw_LDADD = \ mwaw2raw_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \ ../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2RAW_WIN32_RESOURCE@ - ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2RAW_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2RAW_WIN32_RESOURCE@ + ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2RAW_WIN32_RESOURCE@
endif endif
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index afd8937..0b47b60 100644 index 1dcc3a1..a88ba79 100644
--- a/src/conv/svg/Makefile.am --- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am +++ b/src/conv/svg/Makefile.am
@@ -16,7 +16,7 @@ else @@ -16,7 +16,7 @@ else
mwaw2svg_LDADD = \ mwaw2svg_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \ ../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2SVG_WIN32_RESOURCE@ - ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2SVG_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2SVG_WIN32_RESOURCE@ + ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2SVG_WIN32_RESOURCE@
endif endif
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 7413611..ff907b9 100644 index 40826d4..61b64cd 100644
--- a/src/conv/text/Makefile.am --- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am +++ b/src/conv/text/Makefile.am
@@ -16,7 +16,7 @@ else @@ -16,7 +16,7 @@ else
mwaw2text_LDADD = \ mwaw2text_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \ ../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2TEXT_WIN32_RESOURCE@ - ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2TEXT_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2TEXT_WIN32_RESOURCE@ + ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @MWAW2TEXT_WIN32_RESOURCE@
endif endif
@@ -126,5 +126,28 @@ index c44bf7f..5bee711
if STATIC_TOOLS if STATIC_TOOLS
mwawZip_LDFLAGS = -all-static mwawZip_LDFLAGS = -all-static
-- --
2.11.0 2.14.2
commit 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9
Author: David Tardon <dtardon@redhat.com>
Date: Wed Nov 15 13:15:44 2017 +0100
Subject: fix call of explicit ctor
diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
index 2875a0f..b844a9d 100644
--- a/src/lib/libmwaw_internal.hxx
+++ b/src/lib/libmwaw_internal.hxx
@@ -1027,7 +1027,7 @@ public:
}
//! generic constructor
template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
- : m_data(p.min(), p.max())
+ : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
{
}
--
2.14.2