| 1 |
s4t4n 08/02/01 14:00:24 |
| 2 |
|
| 3 |
Added: wmSpaceWeather-1.04_p19-gentoo.patch |
| 4 |
wmSpaceWeather-1.04_p19-getkp.patch |
| 5 |
Log: |
| 6 |
Revision bump, with lots of fixes (see CL). Closes bug #207888. |
| 7 |
(Portage version: 2.1.3.19) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wmSpaceWeather-1.04_p19-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
--- wmSpaceWeather/Makefile.orig 2008-01-28 02:45:07.000000000 +0100 |
| 18 |
+++ wmSpaceWeather/Makefile 2008-01-28 02:46:04.000000000 +0100 |
| 19 |
@@ -1,8 +1,8 @@ |
| 20 |
-CC = gcc |
| 21 |
-CFLAGS = -O2 -Wall |
| 22 |
-INCDIR = -I/usr/X11R6/include/X11 |
| 23 |
-DESTDIR= /usr/X11R6 |
| 24 |
-LIBDIR = -L/usr/X11R6/lib |
| 25 |
+CC ?= gcc |
| 26 |
+CFLAGS += -Wall |
| 27 |
+INCDIR = -I/usr/include/X11 |
| 28 |
+PREFIX = /usr |
| 29 |
+LIBDIR ?= /usr/lib |
| 30 |
# for linux |
| 31 |
LIBS = -lXpm -lX11 -lXext |
| 32 |
# for Solaris |
| 33 |
@@ -12,14 +12,14 @@ |
| 34 |
|
| 35 |
|
| 36 |
.c.o: |
| 37 |
- $(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) |
| 38 |
+ $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) |
| 39 |
|
| 40 |
|
| 41 |
all: wmSpaceWeather.o wmSpaceWeather |
| 42 |
|
| 43 |
wmSpaceWeather.o: wmSpaceWeather_master.xpm wmSpaceWeather_mask.xbm |
| 44 |
wmSpaceWeather: $(OBJS) |
| 45 |
- $(CC) $(COPTS) $(SYSTEM) -o wmSpaceWeather $^ $(INCDIR) $(LIBDIR) $(LIBS) |
| 46 |
+ $(CC) $(CFLAGS) -o wmSpaceWeather $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS) |
| 47 |
|
| 48 |
clean: |
| 49 |
for i in $(OBJS) ; do \ |
| 50 |
@@ -28,10 +28,10 @@ |
| 51 |
rm -f wmSpaceWeather |
| 52 |
|
| 53 |
install:: wmSpaceWeather |
| 54 |
- install -d $(DESTDIR)/usr/bin |
| 55 |
- install -d $(DESTDIR)/usr/share/wmspaceweather |
| 56 |
- install -d $(DESTDIR)/usr/share/man/man1 |
| 57 |
- install -m 0755 wmSpaceWeather $(DESTDIR)/usr/bin |
| 58 |
- install -m 0755 GetKp $(DESTDIR)/usr/share/wmspaceweather |
| 59 |
- install -m 0644 wmSpaceWeather.1 $(DESTDIR)/usr/share/man/man1 |
| 60 |
+ install -d $(DESTDIR)$(PREFIX)/bin |
| 61 |
+ install -d $(DESTDIR)$(PREFIX)/share/wmspaceweather |
| 62 |
+ install -d $(DESTDIR)$(PREFIX)/share/man/man1 |
| 63 |
+ install -m 0755 wmSpaceWeather $(DESTDIR)$(PREFIX)/bin |
| 64 |
+ install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather |
| 65 |
+ install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1 |
| 66 |
|
| 67 |
--- wmSpaceWeather/wmSpaceWeather.c.orig 2008-01-28 03:16:36.000000000 +0100 |
| 68 |
+++ wmSpaceWeather/wmSpaceWeather.c 2008-01-28 03:22:12.000000000 +0100 |
| 69 |
@@ -663,7 +663,7 @@ |
| 70 |
if (GotDoubleClick1) { |
| 71 |
GotFirstClick1 = 0; |
| 72 |
GotDoubleClick1 = 0; |
| 73 |
- sprintf(Command, "sensible-browser '%s' &", URL); |
| 74 |
+ sprintf(Command, "firefox -remote 'openURL(%s)'", URL); |
| 75 |
system(Command); |
| 76 |
} |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.1 x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch?rev=1.1&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch?rev=1.1&content-type=text/plain |
| 85 |
|
| 86 |
Index: wmSpaceWeather-1.04_p19-getkp.patch |
| 87 |
=================================================================== |
| 88 |
--- wmSpaceWeather/GetKp.orig 2008-01-28 14:20:43.000000000 +0100 |
| 89 |
+++ wmSpaceWeather/GetKp 2008-01-28 14:22:48.000000000 +0100 |
| 90 |
@@ -17,10 +17,10 @@ |
| 91 |
unlink(CUR_INDEX); |
| 92 |
|
| 93 |
|
| 94 |
-# $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt"; |
| 95 |
+# $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt"; |
| 96 |
# system "$grabcmd"; |
| 97 |
# |
| 98 |
- $grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.sec.noaa.gov/ftpdir/indices/DGD.txt"; |
| 99 |
+ $grabcmd = "/usr/bin/curl -f -s -o " . DGD_FILE . " http://www.swpc.noaa.gov/ftpdir/indices/DGD.txt"; |
| 100 |
exit 1 if (system "$grabcmd"); |
| 101 |
|
| 102 |
|
| 103 |
@@ -69,9 +69,9 @@ |
| 104 |
# |
| 105 |
# Add in very latest stuff |
| 106 |
# |
| 107 |
-# $grabcmd = "cd /tmp; /usr/bin/wget -q ftp://www.sec.noaa.gov/pub/latest/curind.txt"; |
| 108 |
+# $grabcmd = "cd /tmp; /usr/bin/wget -q http://www.swpc.noaa.gov/ftpdir/latest/curind.txt"; |
| 109 |
# system "$grabcmd"; |
| 110 |
- $grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.sec.noaa.gov/ftpdir/latest/curind.txt"; |
| 111 |
+ $grabcmd = "/usr/bin/curl -f -s -o " . CUR_INDEX . " http://www.swpc.noaa.gov/ftpdir/latest/curind.txt"; |
| 112 |
exit 1 if (system "$grabcmd"); |
| 113 |
%lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12); |
| 114 |
|
| 115 |
|
| 116 |
|
| 117 |
|
| 118 |
-- |
| 119 |
gentoo-commits@l.g.o mailing list |
Archives