Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3873
Modified Files:
libxslt-py.info libxslt-py.patch libxslt.info libxslt.patch
Log Message:
Testing new version
Index: libxslt.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/libxslt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt.patch 4 May 2006 02:13:23 -0000 1.1
+++ libxslt.patch 4 May 2006 05:47:31 -0000 1.2
@@ -80,451 +80,38 @@
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
[EMAIL PROTECTED]@ -m 0644 $(srcdir)/tutorial/*
$(DESTDIR)$(TARGET_DIR)/tutorial
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial2
-diff -Nurd libxslt-1.1.15-orig/libxslt/pattern.c
libxslt-1.1.15/libxslt/pattern.c
---- libxslt-1.1.15-orig/libxslt/pattern.c 2005-09-05 00:41:43.000000000
+0200
-+++ libxslt-1.1.15/libxslt/pattern.c 2006-03-22 23:26:03.000000000 +0100
-@@ -268,6 +268,7 @@
- * @op: an op
- * @value: the first value
- * @value2: the second value
-+ * @novar: flag to set XML_XPATH_NOVAR
- *
- * Add an step to an XSLT Compiled Match
- *
-@@ -275,7 +276,7 @@
- */
- static int
- xsltCompMatchAdd(xsltParserContextPtr ctxt, xsltCompMatchPtr comp,
-- xsltOp op, xmlChar * value, xmlChar * value2)
-+ xsltOp op, xmlChar * value, xmlChar * value2, int novar)
- {
- if (comp->nbStep >= 40) {
- xsltTransformError(NULL, NULL, NULL,
-@@ -308,7 +309,8 @@
- else
- xctxt = xmlXPathNewContext(NULL);
- #ifdef XML_XPATH_NOVAR
-- xctxt->flags = XML_XPATH_NOVAR;
-+ if (novar != 0)
-+ xctxt->flags = XML_XPATH_NOVAR;
+diff -Nurd -x'*~' libxslt-1.1.16.orig/libexslt/date.c
libxslt-1.1.16/libexslt/date.c
+--- libxslt-1.1.16.orig/libexslt/date.c 2006-03-10 05:57:24.000000000
-0500
++++ libxslt-1.1.16/libexslt/date.c 2006-05-04 00:38:58.000000000 -0400
+@@ -28,10 +28,6 @@
+ #include "config.h"
#endif
- if (ctxt->style != NULL)
- xctxt->dict = ctxt->style->dict;
-@@ -317,7 +319,8 @@
- if (comp->steps[comp->nbStep].comp == NULL) {
- xsltTransformError(NULL, ctxt->style, ctxt->elem,
- "Failed to compile predicate\n");
-- ctxt->style->errors++;
-+ if (ctxt->style != NULL)
-+ ctxt->style->errors++;
- }
- }
- comp->nbStep++;
-@@ -1181,8 +1184,8 @@
- #define NEXT ((*ctxt->cur) ? ctxt->cur++: ctxt->cur)
-
-
--#define PUSH(op, val, val2) \
-- if (xsltCompMatchAdd(ctxt, ctxt->comp, (op), (val), (val2))) goto error;
-+#define PUSH(op, val, val2, novar)
\
-+ if (xsltCompMatchAdd(ctxt, ctxt->comp, (op), (val), (val2), (novar)))
goto error;
-
- #define SWAP() \
- xsltSwapTopCompMatch(ctxt->comp);
-@@ -1358,6 +1361,7 @@
- * @ctxt: the compilation context
- * @name: a preparsed name
- * @aid: whether id/key are allowed there
-+ * @novar: flag to prohibit xslt var
- *
- * Compile the XSLT LocationIdKeyPattern
- * [3] IdKeyPattern ::= 'id' '(' Literal ')'
-@@ -1370,7 +1374,8 @@
- * | 'processing-instruction' '(' Literal ')'
- */
- static void
--xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name, int aid) {
-+xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
-+ int aid, int novar) {
- xmlChar *lit = NULL;
- xmlChar *lit2 = NULL;
-
-@@ -1394,7 +1399,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_ID, lit, NULL);
-+ PUSH(XSLT_OP_ID, lit, NULL, novar);
- } else if ((aid) && (xmlStrEqual(name, (const xmlChar *)"key"))) {
- NEXT;
- SKIP_BLANKS;
-@@ -1422,7 +1427,7 @@
- }
- NEXT;
- /* TODO: support namespace in keys */
-- PUSH(XSLT_OP_KEY, lit, lit2);
-+ PUSH(XSLT_OP_KEY, lit, lit2, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"processing-instruction")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1439,7 +1444,7 @@
- }
- }
- NEXT;
-- PUSH(XSLT_OP_PI, lit, NULL);
-+ PUSH(XSLT_OP_PI, lit, NULL, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"text")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1450,7 +1455,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_TEXT, NULL, NULL);
-+ PUSH(XSLT_OP_TEXT, NULL, NULL, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"comment")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1461,7 +1466,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_COMMENT, NULL, NULL);
-+ PUSH(XSLT_OP_COMMENT, NULL, NULL, novar);
- } else if (xmlStrEqual(name, (const xmlChar *)"node")) {
- NEXT;
- SKIP_BLANKS;
-@@ -1472,7 +1477,7 @@
- return;
- }
- NEXT;
-- PUSH(XSLT_OP_NODE, NULL, NULL);
-+ PUSH(XSLT_OP_NODE, NULL, NULL, novar);
- } else if (aid) {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileIdKeyPattern : expecting 'key' or 'id' or node type\n");
-@@ -1493,6 +1498,7 @@
- * xsltCompileStepPattern:
- * @ctxt: the compilation context
- * @token: a posible precompiled name
-+ * @novar: flag to prohibit xslt variables from pattern
- *
- * Compile the XSLT StepPattern and generates a precompiled
- * form suitable for fast matching.
-@@ -1511,7 +1517,7 @@
- */
- static void
--xsltCompileStepPattern(xsltParserContextPtr ctxt, xmlChar *token) {
-+xsltCompileStepPattern(xsltParserContextPtr ctxt, xmlChar *token, int novar) {
- xmlChar *name = NULL;
- const xmlChar *URI = NULL;
- xmlChar *URL = NULL;
-@@ -1524,7 +1530,7 @@
- NEXT;
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ATTR, NULL, NULL);
-+ PUSH(XSLT_OP_ATTR, NULL, NULL, novar);
- goto parse_predicate;
- }
- token = xsltScanQName(ctxt, &prefix);
-@@ -1544,7 +1550,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ATTR, NULL, URL);
-+ PUSH(XSLT_OP_ATTR, NULL, URL, novar);
- return;
- }
- xsltTransformError(NULL, NULL, NULL,
-@@ -1552,7 +1558,7 @@
- ctxt->error = 1;
- goto error;
- }
-- PUSH(XSLT_OP_ATTR, token, URL);
-+ PUSH(XSLT_OP_ATTR, token, URL, novar);
- goto parse_predicate;
- }
- if (token == NULL)
-@@ -1560,7 +1566,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ALL, token, NULL);
-+ PUSH(XSLT_OP_ALL, token, NULL, novar);
- goto parse_predicate;
- } else {
- xsltTransformError(NULL, NULL, NULL,
-@@ -1573,7 +1579,7 @@
-
- SKIP_BLANKS;
- if (CUR == '(') {
-- xsltCompileIdKeyPattern(ctxt, token, 0);
-+ xsltCompileIdKeyPattern(ctxt, token, 0, novar);
- if (ctxt->error)
- goto error;
- } else if (CUR == ':') {
-@@ -1600,7 +1606,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_NS, URL, NULL);
-+ PUSH(XSLT_OP_NS, URL, NULL, novar);
- } else {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileStepPattern : Name expected\n");
-@@ -1608,7 +1614,7 @@
- goto error;
- }
- } else {
-- PUSH(XSLT_OP_ELEM, token, URL);
-+ PUSH(XSLT_OP_ELEM, token, URL, novar);
- }
- } else {
- NEXT;
-@@ -1618,7 +1624,7 @@
- if (token == NULL) {
- if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ALL, token, NULL);
-+ PUSH(XSLT_OP_ALL, token, NULL, novar);
- goto parse_predicate;
- } else {
- xsltTransformError(NULL, NULL, NULL,
-@@ -1636,7 +1642,7 @@
- if (URI != NULL)
- URL = xmlStrdup(URI);
- }
-- PUSH(XSLT_OP_CHILD, name, URL);
-+ PUSH(XSLT_OP_CHILD, name, URL, novar);
- } else if (xmlStrEqual(token, (const xmlChar *) "attribute")) {
- xmlFree(token);
- token = xsltScanName(ctxt);
-@@ -1655,7 +1661,7 @@
- if (URI != NULL)
- URL = xmlStrdup(URI);
- }
-- PUSH(XSLT_OP_ATTR, name, URL);
-+ PUSH(XSLT_OP_ATTR, name, URL, novar);
- } else {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileStepPattern : 'child' or 'attribute'
expected\n");
-@@ -1666,7 +1672,7 @@
- }
- } else if (CUR == '*') {
- NEXT;
-- PUSH(XSLT_OP_ALL, token, NULL);
-+ PUSH(XSLT_OP_ALL, token, NULL, novar);
- } else {
- URI = xsltGetQNameURI(ctxt->elem, &token);
- if (token == NULL) {
-@@ -1675,7 +1681,7 @@
- }
- if (URI != NULL)
- URL = xmlStrdup(URI);
-- PUSH(XSLT_OP_ELEM, token, URL);
-+ PUSH(XSLT_OP_ELEM, token, URL, novar);
- }
- parse_predicate:
- SKIP_BLANKS;
-@@ -1713,7 +1719,7 @@
- return;
- }
- ret = xmlStrndup(q, CUR_PTR - q);
-- PUSH(XSLT_OP_PREDICATE, ret, NULL);
-+ PUSH(XSLT_OP_PREDICATE, ret, NULL, novar);
- /* push the predicate lower than local test */
- SWAP();
- NEXT;
-@@ -1731,6 +1737,7 @@
- * xsltCompileRelativePathPattern:
- * @comp: the compilation context
- * @token: a posible precompiled name
-+ * @novar: flag to prohibit xslt variables
- *
- * Compile the XSLT RelativePathPattern and generates a precompiled
- * form suitable for fast matching.
-@@ -1740,24 +1747,24 @@
- * | RelativePathPattern '//' StepPattern
- */
- static void
--xsltCompileRelativePathPattern(xsltParserContextPtr ctxt, xmlChar *token) {
-- xsltCompileStepPattern(ctxt, token);
-+xsltCompileRelativePathPattern(xsltParserContextPtr ctxt, xmlChar *token, int
novar) {
-+ xsltCompileStepPattern(ctxt, token, novar);
- if (ctxt->error)
- goto error;
- SKIP_BLANKS;
- while ((CUR != 0) && (CUR != '|')) {
- if ((CUR == '/') && (NXT(1) == '/')) {
-- PUSH(XSLT_OP_ANCESTOR, NULL, NULL);
-+ PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
- NEXT;
- NEXT;
- SKIP_BLANKS;
-- xsltCompileStepPattern(ctxt, NULL);
-+ xsltCompileStepPattern(ctxt, NULL, novar);
- } else if (CUR == '/') {
-- PUSH(XSLT_OP_PARENT, NULL, NULL);
-+ PUSH(XSLT_OP_PARENT, NULL, NULL, novar);
- NEXT;
- SKIP_BLANKS;
- if ((CUR != 0) && (CUR != '|')) {
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- }
- } else {
- ctxt->error = 1;
-@@ -1773,6 +1780,7 @@
- /**
- * xsltCompileLocationPathPattern:
- * @ctxt: the compilation context
-+ * @novar: flag to prohibit xslt variables
- *
- * Compile the XSLT LocationPathPattern and generates a precompiled
- * form suitable for fast matching.
-@@ -1782,7 +1790,7 @@
- * | '//'? RelativePathPattern
- */
- static void
--xsltCompileLocationPathPattern(xsltParserContextPtr ctxt) {
-+xsltCompileLocationPathPattern(xsltParserContextPtr ctxt, int novar) {
- SKIP_BLANKS;
- if ((CUR == '/') && (NXT(1) == '/')) {
- /*
-@@ -1792,22 +1800,22 @@
- NEXT;
- NEXT;
- ctxt->comp->priority = 0.5; /* '//' means not 0 priority */
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else if (CUR == '/') {
- /*
- * We need to find root as the parent
- */
- NEXT;
- SKIP_BLANKS;
-- PUSH(XSLT_OP_ROOT, NULL, NULL);
-+ PUSH(XSLT_OP_ROOT, NULL, NULL, novar);
- if ((CUR != 0) && (CUR != '|')) {
-- PUSH(XSLT_OP_PARENT, NULL, NULL);
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ PUSH(XSLT_OP_PARENT, NULL, NULL, novar);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- }
- } else if (CUR == '*') {
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else if (CUR == '@') {
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else {
- xmlChar *name;
- name = xsltScanName(ctxt);
-@@ -1819,34 +1827,35 @@
- }
- SKIP_BLANKS;
- if ((CUR == '(') && !xmlXPathIsNodeType(name)) {
-- xsltCompileIdKeyPattern(ctxt, name, 1);
-+ xsltCompileIdKeyPattern(ctxt, name, 1, novar);
- if ((CUR == '/') && (NXT(1) == '/')) {
-- PUSH(XSLT_OP_ANCESTOR, NULL, NULL);
-+ PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
- NEXT;
- NEXT;
- SKIP_BLANKS;
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- } else if (CUR == '/') {
-- PUSH(XSLT_OP_PARENT, NULL, NULL);
-+ PUSH(XSLT_OP_PARENT, NULL, NULL, novar);
- NEXT;
- SKIP_BLANKS;
-- xsltCompileRelativePathPattern(ctxt, NULL);
-+ xsltCompileRelativePathPattern(ctxt, NULL, novar);
- }
- return;
- }
-- xsltCompileRelativePathPattern(ctxt, name);
-+ xsltCompileRelativePathPattern(ctxt, name, novar);
- }
- error:
- return;
- }
-
- /**
-- * xsltCompilePattern:
-+ * xsltCompilePatternInternal:
- * @pattern: an XSLT pattern
- * @doc: the containing document
- * @node: the containing element
- * @style: the stylesheet
- * @runtime: the transformation context, if done at run-time
-+ * @novar: flag to prohibit xslt variables
- *
- * Compile the XSLT pattern and generates a list of precompiled form suitable
- * for fast matching.
-@@ -1856,10 +1865,10 @@
- * Returns the generated pattern list or NULL in case of failure
- */
-
--xsltCompMatchPtr
--xsltCompilePattern(const xmlChar *pattern, xmlDocPtr doc,
-+static xsltCompMatchPtr
-+xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
- xmlNodePtr node, xsltStylesheetPtr style,
-- xsltTransformContextPtr runtime) {
-+ xsltTransformContextPtr runtime, int novar) {
- xsltParserContextPtr ctxt = NULL;
- xsltCompMatchPtr element, first = NULL, previous = NULL;
- int current, start, end, level, j;
-@@ -1938,7 +1947,7 @@
- This may be changed by xsltCompileLocationPathPattern.
- */
- element->priority = 0;
-- xsltCompileLocationPathPattern(ctxt);
-+ xsltCompileLocationPathPattern(ctxt, novar);
- if (ctxt->error) {
- xsltTransformError(NULL, style, node,
- "xsltCompilePattern : failed to compile '%s'\n",
-@@ -2013,6 +2022,29 @@
- return(NULL);
- }
+-#if HAVE_LOCALTIME_R /* _POSIX_SOURCE required by gnu libc */
+-#define _POSIX_SOURCE
+-#endif
+-
+ #include <libxml/tree.h>
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+diff -Nurd -x'*~' libxslt-1.1.16.orig/libxslt/Makefile.am
libxslt-1.1.16/libxslt/Makefile.am
+--- libxslt-1.1.16.orig/libxslt/Makefile.am 2005-10-02 05:25:21.000000000
-0400
++++ libxslt-1.1.16/libxslt/Makefile.am 2006-05-03 22:52:04.000000000 -0400
+@@ -61,4 +61,4 @@
+ @(cd ../xsltproc ; $(MAKE))
-+/**
-+ * xsltCompilePattern:
-+ * @pattern: an XSLT pattern
-+ * @doc: the containing document
-+ * @node: the containing element
-+ * @style: the stylesheet
-+ * @runtime: the transformation context, if done at run-time
-+ *
-+ * Compile the XSLT pattern and generates a list of precompiled form suitable
-+ * for fast matching.
-+ *
-+ * [1] Pattern ::= LocationPathPattern | Pattern '|' LocationPathPattern
-+ *
-+ * Returns the generated pattern list or NULL in case of failure
-+ */
-+
-+xsltCompMatchPtr
-+xsltCompilePattern(const xmlChar *pattern, xmlDocPtr doc,
-+ xmlNodePtr node, xsltStylesheetPtr style,
-+ xsltTransformContextPtr runtime) {
-+ return (xsltCompilePatternInternal(pattern, doc, node, style, runtime,
0));
-+}
-+
- /************************************************************************
- * *
- * Module interfaces *
-@@ -2041,7 +2073,8 @@
- return(-1);
+ install-exec-hook:
+- $(mkinstalldirs) "$(libdir)/libxslt-plugins"
++ $(mkinstalldirs) "$(DESTDIR)$(libdir)/libxslt-plugins"
+diff -Nurd -x'*~' libxslt-1.1.16.orig/libxslt/Makefile.in
libxslt-1.1.16/libxslt/Makefile.in
+--- libxslt-1.1.16.orig/libxslt/Makefile.in 2006-05-01 17:33:06.000000000
-0400
++++ libxslt-1.1.16/libxslt/Makefile.in 2006-05-03 22:52:00.000000000 -0400
+@@ -662,7 +662,7 @@
+ @(cd ../xsltproc ; $(MAKE))
- priority = cur->priority;
-- pat = xsltCompilePattern(cur->match, style->doc, cur->elem, style, NULL);
-+ pat = xsltCompilePatternInternal(cur->match, style->doc, cur->elem,
-+ style, NULL, 1);
- while (pat) {
- next = pat->next;
- pat->next = NULL;
+ install-exec-hook:
+- $(mkinstalldirs) "$(libdir)/libxslt-plugins"
++ $(mkinstalldirs) "$(DESTDIR)$(libdir)/libxslt-plugins"
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: libxslt.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/libxslt.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt.info 4 May 2006 02:13:23 -0000 1.1
+++ libxslt.info 4 May 2006 05:47:31 -0000 1.2
@@ -1,12 +1,12 @@
Package: libxslt
-Version: 1.1.15
-Revision: 3
+Version: 1.1.16
+Revision: 1
BuildDependsOnly: true
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
BuildDepends: gdbm3, libxml2 (>= 2.6.21-1), libiconv-dev
Depends: %N-shlibs (= %v-%r), %N-bin (= %v-%r)
Source: mirror:gnome:sources/%n/1.1/%n-%v.tar.bz2
-Source-MD5: 0a48d1a723d5338b246702ab1769e7bf
+Source-MD5: 35e1c422b4b222c860dd56445fa51a8b
PatchScript: perl -pi -e 's,/etc,%p/etc,g' doc/*.html doc/*.1
xsltproc/xsltproc.c
Patch: %n.patch
SetLDFLAGS: -no-undefined
@@ -20,7 +20,7 @@
Replaces: %N (<< 1.0.15-2)
Depends: libxml2-shlibs (>= 2.6.21-1), libiconv
Description: XML stylsheet transformation shared libraries
- Files: lib/libexslt.0*.dylib lib/libxslt.1*.dylib
+ Files: lib/libexslt.0*.dylib lib/libxslt.1*.dylib lib/libxslt-plugins
Shlibs: <<
%p/lib/libexslt.0.dylib 9.0.0 %n (>= 1.1.0-1)
%p/lib/libxslt.1.dylib 3.0.0 %n (>= 1.1.0-1)
@@ -51,9 +51,13 @@
changed.
<<
DescPort: <<
- Patching pattern.c to avoid fop bus error when processing docbook
- files. See bugzilla <http://bugzilla.gnome.org/show_bug.cgi?id=316861>
Patching Makefile in doc to install it correctly
+
+ Patch libxslt/Makefile.in to respect DESTDIR. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=340585
+
+ Patch libexslt/date.c to allow <time.h> to declare some functions.
+ See: http://bugzilla.gnome.org/show_bug.cgi?id=340590
<<
License: GPL/LGPL
Homepage: http://www.xmlsoft.org/XSLT/
Index: libxslt-py.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/libxslt-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt-py.patch 4 May 2006 02:13:23 -0000 1.1
+++ libxslt-py.patch 4 May 2006 05:47:31 -0000 1.2
@@ -1,7 +1,19 @@
-diff -Nurd -x'*~' libxslt-1.1.15.orig/python/Makefile.in
libxslt-1.1.15/python/Makefile.in
---- libxslt-1.1.15.orig/python/Makefile.in 2005-09-04 18:58:33.000000000
-0400
-+++ libxslt-1.1.15/python/Makefile.in 2006-03-01 02:24:10.000000000 -0500
-@@ -59,13 +59,12 @@
+diff -Nurd -x'*~' libxslt-1.1.16.orig/configure libxslt-1.1.16/configure
+--- libxslt-1.1.16.orig/configure 2006-05-01 17:28:11.000000000 -0400
++++ libxslt-1.1.16/configure 2006-05-04 01:32:56.000000000 -0400
+@@ -21724,7 +21724,7 @@
+ fi
+ if test "$with_python" != ""
+ then
+- pythondir=$(PYTHON_SITE_PACKAGES)
++ pythondir=$PYTHON_SITE_PACKAGES
+ else
+ pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
+ fi
+diff -Nurd -x'*~' libxslt-1.1.16.orig/python/Makefile.in
libxslt-1.1.16/python/Makefile.in
+--- libxslt-1.1.16.orig/python/Makefile.in 2006-05-01 17:33:06.000000000
-0400
++++ libxslt-1.1.16/python/Makefile.in 2006-05-04 00:55:44.000000000 -0400
+@@ -57,13 +57,12 @@
@[EMAIL PROTECTED] = \
@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \
@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la
@@ -16,7 +28,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -251,10 +250,7 @@
+@@ -249,10 +248,7 @@
SUBDIRS = . tests
INCLUDES = \
-I$(PYTHON_INCLUDES) \
@@ -28,7 +40,7 @@
DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
# libxsltclass.txt is generated
-@@ -269,8 +265,7 @@
+@@ -267,8 +263,7 @@
libxslt-python-api.xml \
$(DOCS)
@@ -38,7 +50,7 @@
@[EMAIL PROTECTED] = \
@WITH_PYTHON_TRUE@ $(top_builddir)/libxslt/libxslt.la \
-@@ -278,7 +273,6 @@
+@@ -276,7 +271,6 @@
@[EMAIL PROTECTED] = libxsltmod.la
@[EMAIL PROTECTED] = libxslt.c types.c libxslt-py.c
Index: libxslt-py.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome/libxslt-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libxslt-py.info 4 May 2006 02:13:23 -0000 1.1
+++ libxslt-py.info 4 May 2006 05:47:31 -0000 1.2
@@ -1,13 +1,13 @@
Info2: <<
Package: libxslt-py%type_pkg[python]
-Version: 1.1.15
+Version: 1.1.16
Revision: 1
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Type: python (2.3 2.4)
Depends: libxslt-shlibs (>= %v-1), libxml2-shlibs (>= 2.6.21-1),
libxml2-py%type_pkg[python], libiconv, python%type_pkg[python]
BuildDepends: libxslt (>= %v-1), libxml2 (>= 2.6.21-1), libiconv-dev
Source: mirror:gnome:sources/libxslt/1.1/libxslt-%v.tar.bz2
-Source-MD5: 0a48d1a723d5338b246702ab1769e7bf
+Source-MD5: 35e1c422b4b222c860dd56445fa51a8b
Patch: %{ni}.patch
ConfigureParams: --mandir=%p/share/man
--with-python=%p/bin/python%type_raw[python] --without-crypto --disable-static
--disable-dependency-tracking
CompileScript: <<
@@ -23,6 +23,10 @@
DescPackaging: <<
Patch python module makefiles to use installed libxslt not locally-built
<<
+DescPort: <<
+ Fix bash syntax in ./configure handling of python lib dir.
+ See: http://bugzilla.gnome.org/show_bug.cgi?id=340592
+<<
License: GPL/LGPL
Homepage: http://www.xmlsoft.org/XSLT/
<<
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
