summaryrefslogtreecommitdiff
blob: c6df11f59aecb0d88985db52e1cd8178608f7154 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
--- tuxpaint-0.9.16/Makefile	2006-10-19 02:41:49.000000000 -0500
+++ tuxpaint-0.9.16-patched/Makefile	2006-10-31 21:25:07.000000000 -0500
@@ -18,7 +18,7 @@
 
 # Where to install things:
 
-PREFIX=/usr/local
+PREFIX=/usr
 
 
 # Root directory to place files when creating packages.
@@ -62,13 +62,14 @@
 
 ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps
 X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps
-GNOME_PREFIX=`gnome-config --prefix 2> /dev/null`
-KDE_PREFIX=`kde-config --install apps --expandvars 2> /dev/null`
-KDE_ICON_PREFIX=`kde-config --install icon --expandvars 2> /dev/null`
+GNOME_PREFIX=
+KDE_PREFIX=
+KDE_ICON_PREFIX=
 
 
 # Locale files
 
+ENABLE_GETTEXT=0
 LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
 # LOCALE_PREFIX=/usr/share/locale
 
@@ -97,7 +98,7 @@
 # The entire set of CFLAGS:
 
 #-ffast-math
-CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \
+CFLAGS += -W -Wall -fno-common -ffloat-store \
 	-Wcast-align -Wredundant-decls \
 	-Wbad-function-cast -Wwrite-strings \
 	-Waggregate-return \
@@ -118,7 +119,10 @@
 
 # "make" with no arguments builds the program and man page from sources:
 
-all:	tuxpaint translations
+all:	tuxpaint
+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
+		make translations; \
+	fi
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo
@@ -220,10 +224,13 @@
 # to do this as superuser ("root"))
 
 install:	install-bin install-data install-man install-doc \
-		install-icon install-gettext install-importscript \
+		install-icon install-importscript \
 		install-default-config install-example-stamps \
 		install-example-starters \
 		install-gnome install-kde install-kde-icons
+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
+		make install-gettext; \
+	fi
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo
@@ -504,9 +511,9 @@
 	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \
 	 cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
 	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
-	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
-	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/applications; \
+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/; \
+	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
 	fi
 
 
@@ -590,9 +597,6 @@
 	@install -d $(ICON_PREFIX)
 	@cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
 	@chmod 644 $(ICON_PREFIX)/tuxpaint.png
-	@install -d $(X11_ICON_PREFIX)
-	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
-	@chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
 
 
 # Install the program:
@@ -1034,7 +1038,7 @@
 		$^ \
 		$(HQXX_O) \
 		$(SDL_LIBS) \
-		-lm $(ARCH_LINKS)
+		-lm -lpng12 $(ARCH_LINKS)
 	@$(RSRC_CMD)
 	@$(MIMESET_CMD)
 
diff -NurdB tuxpaint-0.9.16/src/tuxpaint.desktop tuxpaint-0.9.16-patched/src/tuxpaint.desktop
--- tuxpaint-0.9.16/src/tuxpaint.desktop	2006-09-10 13:18:49.000000000 -0500
+++ tuxpaint-0.9.16-patched/src/tuxpaint.desktop	2006-10-31 21:44:45.000000000 -0500
@@ -158,3 +158,5 @@
 Comment[wa]=Programe di dessinaedje po ls efants
 Comment[zh_cn]=孩子的绘图程序。
 Comment[zh_tw]=適合兒童的畫圖程式
+Categories=Application;Graphics;
+