author | sandman <sandman> | 2002-04-13 01:47:01 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-04-13 01:47:01 (UTC) |
commit | 05cbfb5963a1aa1ccd2b2cdf5d662e00c97c37b1 (patch) (unidiff) | |
tree | 8a90fb613395c9073cfd5361f26caa24897ea2e0 | |
parent | 98a1e3f36567639344f12932b629e526a8783aa8 (diff) | |
download | opie-05cbfb5963a1aa1ccd2b2cdf5d662e00c97c37b1.zip opie-05cbfb5963a1aa1ccd2b2cdf5d662e00c97c37b1.tar.gz opie-05cbfb5963a1aa1ccd2b2cdf5d662e00c97c37b1.tar.bz2 |
Enabled qpdf in main Makfile
Fixed import of wrong version gooStub.cpp
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/gooStub.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,72 +1,72 @@ | |||
1 | default: dynamic | 1 | default: dynamic |
2 | 2 | ||
3 | all: default docs | 3 | all: default docs |
4 | 4 | ||
5 | LIBS=library libopie | 5 | LIBS=library libopie |
6 | 6 | ||
7 | COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \ | 7 | COMPONENTS=$(LOCALCOMPONENTS) inputmethods/keyboard \ |
8 | inputmethods/pickboard \ | 8 | inputmethods/pickboard \ |
9 | inputmethods/handwriting \ | 9 | inputmethods/handwriting \ |
10 | inputmethods/unikeyboard \ | 10 | inputmethods/unikeyboard \ |
11 | inputmethods/jumpx \ | 11 | inputmethods/jumpx \ |
12 | inputmethods/dvorak \ | 12 | inputmethods/dvorak \ |
13 | launcher/batteryapplet \ | 13 | launcher/batteryapplet \ |
14 | launcher/irdaapplet \ | 14 | launcher/irdaapplet \ |
15 | launcher/volumeapplet \ | 15 | launcher/volumeapplet \ |
16 | launcher/clockapplet \ | 16 | launcher/clockapplet \ |
17 | launcher/netmonapplet \ | 17 | launcher/netmonapplet \ |
18 | launcher/screenshotapplet \ | 18 | launcher/screenshotapplet \ |
19 | launcher/vmemo \ | 19 | launcher/vmemo \ |
20 | netsetup/dialup \ | 20 | netsetup/dialup \ |
21 | netsetup/lan \ | 21 | netsetup/lan \ |
22 | opiemail/ifaces/pop3 opiemail/ifaces/smtp \ | 22 | opiemail/ifaces/pop3 opiemail/ifaces/smtp \ |
23 | mpegplayer/libmpeg3 \ | 23 | mpegplayer/libmpeg3 \ |
24 | mpegplayer/libmad \ | 24 | mpegplayer/libmad \ |
25 | mpegplayer/wavplugin \ | 25 | mpegplayer/wavplugin \ |
26 | cardmon \ | 26 | cardmon \ |
27 | sdmon | 27 | sdmon |
28 | 28 | ||
29 | APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \ | 29 | APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \ |
30 | filebrowser helpbrowser minesweep mpegplayer \ | 30 | filebrowser helpbrowser minesweep mpegplayer \ |
31 | settings/light-and-power \ | 31 | settings/light-and-power \ |
32 | settings/language \ | 32 | settings/language \ |
33 | settings/rotation \ | 33 | settings/rotation \ |
34 | settings/appearance \ | 34 | settings/appearance \ |
35 | settings/security \ | 35 | settings/security \ |
36 | settings/sound \ | 36 | settings/sound \ |
37 | settings/systemtime \ | 37 | settings/systemtime \ |
38 | solitaire spreadsheet tetrix textedit \ | 38 | solitaire spreadsheet tetrix textedit \ |
39 | todo wordgame embeddedkonsole launcher sysinfo \ | 39 | todo wordgame embeddedkonsole launcher sysinfo \ |
40 | parashoot snake citytime showimg netsetup tableviewer \ | 40 | parashoot snake citytime showimg netsetup tableviewer \ |
41 | qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ | 41 | qipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ |
42 | noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey | 42 | noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf |
43 | 43 | ||
44 | DOCS = docs/src/opie-policy | 44 | DOCS = docs/src/opie-policy |
45 | single: mpegplayer/libmpeg3 | 45 | single: mpegplayer/libmpeg3 |
46 | 46 | ||
47 | dynamic: $(APPS) | 47 | dynamic: $(APPS) |
48 | 48 | ||
49 | docs: $(DOCS) | 49 | docs: $(DOCS) |
50 | 50 | ||
51 | $(COMPONENTS): $(LIBS) | 51 | $(COMPONENTS): $(LIBS) |
52 | 52 | ||
53 | $(APPS): $(LIBS) $(COMPONENTS) | 53 | $(APPS): $(LIBS) $(COMPONENTS) |
54 | 54 | ||
55 | $(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single: | 55 | $(LIBS) $(COMPONENTS) $(APPS) $(DOCS) single: |
56 | $(MAKE) -C $@ -f Makefile | 56 | $(MAKE) -C $@ -f Makefile |
57 | 57 | ||
58 | showcomponents: | 58 | showcomponents: |
59 | @echo $(LIBS) $(APPS) $(COMPONENTS) single | 59 | @echo $(LIBS) $(APPS) $(COMPONENTS) single |
60 | 60 | ||
61 | clean: | 61 | clean: |
62 | $(MAKE) -C single -f Makefile $@ | 62 | $(MAKE) -C single -f Makefile $@ |
63 | for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done | 63 | for dir in $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done |
64 | 64 | ||
65 | lupdate: | 65 | lupdate: |
66 | for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done | 66 | for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done |
67 | 67 | ||
68 | lrelease: | 68 | lrelease: |
69 | for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done | 69 | for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done |
70 | 70 | ||
71 | 71 | ||
72 | .PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean | 72 | .PHONY: default dynamic $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean |
diff --git a/noncore/unsupported/qpdf/gooStub.cpp b/noncore/unsupported/qpdf/gooStub.cpp index cc29685..edbea55 100644 --- a/noncore/unsupported/qpdf/gooStub.cpp +++ b/noncore/unsupported/qpdf/gooStub.cpp | |||
@@ -1,60 +1,60 @@ | |||
1 | 1 | ||
2 | extern "C" { | 2 | extern "C" { |
3 | 3 | ||
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | #include <string.h> | 5 | #include <string.h> |
6 | #include <unistd.h> | 6 | #include <unistd.h> |
7 | #include <stdio.h> | 7 | #include <stdio.h> |
8 | #include <dirent.h> | 8 | #include <dirent.h> |
9 | #include <fcntl.h> | 9 | #include <fcntl.h> |
10 | 10 | ||
11 | #include <gmem.h> | 11 | #include <gmem.h> |
12 | } | 12 | } |
13 | 13 | ||
14 | #include <gfile.h> | 14 | #include <gfile.h> |
15 | #include <GString.h> | 15 | #include <GString.h> |
16 | 16 | ||
17 | #include <qdir.h> | 17 | #include <qdir.h> |
18 | 18 | ||
19 | 19 | ||
20 | // replacement stubs to simplify (and speed up) operations | 20 | // replacement stubs to simplify (and speed up) operations |
21 | 21 | ||
22 | void *gmalloc ( int size ) { return malloc ( size ); } | 22 | void *gmalloc ( int size ) { return malloc ( size ); } |
23 | void *grealloc ( void *p, int size ) { return realloc ( p, size ); } | 23 | void *grealloc ( void *p, int size ) { return realloc ( p, size ); } |
24 | void gfree ( void *p ) { free ( p ); } | 24 | void gfree ( void *p ) { free ( p ); } |
25 | char *copyString ( char *str ) { return strdup ( str ); } | 25 | char *copyString ( char *str ) { return strdup ( str ); } |
26 | char *getLine(char *buf, int size, FILE *f) { return fgets ( buf, size, f ); } | 26 | char *getLine(char *buf, int size, FILE *f) { return fgets ( buf, size, f ); } |
27 | GString *getHomeDir ( ) { return new GString ( QDir::home ( ). absPath ( ). local8Bit ( )); } | 27 | GString *getHomeDir ( ) { return new GString ( QDir::home ( ). absPath ( ). local8Bit ( )); } |
28 | GString *appendToPath ( GString *path, char *fileName ) { return new GString ( QDir ( path-> getCString ( )). absFilePath ( fileName ). local8Bit ( )); } | 28 | GString *appendToPath ( GString *path, char *fileName ) { return new GString ( QDir ( path-> getCString ( )). absFilePath ( fileName ). local8Bit ( )); } |
29 | 29 | ||
30 | // mostly taken from XPDF, but simplified... | 30 | // mostly taken from XPDF, but simplified... |
31 | 31 | ||
32 | GBool openTempFile ( GString **name, FILE **f, char *mode, char *ext ) | 32 | GBool openTempFile ( GString **name, FILE **f, char *mode, char *ext ) |
33 | { | 33 | { |
34 | char *s, *p; | 34 | char *s, *p; |
35 | int fd; | 35 | int fd; |
36 | 36 | ||
37 | if ( !ext ) | 37 | if ( !ext ) |
38 | ext = ".tmp"; | 38 | ext = ".tmp"; |
39 | 39 | ||
40 | if (!( s = tmpnam ( 0 ))) | 40 | if (!( s = tmpnam ( 0 ))) |
41 | return gFalse; | 41 | return gFalse; |
42 | 42 | ||
43 | *name = new GString ( "qpdf_" ); | 43 | *name = new GString ( s ); |
44 | (*name)-> append ( s ); | ||
45 | 44 | ||
46 | s = (*name)-> getCString ( ); | 45 | s = (*name)-> getCString ( ); |
47 | if (( p = strrchr ( s, '.' ))) | 46 | if (( p = strrchr ( s, '.' ))) |
48 | (*name)-> del ( p - s, (*name)-> getLength ( ) - ( p - s )); | 47 | (*name)-> del ( p - s, (*name)-> getLength ( ) - ( p - s )); |
49 | 48 | ||
49 | (*name)-> append ( "_qpdf" ); | ||
50 | (*name)-> append ( ext ); | 50 | (*name)-> append ( ext ); |
51 | 51 | ||
52 | fd = open ((*name)-> getCString ( ), O_WRONLY | O_CREAT | O_EXCL, 0600 ); | 52 | fd = open ((*name)-> getCString ( ), O_WRONLY | O_CREAT | O_EXCL, 0600 ); |
53 | 53 | ||
54 | if ( fd < 0 || !( *f = fdopen ( fd, mode ))) { | 54 | if ( fd < 0 || !( *f = fdopen ( fd, mode ))) { |
55 | delete *name; | 55 | delete *name; |
56 | return gFalse; | 56 | return gFalse; |
57 | } | 57 | } |
58 | 58 | ||
59 | return gTrue; | 59 | return gTrue; |
60 | } | 60 | } |