www-client/w3m: update patches

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
deleted file mode 100644 (file)
index 1b034b4..0000000
--- a/www-client/w3m/files/w3m-0.5.3-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in 2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in      2011-02-06 12:05:40.000000000 +0900
-@@ -199,7 +199,7 @@
-       $(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
- 
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--      $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+      $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
- 
- w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
-       $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c

diff --git a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch b/www-client/w3m/files/w3m-time.patch
similarity index 80%
rename from www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
rename to www-client/w3m/files/w3m-time.patch
index 03efd85d6536fbc6d00b5ff2e20828cc351d3218..8489eee3fae99f682861a8d957143dc6f09a34c4 100644 (file)
--- a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
+++ b/www-client/w3m/files/w3m-time.patch
@@ -1,5 +1,3 @@
-diff --git a/html.h b/html.h
-index c490655..2a9a431 100644
 --- a/html.h
 +++ b/html.h
 @@ -8,6 +8,8 @@

diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild b/www-client/w3m/w3m-0.5.3-r9.ebuild
index a4a9eb180c89399b19decaaa316b52d839a2bbbe..811e11b5efdcd246a85447ad6b93cc2e1d9d88e6 100644 (file)
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-       "${FILESDIR}/${P}-underlinking.patch"
-       "${FILESDIR}/${P}-fix-missing-time.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-time.patch" )
 
 src_prepare() {
        default