diff options
| author | hira <hira> | 2007-03-17 02:24:36 +0000 |
|---|---|---|
| committer | hira <hira> | 2007-03-17 02:24:36 +0000 |
| commit | 7b6608deb15f4e354f3ff1846aed21a64617c320 (patch) | |
| tree | 5363ccb039f8fccde8bb3bc8ae73ca8e6b74b2e3 /misc | |
| parent | 08c1bec73c4dd598a763deab4a94c0c1509e4b59 (diff) | |
| download | pkgsrc-7b6608deb15f4e354f3ff1846aed21a64617c320.tar.gz | |
Fix build with cairo. Found by bulk build.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice2/distinfo | 3 | ||||
| -rw-r--r-- | misc/openoffice2/patches/patch-bw | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo index 64711eab6e8..acc980bb155 100644 --- a/misc/openoffice2/distinfo +++ b/misc/openoffice2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2007/03/12 10:21:18 hira Exp $ +$NetBSD: distinfo,v 1.7 2007/03/17 02:24:36 hira Exp $ SHA1 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 9513216ae71267addf3625f5a41c3a43564da3bc RMD160 (openoffice-2.1.0/OOo_2.1.0_src.tar.bz2) = 11256b125fdc412480d90983b0f80f35d4833e9a @@ -54,3 +54,4 @@ SHA1 (patch-bs) = c6e47b0154a3569b3cb466c7af55e2d2e7a80a12 SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661 SHA1 (patch-bu) = 246771afac29432adbe479e5be3b3c032ad49413 SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33 +SHA1 (patch-bw) = aa286260f21820a8c39812fe82ef62e56921a950 diff --git a/misc/openoffice2/patches/patch-bw b/misc/openoffice2/patches/patch-bw new file mode 100644 index 00000000000..0abbefddf40 --- /dev/null +++ b/misc/openoffice2/patches/patch-bw @@ -0,0 +1,16 @@ +$NetBSD: patch-bw,v 1.1 2007/03/17 02:24:36 hira Exp $ + +--- canvas/source/cairo/makefile.mk.orig 2007-03-17 10:59:33.000000000 +0900 ++++ canvas/source/cairo/makefile.mk 2007-03-17 10:59:55.000000000 +0900 +@@ -110,9 +110,9 @@ + SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB) + + .IF "$(SYSTEM_CAIRO)" == "YES" +-SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 -lXrender ++SHL1STDLIBS+= $(CAIRO_LIBS) $(X11_LDFLAGS) -lX11 -lXrender + .ELSE +-SHL1STDLIBS+= -lcairo -lX11 -lXrender ++SHL1STDLIBS+= -lcairo $(X11_LDFLAGS) -lX11 -lXrender + .ENDIF + + SHL1IMPLIB=i$(TARGET) |