Atri Bhattacharya
c2615d809a
* Update to version 0.9.35. * Re-base patches for update: tuxpaint-makefile.patch, tuxpaint-pango-cflags.patch. OBS-URL: https://build.opensuse.org/request/show/1283949 OBS-URL: https://build.opensuse.org/package/show/Education/tuxpaint?expand=0&rev=49
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
---
|
|
Makefile | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: tuxpaint-0.9.35/Makefile
|
|
===================================================================
|
|
--- tuxpaint-0.9.35.orig/Makefile
|
|
+++ tuxpaint-0.9.35/Makefile
|
|
@@ -1254,7 +1254,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/
|
|
$(ARCH_LIBS)
|
|
@echo
|
|
@echo "...Linking Tux Paint..."
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(LIBXML_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(FRIBIDI_CFLAGS) $(LIBXML_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
-o tuxpaint $^ \
|
|
$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) -lm
|
|
@$(RAD_CMD)
|
|
@@ -1290,7 +1290,7 @@ obj/tuxpaint.o: src/tuxpaint.c \
|
|
$(ARCH_HEADERS)
|
|
@echo
|
|
@echo "...Compiling Tux Paint from source..."
|
|
- $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(LIBXML_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
+ $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(FRIBIDI_CFLAGS) $(LIBXML_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
-c src/tuxpaint.c -o obj/tuxpaint.o
|
|
|
|
# Broke gperf|sed up into two steps so that it will fail properly if gperf is not installed; there's probably a more elegant solution -bjk 2009.11.20
|
|
@@ -1337,14 +1337,14 @@ obj/fonts.o: src/fonts.c src/fonts.h src
|
|
src/get_fname.h src/debug.h
|
|
@echo
|
|
@echo "...Compiling font support..."
|
|
- $(CC) $(CFLAGS) $(LIBXML_CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
+ $(CC) $(CFLAGS) $(LIBXML_CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
-c src/fonts.c -o obj/fonts.o
|
|
|
|
obj/dirwalk.o: src/dirwalk.c src/dirwalk.h src/progressbar.h src/fonts.h \
|
|
src/debug.h
|
|
@echo
|
|
@echo "...Compiling directory-walking support..."
|
|
- @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
+ @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PANGO_CFLAGS) $(DEFS) $(ARCH_DEFS) \
|
|
-c src/dirwalk.c -o obj/dirwalk.o
|
|
|
|
obj/cursor.o: src/cursor.c src/cursor.h src/debug.h
|