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

xmlroff: bump version, fix libpng16 reference (#3795)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-04-26 12:13:45 +02:00
committed by Jérôme Duval
parent c347054321
commit 99ec6decdf
3 changed files with 30 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app-text/xmlroff/patches/xmlroff-0.6.2.patchset
View File

@@ -1,47 +0,0 @@
From f0c5b1119c2df93c8791cce2dc5133e28bd12fe9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Thu, 13 Aug 2015 22:16:25 +0200
Subject: Include glib headers the right way.
diff --git a/xmlroff/libfo/fo-libfo-basic.h b/xmlroff/libfo/fo-libfo-basic.h
index 148f916..adc9084 100644
--- a/xmlroff/libfo/fo-libfo-basic.h
+++ b/xmlroff/libfo/fo-libfo-basic.h
@@ -11,8 +11,7 @@
#define __FO_LIBFO_BASIC_H__
#include <stdio.h>
-#include <glib/gtypes.h>
-#include <glib/gerror.h>
+#include <glib.h>
G_BEGIN_DECLS
--
2.2.2
From 4173249e806af3f609df0ce7072e38d2f51be214 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Thu, 13 Aug 2015 22:22:49 +0200
Subject: Compatibility with modern autotoolsCompatibility with modern
autotools..
diff --git a/xmlroff/configure.ac b/xmlroff/configure.ac
index 9e97d7f..7f6aa4d 100644
--- a/xmlroff/configure.ac
+++ b/xmlroff/configure.ac
@@ -31,7 +31,7 @@ AC_INIT([xmlroff XSL Formatter],
xmlroff_version(),
[http://xmlroff.org/newticket],
xmlroff)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
XMLROFF_VERSION_MAJOR=xmlroff_version_major()
XMLROFF_VERSION_MINOR=xmlroff_version_minor()
--
2.2.2

22
app-text/xmlroff/patches/xmlroff-0.6.3.patchset Normal file
View File

@@ -0,0 +1,22 @@
From 9e07be242ad757e2985f45665301e1e2054b39c5 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Thu, 13 Aug 2015 22:22:49 +0200
Subject: Compatibility with modern autotools
diff --git a/xmlroff/configure.ac b/xmlroff/configure.ac
index 5648dc8..3cace78 100644
--- a/xmlroff/configure.ac
+++ b/xmlroff/configure.ac
@@ -31,7 +31,7 @@ AC_INIT([xmlroff XSL Formatter],
xmlroff_version(),
[http://xmlroff.org/newticket],
xmlroff)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
XMLROFF_VERSION_MAJOR=xmlroff_version_major()
XMLROFF_VERSION_MINOR=xmlroff_version_minor()
--
2.21.0

14
app-text/xmlroff/xmlroff-0.6.2.recipe → app-text/xmlroff/xmlroff-0.6.3.recipe
View File

@@ -7,18 +7,18 @@ COPYRIGHT="2001-2002 Sun Microsystems
2007-2010 Meneith Consulting
2011-2012 Mentea"
LICENSE="BSD (3-clause)"
REVISION="4"
REVISION="1"
SOURCE_URI="https://github.com/xmlroff/xmlroff/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="9c4777c27418eeb013b50246a4852f49893829ee6463b9686f4e7f26bbb19fe9"
CHECKSUM_SHA256="ef8386da3cd2fb12ac0d59899e3017b5ab2bebe8df23a94dbe95191724c3bc8f"
PATCHES="xmlroff-$portVersion.patchset"
ARCHITECTURES="x86 x86_64"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
xmlroff$secondaryArchSuffix = $portVersion
cmd:xmlroff$secondaryArchSuffix
lib:libfo_0.6$secondaryArchSuffix = 0.602.0 compat >= 0
lib:libfo_0.6$secondaryArchSuffix = 0.603.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -27,6 +27,7 @@ REQUIRES="
lib:libffi$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
lib:libfribidi$secondaryArchSuffix
lib:libgdk_pixbuf_2.0$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libgobject_2.0$secondaryArchSuffix
@@ -37,7 +38,7 @@ REQUIRES="
lib:libpango_1.0$secondaryArchSuffix
lib:libpangoft_1.0$secondaryArchSuffix
lib:libpixman_1$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libxslt$secondaryArchSuffix
lib:libz$secondaryArchSuffix
@@ -45,7 +46,7 @@ REQUIRES="
PROVIDES_devel="
xmlroff${secondaryArchSuffix}_devel = $portVersion
devel:libfo_0.6$secondaryArchSuffix = 0.602.0 compat >= 0
devel:libfo_0.6$secondaryArchSuffix = 0.603.0 compat >= 0
"
REQUIRES_devel="
xmlroff$secondaryArchSuffix == $portVersion base
@@ -56,6 +57,7 @@ BUILD_REQUIRES="
docbook_xsl_stylesheets
devel:libcairo$secondaryArchSuffix
devel:libfreetype$secondaryArchSuffix
devel:libfribidi$secondaryArchSuffix
devel:libgdk_pixbuf_2.0$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libpango_1.0$secondaryArchSuffix