| 1 |
lack 07/09/07 16:29:42 |
| 2 |
|
| 3 |
Added: gkrellm-2.3.0-gnutls.patch |
| 4 |
gkrellm-2.3.0-Makefile.patch |
| 5 |
gkrellm-2.3.0-build.patch digest-gkrellm-2.3.0 |
| 6 |
Log: |
| 7 |
Version bump - 2.3.0 is released (bug 187398) |
| 8 |
(Portage version: 2.1.3.7) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gkrellm-2.3.0-gnutls.patch |
| 17 |
=================================================================== |
| 18 |
--- src/configure |
| 19 |
+++ src/configure |
| 20 |
@@ -37,6 +37,7 @@ |
| 21 |
#include <gnutls/openssl.h> |
| 22 |
#include <errno.h> |
| 23 |
#include <pthread.h> |
| 24 |
+#include <gcrypt.h> |
| 25 |
|
| 26 |
GCRY_THREAD_OPTION_PTHREAD_IMPL; |
| 27 |
|
| 28 |
--- src/mail.c |
| 29 |
+++ src/mail.c |
| 30 |
@@ -40,6 +40,7 @@ |
| 31 |
#if defined(HAVE_GNUTLS) |
| 32 |
#include <gnutls/openssl.h> |
| 33 |
#include <pthread.h> |
| 34 |
+#include <gcrypt.h> |
| 35 |
#define MD5Init MD5_Init |
| 36 |
#define MD5Update MD5_Update |
| 37 |
#define MD5Final MD5_Final |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: gkrellm-2.3.0-Makefile.patch |
| 47 |
=================================================================== |
| 48 |
diff -Nru gkrellm-2.2.10/src/Makefile gkrellm-2.2.10_patched/src/Makefile |
| 49 |
--- gkrellm-2.2.10/src/Makefile 2007-02-15 17:50:03 +0100 |
| 50 |
+++ gkrellm-2.2.10_patched/src/Makefile 2007-02-15 17:50:49 +0100 |
| 51 |
@@ -95,7 +95,7 @@ |
| 52 |
endif |
| 53 |
|
| 54 |
|
| 55 |
-override CC += -Wall $(FLAGS) |
| 56 |
+CFLAGS += -Wall $(FLAGS) |
| 57 |
|
| 58 |
OBJS = main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \ |
| 59 |
hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \ |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 app-admin/gkrellm/files/gkrellm-2.3.0-build.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-build.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-build.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: gkrellm-2.3.0-build.patch |
| 69 |
=================================================================== |
| 70 |
--- server/Makefile |
| 71 |
+++ server/Makefile |
| 72 |
@@ -21,7 +21,7 @@ |
| 73 |
MANMODE ?= 644 |
| 74 |
MANDIRMODE ?= 755 |
| 75 |
INSTALL ?= install |
| 76 |
-LINK_FLAGS ?= -Wl,-E |
| 77 |
+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E |
| 78 |
EXTRAOBJS = |
| 79 |
|
| 80 |
|
| 81 |
@@ -41,7 +41,7 @@ |
| 82 |
|
| 83 |
|
| 84 |
CC ?= gcc |
| 85 |
-STRIP ?= -s |
| 86 |
+STRIP ?= |
| 87 |
|
| 88 |
GKRELLMD_INCLUDES = gkrellmd.h |
| 89 |
|
| 90 |
@@ -51,7 +51,7 @@ |
| 91 |
GLIB12_INCLUDE = `glib-config --cflags` |
| 92 |
GLIB12_LIB = `glib-config --libs glib gmodule` |
| 93 |
|
| 94 |
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
| 95 |
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
| 96 |
ifeq ($(glib12),1) |
| 97 |
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) |
| 98 |
endif |
| 99 |
--- src/Makefile |
| 100 |
+++ src/Makefile |
| 101 |
@@ -18,7 +18,7 @@ |
| 102 |
MANMODE ?= 644 |
| 103 |
MANDIRMODE ?= 755 |
| 104 |
INSTALL ?= install |
| 105 |
-LINK_FLAGS ?= -Wl,-E |
| 106 |
+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E |
| 107 |
SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE |
| 108 |
|
| 109 |
ifeq ($(without-gnutls),1) |
| 110 |
@@ -62,7 +62,7 @@ |
| 111 |
endif |
| 112 |
|
| 113 |
CC ?= gcc |
| 114 |
-STRIP ?= -s |
| 115 |
+STRIP ?= |
| 116 |
|
| 117 |
GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h |
| 118 |
|
| 119 |
@@ -70,7 +70,7 @@ |
| 120 |
|
| 121 |
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` |
| 122 |
|
| 123 |
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
| 124 |
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) |
| 125 |
FLAGS+= $(PTHREAD_INC) |
| 126 |
|
| 127 |
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS) |
| 128 |
|
| 129 |
|
| 130 |
|
| 131 |
1.1 app-admin/gkrellm/files/digest-gkrellm-2.3.0 |
| 132 |
|
| 133 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/digest-gkrellm-2.3.0?rev=1.1&view=markup |
| 134 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/digest-gkrellm-2.3.0?rev=1.1&content-type=text/plain |
| 135 |
|
| 136 |
Index: digest-gkrellm-2.3.0 |
| 137 |
=================================================================== |
| 138 |
MD5 8ced6843f4681ad8501fd04285ecff1f gkrellm-2.3.0.tar.bz2 742468 |
| 139 |
RMD160 6db53085008fca36bafa1085f1362e79c65b3203 gkrellm-2.3.0.tar.bz2 742468 |
| 140 |
SHA256 eae0a6862fe6131c67c2f8bca451b0410e69229a5a16463dd1f2266b3ff13dcb gkrellm-2.3.0.tar.bz2 742468 |
| 141 |
|
| 142 |
|
| 143 |
|
| 144 |
-- |
| 145 |
gentoo-commits@g.o mailing list |
Archives