| blob | 9642a02a336e84bc7a89b8de86ddb5be639b1eff |
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../xawtv/X11.patch
5 # Copyright (C) 2006 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
17 diff -ur xawtv-3.95/Makefile.in xawtv-3.95-t2/Makefile.in
18 --- xawtv-3.95/Makefile.in 2004-04-22 16:52:29.000000000 +0200
19 +++ xawtv-3.95-t2/Makefile.in 2006-02-10 02:38:31.000000000 +0100
20 @@ -29,7 +29,7 @@
21 # for CFLAGS
22 WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
23 LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
24 -X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
25 +X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11/include/X11/fonts
26 LIB_FLAGS := -I. -I./vbistuff -I./x11 \
27 -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
28 -I$(srcdir)/x11 -I$(srcdir)/structs \
29 diff -ur xawtv-3.95/configure xawtv-3.95-t2/configure
30 --- xawtv-3.95/configure 2005-09-30 12:10:03.000000000 +0200
31 +++ xawtv-3.95-t2/configure 2006-02-10 02:38:30.000000000 +0100
32 @@ -4130,22 +4130,22 @@
33 # Check X11 before X11Rn because it is often a symlink to the current release.
34 ac_x_header_dirs='
35 /usr/X11/include
36 -/usr/X11R6/include
37 +/usr/X11/include
38 /usr/X11R5/include
39 /usr/X11R4/include
41 /usr/include/X11
42 -/usr/include/X11R6
43 +/usr/include/X11
44 /usr/include/X11R5
45 /usr/include/X11R4
47 /usr/local/X11/include
48 -/usr/local/X11R6/include
49 +/usr/local/X11/include
50 /usr/local/X11R5/include
51 /usr/local/X11R4/include
53 /usr/local/include/X11
54 -/usr/local/include/X11R6
55 +/usr/local/include/X11
56 /usr/local/include/X11R5
57 /usr/local/include/X11R4
59 @@ -5376,7 +5376,7 @@
60 fi
61 fi
63 - # Check for libraries that X11R6 Xt/Xaw programs need.
64 + # Check for libraries that X11 Xt/Xaw programs need.
65 ac_save_LDFLAGS=$LDFLAGS
66 test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
67 # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
68 @@ -6812,7 +6812,7 @@
70 echo "$as_me:$LINENO: checking for X11 config directory" >&5
71 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
72 -x11conf=/usr/X11R6/lib/X11
73 +x11conf=/usr/X11/lib/X11
74 if test -d /etc/X11; then
75 x11conf=/etc/X11
76 fi
77 @@ -6822,7 +6822,7 @@
79 echo "$as_me:$LINENO: checking for X11 app-defaults directory" >&5
80 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
81 -resdir=/usr/X11R6/lib/X11
82 +resdir=/usr/X11/lib/X11
83 if test -d /etc/X11/app-defaults; then
84 resdir=/etc/X11
85 fi
86 diff -ur xawtv-3.95/configure.ac xawtv-3.95-t2/configure.ac
87 --- xawtv-3.95/configure.ac 2004-08-18 17:48:09.000000000 +0200
88 +++ xawtv-3.95-t2/configure.ac 2006-02-10 02:38:30.000000000 +0100
89 @@ -287,7 +287,7 @@
91 dnl ---------------------------------------------------------------------
92 AC_MSG_CHECKING(for X11 config directory)
93 -x11conf=/usr/X11R6/lib/X11
94 +x11conf=/usr/X11/lib/X11
95 if test -d /etc/X11; then
96 x11conf=/etc/X11
97 fi
98 @@ -295,7 +295,7 @@
99 AC_SUBST(x11conf)
101 AC_MSG_CHECKING(for X11 app-defaults directory)
102 -resdir=/usr/X11R6/lib/X11
103 +resdir=/usr/X11/lib/X11
104 if test -d /etc/X11/app-defaults; then
105 resdir=/etc/X11
106 fi
107 diff -ur xawtv-3.95/xawtv.spec xawtv-3.95-t2/xawtv.spec
108 --- xawtv-3.95/xawtv.spec 2005-09-30 14:57:44.000000000 +0200
109 +++ xawtv-3.95-t2/xawtv.spec 2006-02-10 02:38:30.000000000 +0100
110 @@ -17,14 +17,14 @@
111 %build
112 mkdir build
113 cd build
114 -CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11R6
115 +CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11
116 make
118 %install
119 test "%{buildroot}" != "" && rm -rf "%{buildroot}"
120 (cd build; make DESTDIR="%{buildroot}" SUID_ROOT="" install)
121 -gzip -v %{buildroot}/usr/X11R6/man/man*/*.[158]
122 -gzip -v %{buildroot}/usr/X11R6/man/*/man*/*.[158]
123 +gzip -v %{buildroot}/usr/X11/man/man*/*.[158]
124 +gzip -v %{buildroot}/usr/X11/man/*/man*/*.[158]
125 find %{buildroot} -type f -print \
126 | sed -e 's|%{buildroot}||' \
127 | grep -v -e %{docdir} \
128 @@ -34,7 +34,7 @@
129 %files -f filelist
130 %defattr(-,root,root)
131 %doc COPYING Changes TODO README README.* contrib/frequencies*
132 -%attr(4711,root,root) /usr/X11R6/bin/v4l-conf
133 +%attr(4711,root,root) /usr/X11/bin/v4l-conf
135 %clean
136 test "%{buildroot}" != "" && rm -rf "%{buildroot}"
137 diff -ur xawtv-3.95/xawtv.spec.in xawtv-3.95-t2/xawtv.spec.in
138 --- xawtv-3.95/xawtv.spec.in 2003-02-14 15:14:09.000000000 +0100
139 +++ xawtv-3.95-t2/xawtv.spec.in 2006-02-10 02:38:31.000000000 +0100
140 @@ -17,14 +17,14 @@
141 %build
142 mkdir build
143 cd build
144 -CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11R6
145 +CFLAGS="$RPM_OPT_FLAGS" ../configure --prefix=/usr/X11
146 make
148 %install
149 test "%{buildroot}" != "" && rm -rf "%{buildroot}"
150 (cd build; make DESTDIR="%{buildroot}" SUID_ROOT="" install)
151 -gzip -v %{buildroot}/usr/X11R6/man/man*/*.[158]
152 -gzip -v %{buildroot}/usr/X11R6/man/*/man*/*.[158]
153 +gzip -v %{buildroot}/usr/X11/man/man*/*.[158]
154 +gzip -v %{buildroot}/usr/X11/man/*/man*/*.[158]
155 find %{buildroot} -type f -print \
156 | sed -e 's|%{buildroot}||' \
157 | grep -v -e %{docdir} \
158 @@ -34,7 +34,7 @@
159 %files -f filelist
160 %defattr(-,root,root)
161 %doc COPYING Changes TODO README README.* contrib/frequencies*
162 -%attr(4711,root,root) /usr/X11R6/bin/v4l-conf
163 +%attr(4711,root,root) /usr/X11/bin/v4l-conf
165 %clean
166 test "%{buildroot}" != "" && rm -rf "%{buildroot}"