| 1 |
drac 08/05/03 07:17:18 |
| 2 |
|
| 3 |
Added: wmcalendar-0.5.2-exit-sin-and-cos.patch |
| 4 |
Log: |
| 5 |
Version bump. Move pkgconfig to DEPEND wrt #217278 for stable version. |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-exit-sin-and-cos.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: wmcalendar-0.5.2-exit-sin-and-cos.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur wmcalendar-0.5.2.orig/Src/calendarfunc.c wmcalendar-0.5.2/Src/calendarfunc.c |
| 17 |
--- wmcalendar-0.5.2.orig/Src/calendarfunc.c 2003-07-13 17:41:02.000000000 +0300 |
| 18 |
+++ wmcalendar-0.5.2/Src/calendarfunc.c 2008-05-03 10:03:06.000000000 +0300 |
| 19 |
@@ -22,7 +22,7 @@ |
| 20 |
|
| 21 |
#include "calendarfunc.h" |
| 22 |
#include <stdio.h> |
| 23 |
- |
| 24 |
+#include <math.h> |
| 25 |
|
| 26 |
|
| 27 |
long persian_jdn(struct icaltimetype dt) |
| 28 |
diff -ur wmcalendar-0.5.2.orig/Src/dockapp.c wmcalendar-0.5.2/Src/dockapp.c |
| 29 |
--- wmcalendar-0.5.2.orig/Src/dockapp.c 2003-07-15 18:15:12.000000000 +0300 |
| 30 |
+++ wmcalendar-0.5.2/Src/dockapp.c 2008-05-03 10:03:34.000000000 +0300 |
| 31 |
@@ -23,6 +23,7 @@ |
| 32 |
* modified by Seiichi SATO <ssato@×××××××××.jp> |
| 33 |
*/ |
| 34 |
|
| 35 |
+#include <stdlib.h> |
| 36 |
#include "dockapp.h" |
| 37 |
|
| 38 |
#define WINDOWED_SIZE_W 64 |
| 39 |
diff -ur wmcalendar-0.5.2.orig/Src/Makefile wmcalendar-0.5.2/Src/Makefile |
| 40 |
--- wmcalendar-0.5.2.orig/Src/Makefile 2003-07-15 18:19:26.000000000 +0300 |
| 41 |
+++ wmcalendar-0.5.2/Src/Makefile 2008-05-03 10:11:48.000000000 +0300 |
| 42 |
@@ -1,19 +1,15 @@ |
| 43 |
-CC = gcc |
| 44 |
+CC ?= gcc |
| 45 |
INCLUDES = `pkg-config --cflags gtk+-2.0` -I. |
| 46 |
-LFLAGS = `pkg-config --libs gtk+-2.0` |
| 47 |
|
| 48 |
# for BSD |
| 49 |
#INCLUDES = `gtk12-config --cflags` -I. |
| 50 |
#LFLAGS = `gtk12-config --libs` |
| 51 |
-X11BASE = /usr/X11R6 |
| 52 |
-CFLAGS = $(INCLUDES) -DICON_TYPE=$(ICON_TYPE) |
| 53 |
-INCDIR = -I$(X11BASE)/include/X11 -I$(X11BASE)/include -I$/usr/include -I$/usr/local/include |
| 54 |
-DESTDIR= /usr/local |
| 55 |
-LIBDIR = -L/usr/lib -L${X11BASE}/lib -L/usr/local/lib |
| 56 |
+CFLAGS += $(INCLUDES) -DICON_TYPE=$(ICON_TYPE) |
| 57 |
+PREFIX = /usr |
| 58 |
PACKAGE = wmCalendar |
| 59 |
|
| 60 |
# for Linux |
| 61 |
-LIBS = $(LIBDIR) -lXpm -lical -lpthread |
| 62 |
+LIBS = -lXpm -lical -lpthread `pkg-config --libs gtk+-2.0` |
| 63 |
# for Solaris (untested!!!) |
| 64 |
# LIBS = -lXpm -lX11 -lXext -lsocket -lnsl -lical |
| 65 |
|
| 66 |
@@ -30,7 +26,7 @@ |
| 67 |
all: wmCalendar.o wmCalendar |
| 68 |
|
| 69 |
wmCalendar: $(OBJECTS) |
| 70 |
- $(CC) $(COPTS) $(SYSTEM) $(LFLAGS) -o $@ $(OBJECTS) -o wmCalendar $(INCDIR)$(LIBDIR) $(LIBS) |
| 71 |
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ |
| 72 |
|
| 73 |
wmCalendar.o: wmCalendar_master.xpm wmCalendar_master2.xpm |
| 74 |
clean: |
| 75 |
@@ -40,6 +36,8 @@ |
| 76 |
rm -f wmCalendar |
| 77 |
|
| 78 |
install:: wmCalendar |
| 79 |
- install -c -s -m 0755 wmCalendar $(DESTDIR)/bin/ |
| 80 |
- install -c -m 0644 wmCalendar.1 $(DESTDIR)/man/man1 |
| 81 |
+ install -d $(DESTDIR)$(PREFIX)/bin |
| 82 |
+ install -m 0755 wmCalendar $(DESTDIR)$(PREFIX)/bin |
| 83 |
+ install -d $(DESTDIR)$(PREFIX)/share/man/man1 |
| 84 |
+ install -m 0644 wmCalendar.1 $(DESTDIR)$(PREFIX)/share/man/man1 |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
-- |
| 90 |
gentoo-commits@l.g.o mailing list |
Archives