[oe-commits] org.oe.dev gkrellm: updated to 2.2.10 with patch by Marek Vasut to fix install - close #2090

[hrw commit]

gkrellm: updated to 2.2.10 with patch by Marek Vasut to fix install - close #2090

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 23ef74ef0e761123523908d6fa9c47b9a015f1fd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=23ef74ef0e761123523908d6fa9c47b9a015f1fd
Files:
1
packages/gkrellm/gkrellm_2.2.7.bb
packages/gkrellm/gkrellm_2.2.10.bb
packages/gkrellm/gkrellm
packages/gkrellm/gkrellm/destdir.patch
Diffs:

#
# mt diff -r21a1120159d15ee83874f1ba4dc3bdddae5762a2 -r23ef74ef0e761123523908d6fa9c47b9a015f1fd
#
# 
# 
# rename "packages/gkrellm/gkrellm_2.2.7.bb"
#     to "packages/gkrellm/gkrellm_2.2.10.bb"
# 
# add_dir "packages/gkrellm/gkrellm"
# 
# add_file "packages/gkrellm/gkrellm/destdir.patch"
#  content [ca03ef0a4e98189e5c691db537589e44d35d1843]
# 
# patch "packages/gkrellm/gkrellm_2.2.10.bb"
#  from [a35c05f23bbdc3b57fa55df6d90eb2f7e5ba579f]
#    to [9857c317f13bec95ec120a7f0bf60239b220d73f]
# 
============================================================
--- packages/gkrellm/gkrellm/destdir.patch	ca03ef0a4e98189e5c691db537589e44d35d1843
+++ packages/gkrellm/gkrellm/destdir.patch	ca03ef0a4e98189e5c691db537589e44d35d1843
@@ -0,0 +1,24 @@
+diff -Naur gkrellm-2.2.7-orig/server/Makefile gkrellm-2.2.7/server/Makefile
+--- gkrellm-2.2.7-orig/server/Makefile	2004-04-12 15:30:48.000000000 +0200
++++ gkrellm-2.2.7/server/Makefile	2007-04-06 12:48:08.000000000 +0200
+@@ -129,7 +129,7 @@
+ 
+ install:
+ 	$(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
++	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)
+ 	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+ 	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
+ 	$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
+diff -Naur gkrellm-2.2.7-orig/src/Makefile gkrellm-2.2.7/src/Makefile
+--- gkrellm-2.2.7-orig/src/Makefile	2005-05-09 18:54:03.000000000 +0200
++++ gkrellm-2.2.7/src/Makefile	2007-04-06 12:48:24.000000000 +0200
+@@ -144,7 +144,7 @@
+ 
+ install:
+ 	$(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE)
++	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)
+ 	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
+ 	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
+ 	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
============================================================
--- packages/gkrellm/gkrellm_2.2.7.bb	a35c05f23bbdc3b57fa55df6d90eb2f7e5ba579f
+++ packages/gkrellm/gkrellm_2.2.10.bb	9857c317f13bec95ec120a7f0bf60239b220d73f
@@ -1,9 +1,10 @@ DEPENDS = "gtk+ glib-2.0 libsm libice"
 SECTION = "x11/utils"
 DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
 LICENSE = "GPL"
 DEPENDS = "gtk+ glib-2.0 libsm libice"
 
-SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2"
+SRC_URI = "http://members.dslextreme.com/users/billw/gkrellm/gkrellm-${PV}.tar.bz2 \
+           file://destdir.patch;patch=1"
 
 inherit pkgconfig