1 |
pylon 08/03/30 14:57:59 |
2 |
|
3 |
Added: nxtvepg-daemon-install.patch nxtvepg-tcl8.5.patch |
4 |
nxtvepg-unicode.patch |
5 |
Log: |
6 |
Version bump; fixes tcl8.5-compatibility; bug #212682 and #173467. |
7 |
Probably the tcl/tk-dependency must be fixed to 8.5, but that version is |
8 |
still masked. |
9 |
(Portage version: 2.1.4.4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 media-tv/nxtvepg/files/nxtvepg-daemon-install.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/nxtvepg/files/nxtvepg-daemon-install.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/nxtvepg/files/nxtvepg-daemon-install.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: nxtvepg-daemon-install.patch |
18 |
=================================================================== |
19 |
diff -Naur nxtvepg-2.8.0.orig/Makefile nxtvepg-2.8.0/Makefile |
20 |
--- nxtvepg-2.8.0.orig/Makefile 2008-03-30 16:19:54.000000000 +0200 |
21 |
+++ nxtvepg-2.8.0/Makefile 2008-03-30 16:21:00.000000000 +0200 |
22 |
@@ -209,8 +209,8 @@ |
23 |
$(BUILD_DIR)/vbirec: $(VBIREC_OBJS) |
24 |
$(CC) -o $@ $(VBIREC_OBJS) $(LDFLAGS) $(GUILIBS) $(ACQLIBS) |
25 |
|
26 |
-.PHONY: install |
27 |
-install: daemon Nxtvepg.ad nxtvepgd.1 |
28 |
+.PHONY: install-common |
29 |
+install-common: daemon nxtvepgd.1 |
30 |
test -d $(bindir) || install -d $(bindir) |
31 |
test -d $(mandir) || install -d $(mandir) |
32 |
test -d $(resdir)/app-defaults || install -d $(resdir)/app-defaults |
33 |
@@ -218,10 +218,16 @@ |
34 |
test -d $(INST_DB_DIR) || install -d $(INST_DB_DIR) |
35 |
chmod $(INST_DB_PERM) $(INST_DB_DIR) |
36 |
endif |
37 |
- install -c -m 0755 $(BUILD_DIR)/nxtvepg $(bindir) |
38 |
- install -c -m 0755 $(BUILD_DIR)/nxtvepgd $(bindir) |
39 |
install -c -m 0644 nxtvepg.1 $(mandir) |
40 |
+ |
41 |
+.PHONY: install-daemon |
42 |
+install-daemon: install-common |
43 |
+ install -c -m 0755 $(BUILD_DIR)/nxtvepgd $(bindir) |
44 |
install -c -m 0644 nxtvepgd.1 $(mandir) |
45 |
+ |
46 |
+.PHONY: install |
47 |
+install: install-common install-daemon Nxtvepg.ad |
48 |
+ install -c -m 0755 $(BUILD_DIR)/nxtvepg $(bindir) |
49 |
install -c -m 0644 Nxtvepg.ad $(resdir)/app-defaults/Nxtvepg |
50 |
|
51 |
.SUFFIXES: .c .o .tcl |
52 |
|
53 |
|
54 |
|
55 |
1.1 media-tv/nxtvepg/files/nxtvepg-tcl8.5.patch |
56 |
|
57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/nxtvepg/files/nxtvepg-tcl8.5.patch?rev=1.1&view=markup |
58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/nxtvepg/files/nxtvepg-tcl8.5.patch?rev=1.1&content-type=text/plain |
59 |
|
60 |
Index: nxtvepg-tcl8.5.patch |
61 |
=================================================================== |
62 |
diff -Naur nxtvepg-2.8.0.orig/Makefile nxtvepg-2.8.0/Makefile |
63 |
--- nxtvepg-2.8.0.orig/Makefile 2008-03-30 16:35:42.000000000 +0200 |
64 |
+++ nxtvepg-2.8.0/Makefile 2008-03-30 16:35:54.000000000 +0200 |
65 |
@@ -58,8 +58,8 @@ |
66 |
YACC = /usr/bin/yacc |
67 |
|
68 |
# select Tcl/Tk version (8.5 recommended due to modernized widget appearence) |
69 |
-TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh) |
70 |
-#TCL_VER = 8.5 |
71 |
+#TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh) |
72 |
+TCL_VER = 8.5 |
73 |
|
74 |
ifeq ($(shell test -d /usr/include/tcl$(TCL_VER) && echo YES),YES) |
75 |
INCS += -I/usr/include/tcl$(TCL_VER) |
76 |
|
77 |
|
78 |
|
79 |
1.1 media-tv/nxtvepg/files/nxtvepg-unicode.patch |
80 |
|
81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/nxtvepg/files/nxtvepg-unicode.patch?rev=1.1&view=markup |
82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/nxtvepg/files/nxtvepg-unicode.patch?rev=1.1&content-type=text/plain |
83 |
|
84 |
Index: nxtvepg-unicode.patch |
85 |
=================================================================== |
86 |
diff -Naur nxtvepg-2.8.0.orig/Makefile nxtvepg-2.8.0/Makefile |
87 |
--- nxtvepg-2.8.0.orig/Makefile 2008-03-30 16:36:52.000000000 +0200 |
88 |
+++ nxtvepg-2.8.0/Makefile 2008-03-30 16:36:58.000000000 +0200 |
89 |
@@ -86,7 +86,7 @@ |
90 |
ACQLIBS += -lpthread |
91 |
|
92 |
# use UTF-8 internally instead of Latin-1 (EXPERIMENTAL) |
93 |
-#DEFS += -DUSE_UTF8 -DXMLTV_OUTPUT_UTF8 |
94 |
+DEFS += -DUSE_UTF8 -DXMLTV_OUTPUT_UTF8 |
95 |
|
96 |
# enable support for importing XMLTV files |
97 |
DEFS += -DUSE_XMLTV_IMPORT |
98 |
|
99 |
|
100 |
|
101 |
-- |
102 |
gentoo-commits@l.g.o mailing list |