* [gentoo-commits] repo/gentoo:master commit in: net-libs/libhubbub/files/, net-libs/libhubbub/
@ 2016-03-02 22:53 Michael Weber
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber @ 2016-03-02 22:53 UTC (permalink / raw
To: gentoo-commits
commit: 2ad956cff9374126a05d5eeff8ce92b05768486e
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 00:54:49 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 22:32:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad956cf
net-libs/libhubbub: Drop old.
Package-Manager: portage-2.2.27
net-libs/libhubbub/Manifest | 2 --
.../files/libhubbub-0.3.0-glibc2.20.patch | 17 -------------
net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild | 28 ----------------------
3 files changed, 47 deletions(-)
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 5dd9f07..61966cb 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,6 +1,4 @@
-DIST libhubbub-0.3.0-src.tar.gz 792069 SHA256 dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7 SHA512 e34e74baca01039ba0435785ec5a33718d438d5bdedab37fa42f73be79f8e928642667811e40a97d7f9ffad7b6a0f3eb3a70982838611f83f085b1d9503e7894 WHIRLPOOL b6f8d86cafb8196d53f577072c4b2710bb2ff64d9c0e7bb0162da384992fc6f4b36dc3f639d2c6775488ed0a99db9a662d157c04c8184ad23db68005a6e5e16c
DIST libhubbub-0.3.1-src.tar.gz 791945 SHA256 1f8b31e86d0d32735f247c071a7ade1a475606b7a3583d2132e567a310b62053 SHA512 79a40602cda351f16e81788903c8b77a6f4975fc6e6389b9b197bde8b20478e528acbd7b10bbb556c9ea78accf8088a7c461c239e457903615b159e8c5a881c8 WHIRLPOOL dfc0e20059c7f11d78d3006b1350328588a5651024a17672fb3cfe9717390654223a2366ab9fa64dc227634fc27ffb638d84fc50f286606aa4548c62d0dca4ea
DIST libhubbub-0.3.3-src.tar.gz 783945 SHA256 066dffd127ead12da60050aa13b80891fb996d00197767d038e48ac163402780 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526 WHIRLPOOL c2f5459064e75699231f59dcfa56823d721aba8dc5062c5996807109f0bca1019a8a0b8371bb0934a49b8f98805d89ae9131d203379117f13e6ed2ee7eacae09
-DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c
DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980
DIST netsurf-buildsystem-1.5.tar.gz 38196 SHA256 dbc6afc639f6987b704e6ff4427668787ee7efba77e1bbf76b614699b5daaf71 SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4 WHIRLPOOL 7b7d595a2e399b361e71769e509a129af42da5ce823f1b55183efb53898ac2ae731593eb13e1ecc2271ea26ee0948ac35bf99fea280eb72a2bb00164b4b29f09
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch b/net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch
deleted file mode 100644
index ad7beeb..0000000
--- a/net-libs/libhubbub/files/libhubbub-0.3.0-glibc2.20.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- libhubbub-0.3.0/Makefile
-+++ libhubbub-0.3.0/Makefile
-@@ -15,13 +15,7 @@
- WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \
- -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
- -Wmissing-declarations -Wnested-externs -pedantic
--# BeOS/Haiku/AmigaOS have standard library errors that issue warnings.
--ifneq ($(TARGET),beos)
-- ifneq ($(TARGET),amiga)
-- WARNFLAGS := $(WARNFLAGS) -Werror
-- endif
--endif
--CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \
-+CFLAGS := -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
- -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS)
- ifneq ($(GCCVER),2)
- CFLAGS := $(CFLAGS) -std=c99
diff --git a/net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild
deleted file mode 100644
index 9f442ff..0000000
--- a/net-libs/libhubbub/libhubbub-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.2
-inherit netsurf
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~m68k-mint"
-IUSE="doc test"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.0-r1[static-libs?,${MULTILIB_USEDEP}]
- !net-libs/hubbub"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-lang/perl
- >=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-glibc2.20.patch )
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-
-#RESTRICT=test
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libhubbub/files/, net-libs/libhubbub/
@ 2019-11-12 14:46 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2019-11-12 14:46 UTC (permalink / raw
To: gentoo-commits
commit: bcb08f36f4cf276faab83c785c2f33dba57135c1
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Wed Nov 6 11:27:23 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 14:45:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb08f36
net-libs/libhubbub: bump to 0.3.6 and fix for json-c issue.
Also add myself as proxy maintainer. Others are welcome to contribute,
my only interest here is in libwebsockets.
Closes: https://bugs.gentoo.org/694042
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/13566
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-libs/libhubbub/Manifest | 1 +
.../libhubbub/files/libhubbub-0.3.6-json-c.patch | 24 ++++++++++
net-libs/libhubbub/libhubbub-0.3.6.ebuild | 54 ++++++++++++++++++++++
net-libs/libhubbub/metadata.xml | 9 +++-
4 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 737a61e6541..199df49861d 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,3 +1,4 @@
DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
+DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
diff --git a/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
new file mode 100644
index 00000000000..763693e21b8
--- /dev/null
+++ b/net-libs/libhubbub/files/libhubbub-0.3.6-json-c.patch
@@ -0,0 +1,24 @@
+diff -u -rb libhubbub-0.3.6/test.o/tokeniser2.c libhubbub-0.3.6/test/tokeniser2.c
+--- libhubbub-0.3.6/test.o/tokeniser2.c 2019-06-26 22:39:57.000000000 +0200
++++ libhubbub-0.3.6/test/tokeniser2.c 2019-11-06 13:09:02.321068038 +0200
+@@ -48,7 +48,7 @@
+ }
+
+ json = json_object_from_file(argv[1]);
+- assert(!is_error(json));
++ assert(json);
+
+ assert(strcmp((char *) ((json_object_get_object(json)->head)->k),
+ "tests") == 0);
+diff -u -rb libhubbub-0.3.6/test.o/tokeniser3.c libhubbub-0.3.6/test/tokeniser3.c
+--- libhubbub-0.3.6/test.o/tokeniser3.c 2019-06-26 22:39:57.000000000 +0200
++++ libhubbub-0.3.6/test/tokeniser3.c 2019-11-06 13:13:03.162538564 +0200
+@@ -46,7 +46,7 @@
+ }
+
+ json = json_object_from_file(argv[1]);
+- assert(!is_error(json));
++ assert(json);
+
+ assert(strcmp((char *) ((json_object_get_object(json)->head)->k),
+ "tests") == 0);
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
new file mode 100644
index 00000000000..7a2bdd8ebcb
--- /dev/null
+++ b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="HTML5 compliant parsing library, written in C"
+HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
+IUSE="doc test"
+
+BDEPEND="
+ dev-util/netsurf-buildsystem
+ virtual/pkgconfig
+
+ test? ( dev-lang/perl )
+"
+RDEPEND="dev-libs/libparserutils:="
+DEPEND="${RDEPEND}
+ test? ( dev-libs/json-c )"
+RESTRICT="!test? ( test )"
+
+DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
+
+src_prepare() {
+ default
+ sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+ -i test/tree2.c || die
+}
+
+_emake() {
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+ netsurf_define_makeconf
+ append-cflags -Wno-error
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+ _emake
+}
+
+src_test() {
+ _emake test
+}
+
+src_install() {
+ _emake DESTDIR="${ED}" install
+}
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 7a38bb90096..64b17e08bff 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-12 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-12 14:46 [gentoo-commits] repo/gentoo:master commit in: net-libs/libhubbub/files/, net-libs/libhubbub/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2016-03-02 22:53 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox