aboutsummaryrefslogtreecommitdiffstats
path: root/x11-clocks/kdetoys11/files/patch-bb
blob: cd2f97541dfd2d8822d6a3dea9d8e50aa4b7ed58 (plain) (blame)
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
--- kworldwatch/pics/Makefile.in.orig	Tue Aug 24 23:08:20 1999
+++ kworldwatch/pics/Makefile.in	Mon Aug 30 23:40:51 1999
@@ -156,7 +156,7 @@
 x_includes = @x_includes@
 x_libraries = @x_libraries@
 
-data_DATA = flag-blue.xpm flag-green.xpm flag-yellow.xpm flag-red.xpm             world.gif world2.gif world_dark.gif
+data_DATA = flag-blue.xpm flag-green.xpm flag-yellow.xpm flag-red.xpm             world.xpm world2.xpm world_dark.xpm
 
 
 datadir = $(kde_datadir)/kworldwatch/pics
@@ -174,6 +174,7 @@
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
+.SUFFIXES: .gif .xpm
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kworldwatch/pics/Makefile
 
@@ -281,6 +282,8 @@
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+.gif.xpm:
+	$(LOCALBASE)/bin/convert $< $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- kworldwatch/world.cpp.orig	Fri Aug 27 02:50:27 1999
+++ kworldwatch/world.cpp	Fri Aug 27 02:50:41 1999
@@ -37,10 +37,10 @@
   QFontMetrics metric(font);
   KIconLoader  iconLoader;
 
-  cleanMap = iconLoader.loadIcon("world.gif");
+  cleanMap = iconLoader.loadIcon("world.xpm");
   if (cleanMap.isNull())
     abort();
-  darkMap = iconLoader.loadIcon("world_dark.gif");
+  darkMap = iconLoader.loadIcon("world_dark.xpm");
   if (darkMap.isNull())
     abort();
   map = cleanMap;
@@ -259,7 +259,7 @@
     button(klocale->translate("Close"), this)
 {
   KIconLoader iconLoader;
-  QPixmap back(iconLoader.loadIcon("world2.gif"));
+  QPixmap back(iconLoader.loadIcon("world2.xpm"));
 
   setCaption(klocale->translate("About KDE World Watch"));
   setFixedSize(back.width(), back.height());