diff options
author | Pacho Ramos <pacho@gentoo.org> | 2012-02-25 12:31:13 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2012-02-25 12:31:13 +0000 |
commit | dec4c697e830892731adba8fd08cffda5a812101 (patch) | |
tree | 8fff600c84f4ce6446a31593f40469f9a39ae478 /net-misc | |
parent | Restricting pypy and jython (diff) | |
download | historical-dec4c697e830892731adba8fd08cffda5a812101.tar.gz historical-dec4c697e830892731adba8fd08cffda5a812101.tar.bz2 historical-dec4c697e830892731adba8fd08cffda5a812101.zip |
Fixes underlinking, bug #405337 by Attila Tóth; fixes a segfault in the GTK+2 interface on amd64, bug #262504#c40. Thanks to Richard Grenville for the fixes.
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/pavuk/ChangeLog | 12 | ||||
-rw-r--r-- | net-misc/pavuk/Manifest | 11 | ||||
-rw-r--r-- | net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch | 26 | ||||
-rw-r--r-- | net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch | 10 | ||||
-rw-r--r-- | net-misc/pavuk/pavuk-0.9.36_pre20120215-r1.ebuild | 111 |
5 files changed, 165 insertions, 5 deletions
diff --git a/net-misc/pavuk/ChangeLog b/net-misc/pavuk/ChangeLog index ce9b317625e5..e3dae5f15ed8 100644 --- a/net-misc/pavuk/ChangeLog +++ b/net-misc/pavuk/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-misc/pavuk # Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.37 2012/02/19 13:20:37 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.38 2012/02/25 12:31:13 pacho Exp $ + +*pavuk-0.9.36_pre20120215-r1 (25 Feb 2012) + + 25 Feb 2012; Pacho Ramos <pacho@gentoo.org> + +files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch, + +files/pavuk-0.9.36_pre20120215-fix-underlinking.patch, + +pavuk-0.9.36_pre20120215-r1.ebuild: + Fixes underlinking, bug #405337 by Attila Tóth; fixes a segfault in the GTK+2 + interface on amd64, bug #262504#c40. Thanks to Richard Grenville for the + fixes. 19 Feb 2012; Pacho Ramos <pacho@gentoo.org> +files/pavuk-0.9.36_pre20120215-pcre-fix.patch, diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest index 91aab08abc40..11d604b00ed6 100644 --- a/net-misc/pavuk/Manifest +++ b/net-misc/pavuk/Manifest @@ -1,15 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch 937 RMD160 298cf7aac11435cacc3f2f5af9e640a2c7c5094e SHA1 3fb5c73680b750cfc758dc01e13f86a66d3adde4 SHA256 a34a474bd2dc1940892e3e86b24a0d43bc9300fc6bd380f385a9f9d6313138b2 +AUX pavuk-0.9.36_pre20120215-fix-underlinking.patch 409 RMD160 90baf4141be054025a43a2e00326ae33a4d40a2c SHA1 29643fb344e7626db9ad133a4dc3ec3e65acf0d8 SHA256 3cddc688d4e67477e3cf89dd045a7a1c2e6b803f4842cb382f56e49a06b312cf AUX pavuk-0.9.36_pre20120215-pcre-fix.patch 427 RMD160 91c8aaee9cce0af5167dac21e99ee513bfebd28f SHA1 c47b4dbe23d091de41df0212be30e32dee198de1 SHA256 0e0b2f439d57561783a212ac76e8e1778bb7156149150994b7e65fc31f17a04e DIST pavuk-0.9.36_pre20120215.tar.xz 810516 RMD160 c3a5bc160b70a74dbe90ccc68d0ccae68e0143ed SHA1 686d1a4d016992cf1cf13315bea2bb070483a92d SHA256 522e07e3163b835f26157f091ad43bd6fa6e2ddb5d46c2176f10e81c6429ff1e +EBUILD pavuk-0.9.36_pre20120215-r1.ebuild 2898 RMD160 4d366be956811f5b95e0e2ec7fa449e675686308 SHA1 be40e5d2042d9e57ba1b842b1d75bb19648699a4 SHA256 b5049cf16a244b51df435f689aa17997e3a6581704becc0c28ba5a79e42bf329 EBUILD pavuk-0.9.36_pre20120215.ebuild 2690 RMD160 7c9f5d19ef19b23d14de95ce876bb26d517711c5 SHA1 9e60d5fbf252e2f16549148d9a57af455a86dfa3 SHA256 82efa70ad154cd62f8e2f218e53ec3054d73920f08e16cd526fe10d10188fa06 -MISC ChangeLog 6500 RMD160 2521f87b55d141c5005ee104d9d04070345c0025 SHA1 f1a73d8b72381df9498ebf04949b4f02d50c52d5 SHA256 93981fabea7d23361c8a11d3cf355ccb5ede8dd225ce930ed9ad2ac6c4c34704 +MISC ChangeLog 6919 RMD160 0ef7859fc50b277a6f4e01c3fc87dda8bc12eae4 SHA1 d697f92a73b508f6bd288d4ba70191475fc3c29d SHA256 385c44d9f3c57271116bb5bca96d255eaf8e8a68776a2ea58209b1dd077ae5e8 MISC metadata.xml 571 RMD160 c14493296067207791aad6721348d99e66214719 SHA1 996f5f60a9d208580015bbac7d986bfab4389c88 SHA256 36369dcce2a3db8ed7274e3833d6d147112c1d4dcbd80059f641635d85cac168 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk9A9ysACgkQCaWpQKGI+9Qi+ACfeUrsMtkHu7+nsvfuIeT1PYtp -944An1MzcX/jV2NoQY9lb3cWn91MDIq8 -=BAQH +iEYEARECAAYFAk9I1JcACgkQCaWpQKGI+9QHhACfcF6oxq0FZCl+R5QiM184ntE7 +ndYAnj3Qj1KWBgyq1Bm6ayT6Qh02QtEx +=3oyN -----END PGP SIGNATURE----- diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch new file mode 100644 index 000000000000..6ce18c1ed3e2 --- /dev/null +++ b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch @@ -0,0 +1,26 @@ +--- src/gtkmulticol.c 2009-01-21 16:37:39.000000000 +0800 ++++ src/gtkmulticol.c 2012-02-21 09:47:21.680512626 +0800 +@@ -45,9 +45,9 @@ + static void gtk_multicol_size_request(GtkWidget *widget, GtkRequisition *requisition); + static void gtk_multicol_size_allocate(GtkWidget *widget, GtkAllocation *allocation); + +-guint gtk_multicol_get_type(void) ++GType gtk_multicol_get_type(void) + { +- static guint multicol_type = 0; ++ static GType multicol_type = 0; + + if (!multicol_type) + { + +--- src/gtkmulticol.h 2009-01-21 16:37:40.000000000 +0800 ++++ src/gtkmulticol.h 2012-02-21 09:47:42.880514545 +0800 +@@ -41,7 +41,7 @@ + GtkBoxClass parent_class; + }; + +-guint gtk_multicol_get_type(void); ++GType gtk_multicol_get_type(void); + GtkWidget *gtk_multicol_new(gint nrows); + void gtk_multicol_set_number_of_rows(GtkMultiCol *multicol, gint nrows); + void gtk_multicol_set_spacing(GtkMultiCol *multicol, gint hspacing, gint vspacing); diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch new file mode 100644 index 000000000000..25338460bd4c --- /dev/null +++ b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch @@ -0,0 +1,10 @@ +--- configure.in~ 2011-03-02 10:44:45.000000000 +0800 ++++ configure.in 2012-02-23 09:55:28.073709216 +0800 +@@ -1749,6 +1749,7 @@ + + if test -n "$GTK_LIBS" ; then + if test -n "$GTK_LIBS"; then ++ AX_ADD_OPTION([LIBS], [$X_LIBS]) + AX_ADD_OPTION([LIBS], [$GTK_LIBS]) + AX_ADD_OPTION([CPPFLAGS], [$GTK_CFLAGS]) + AC_DEFINE_UNQUOTED(GTK_FACE, [$GTK_VERSION], [with GTK+ GUI]) diff --git a/net-misc/pavuk/pavuk-0.9.36_pre20120215-r1.ebuild b/net-misc/pavuk/pavuk-0.9.36_pre20120215-r1.ebuild new file mode 100644 index 000000000000..e5b5f05b6172 --- /dev/null +++ b/net-misc/pavuk/pavuk-0.9.36_pre20120215-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.36_pre20120215-r1.ebuild,v 1.1 2012/02/25 12:31:13 pacho Exp $ + +EAPI=4 + +S="${WORKDIR}/${PN}" + +inherit eutils autotools-utils + +DESCRIPTION="Web spider and website mirroring tool" +HOMEPAGE="http://www.pavuk.org/" +SRC_URI="http://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug gtk hammer ipv6 nls pcre profile ssl" + +RDEPEND="virtual/libintl + gtk? ( x11-libs/gtk+:2 ) + pcre? ( dev-libs/libpcre ) + ssl? ( dev-libs/openssl )" + +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + sys-devel/gettext" + +AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +PATCHES=( + # Fixes a bug in re.c for PCRE support + "${FILESDIR}/${P}-pcre-fix.patch" + + # Fixes underlinking, bug #405337 + "${FILESDIR}/${P}-fix-underlinking.patch" + + # Fixes a segfault in the GTK+2 interface on amd64, bug #262504#c40 + "${FILESDIR}/${P}-fix-gtkmulticol-segfault.patch" +) + +DOCS=( README CREDITS NEWS AUTHORS BUGS TODO MAILINGLIST wget-pavuk.HOWTO + ChangeLog wget-pavuk.HOWTO pavuk_authinfo.sample pavukrc.sample + ) + +src_prepare() { + # Fixes a bug in Makefile.am that causes aclocal to fail + sed -i 's/^\(ACLOCAL_AMFLAGS[[:space:]]*=[[:space:]]*-I[[:space:]]*\)\$(top_srcdir)\//\1/' "${S}/Makefile.am" || die + + # Fixes a bug in configure.in that breaks non-debug builds + sed -i 's/\([[:space:]]C\(PP\)*FLAGS=`\)/true; # \1/' "${S}/configure.in" || die + + # Fix for building with ~dev-lang/spidermonkey-1.8.5 + # sed -i 's/mozjs/mozjs185/g' "${S}/configure.in" || die + + autotools-utils_src_prepare +} + +src_configure() { + local regex="auto" + use pcre && regex="pcre" + + local myeconfargs=( + --enable-threads + --enable-socks + --enable-utf-8 + --disable-js + "--with-regex=${regex}" + $(use_enable gtk) + $(use_enable gtk gtk2) + $(use_enable gtk gnome) + $(use_with gtk x) + $(use_enable debug debugging) + $(use_enable debug debug-build) + # $(use_enable debug debug-features) + $(use_enable ssl) + $(use_enable nls) + $(use_enable ipv6) + # $(use_enable javascript js) + $(use_enable profile profiling) + ) + + # JavaScript bindings: Broken! + # ============================ + # Currently could pass configure phase with ~dev-lang/spidermonkey-1.8.5 + # yet apparently incompatible with recent versions of spidermonkey + + # if use javascript; then + # local jspkg='mozjs185' + # local jsinclude=$(pkg-config --cflags "$jspkg") + # local jslibs='/dev/null '$(pkg-config --libs-only-l "$jspkg") + # myeconfargs+=( + # "--with-js-include=${jsinclude}" + # "--with-js-libraries=${jslibs}" + # ) + # fi + + autotools-utils_src_configure +} + +src_install() { + if use gtk; then + newicon src/pavuk_logo.xpm pavuk.xpm + domenu pavuk.desktop + fi + + doman "${S}/doc/pavuk.1" + + autotools-utils_src_install +} |