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

mxml, bump version, rename to mxml (#4410)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-11-30 14:15:30 +01:00
committed by Jérôme Duval
parent f91c073848
commit 0ed8473a41
6 changed files with 62 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dev-libs/mini-xml/mini_xml-2.6.recipe
View File

@@ -1,69 +0,0 @@
SUMMARY="Minimum XML Library"
DESCRIPTION="Mini-XML is a small XML parsing library that you can \
use to read XML and XML-like data files in your application without \
requiring large non-standard libraries."
HOMEPAGE="http://www.minixml.org/index.php"
COPYRIGHT="2003-2009 Michael R Sweet"
LICENSE="GNU LGPL v2"
REVISION="2"
SOURCE_URI="https://github.com/michaelrsweet/mxml/archive/release-$portVersion.tar.gz"
CHECKSUM_SHA256="91d13f51d33dbd17360cc51ce69cf046a7ff7ff256195064c092dc4dbd95810a"
SOURCE_FILENAME="mxml-$portVersion.tar.gz"
SOURCE_DIR="mxml-release-$portVersion"
PATCHES="mini_xml-$portVersion.patch"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion="1.4"
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
PROVIDES="
mini_xml$secondaryArchSuffix = $portVersion
cmd:mxmldoc$secondaryArchSuffix
lib:libmxml$secondaryArchSuffix = $libVersionCompat
lib:mxml$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
"
PROVIDES_devel="
mini_xml${secondaryArchSuffix}_devel = $portVersion
devel:libmxml$secondaryArchSuffix = $libVersionCompat
devel:mxml$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
mini_xml$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
"
defineDebugInfoPackage mini_xml$secondaryArchSuffix \
"$libDir"/libmxml.so.$libVersion
BUILD()
{
runConfigure ./configure --enable-shared
make $jobArgs
}
INSTALL()
{
make install
prepareInstalledDevelLib libmxml
fixPkgconfig
packageEntries devel \
$developDir \
$dataDir \
$manDir/man3
}

98
dev-libs/mini-xml/patches/mini_xml-2.11.patchset
View File

@@ -1,98 +0,0 @@
From e2a3c296c54c0bb22d2b60a87ed4e8f076a4a550 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 24 Sep 2018 08:31:32 +0200
Subject: enable shared library
diff --git a/configure.ac b/configure.ac
index 47a0d41..c852d90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,6 +219,14 @@ if test x$enable_shared != xno; then
LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
;;
+ haiku*)
+ AC_MSG_RESULT(yes)
+ LIBMXML="libmxml.so.1.6"
+ DSO="\$(CC)"
+ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
+ LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
+ ;;
+
darwin)
AC_MSG_RESULT(yes)
LIBMXML="libmxml.1.dylib"
--
2.19.0
From 4b0ecbc14207e24623889a371b5404654f02cc27 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 24 Sep 2018 08:27:13 +0200
Subject: testmxml mxml.xml @MXML_EPUB@ break the build
diff --git a/Makefile.in b/Makefile.in
index eef14fe..03a203d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,7 +83,7 @@ PUBLIBOBJS = mxml-attr.o mxml-entity.o mxml-file.o mxml-get.o \
mxml-index.o mxml-node.o mxml-search.o mxml-set.o
LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o
OBJS = mmd.o mxmldoc.o testmxml.o zipc.o $(LIBOBJS)
-ALLTARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml @MXML_EPUB@
+ALLTARGETS = $(LIBMXML) mxmldoc
CROSSTARGETS = $(LIBMXML) mxmldoc
TARGETS = $(@TARGETS@)
--
2.19.0
From f3651900fc703003e95d6dbb9d599bf13e3faaa1 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 24 Sep 2018 09:14:23 +0200
Subject: import upstream patch
diff --git a/Makefile.in b/Makefile.in
index 03a203d..e720727 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -162,13 +162,13 @@ install: $(TARGETS) install-$(LIBMXML) install-libmxml.a
$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
-install-libmxml.a:
+install-libmxml.a: libmxml.a
echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
$(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
$(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a
-install-libmxml.so.1.6:
+install-libmxml.so.1.6: libmxml.so.1.6
echo Installing libmxml.so to $(BUILDROOT)$(libdir)...
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
$(INSTALL_LIB) libmxml.so.1.6 $(BUILDROOT)$(libdir)
@@ -177,14 +177,14 @@ install-libmxml.so.1.6:
$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
$(LN) libmxml.so.1.6 $(BUILDROOT)$(libdir)/libmxml.so.1
-install-libmxml.sl.1:
+install-libmxml.sl.1: libmxml.sl.1
echo Installing libmxml.sl to $(BUILDROOT)$(libdir)...
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
$(INSTALL_LIB) libmxml.sl.1 $(BUILDROOT)$(libdir)
$(RM) $(BUILDROOT)$(libdir)/libmxml.so
$(LN) libmxml.sl.1 $(BUILDROOT)$(libdir)/libmxml.sl
-install-libmxml.1.dylib:
+install-libmxml.1.dylib: libmxml.1.dylib
echo Installing libmxml.dylib to $(BUILDROOT)$(libdir)...
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
$(INSTALL_LIB) libmxml.1.dylib $(BUILDROOT)$(libdir)
--
2.19.0

1542
dev-libs/mini-xml/patches/mini_xml-2.6.patch
View File

File diff suppressed because it is too large Load Diff

16
dev-libs/mxml/licenses/Mini-XML Normal file
View File

@@ -0,0 +1,16 @@
Mini-XML
Copyright © 2003-2019 by Michael R Sweet
Exceptions to the Apache 2.0 License:
=====================================
In addition, if you combine or link compiled forms of this Software with
software that is licensed under the GPLv2 or LGPLv2 (“Combined Software”) and if
a court of competent jurisdiction determines that the patent provision (Section
3), the indemnity provision (Section 9) or other Section of the License
conflicts with the conditions of the GPLv2 or LGPLv2, you may retroactively and
prospectively choose to deem waived or otherwise exclude such Section(s) of the
License, but only in their entirety and only with respect to the Combined
Software.

35
dev-libs/mini-xml/mini_xml-2.11.recipe → dev-libs/mxml/mxml-3.1.recipe
View File

@@ -2,14 +2,17 @@ SUMMARY="Minimum XML Library"
DESCRIPTION="Mini-XML is a small XML parsing library that you can \
use to read XML and XML-like data files in your application without \
requiring large non-standard libraries."
HOMEPAGE="http://www.minixml.org/index.php"
COPYRIGHT="2003-2014 Michael R Sweet"
LICENSE="GNU LGPL v2"
HOMEPAGE="https://www.msweet.org/mxml/
https://github.com/michaelrsweet/mxml"
COPYRIGHT="2003-2019 Michael R Sweet"
LICENSE="Mini-XML
Apache v2
GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://github.com/michaelrsweet/mxml/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="7d3dfe661e50908fe41aef9b97ba6f7f158cab5208515c6be9f5bc9daf032329"
SOURCE_DIR="mxml-$portVersion"
PATCHES="mini_xml-$portVersion.patchset"
CHECKSUM_SHA256="0a50cbb42ad078e51589208997858c8d86ea95f255d61e4af5b3d635d2659603"
SOURCE_FILENAME="mxml-v$portVersion.tar.gz"
PATCHES="mxml-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
@@ -18,7 +21,7 @@ libVersion="1.6"
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
PROVIDES="
mini_xml$secondaryArchSuffix = $portVersion
mxml$secondaryArchSuffix = $portVersion
cmd:mxmldoc$secondaryArchSuffix = $portVersion
lib:libmxml$secondaryArchSuffix = $libVersionCompat
"
@@ -27,11 +30,11 @@ REQUIRES="
"
PROVIDES_devel="
mini_xml${secondaryArchSuffix}_devel = $portVersion
mxml${secondaryArchSuffix}_devel = $portVersion
devel:libmxml$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
mini_xml${secondaryArchSuffix}_devel == $portVersion base
mxml${secondaryArchSuffix}_devel == $portVersion base
"
BUILD_REQUIRES="
@@ -59,13 +62,11 @@ BUILD()
INSTALL()
{
make install
prepareInstalledDevelLibs \
libmxml
packageEntries devel \
$developDir
}
TEST()
{
make testmxml
prepareInstalledDevelLibs libmxml
fixPkgconfig
packageEntries devel \
$developDir \
$manDir
}

28
dev-libs/mxml/patches/mxml-3.1.patchset Normal file
View File

@@ -0,0 +1,28 @@
From b31124071358fcbfd979ceeddf6d479564ab2987 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 30 Nov 2019 11:31:57 +0100
Subject: Enable shared library
diff --git a/configure.ac b/configure.ac
index 455537a..70d2c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,6 +206,14 @@ if test x$enable_shared != xno; then
LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
;;
+ haiku*)
+ AC_MSG_RESULT(yes)
+ LIBMXML="libmxml.so.1.6"
+ DSO="\$(CC)"
+ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)"
+ LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)"
+ ;;
+
darwin)
AC_MSG_RESULT(yes)
LIBMXML="libmxml.1.dylib"
--
2.24.0