mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
Fix build for vcl [1] and Python.
PR: 161789 [1] Submitted by: Pim van Grol [1]
This commit is contained in:
Maho Nakata
parent
3559e02902
commit
1eb1e566c5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=285122
53
editors/openoffice-3/files/patch-python-2.6.2-svnversion
Normal file
53
editors/openoffice-3/files/patch-python-2.6.2-svnversion
Normal file
@ -0,0 +1,53 @@
|
||||
http://bugs.python.org/file14047
|
||||
|
||||
--- python/Python-2.6.1.patch~ 2011-11-06 00:03:55.000000000 +0900
|
||||
+++ python/Python-2.6.1.patch 2011-11-06 07:51:41.000000000 +0900
|
||||
@@ -1,3 +1,48 @@
|
||||
+--- misc/Python-2.6.1/configure.in Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/configure.in Fri Apr 17 09:02:52 2009
|
||||
+@@ -767,7 +767,7 @@
|
||||
+ then
|
||||
+ SVNVERSION="svnversion \$(srcdir)"
|
||||
+ else
|
||||
+- SVNVERSION="echo exported"
|
||||
++ SVNVERSION="echo Unversioned directory"
|
||||
+ fi
|
||||
+
|
||||
+ case $MACHDEP in
|
||||
+--- misc/Python-2.6.1/Makefile.pre.in Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/Makefile.pre.in Fri Apr 17 09:02:52 2009
|
||||
+@@ -501,7 +501,7 @@
|
||||
+ $(SIGNAL_OBJS) \
|
||||
+ $(MODOBJS) \
|
||||
+ $(srcdir)/Modules/getbuildinfo.c
|
||||
+- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
|
||||
++ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
|
||||
+
|
||||
+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
|
||||
+ $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
|
||||
+--- misc/Python-2.6.1/Modules/getbuildinfo.c Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/Modules/getbuildinfo.c Fri Apr 17 09:02:52 2009
|
||||
+@@ -48,5 +48,5 @@
|
||||
+ static const char svnversion[] = SVNVERSION;
|
||||
+ if (svnversion[0] != '$')
|
||||
+ return svnversion; /* it was interpolated, or passed on command line */
|
||||
+- return "exported";
|
||||
++ return "Unversioned directory";
|
||||
+ }
|
||||
+--- misc/Python-2.6.1/Python/sysmodule.c Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/Python/sysmodule.c Fri Apr 17 09:02:52 2009
|
||||
+@@ -1161,7 +1161,7 @@
|
||||
+
|
||||
+
|
||||
+ svnversion = _Py_svnversion();
|
||||
+- if (strcmp(svnversion, "exported") != 0)
|
||||
++ if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
|
||||
+ svn_revision = svnversion;
|
||||
+ else if (istag) {
|
||||
+ len = strlen(_patchlevel_revision);
|
||||
+
|
||||
+
|
||||
+
|
||||
--- misc/Python-2.6.1/Include/pyport.h Wed Jun 11 09:41:16 2008
|
||||
+++ misc/build/Python-2.6.1/Include/pyport.h Fri Apr 17 09:02:52 2009
|
||||
@@ -449,11 +449,6 @@
|
||||
22
editors/openoffice-3/files/patch-vcl-PR161789
Normal file
22
editors/openoffice-3/files/patch-vcl-PR161789
Normal file
@ -0,0 +1,22 @@
|
||||
--- vcl/unx/inc/xfont.hxx~ 2011-01-18 22:35:50.000000000 +0900
|
||||
+++ vcl/unx/inc/xfont.hxx 2011-11-06 07:38:40.000000000 +0900
|
||||
@@ -27,7 +27,7 @@
|
||||
#ifndef EXTENDED_FONTSTRUCT_HXX
|
||||
#define EXTENDED_FONTSTRUCT_HXX
|
||||
|
||||
-#ifndef _XLIB_H_
|
||||
+#ifndef _X11_XLIB_H_
|
||||
#include <tools/prex.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <tools/postx.h>
|
||||
--- vcl/unx/inc/dtint.hxx~ 2011-01-18 22:35:50.000000000 +0900
|
||||
+++ vcl/unx/inc/dtint.hxx 2011-11-06 07:38:23.000000000 +0900
|
||||
@@ -36,7 +36,7 @@
|
||||
class SalDisplay;
|
||||
class AllSettings;
|
||||
|
||||
-#ifndef _XLIB_H_
|
||||
+#ifndef _X11_XLIB_H_
|
||||
// forwards from X
|
||||
struct Display;
|
||||
struct XEvent;
|
||||
53
editors/openoffice.org-3/files/patch-python-2.6.2-svnversion
Normal file
53
editors/openoffice.org-3/files/patch-python-2.6.2-svnversion
Normal file
@ -0,0 +1,53 @@
|
||||
http://bugs.python.org/file14047
|
||||
|
||||
--- python/Python-2.6.1.patch~ 2011-11-06 00:03:55.000000000 +0900
|
||||
+++ python/Python-2.6.1.patch 2011-11-06 07:51:41.000000000 +0900
|
||||
@@ -1,3 +1,48 @@
|
||||
+--- misc/Python-2.6.1/configure.in Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/configure.in Fri Apr 17 09:02:52 2009
|
||||
+@@ -767,7 +767,7 @@
|
||||
+ then
|
||||
+ SVNVERSION="svnversion \$(srcdir)"
|
||||
+ else
|
||||
+- SVNVERSION="echo exported"
|
||||
++ SVNVERSION="echo Unversioned directory"
|
||||
+ fi
|
||||
+
|
||||
+ case $MACHDEP in
|
||||
+--- misc/Python-2.6.1/Makefile.pre.in Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/Makefile.pre.in Fri Apr 17 09:02:52 2009
|
||||
+@@ -501,7 +501,7 @@
|
||||
+ $(SIGNAL_OBJS) \
|
||||
+ $(MODOBJS) \
|
||||
+ $(srcdir)/Modules/getbuildinfo.c
|
||||
+- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
|
||||
++ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
|
||||
+
|
||||
+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
|
||||
+ $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
|
||||
+--- misc/Python-2.6.1/Modules/getbuildinfo.c Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/Modules/getbuildinfo.c Fri Apr 17 09:02:52 2009
|
||||
+@@ -48,5 +48,5 @@
|
||||
+ static const char svnversion[] = SVNVERSION;
|
||||
+ if (svnversion[0] != '$')
|
||||
+ return svnversion; /* it was interpolated, or passed on command line */
|
||||
+- return "exported";
|
||||
++ return "Unversioned directory";
|
||||
+ }
|
||||
+--- misc/Python-2.6.1/Python/sysmodule.c Wed Jun 11 09:41:16 2008
|
||||
++++ misc/build/Python-2.6.1/Python/sysmodule.c Fri Apr 17 09:02:52 2009
|
||||
+@@ -1161,7 +1161,7 @@
|
||||
+
|
||||
+
|
||||
+ svnversion = _Py_svnversion();
|
||||
+- if (strcmp(svnversion, "exported") != 0)
|
||||
++ if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0)
|
||||
+ svn_revision = svnversion;
|
||||
+ else if (istag) {
|
||||
+ len = strlen(_patchlevel_revision);
|
||||
+
|
||||
+
|
||||
+
|
||||
--- misc/Python-2.6.1/Include/pyport.h Wed Jun 11 09:41:16 2008
|
||||
+++ misc/build/Python-2.6.1/Include/pyport.h Fri Apr 17 09:02:52 2009
|
||||
@@ -449,11 +449,6 @@
|
||||
22
editors/openoffice.org-3/files/patch-vcl-PR161789
Normal file
22
editors/openoffice.org-3/files/patch-vcl-PR161789
Normal file
@ -0,0 +1,22 @@
|
||||
--- vcl/unx/inc/xfont.hxx~ 2011-01-18 22:35:50.000000000 +0900
|
||||
+++ vcl/unx/inc/xfont.hxx 2011-11-06 07:38:40.000000000 +0900
|
||||
@@ -27,7 +27,7 @@
|
||||
#ifndef EXTENDED_FONTSTRUCT_HXX
|
||||
#define EXTENDED_FONTSTRUCT_HXX
|
||||
|
||||
-#ifndef _XLIB_H_
|
||||
+#ifndef _X11_XLIB_H_
|
||||
#include <tools/prex.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <tools/postx.h>
|
||||
--- vcl/unx/inc/dtint.hxx~ 2011-01-18 22:35:50.000000000 +0900
|
||||
+++ vcl/unx/inc/dtint.hxx 2011-11-06 07:38:23.000000000 +0900
|
||||
@@ -36,7 +36,7 @@
|
||||
class SalDisplay;
|
||||
class AllSettings;
|
||||
|
||||
-#ifndef _XLIB_H_
|
||||
+#ifndef _X11_XLIB_H_
|
||||
// forwards from X
|
||||
struct Display;
|
||||
struct XEvent;
|
||||
Loading…
Reference in New Issue
Block a user