|
|
@ -2,6 +2,7 @@ |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Filename: package/.../gkrellm/libsm.patch
|
|
|
|
# Filename: package/.../gkrellm/libsm.patch
|
|
|
|
|
|
|
|
# Copyright (C) 2010 The OpenSDE Project
|
|
|
|
# Copyright (C) 2006 The T2 SDE Project
|
|
|
|
# Copyright (C) 2006 The T2 SDE Project
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
@ -14,10 +15,10 @@ |
|
|
|
# version.
|
|
|
|
# version.
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
|
|
|
|
|
|
diff -ur gkrellm-2.2.7/Makefile gkrellm-2.2.7-t2/Makefile
|
|
|
|
diff -ruN gkrellm-2.3.4-orig/Makefile gkrellm-2.3.4/Makefile
|
|
|
|
--- gkrellm-2.2.7/Makefile 2005-05-22 18:18:44.000000000 +0200
|
|
|
|
--- gkrellm-2.3.4-orig/Makefile 2010-01-05 00:13:13.000000000 +0100
|
|
|
|
+++ gkrellm-2.2.7-t2/Makefile 2006-01-25 14:10:16.000000000 +0100
|
|
|
|
+++ gkrellm-2.3.4/Makefile 2010-08-25 19:00:46.800005755 +0200
|
|
|
|
@@ -207,7 +207,7 @@
|
|
|
|
@@ -247,7 +247,7 @@
|
|
|
|
(cd po && ${MAKE} all)
|
|
|
|
(cd po && ${MAKE} all)
|
|
|
|
(cd src && ${MAKE} \
|
|
|
|
(cd src && ${MAKE} \
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm" \
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm" \
|
|
|
@ -26,7 +27,7 @@ diff -ur gkrellm-2.2.7/Makefile gkrellm-2.2.7-t2/Makefile |
|
|
|
gkrellm )
|
|
|
|
gkrellm )
|
|
|
|
(cd server && ${MAKE} \
|
|
|
|
(cd server && ${MAKE} \
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd )
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm" gkrellmd )
|
|
|
|
@@ -216,7 +216,7 @@
|
|
|
|
@@ -256,7 +256,7 @@
|
|
|
|
(cd po && ${MAKE} all)
|
|
|
|
(cd po && ${MAKE} all)
|
|
|
|
(cd src && ${MAKE} \
|
|
|
|
(cd src && ${MAKE} \
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm -pthread" \
|
|
|
@ -35,19 +36,19 @@ diff -ur gkrellm-2.2.7/Makefile gkrellm-2.2.7-t2/Makefile |
|
|
|
gkrellm )
|
|
|
|
gkrellm )
|
|
|
|
(cd server && ${MAKE} \
|
|
|
|
(cd server && ${MAKE} \
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd )
|
|
|
|
EXTRAOBJS= SYS_LIBS="-lkvm -pthread" gkrellmd )
|
|
|
|
diff -ur gkrellm-2.2.7/src/Makefile gkrellm-2.2.7-t2/src/Makefile
|
|
|
|
diff -ruN gkrellm-2.3.4-orig/src/Makefile gkrellm-2.3.4/src/Makefile
|
|
|
|
--- gkrellm-2.2.7/src/Makefile 2005-05-09 18:54:03.000000000 +0200
|
|
|
|
--- gkrellm-2.3.4-orig/src/Makefile 2010-01-05 00:12:07.000000000 +0100
|
|
|
|
+++ gkrellm-2.2.7-t2/src/Makefile 2006-01-25 14:16:58.000000000 +0100
|
|
|
|
+++ gkrellm-2.3.4/src/Makefile 2010-08-25 19:00:46.800005755 +0200
|
|
|
|
@@ -17,7 +17,7 @@
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
|
MANDIRMODE ?= 755
|
|
|
|
MANDIRMODE ?= 755
|
|
|
|
INSTALL ?= install
|
|
|
|
INSTALL ?= install
|
|
|
|
LINK_FLAGS ?= -Wl,-E
|
|
|
|
LINK_FLAGS ?= -Wl,-E
|
|
|
|
-SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
|
|
|
|
-SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
|
|
|
|
+SMC_LIBS ?= $(shell pkg-config --libs sm)
|
|
|
|
+SMC_LIBS ?= $(shell pkg-config --libs sm)
|
|
|
|
|
|
|
|
|
|
|
|
ifeq ($(without-gnutls),1)
|
|
|
|
X11_LIBS ?= -lX11
|
|
|
|
CONFIGURE_ARGS += --without-gnutls
|
|
|
|
|
|
|
|
@@ -128,11 +128,11 @@
|
|
|
|
@@ -188,11 +188,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
netbsd1:
|
|
|
|
netbsd1:
|
|
|
|
$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" \
|
|
|
|
$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm" \
|
|
|
|