kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build & linkage

Browse source
This commit is contained in:
joerg 2011-09-25 20:11:11 +00:00
parent 3f7a9b69aa
commit 5dcabf8c4e
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
textproc/OdfConverter/distinfo
View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.4 2010/05/28 16:18:23 joerg Exp $
$NetBSD: distinfo,v 1.5 2011/09/25 20:11:11 joerg Exp $
SHA1 (OdfAddinForOffice-src-3.0.zip) = 678d98672ecca9adabe1221b1725c255f4f88fe5
RMD160 (OdfAddinForOffice-src-3.0.zip) = ff6ddab2784ef1d54261cde15abfb7e98e30b80a
Size (OdfAddinForOffice-src-3.0.zip) = 34547426 bytes
SHA1 (patch-aa) = 33ed2b5d999d71b9ad1edee87328eebb5f408d57
SHA1 (patch-aa) = 633d675ee3a2d12e99874da0c936e9c5a9b6f964
SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626
SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202

20
textproc/OdfConverter/patches/patch-aa
View file

@ -1,25 +1,35 @@
$NetBSD: patch-aa,v 1.4 2010/05/28 16:18:23 joerg Exp $
$NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $
--- source/Shell/OdfConverter/Makefile.orig 2007-12-19 15:16:04.000000000 +0100
+++ source/Shell/OdfConverter/Makefile
@@ -54,7 +54,7 @@ OdfConverterTestStatic.exe : $(SOURCE) .
$(SOURCE)
main.c bundle.o : OdfConverterTestStatic.exe Makefile
- MONO_PATH='../../Common/OdfZipUtils$(PATHSEP)../../Common/OdfConverterLib$(PATHSEP)../../Word/Converter$(PATHSEP)../../Presentation/Converter$(PATHSEP)../../Spreadsheet/Converter' mkbundle2 -c -o main.c -oo bundle.o --deps $(MACHINE_CONFIG_FILE) OdfConverterTestStatic.exe
+ MONO_PATH='../../Common/OdfZipUtils$(PATHSEP)../../Common/OdfConverterLib$(PATHSEP)../../Word/Converter$(PATHSEP)../../Presentation/Converter$(PATHSEP)../../Spreadsheet/Converter' mkbundle -c -o main.c -oo bundle.o --deps $(MACHINE_CONFIG_FILE) OdfConverterTestStatic.exe
OdfConverter$(EXEEXT) : main.c bundle.o $(ZLIBDEP) Makefile
rm -f $@
@@ -64,16 +64,16 @@ ifeq ($(OS),Darwin)
$(CC) -o OdfConverter -Wall `pkg-config --cflags mono` main.c \
`pkg-config --libs-only-L mono` -bind_at_load -all_load -lz \
../../AdditionalTools/zlib123/contrib/minizip/libzlibwapi.a \
- `pkg-config --libs-only-l mono` bundle.o
+ `pkg-config --libs-only-l mono gtk+-2.0 gthread-2.0` bundle.o
+ `pkg-config --libs-only-l mono-2 gtk+-2.0 gthread-2.0` bundle.o
else
- $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \
+ $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono gtk+-2.0 gthread-2.0` main.c \
+ $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono-2 gtk+-2.0 gthread-2.0` main.c \
$(KILLAT) \
bundle.o \
$(EXPORTDYNAMIC) \
-Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \
- `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \
+ -L../../AdditionalTools/zlib123/contrib/minizip \
-Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic \
- -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic \
+ -Wl,-Bstatic -lmono-2.0 -lzlibwapi -Wl,-Bdynamic \
- `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \
+ `pkg-config --libs mono gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono //"` \
+ `pkg-config --libs mono-2 gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono-2.0 //"` \
$(ZLIB) $(OTHERLIBS)
endif
ifeq ($(OS),Cygwin)