commit 5c0d3587e8858d0bf3266242d7657ffc3ea5a055
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Fri Mar 29 05:59:12 2024 +0100
- new URLs, updated to 2.3.11
format-security.patch | 11 ---
gkrellm-ldflags.patch | 46 ----------
gkrellm-opt.patch | 30 +++++--
gkrellm-pl.po-update.patch | 181 +++++++++++++++++++++++++++++++++++-----
gkrellm-plugins_dir_lib64.patch | 39 ---------
gkrellm.spec | 38 ++++-----
glib2-link.patch | 26 ------
myflags.patch | 22 -----
8 files changed, 196 insertions(+), 197 deletions(-)
---
diff --git a/gkrellm.spec b/gkrellm.spec
index fd96828..b10138f 100644
--- a/gkrellm.spec
+++ b/gkrellm.spec
@@ -1,7 +1,7 @@
#
# Conditional build:
-%bcond_without gnutls # replace gnutls with OpenSSL (for mail check
support)
-%bcond_without lm_sensors # don't include sensors support by libsensors
+%bcond_without gnutls # gnutls instead of OpenSSL (for mail check
support)
+%bcond_without lm_sensors # sensors support by libsensors
#
Summary: Multiple stacked system monitors: 1 process
Summary(pl.UTF-8): Zestaw wielu monitorów systemu(ów) w jednym procesie
@@ -9,12 +9,12 @@ Summary(pt_BR.UTF-8): Monitoração de atividades do sistema
Summary(ru.UTF-8): GKrellM - это стек системных мониторов в рамках одного
процесса
Summary(uk.UTF-8): GKrellM - це стек системних моніторів у рамках одного
процесу
Name: gkrellm
-Version: 2.3.5
-Release: 7
+Version: 2.3.11
+Release: 1
License: GPL v3+
Group: X11/Applications
-Source0:
http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.gz
-# Source0-md5: 05d00fa8d6376038b0c7e967583c0b8d
+Source0: http://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2
+# Source0-md5: de25d51653567a896979bcce8c91a019
Source1: %{name}.desktop
Source2: %{name}.png
Source3: %{name}d.init
@@ -23,12 +23,7 @@ Patch0: %{name}-opt.patch
Patch1: %{name}-home_etc.patch
Patch2: %{name}-pl.po-update.patch
Patch3: %{name}-lm_sensors.patch
-Patch4: %{name}-ldflags.patch
-Patch5: myflags.patch
-Patch6: %{name}-plugins_dir_lib64.patch
-Patch7: glib2-link.patch
-Patch8: format-security.patch
-URL: http://www.gkrellm.net/
+URL: http://gkrellm.srcbox.net/
BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 2.2.0
%{?with_gnutls:BuildRequires: gnutls-devel >= 1.2.5}
@@ -39,7 +34,9 @@ BuildRequires: libntlm-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: which
+BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xorg-lib-libX11-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -135,22 +132,17 @@ Componentes para desenvolvimento de plugins para o
gkrellm.
%prep
%setup -q
-# %patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-# %patch4 -p1
-%patch5 -p1
-%ifarch %{x8664} ia64 ppc64 sparc64
-%patch6 -p1
-%endif
-%patch7 -p1
-%patch8 -p1
+
+%{__sed} -i -e 's,/lib/,/%{_lib}/,g' README server/gkrellmd.h src/gkrellm.h
%build
%{__make} \
CC="%{__cc}" \
- MYFLAGS="%{rpmcflags}" \
+ OPTFLAGS="%{rpmcflags}" \
LDFLAGS="%{rpmldflags}" \
PKGCONFIGDIR=%{_pkgconfigdir} \
INSTALLROOT=%{_prefix} \
@@ -200,8 +192,8 @@ fi
%dir %{_libdir}/gkrellm2/plugins
%dir %{_datadir}/gkrellm2
%dir %{_datadir}/gkrellm2/themes
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/gkrellm.desktop
+%{_pixmapsdir}/gkrellm.png
%files gkrellmd
%defattr(644,root,root,755)
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 8286361..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gkrellm-2.3.5/server/main.c~ 2010-10-02 18:13:29.000000000 +0200
-+++ gkrellm-2.3.5/server/main.c 2014-01-02 13:55:48.722813858 +0100
-@@ -187,7 +187,7 @@
- if (log_level & G_LOG_LEVEL_CRITICAL)
- facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
-
-- syslog(facility_priority, message);
-+ syslog(facility_priority, "%s", message);
- #endif // defined(WIN32)
- } // gkrellmd_syslog_log()
-
diff --git a/gkrellm-ldflags.patch b/gkrellm-ldflags.patch
deleted file mode 100644
index b947ea7..0000000
--- a/gkrellm-ldflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -u -r gkrellm-2.3.0.orig/server/Makefile gkrellm-2.3.0/server/Makefile
---- gkrellm-2.3.0.orig/server/Makefile 2007-05-28 21:12:20.000000000 +0200
-+++ gkrellm-2.3.0/server/Makefile 2007-10-26 03:45:08.000000000 +0200
-@@ -21,7 +21,7 @@
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+override LINK_FLAGS += -Wl,-E
- EXTRAOBJS =
-
-
-@@ -112,7 +112,7 @@
- all: gkrellmd
-
- gkrellmd: $(OBJS) $(EXTRAOBJS)
-- $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
-+ $(CC) $(LINK_FLAGS) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS)
-
- static: $(OBJS) $(EXTRAOBJS)
- $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
-Only in gkrellm-2.3.0/server: Makefile~
-Only in gkrellm-2.3.0/server: .Makefile.swp
-diff -u -r gkrellm-2.3.0.orig/src/Makefile gkrellm-2.3.0/src/Makefile
---- gkrellm-2.3.0.orig/src/Makefile 2007-05-28 21:12:20.000000000 +0200
-+++ gkrellm-2.3.0/src/Makefile 2007-10-26 03:39:59.000000000 +0200
-@@ -18,7 +18,7 @@
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+override LINK_FLAGS += -Wl,-E
- SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE
-
- ifeq ($(without-gnutls),1)
-@@ -111,7 +112,7 @@
- all: gkrellm
-
- gkrellm: check_env $(OBJS) $(UNIXOBJS) $(EXTRAOBJS)
-- $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LINK_FLAGS)
-+ $(CC) $(LINK_FLAGS) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm $(LIBS)
-
- static: check_env $(OBJS) $(UNIXOBJS) $(EXTRAOBJS)
- $(CC) $(OBJS) $(UNIXOBJS) $(EXTRAOBJS) -o gkrellm.static -static \
-Only in gkrellm-2.3.0/src: Makefile.orig
-Only in gkrellm-2.3.0/src: .Makefile.swp
diff --git a/gkrellm-opt.patch b/gkrellm-opt.patch
index 417b997..9ad18da 100644
--- a/gkrellm-opt.patch
+++ b/gkrellm-opt.patch
@@ -1,12 +1,24 @@
---- gkrelkm-2.3.2/src/Makefile.orig 2009-01-19 17:59:24.000000000 +0000
-+++ gkrellm-2.3.2/src/Makefile 2009-01-19 17:59:40.000000000 +0000
-@@ -87,7 +87,8 @@
- PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
- PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
+--- gkrellm-2.3.11/src/Makefile.orig 2019-07-23 17:19:04.000000000 +0200
++++ gkrellm-2.3.11/src/Makefile 2024-03-29 05:42:20.750146764 +0100
+@@ -47,7 +47,8 @@ GKRELLM_INCLUDES = gkrellm.h gkrellm-pub
+ PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags gtk+-2.0 gmodule-2.0
gthread-2.0)
+ PKG_LIB := $(shell $(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0)
--FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC) \
+-FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC)\
+OPTFLAGS = -O2
-+FLAGS = $(OPTFLAGS) -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC) \
- ${NTLM_INCLUDES} -DGKRELLM_CLIENT
++FLAGS = $(OPTFLAGS) -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC)\
+ ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
+
+ LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS)
$(SENSORS_LIBS)\
+--- gkrellm-2.3.11/server/Makefile.orig 2019-07-23 17:19:04.000000000
+0200
++++ gkrellm-2.3.11/server/Makefile 2024-03-29 05:42:46.263341880 +0100
+@@ -31,7 +31,8 @@ GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_
+ PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0
gthread-2.0)
+ PKG_LIB := $(shell $(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0)
+
+-FLAGS = -O2 $(PKG_INCLUDE)
++OPTFLAGS = -O2
++FLAGS = $(OPTFLAGS) $(PKG_INCLUDE)
+
+ FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER
- LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS)
$(SENSORS_LIBS) \
diff --git a/gkrellm-pl.po-update.patch b/gkrellm-pl.po-update.patch
index 20fa5ee..ec44764 100644
--- a/gkrellm-pl.po-update.patch
+++ b/gkrellm-pl.po-update.patch
@@ -1,31 +1,161 @@
---- gkrellm-2.3.2/po/pl.po.orig 2009-12-21 01:56:48.000000000 +0000
-+++ gkrellm-2.3.2/po/pl.po 2010-02-14 00:28:39.233137768 +0000
-@@ -1,11 +1,11 @@
- # translation of pl.po to Polish
--# Polish Translation of GKrellM. Copyright Przemys�aw Su�ek
--#
--# <p...@linux.net.pl>, 2001. Released under the GPL.
-+# Polish Translation of GKrellM. Released under the GPL.
-+# Copyright Przemys�aw Su�ek <p...@linux.net.pl>, 2001-2003.
-+# Jakub Bogusz <qbo...@pld-linux.org>, 2006
- # Micha� Smoczyk <msmoc...@wp.pl>, 2009, 2008.
+--- gkrellm-2.3.11/po/pl.po.orig 2019-07-25 15:45:58.000000000 +0200
++++ gkrellm-2.3.11/po/pl.po 2024-03-29 05:37:42.198322475 +0100
+@@ -277,9 +277,8 @@ msgid "Ag8"
+ msgstr "Ag8"
+
+ #: ../src/chart.c:2310 ../src/chart.c:2467
+-#, fuzzy
+ msgid "/Control/Auto mode sticks at peak value"
+-msgstr "/Kontrola/Tryb auto-pa�ki przy warto�ci szczytowej"
++msgstr "/Kontrola/Tryb auto pozostaje przy warto�ci szczytowej"
+
+ #: ../src/chart.c:2314 ../src/chart.c:2465
+ msgid "/Control/Auto mode recalibrate"
+@@ -343,11 +342,11 @@ msgstr "Wysoko�� wykresu"
+
+ #: ../src/clock.c:49
+ msgid "%l:%M <span foreground=\"$A\"><small>%S</small></span>"
+-msgstr ""
++msgstr "%l:%M <span foreground=\"$A\"><small>%S</small></span>"
+
+ #: ../src/clock.c:54
+ msgid "%a <span foreground=\"$A\"><big><big>%e</big></big></span> %b"
+-msgstr ""
++msgstr "%a <span foreground=\"$A\"><big><big>%e</big></big></span> %b"
+
+ #: ../src/clock.c:688
+ msgid "<h>Clock/Calendar Format Strings\n"
+@@ -373,13 +372,12 @@ msgstr ""
+ "lub czas 24-godzinny z sekundami.\n"
+
+ #: ../src/clock.c:696
+-#, fuzzy
msgid ""
+ "The special $A substitution variable expands to the current theme\n"
+ "alternate color and is for use with the Pango \"foreground\" attribute.\n"
+ msgstr ""
+-"Zmienna specjalna $A uwypukla kolor alternatywny bie��cego\n"
+-"wystroju - u�ywana jest ze znacznikiem \"t�a\" Pango.\n"
++"Zmienna specjalna $A rozwija si� do koloru alternatywnego bie��cego\n"
++"wystroju - u�ywana jest ze znacznikiem \"pierwszoplanowym\" Pango.\n"
+
+ #: ../src/clock.c:716 ../src/clock.c:787 ../src/clock.c:850
+ msgid "Calendar"
+@@ -991,6 +989,9 @@ msgid ""
+ "Bill Nalen <b...@nalens.com>\n"
+ "Stefan Gehn <stefan+gkre...@srcbox.net>\n"
msgstr ""
--"Project-Id-Version: pl\n"
-+"Project-Id-Version: GKrellM 2.2.10\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-12-20 19:56-0600\n"
- "PO-Revision-Date: 2008-01-26 16:27+0100\n"
-@@ -2065,7 +2065,7 @@
-
- #: ../src/main.c:1999
++"Kod zale�ny od systemu Windows zosta� udost�pniony przez:\n"
++"Bill Nalen <b...@nalens.com>\n"
++"Stefan Gehn <stefan+gkre...@srcbox.net>\n"
+
+ #: ../src/gui.c:996
+ msgid "<h>Krells\n"
+@@ -1549,7 +1550,7 @@ msgstr "Z�a odpowied� po STARTTLS."
+
+ #: ../src/mail.c:1272
+ msgid "Bad response after CAPABILITY."
+-msgstr ""
++msgstr "Z�a odpowied� po CAPABILITY."
+
+ #: ../src/mail.c:1834
+ #, c-format
+@@ -1728,9 +1729,8 @@ msgid "Mail fetch/check program:"
+ msgstr "Program odbieraj�cy/sprawdzaj�cy poczt�:"
+
+ #: ../src/mail.c:4000
+-#, fuzzy
+ msgid "Run fetch/check program at local interval"
+-msgstr "Uruchom lokalny program sprawdzaj�cy/odbieraj�cy poczt� okresowo"
++msgstr "Uruchom program sprawdzaj�cy/odbieraj�cy z lokalnym okresem"
+
+ #: ../src/mail.c:4010
+ msgid "Check local mailboxes every"
+@@ -1939,6 +1939,7 @@ msgid ""
+ " --m2 Left button side frame shading (for 2 btn "
+ "mice).\n"
+ msgstr ""
++" --m2 Cieniowanie ramki po stronie lewego przycisku
(dla myszy 2-przyciskowych)\n"
+
+ #: ../src/main.c:1788
+ msgid " --nt No transparency.\n"
+@@ -1946,13 +1947,15 @@ msgstr " --nt Bez
+
+ #: ../src/main.c:1789
+ msgid " -w, --withdrawn Draw GKrellM in withdrawn mode.\n"
+-msgstr ""
++msgstr " -w, --withdrawn Rysowanie GKrellM w trybie wycofania.\n"
+
+ #: ../src/main.c:1790
+ msgid ""
+ " -c, --config suffix Use alternate config files generated by\n"
+ " appending \"suffix\" to config file names.\n"
+ msgstr ""
++" -c, --config przyrostek U�ycie alternatywnych plik�w konfiguracyjnych\n"
++" wygenerowanych przez dodanie \"przyrostka\" do
nazw.\n"
+
+ #: ../src/main.c:1792
+ msgid ""
+@@ -1965,6 +1968,15 @@ msgid ""
+ " and for the hostname to be in the window
title.\n"
+ " This option has no effect in client mode.\n"
+ msgstr ""
++" -f, --force-host-config Utworzenie plik�w konfiguracyjnych
wygenerowanych\n"
++" przez dodanie nazwy hosta do nazw plik�w.
Kolejne\n"
++" uruchomienia b�d� automatycznie u�ywa� tych\n"
++" plik�w, chyba �e konfiguracja zostanie
okre�lona\n"
++" przez --config. Jest to wygodne w przypadku\n"
++" zdalnego uruchamiania z r�nymi konfiguracjami
we\n"
++" wsp�dzielonym katalogu domowym i kiedy nazwa
hosta\n"
++" jest w tytule okna. Opcja nie ma znaczenia w
trybie\n"
++" klienta.\n"
+
+ #: ../src/main.c:1800
+ msgid ""
+@@ -1985,6 +1997,7 @@ msgstr ""
+ msgid ""
+ " --nc No config mode prevents configuration changes.\n"
+ msgstr ""
++" --nc Tryb bez konfiguracji, zapobiega jej zmianom.\n"
+
+ #: ../src/main.c:1804
+ msgid " --config-clean Clean out unused configs on config
write.\n"
+@@ -2027,7 +2040,6 @@ msgstr ""
+ " -d, --debug-level n W��cz debugowanie dla wybranych sekcji kodu.\n"
+
+ #: ../src/main.c:1813
+-#, fuzzy
+ msgid ""
+ "\n"
+ "debug-level numbers are (bitwise OR to debug multiple sections):\n"
+@@ -2046,10 +2058,10 @@ msgstr ""
+ "poziomy debugowania to (u�yj operatora OR aby debugowa� wiele sekcji):\n"
+ " 0x10 poczta\n"
+ " 0x20 sie�\n"
+-" 0x40 timer button\n"
++" 0x40 stoper\n"
+ " 0x80 czujniki\n"
+ " 0x800 inet\n"
+-" 0x1000 dump gkrellmd server data\n"
++" 0x1000 zrzut danych serwera gkrellmd\n"
+ " 0x2000 GUI\n"
+ " 0x8000 bateria\n"
+ " 0x20000 wtyczka\n"
+@@ -2057,11 +2069,11 @@ msgstr ""
+
+ #: ../src/main.c:1832
+ msgid "GKrellM"
+-msgstr ""
++msgstr "GKrellM"
+
+ #: ../src/main.c:2025
msgid "segmentation fault"
-msgstr ""
+msgstr "naruszenie ochrony pami�ci"
- #: ../src/main.c:2001
+ #: ../src/main.c:2027
msgid "floating point exception"
-@@ -2193,6 +2193,9 @@
+@@ -2189,6 +2201,9 @@ msgid ""
"The free and used variables may have a 'r' qualifier for printing\n"
"raw free and raw used values. For example: $fr for raw free.\n"
msgstr ""
@@ -35,3 +165,12 @@
#: ../src/mem.c:1286
msgid ""
+@@ -2737,7 +2752,7 @@ msgstr "Poka� w stopniach Fahrenheita"
+
+ #: ../src/sensors.c:2846
+ msgid "Show units"
+-msgstr ""
++msgstr "Jednostki wy�wietlane"
+
+ #: ../src/sensors.c:2853
+ msgid "Normal with labels"
diff --git a/gkrellm-plugins_dir_lib64.patch b/gkrellm-plugins_dir_lib64.patch
deleted file mode 100644
index 7d8d13c..0000000
--- a/gkrellm-plugins_dir_lib64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- gkrellm-2.2.9/README 2006-03-29 22:18:36.000000000 +0000
-+++ gkrellm-2.2.9-lib64/README 2006-09-29 13:44:06.000000000 +0000
-@@ -759,7 +759,7 @@
-
- GKrellM tries to load all plugins (shared object files ending in .so)
- it finds in your plugin directory ~/.gkrellm2/plugins. The directories
--/usr/local/lib/gkrellm2/plugins and /usr/lib/gkrellm2/plugins are
-+/usr/local/lib64/gkrellm2/plugins and /usr/lib64/gkrellm2/plugins are
- also searched for plugins to install.
-
- Some plugins may be available only as source files and they will
---- gkrellm-2.3.4/src/gkrellm.h.orig 2010-07-19 14:18:56.000000000 +0200
-+++ gkrellm-2.3.4/src/gkrellm.h 2010-07-19 14:20:53.000000000 +0200
-@@ -136,9 +136,9 @@
- #if !defined(SYSTEM_THEMES_DIR)
- #define SYSTEM_THEMES_DIR "/usr/share/gkrellm2/themes"
- #endif
--#define LOCAL_PLUGINS_DIR
"/usr/local/lib/gkrellm2/plugins"
-+#define LOCAL_PLUGINS_DIR
"/usr/local/lib64/gkrellm2/plugins"
- #if !defined(SYSTEM_PLUGINS_DIR)
--#define SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins"
-+#define SYSTEM_PLUGINS_DIR "/usr/lib64/gkrellm2/plugins"
- #endif
-
- #else
---- gkrellm-2.3.4/server/gkrellmd.h.orig 2010-07-19 14:28:21.000000000
+0200
-+++ gkrellm-2.3.4/server/gkrellmd.h 2010-07-19 14:28:43.000000000 +0200
-@@ -126,9 +126,9 @@
-
- #define GKRELLMD_PLUGINS_DIR ".gkrellm2/plugins-gkrellmd"
- #if !defined(WIN32)
-- #define GKRELLMD_LOCAL_PLUGINS_DIR
"/usr/local/lib/gkrellm2/plugins-gkrellmd"
-+ #define GKRELLMD_LOCAL_PLUGINS_DIR
"/usr/local/lib64/gkrellm2/plugins-gkrellmd"
- #if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR)
-- #define GKRELLMD_SYSTEM_PLUGINS_DIR
"/usr/lib/gkrellm2/plugins-gkrellmd"
-+ #define GKRELLMD_SYSTEM_PLUGINS_DIR
"/usr/lib64/gkrellm2/plugins-gkrellmd"
- #endif
- #define GKRELLMD_SYS_ETC "/etc"
- #define GKRELLMD_LOCAL_ETC "/usr/local/etc"
diff --git a/glib2-link.patch b/glib2-link.patch
deleted file mode 100644
index ba80347..0000000
--- a/glib2-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gkrellm-2.3.5/server/Makefile~ 2014-01-02 13:47:46.000000000 +0100
-+++ gkrellm-2.3.5/server/Makefile 2014-01-02 13:51:41.626148979 +0100
-@@ -54,8 +54,8 @@
-
- GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h
-
--PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
--PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
-+PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0 gmodule-2.0`
-+PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0 gmodule-2.0`
-
- GLIB12_INCLUDE = `glib-config --cflags`
- GLIB12_LIB = `glib-config --libs glib gmodule`
---- gkrellm-2.3.5/src/Makefile~ 2014-01-02 13:47:46.000000000 +0100
-+++ gkrellm-2.3.5/src/Makefile 2014-01-02 13:52:53.649481792 +0100
-@@ -68,8 +68,8 @@
-
- GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
-
--PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
--PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
-+PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0 gmodule-2.0`
-+PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0 gmodule-2.0`
-
- FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC)\
- ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT ${MYFLAGS}
diff --git a/myflags.patch b/myflags.patch
deleted file mode 100644
index 9fe1477..0000000
--- a/myflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gkrellm-2.3.5/src/Makefile~ 2010-10-02 18:21:01.000000000 +0200
-+++ gkrellm-2.3.5/src/Makefile 2010-10-14 22:28:29.188002756 +0200
-@@ -72,7 +72,7 @@
- PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
-
- FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC)\
-- ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
-+ ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT ${MYFLAGS}
-
- LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS)
$(SENSORS_LIBS)\
- $(NTLM_LIBS) $(MATH_LIB)
---- gkrellm-2.3.5/server/Makefile~ 2010-10-02 18:21:01.000000000 +0200
-+++ gkrellm-2.3.5/server/Makefile 2010-10-14 22:32:33.201146284 +0200
-@@ -60,7 +60,7 @@
- GLIB12_INCLUDE = `glib-config --cflags`
- GLIB12_LIB = `glib-config --libs glib gmodule`
-
--FLAGS = -O2 $(PKG_INCLUDE)
-+FLAGS = -O2 $(PKG_INCLUDE) ${MYFLAGS}
-
- ifeq ($(glib12),1)
- FLAGS = -O2 $(GLIB12_INCLUDE)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gkrellm.git/commitdiff/5c0d3587e8858d0bf3266242d7657ffc3ea5a055
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
