[arch-commits] Commit in w3m/repos (6 files)

Gaetan Bisson bisson at archlinux.org
Mon Feb 6 20:25:49 EST 2012


    Date: Monday, February 6, 2012 @ 20:25:49
  Author: bisson
Revision: 149346

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  w3m/repos/extra-i686/PKGBUILD
    (from rev 149345, w3m/trunk/PKGBUILD)
  w3m/repos/extra-i686/https-segfault.patch
    (from rev 149345, w3m/trunk/https-segfault.patch)
  w3m/repos/extra-x86_64/PKGBUILD
    (from rev 149345, w3m/trunk/PKGBUILD)
  w3m/repos/extra-x86_64/https-segfault.patch
    (from rev 149345, w3m/trunk/https-segfault.patch)
Deleted:
  w3m/repos/extra-i686/PKGBUILD
  w3m/repos/extra-x86_64/PKGBUILD

-----------------------------------+
 extra-i686/PKGBUILD               |   87 ++++++++++++++++++------------------
 extra-i686/https-segfault.patch   |   19 +++++++
 extra-x86_64/PKGBUILD             |   87 ++++++++++++++++++------------------
 extra-x86_64/https-segfault.patch |   19 +++++++
 4 files changed, 128 insertions(+), 84 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-07 01:25:19 UTC (rev 149345)
+++ extra-i686/PKGBUILD	2012-02-07 01:25:49 UTC (rev 149346)
@@ -1,42 +0,0 @@
-# $Id$
-# Contributor: dorphell <dorphell at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=w3m
-pkgver=0.5.3
-pkgrel=2
-pkgdesc='Text-based Web browser, as well as pager'
-url='http://w3m.sourceforge.net/'
-license=('custom')
-arch=('i686' 'x86_64')
-makedepends=('imlib2')
-optdepends=('imlib2: for graphics support') 
-depends=('openssl' 'gc' 'ncurses')
-source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed 's/file_handle/file_handle_rofl/g' -i istream.*
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--enable-image=x11,fb \
-		--with-imagelib=imlib2 \
-		--with-termlib=ncurses \
-		--disable-w3mmailer \
-		--disable-mouse \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
-	find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}"
-	ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}"
-}

Copied: w3m/repos/extra-i686/PKGBUILD (from rev 149345, w3m/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-07 01:25:49 UTC (rev 149346)
@@ -0,0 +1,45 @@
+# $Id$
+# Contributor: dorphell <dorphell at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=w3m
+pkgver=0.5.3
+pkgrel=3
+pkgdesc='Text-based Web browser, as well as pager'
+url='http://w3m.sourceforge.net/'
+license=('custom')
+arch=('i686' 'x86_64')
+makedepends=('imlib2')
+optdepends=('imlib2: for graphics support') 
+depends=('openssl' 'gc' 'ncurses')
+source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz"
+        'https-segfault.patch')
+sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237'
+          '66affb2f695fe0bdde25cf774642bfd6a9404e88')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	sed 's/file_handle/file_handle_rofl/g' -i istream.*
+	patch -p1 -i ../https-segfault.patch
+
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--enable-image=x11,fb \
+		--with-imagelib=imlib2 \
+		--with-termlib=ncurses \
+		--disable-w3mmailer \
+		--disable-mouse \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
+	find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}"
+	ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: w3m/repos/extra-i686/https-segfault.patch (from rev 149345, w3m/trunk/https-segfault.patch)
===================================================================
--- extra-i686/https-segfault.patch	                        (rev 0)
+++ extra-i686/https-segfault.patch	2012-02-07 01:25:49 UTC (rev 149346)
@@ -0,0 +1,19 @@
+Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
+
+--- old/url.c	2011-01-04 14:52:24.000000000 +0530
++++ new/url.c	2011-09-02 18:25:43.305652690 +0530
+@@ -82,11 +82,11 @@
+     {"ftp", SCM_FTP},
+     {"local", SCM_LOCAL},
+     {"file", SCM_LOCAL},
+-    /*  {"exec", SCM_EXEC}, */
++    {"exec", SCM_EXEC}, 
+     {"nntp", SCM_NNTP},
+-    /*  {"nntp", SCM_NNTP_GROUP}, */
++    {"nntp", SCM_NNTP_GROUP}, 
+     {"news", SCM_NEWS},
+-    /*  {"news", SCM_NEWS_GROUP}, */
++    {"news", SCM_NEWS_GROUP}, 
+     {"data", SCM_DATA},
+ #ifndef USE_W3MMAILER
+     {"mailto", SCM_MAILTO},

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-07 01:25:19 UTC (rev 149345)
+++ extra-x86_64/PKGBUILD	2012-02-07 01:25:49 UTC (rev 149346)
@@ -1,42 +0,0 @@
-# $Id$
-# Contributor: dorphell <dorphell at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=w3m
-pkgver=0.5.3
-pkgrel=2
-pkgdesc='Text-based Web browser, as well as pager'
-url='http://w3m.sourceforge.net/'
-license=('custom')
-arch=('i686' 'x86_64')
-makedepends=('imlib2')
-optdepends=('imlib2: for graphics support') 
-depends=('openssl' 'gc' 'ncurses')
-source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed 's/file_handle/file_handle_rofl/g' -i istream.*
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--enable-image=x11,fb \
-		--with-imagelib=imlib2 \
-		--with-termlib=ncurses \
-		--disable-w3mmailer \
-		--disable-mouse \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
-	find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}"
-	ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}"
-}

