| 1 |
a3li 11/05/29 22:08:33 |
| 2 |
|
| 3 |
Added: tvtime-1.0.2_p20110131-autotools.patch |
| 4 |
tvtime-1.0.2_p20110131-gettext.patch |
| 5 |
tvtime-1.0.2_p20110131-libsupc++.patch |
| 6 |
Log: |
| 7 |
Bump to 1.0.2_p20110131 from new upstream. Fixes building with linux-headers-2.6.38 and newer autoconf. Closes bug 359743 by Billy DeVincentis. |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-tv/tvtime/files/tvtime-1.0.2_p20110131-autotools.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2_p20110131-autotools.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2_p20110131-autotools.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: tvtime-1.0.2_p20110131-autotools.patch |
| 18 |
=================================================================== |
| 19 |
diff -Naur tvtime.orig/configure.ac tvtime/configure.ac |
| 20 |
--- tvtime.orig/configure.ac 2011-02-01 02:35:26.000000000 +0100 |
| 21 |
+++ tvtime/configure.ac 2011-05-29 21:45:16.825993007 +0200 |
| 22 |
@@ -10,6 +10,7 @@ |
| 23 |
|
| 24 |
# Check for compilers. |
| 25 |
AC_PROG_CC |
| 26 |
+AM_PROG_CC_C_O |
| 27 |
AC_CHECK_PROG(found_cc, "$CC", yes, no) |
| 28 |
test "x$found_cc" = "xyes" || exit 1 |
| 29 |
|
| 30 |
@@ -18,7 +19,6 @@ |
| 31 |
test "x$found_cxx" = "xyes" || exit 1 |
| 32 |
|
| 33 |
# Check for libtool. |
| 34 |
-AC_PROG_LIBTOOL |
| 35 |
|
| 36 |
# Checks for header files. |
| 37 |
AC_HEADER_STDC |
| 38 |
@@ -67,10 +67,7 @@ |
| 39 |
dnl freetype |
| 40 |
dnl --------------------------------------------- |
| 41 |
dnl Test for freetype |
| 42 |
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) |
| 43 |
-if test "$FREETYPE_CONFIG" = "no" ; then |
| 44 |
- AC_MSG_ERROR(freetype2 needed and freetype-config not found) |
| 45 |
-fi |
| 46 |
+PKG_CHECK_MODULES([TTF], [freetype2]) |
| 47 |
|
| 48 |
dnl --------------------------------------------- |
| 49 |
dnl libxml2 |
| 50 |
diff -Naur tvtime.orig/src/Makefile.am tvtime/src/Makefile.am |
| 51 |
--- tvtime.orig/src/Makefile.am 2011-02-01 02:35:26.000000000 +0100 |
| 52 |
+++ tvtime/src/Makefile.am 2011-05-29 21:42:32.156993111 +0200 |
| 53 |
@@ -19,9 +19,6 @@ |
| 54 |
tmpdir = /tmp |
| 55 |
localedir = $(datadir)/locale |
| 56 |
|
| 57 |
-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags` |
| 58 |
-TTF_LIBS = `$(FREETYPE_CONFIG) --libs` |
| 59 |
- |
| 60 |
# Set the following if you want to specify an additional font directory |
| 61 |
# FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/' |
| 62 |
|
| 63 |
@@ -76,20 +73,20 @@ |
| 64 |
tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \ |
| 65 |
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \ |
| 66 |
$(FONT_CFLAGS) $(AM_CFLAGS) |
| 67 |
-tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \ |
| 68 |
+tvtime_LDADD = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \ |
| 69 |
$(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++ |
| 70 |
|
| 71 |
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \ |
| 72 |
tvtime-command.c |
| 73 |
tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS) |
| 74 |
-tvtime_command_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) |
| 75 |
+tvtime_command_LDADD = $(ZLIB_LIBS) $(XML2_LIBS) |
| 76 |
tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \ |
| 77 |
tvtime-configure.c |
| 78 |
tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS) |
| 79 |
-tvtime_configure_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) |
| 80 |
+tvtime_configure_LDADD = $(ZLIB_LIBS) $(XML2_LIBS) |
| 81 |
tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \ |
| 82 |
tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \ |
| 83 |
mixer.h mixer.c |
| 84 |
tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS) |
| 85 |
-tvtime_scanner_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) |
| 86 |
+tvtime_scanner_LDADD = $(ZLIB_LIBS) $(XML2_LIBS) |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.1 media-tv/tvtime/files/tvtime-1.0.2_p20110131-gettext.patch |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2_p20110131-gettext.patch?rev=1.1&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2_p20110131-gettext.patch?rev=1.1&content-type=text/plain |
| 95 |
|
| 96 |
Index: tvtime-1.0.2_p20110131-gettext.patch |
| 97 |
=================================================================== |
| 98 |
Quick fix for building with newer autoconf where mkinstalldirs is no longer |
| 99 |
available. |
| 100 |
|
| 101 |
Upstream: no |
| 102 |
Author: Alex Legler <a3li@g.o> |
| 103 |
|
| 104 |
diff -Naur tvtime.orig/po/Makefile.in.in tvtime/po/Makefile.in.in |
| 105 |
--- tvtime.orig/po/Makefile.in.in 2011-02-01 02:35:26.000000000 +0100 |
| 106 |
+++ tvtime/po/Makefile.in.in 2011-05-29 22:16:54.093991811 +0200 |
| 107 |
@@ -26,8 +26,11 @@ |
| 108 |
|
| 109 |
INSTALL = @INSTALL@ |
| 110 |
INSTALL_DATA = @INSTALL_DATA@ |
| 111 |
-MKINSTALLDIRS = @MKINSTALLDIRS@ |
| 112 |
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) |
| 113 |
+ |
| 114 |
+mkdir_p = $(SHELL) @install_sh@ -d |
| 115 |
+install_sh = $(SHELL) @install_sh@ |
| 116 |
+MKDIR_P = @MKDIR_P@ |
| 117 |
+mkdir_p = @mkdir_p@ |
| 118 |
|
| 119 |
GMSGFMT = @GMSGFMT@ |
| 120 |
MSGFMT = @MSGFMT@ |
| 121 |
@@ -137,7 +140,7 @@ |
| 122 |
install-exec: |
| 123 |
install-data: install-data-@USE_NLS@ |
| 124 |
if test "$(PACKAGE)" = "gettext-tools"; then \ |
| 125 |
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ |
| 126 |
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ |
| 127 |
for file in $(DISTFILES.common) Makevars.template; do \ |
| 128 |
$(INSTALL_DATA) $(srcdir)/$$file \ |
| 129 |
$(DESTDIR)$(gettextsrcdir)/$$file; \ |
| 130 |
@@ -150,13 +153,13 @@ |
| 131 |
fi |
| 132 |
install-data-no: all |
| 133 |
install-data-yes: all |
| 134 |
- $(mkinstalldirs) $(DESTDIR)$(datadir) |
| 135 |
+ $(mkdir_p) $(DESTDIR)$(datadir) |
| 136 |
@catalogs='$(CATALOGS)'; \ |
| 137 |
for cat in $$catalogs; do \ |
| 138 |
cat=`basename $$cat`; \ |
| 139 |
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ |
| 140 |
dir=$(localedir)/$$lang/LC_MESSAGES; \ |
| 141 |
- $(mkinstalldirs) $(DESTDIR)$$dir; \ |
| 142 |
+ $(mkdir_p) $(DESTDIR)$$dir; \ |
| 143 |
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ |
| 144 |
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ |
| 145 |
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ |
| 146 |
@@ -196,19 +199,19 @@ |
| 147 |
installdirs-exec: |
| 148 |
installdirs-data: installdirs-data-@USE_NLS@ |
| 149 |
if test "$(PACKAGE)" = "gettext-tools"; then \ |
| 150 |
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ |
| 151 |
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ |
| 152 |
else \ |
| 153 |
: ; \ |
| 154 |
fi |
| 155 |
installdirs-data-no: |
| 156 |
installdirs-data-yes: |
| 157 |
- $(mkinstalldirs) $(DESTDIR)$(datadir) |
| 158 |
+ $(mkdir_p) $(DESTDIR)$(datadir) |
| 159 |
@catalogs='$(CATALOGS)'; \ |
| 160 |
for cat in $$catalogs; do \ |
| 161 |
cat=`basename $$cat`; \ |
| 162 |
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ |
| 163 |
dir=$(localedir)/$$lang/LC_MESSAGES; \ |
| 164 |
- $(mkinstalldirs) $(DESTDIR)$$dir; \ |
| 165 |
+ $(mkdir_p) $(DESTDIR)$$dir; \ |
| 166 |
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ |
| 167 |
if test -n "$$lc"; then \ |
| 168 |
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ |
| 169 |
|
| 170 |
|
| 171 |
|
| 172 |
1.1 media-tv/tvtime/files/tvtime-1.0.2_p20110131-libsupc++.patch |
| 173 |
|
| 174 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2_p20110131-libsupc++.patch?rev=1.1&view=markup |
| 175 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2_p20110131-libsupc++.patch?rev=1.1&content-type=text/plain |
| 176 |
|
| 177 |
Index: tvtime-1.0.2_p20110131-libsupc++.patch |
| 178 |
=================================================================== |
| 179 |
diff -Naur tvtime.orig/src/Makefile.am tvtime/src/Makefile.am |
| 180 |
--- tvtime.orig/src/Makefile.am 2011-02-01 02:35:26.000000000 +0100 |
| 181 |
+++ tvtime/src/Makefile.am 2011-05-29 21:39:08.739993239 +0200 |
| 182 |
@@ -77,7 +77,7 @@ |
| 183 |
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \ |
| 184 |
$(FONT_CFLAGS) $(AM_CFLAGS) |
| 185 |
tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \ |
| 186 |
- $(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lstdc++ |
| 187 |
+ $(X11_LIBS) $(XML2_LIBS) $(ASOUND_LIBS) -lm -lsupc++ |
| 188 |
|
| 189 |
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \ |
| 190 |
tvtime-command.c |
Archives