summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2012-06-10 16:00:03 +0000
committerJoerg Bornkessel <hd_brummy@gentoo.org>2012-06-10 16:00:03 +0000
commitbb70b71604f3b5258eb8fe653b3d3a75ff5614ae (patch)
tree25751f6d42b6a6b24110bf294322e2590c94c9b1 /media-video/vdr/files
parentUpdate app-doc/doxygen dependency by Torsten Kaiser (bug #420467). (diff)
downloadhistorical-bb70b71604f3b5258eb8fe653b3d3a75ff5614ae.tar.gz
historical-bb70b71604f3b5258eb8fe653b3d3a75ff5614ae.tar.bz2
historical-bb70b71604f3b5258eb8fe653b3d3a75ff5614ae.zip
fixed gcc-4.7 compile; cleanup; strip-linguas en fixing
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'media-video/vdr/files')
-rw-r--r--media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch17
-rw-r--r--media-video/vdr/files/vdr-1.6.0_p2_linguas.diff24
2 files changed, 17 insertions, 24 deletions
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch b/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
new file mode 100644
index 000000000000..bebdbba5b2bd
--- /dev/null
+++ b/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
@@ -0,0 +1,17 @@
+Fix building with gcc-4.7
+
+https://bugs.gentoo.org/show_bug.cgi?id=419165
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2012/06/10
+
+diff -Naur vdr-1.6.0.orig/config.h vdr-1.6.0/config.h
+--- vdr-1.6.0.orig/config.h 2012-06-10 17:41:26.000000000 +0200
++++ vdr-1.6.0/config.h 2012-06-10 17:42:19.000000000 +0200
+@@ -182,7 +182,7 @@
+ #ifdef USE_CMDSUBMENU
+ AddConfig(l);
+ #else
+- Add(l);
++ this->Add(l);
+ #endif /* CMDSUBMENU */
+ else {
+ esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_linguas.diff b/media-video/vdr/files/vdr-1.6.0_p2_linguas.diff
deleted file mode 100644
index 0b9eb5d668d6..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_linguas.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-install only the given value in LINGUAS
-signed-of: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2012/04/15 )
-
-diff -Naur vdr-1.7.27.orig/Makefile vdr-1.7.27/Makefile
---- vdr-1.7.27.orig/Makefile 2012-04-15 15:45:18.000000000 +0200
-+++ vdr-1.7.27/Makefile 2012-04-15 15:46:21.000000000 +0200
-@@ -144,7 +144,7 @@
-
- PODIR = po
- LOCALEDIR = locale
--I18Npo = $(wildcard $(PODIR)/*.po)
-+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot = $(PODIR)/vdr.pot
-
-@@ -167,7 +167,7 @@
-
- install-i18n:
- @mkdir -p $(DESTDIR)$(LOCDIR)
-- @(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
-+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
-
- # The 'include' directory (for plugins):
-