Sun Sep 25 20:11:11 2011 UTC ()
Fix build & linkage


(joerg)
diff -r1.4 -r1.5 pkgsrc/textproc/OdfConverter/distinfo
diff -r1.4 -r1.5 pkgsrc/textproc/OdfConverter/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/textproc/OdfConverter/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/OdfConverter/Attic/distinfo 2010/05/28 16:18:23 1.4
+++ pkgsrc/textproc/OdfConverter/Attic/distinfo 2011/09/25 20:11:11 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2010/05/28 16:18:23 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2011/09/25 20:11:11 joerg Exp $
2 2
3SHA1 (OdfAddinForOffice-src-3.0.zip) = 678d98672ecca9adabe1221b1725c255f4f88fe5 3SHA1 (OdfAddinForOffice-src-3.0.zip) = 678d98672ecca9adabe1221b1725c255f4f88fe5
4RMD160 (OdfAddinForOffice-src-3.0.zip) = ff6ddab2784ef1d54261cde15abfb7e98e30b80a 4RMD160 (OdfAddinForOffice-src-3.0.zip) = ff6ddab2784ef1d54261cde15abfb7e98e30b80a
5Size (OdfAddinForOffice-src-3.0.zip) = 34547426 bytes 5Size (OdfAddinForOffice-src-3.0.zip) = 34547426 bytes
6SHA1 (patch-aa) = 33ed2b5d999d71b9ad1edee87328eebb5f408d57 6SHA1 (patch-aa) = 633d675ee3a2d12e99874da0c936e9c5a9b6f964
7SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626 7SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626
8SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202 8SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202
cvs diff -r1.4 -r1.5 pkgsrc/textproc/OdfConverter/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/OdfConverter/patches/Attic/patch-aa 2010/05/28 16:18:23 1.4
+++ pkgsrc/textproc/OdfConverter/patches/Attic/patch-aa 2011/09/25 20:11:11 1.5
@@ -1,25 +1,35 @@ @@ -1,25 +1,35 @@
1$NetBSD: patch-aa,v 1.4 2010/05/28 16:18:23 joerg Exp $ 1$NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $
2 2
3--- source/Shell/OdfConverter/Makefile.orig 2007-12-19 15:16:04.000000000 +0100 3--- source/Shell/OdfConverter/Makefile.orig 2007-12-19 15:16:04.000000000 +0100
4+++ source/Shell/OdfConverter/Makefile 4+++ source/Shell/OdfConverter/Makefile
 5@@ -54,7 +54,7 @@ OdfConverterTestStatic.exe : $(SOURCE) .
 6 $(SOURCE)
 7
 8 main.c bundle.o : OdfConverterTestStatic.exe Makefile
 9- 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
 10+ 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
 11
 12 OdfConverter$(EXEEXT) : main.c bundle.o $(ZLIBDEP) Makefile
 13 rm -f $@
5@@ -64,16 +64,16 @@ ifeq ($(OS),Darwin) 14@@ -64,16 +64,16 @@ ifeq ($(OS),Darwin)
6 $(CC) -o OdfConverter -Wall `pkg-config --cflags mono` main.c \ 15 $(CC) -o OdfConverter -Wall `pkg-config --cflags mono` main.c \
7 `pkg-config --libs-only-L mono` -bind_at_load -all_load -lz \ 16 `pkg-config --libs-only-L mono` -bind_at_load -all_load -lz \
8 ../../AdditionalTools/zlib123/contrib/minizip/libzlibwapi.a \ 17 ../../AdditionalTools/zlib123/contrib/minizip/libzlibwapi.a \
9- `pkg-config --libs-only-l mono` bundle.o 18- `pkg-config --libs-only-l mono` bundle.o
10+ `pkg-config --libs-only-l mono gtk+-2.0 gthread-2.0` bundle.o 19+ `pkg-config --libs-only-l mono-2 gtk+-2.0 gthread-2.0` bundle.o
11 else 20 else
12- $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \ 21- $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \
13+ $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono gtk+-2.0 gthread-2.0` main.c \ 22+ $(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono-2 gtk+-2.0 gthread-2.0` main.c \
14 $(KILLAT) \ 23 $(KILLAT) \
15 bundle.o \ 24 bundle.o \
16 $(EXPORTDYNAMIC) \ 25 $(EXPORTDYNAMIC) \
17 -Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \ 26 -Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \
18- `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \ 27- `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \
19+ -L../../AdditionalTools/zlib123/contrib/minizip \ 28+ -L../../AdditionalTools/zlib123/contrib/minizip \
20 -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic \ 29- -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic \
 30+ -Wl,-Bstatic -lmono-2.0 -lzlibwapi -Wl,-Bdynamic \
21- `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \ 31- `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \
22+ `pkg-config --libs mono gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono //"` \ 32+ `pkg-config --libs mono-2 gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono-2.0 //"` \
23 $(ZLIB) $(OTHERLIBS) 33 $(ZLIB) $(OTHERLIBS)
24 endif 34 endif
25 ifeq ($(OS),Cygwin) 35 ifeq ($(OS),Cygwin)