public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-admin/gkrellm/files: gkrellm-2.3.0-gnutls.patch gkrellm-2.3.0-Makefile.patch gkrellm-2.3.0-build.patch digest-gkrellm-2.3.0
@ 2007-09-07 16:29 Jim Ramsay (lack)
  0 siblings, 0 replies; only message in thread
From: Jim Ramsay (lack) @ 2007-09-07 16:29 UTC (permalink / raw
  To: gentoo-commits

lack        07/09/07 16:29:42

  Added:                gkrellm-2.3.0-gnutls.patch
                        gkrellm-2.3.0-Makefile.patch
                        gkrellm-2.3.0-build.patch digest-gkrellm-2.3.0
  Log:
  Version bump - 2.3.0 is released (bug 187398)
  (Portage version: 2.1.3.7)

Revision  Changes    Path
1.1                  app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-gnutls.patch?rev=1.1&view=markup
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

Index: gkrellm-2.3.0-gnutls.patch
===================================================================
--- src/configure
+++ src/configure
@@ -37,6 +37,7 @@
 #include <gnutls/openssl.h>
 #include <errno.h>
 #include <pthread.h>
+#include <gcrypt.h>
 
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
--- src/mail.c
+++ src/mail.c
@@ -40,6 +40,7 @@
 #if defined(HAVE_GNUTLS)
 #include <gnutls/openssl.h>
 #include <pthread.h>
+#include <gcrypt.h>
 #define MD5Init		MD5_Init
 #define MD5Update	MD5_Update
 #define MD5Final	MD5_Final



1.1                  app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-Makefile.patch?rev=1.1&view=markup
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

Index: gkrellm-2.3.0-Makefile.patch
===================================================================
diff -Nru gkrellm-2.2.10/src/Makefile gkrellm-2.2.10_patched/src/Makefile
--- gkrellm-2.2.10/src/Makefile	2007-02-15 17:50:03 +0100
+++ gkrellm-2.2.10_patched/src/Makefile	2007-02-15 17:50:49 +0100
@@ -95,7 +95,7 @@
 endif
 
 
-override CC += -Wall $(FLAGS)
+CFLAGS += -Wall $(FLAGS)
 
 OBJS =	main.o alerts.o battery.o base64.o clock.o cpu.o disk.o fs.o \
 	hostname.o inet.o mail.o mem.o net.o proc.o sensors.o uptime.o \



1.1                  app-admin/gkrellm/files/gkrellm-2.3.0-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/gkrellm-2.3.0-build.patch?rev=1.1&view=markup
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

Index: gkrellm-2.3.0-build.patch
===================================================================
--- server/Makefile
+++ server/Makefile
@@ -21,7 +21,7 @@
 MANMODE ?= 644
 MANDIRMODE ?= 755
 INSTALL ?= install
-LINK_FLAGS ?= -Wl,-E
+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
 EXTRAOBJS =
 
 
@@ -41,7 +41,7 @@
 
 
 CC ?= gcc
-STRIP ?= -s
+STRIP ?=
 
 GKRELLMD_INCLUDES = gkrellmd.h
 
@@ -51,7 +51,7 @@
 GLIB12_INCLUDE = `glib-config --cflags`
 GLIB12_LIB = `glib-config --libs glib gmodule`
 
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 ifeq ($(glib12),1)
 FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
 endif
--- src/Makefile
+++ src/Makefile
@@ -18,7 +18,7 @@
 MANMODE ?= 644
 MANDIRMODE ?= 755
 INSTALL ?= install
-LINK_FLAGS ?= -Wl,-E
+LINK_FLAGS ?= $(LDFLAGS) -Wl,-E
 SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
 
 ifeq ($(without-gnutls),1)
@@ -62,7 +62,7 @@
 endif
 
 CC ?= gcc
-STRIP ?= -s
+STRIP ?=
 
 GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h
 
@@ -70,7 +70,7 @@
 
 PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
 
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 FLAGS+= $(PTHREAD_INC)
 
 LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)



1.1                  app-admin/gkrellm/files/digest-gkrellm-2.3.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/files/digest-gkrellm-2.3.0?rev=1.1&view=markup
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

Index: digest-gkrellm-2.3.0
===================================================================
MD5 8ced6843f4681ad8501fd04285ecff1f gkrellm-2.3.0.tar.bz2 742468
RMD160 6db53085008fca36bafa1085f1362e79c65b3203 gkrellm-2.3.0.tar.bz2 742468
SHA256 eae0a6862fe6131c67c2f8bca451b0410e69229a5a16463dd1f2266b3ff13dcb gkrellm-2.3.0.tar.bz2 742468



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-09-07 17:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-07 16:29 [gentoo-commits] gentoo-x86 commit in app-admin/gkrellm/files: gkrellm-2.3.0-gnutls.patch gkrellm-2.3.0-Makefile.patch gkrellm-2.3.0-build.patch digest-gkrellm-2.3.0 Jim Ramsay (lack)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox