diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-01-10 09:03:03 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-01-10 09:03:03 +0000 |
| commit | ab154a507cd0cabf84f4822026075f22b35906a4 (patch) | |
| tree | 43d989b64d678e550817b3264a988e7a737e2553 /packages/roadmap/files/options.mk.patch | |
| parent | 9e94f8715c6181213dd7589632598e2a1592e759 (diff) | |
roadmap: fix roadmap-gtk2, drop 1.0.12.
* fix roadmap-gtk2 build and packaging (use Makefile supplied by upstream)
* fix building gtk2 with agg support Courtesy of Joshua
* drop 1.0.12: old (2002 map), not upwards compatible, buggy, messy to patch,
* not working originally and nobody uses it anyway.
* TODO: fix packaging of zroadmap (same as above), further unification of recipies
Diffstat (limited to 'packages/roadmap/files/options.mk.patch')
| -rw-r--r-- | packages/roadmap/files/options.mk.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/roadmap/files/options.mk.patch b/packages/roadmap/files/options.mk.patch new file mode 100644 index 0000000000..196f16e31d --- /dev/null +++ b/packages/roadmap/files/options.mk.patch @@ -0,0 +1,34 @@ +--- roadmap-1.1.0/src/options.mk.old 2008-01-09 22:08:00.000000000 -0600 ++++ roadmap-1.1.0/src/options.mk 2008-01-09 23:06:29.000000000 -0600 +@@ -177,10 +177,7 @@ ifeq ($(strip $(AGG)),NO) + else + LIBS += -laggfontfreetype -lagg -lfreetype + CFLAGS += -DAGG_PIXFMT=pixfmt_$(AGG) \ +- -I$(TOP)/agg_support \ +- -I/usr/include/agg2 \ +- -I/usr/local/include/agg2 \ +- -I/usr/include/freetype2 ++ -I$(TOP)/agg_support + CANVAS_OBJS = roadmap_canvas_agg.o \ + $(TOP)/agg_support/roadmap_canvas.o + endif +@@ -188,7 +185,7 @@ endif + # bidirectional text lib + ifneq ($(strip $(BIDI)),NO) + LIBS += -lfribidi +- CFLAGS += -DUSE_FRIBIDI -I/usr/include/fribidi ++ CFLAGS += -DUSE_FRIBIDI + endif + + # RoadMap internal profiling +@@ -205,8 +202,8 @@ else + endif + + +-CFLAGS += -I$(TOP) -I/usr/local/include -DNDEBUG ++CFLAGS += -I$(TOP) -DNDEBUG + +-LIBS := -L/usr/local/lib $(LIBS) -lm ++LIBS := $(LIBS) -lm + + CXXFLAGS = $(CFLAGS) |