Copied: w3m/repos/extra-x86_64/PKGBUILD (from rev 149345, w3m/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-07 01:25:49 UTC (rev 149346)
@@ -0,0 +1,45 @@
+# $Id$
+# Contributor: dorphell <dorphell at archlinux.org>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=w3m
+pkgver=0.5.3
+pkgrel=3
+pkgdesc='Text-based Web browser, as well as pager'
+url='http://w3m.sourceforge.net/'
+license=('custom')
+arch=('i686' 'x86_64')
+makedepends=('imlib2')
+optdepends=('imlib2: for graphics support') 
+depends=('openssl' 'gc' 'ncurses')
+source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz"
+        'https-segfault.patch')
+sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237'
+          '66affb2f695fe0bdde25cf774642bfd6a9404e88')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	sed 's/file_handle/file_handle_rofl/g' -i istream.*
+	patch -p1 -i ../https-segfault.patch
+
+	./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--enable-image=x11,fb \
+		--with-imagelib=imlib2 \
+		--with-termlib=ncurses \
+		--disable-w3mmailer \
+		--disable-mouse \
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+
+	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
+	find doc/* | grep -v CVS | xargs -i install "{}" "${pkgdir}/usr/share/doc/${pkgname}"
+	ln -s ../../doc/"${pkgname}"/README "${pkgdir}/usr/share/licenses/${pkgname}"
+}

Copied: w3m/repos/extra-x86_64/https-segfault.patch (from rev 149345, w3m/trunk/https-segfault.patch)
===================================================================
--- extra-x86_64/https-segfault.patch	                        (rev 0)
+++ extra-x86_64/https-segfault.patch	2012-02-07 01:25:49 UTC (rev 149346)
@@ -0,0 +1,19 @@
+Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
+
+--- old/url.c	2011-01-04 14:52:24.000000000 +0530
++++ new/url.c	2011-09-02 18:25:43.305652690 +0530
+@@ -82,11 +82,11 @@
+     {"ftp", SCM_FTP},
+     {"local", SCM_LOCAL},
+     {"file", SCM_LOCAL},
+-    /*  {"exec", SCM_EXEC}, */
++    {"exec", SCM_EXEC}, 
+     {"nntp", SCM_NNTP},
+-    /*  {"nntp", SCM_NNTP_GROUP}, */
++    {"nntp", SCM_NNTP_GROUP}, 
+     {"news", SCM_NEWS},
+-    /*  {"news", SCM_NEWS_GROUP}, */
++    {"news", SCM_NEWS_GROUP}, 
+     {"data", SCM_DATA},
+ #ifndef USE_W3MMAILER
+     {"mailto", SCM_MAILTO},



More information about the arch-commits mailing list