* [gentoo-commits] repo/gentoo:master commit in: dev-libs/uriparser/, dev-libs/uriparser/files/
@ 2018-01-24 20:48 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2018-01-24 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 4c23469e736594a8dac1738aa857aac7e246e5bd
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 20:45:45 2018 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 20:48:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c23469e
dev-libs/uriparser: Qt5, EAPI 6, fix USE="doc qt[45]"
Closes: https://bugs.gentoo.org/645430
Package-Manager: Portage-2.3.20, Repoman-2.3.6
.../files/uriparser-0.8.4-doc-install.patch | 13 +++++++++++
...rser-0.8.4.ebuild => uriparser-0.8.4-r1.ebuild} | 25 ++++++++++++++++------
dev-libs/uriparser/uriparser-0.8.4.ebuild | 12 ++++++++++-
3 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
new file mode 100644
index 00000000000..28cef94c642
--- /dev/null
+++ b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ae5e101..012f0bc 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -24,7 +24,7 @@ distclean-local:
+ ## Install doc files
+ install-data-local:
+ $(MKDIR_P) "$(DESTDIR)$(docdir)/html/search" ## Didn't work with installdirs-local
+- $(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
++ $(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
+ $(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
+ -$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
+
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
similarity index 72%
copy from dev-libs/uriparser/uriparser-0.8.4.ebuild
copy to dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
index 97ad9a71617..84b47476abd 100644
--- a/dev-libs/uriparser/uriparser-0.8.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
+inherit autotools
DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
HOMEPAGE="http://uriparser.sourceforge.net/"
@@ -10,16 +12,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt4 test unicode"
+IUSE="doc qt5 test unicode"
RDEPEND=""
DEPEND="virtual/pkgconfig
doc? ( >=app-doc/doxygen-1.5.8
- qt4? ( dev-qt/qthelp:4 ) )
+ qt5? ( dev-qt/qthelp:5 ) )
test? ( >=dev-util/cpptest-1.1.1 )"
REQUIRED_USE="test? ( unicode )"
+PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_prepare() {
+ default
+ eapply_user
+ eautoreconf
+}
+
src_configure() {
econf \
--disable-sizedown \
@@ -31,10 +43,9 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog THANKS
+ default
- if use doc && use qt4; then
+ if use doc && use qt5; then
dodoc doc/*.qch
docompress -x /usr/share/doc/${PF}/${P}.qch
fi
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4.ebuild
index 97ad9a71617..11c9e1d5934 100644
--- a/dev-libs/uriparser/uriparser-0.8.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.8.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+inherit epatch autotools
+
DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
HOMEPAGE="http://uriparser.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -20,6 +22,14 @@ DEPEND="virtual/pkgconfig
REQUIRED_USE="test? ( unicode )"
+PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ epatch_user
+ eautoreconf
+}
+
src_configure() {
econf \
--disable-sizedown \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/uriparser/, dev-libs/uriparser/files/
@ 2019-03-31 20:09 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2019-03-31 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 624bab09f7e792baea6716ade0746499497b34d6
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 20:08:31 2019 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 20:09:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624bab09
dev-libs/uriparser: Remove vulnerable
Bug: https://bugs.gentoo.org/674354
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
dev-libs/uriparser/Manifest | 4 --
.../files/uriparser-0.8.4-doc-install.patch | 13 ------
dev-libs/uriparser/uriparser-0.8.4-r1.ebuild | 51 ----------------------
dev-libs/uriparser/uriparser-0.8.5.ebuild | 42 ------------------
dev-libs/uriparser/uriparser-0.8.6.ebuild | 42 ------------------
dev-libs/uriparser/uriparser-0.9.0.ebuild | 41 -----------------
6 files changed, 193 deletions(-)
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 99cf53d1720..e92400ef355 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,5 +1 @@
-DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
-DIST uriparser-0.8.5.tar.bz2 359469 BLAKE2B 44fb7d8bd5dac8bb0dd68bfbc4fb2adec310a913a7ebb92850fb2b8833c159db7cb29fa4f8b5de3e3b3def018024d1e69a0814bcd12aa24b6a14deca6f6768fb SHA512 e9b0228092cf12b824975000b0a6dbe2e413d3642203666d77c5b42f04bc13e0ec3f61d6a2c44d9613bea15e8cf7ec42cc4c92c5bc4318ee3349c1b380409d5c
-DIST uriparser-0.8.6.tar.bz2 360214 BLAKE2B 18a0e02f5dc6efa840cd6647c4595f238f811e8131750959b31f5283c5632b8892fa38767f883110ff2fbcb9dd07afabcaef64b206b9a951a773bd9d4b1cd9e9 SHA512 b95e6d7c7f835002f6ea1a9c0962f4d385cd16519c40b921e9a9679140fd5d6cd326002b452fc73431aa2f36d049ae510c034a423eca143a6285f9b4b3dd7b83
-DIST uriparser-0.9.0.tar.bz2 371895 BLAKE2B 13479fe75d8dcc9514da6c26d9a60a68256b895f012d3b36e156353f1f37b2e572a3c8014f5cab30fe1d6da58ef840ea9878eabb48625a7449e46c7dbc13247c SHA512 8ad631726c59d244b945221e803dcb13daa6df6550b3de94da19745f4b4d53a5ce17dba54280273181479f2803dea4ca7b0154ac3b54ca39fc4eda2c8a03e3f7
DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
diff --git a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
deleted file mode 100644
index 28cef94c642..00000000000
--- a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index ae5e101..012f0bc 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -24,7 +24,7 @@ distclean-local:
- ## Install doc files
- install-data-local:
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html/search" ## Didn't work with installdirs-local
-- $(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
-+ $(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
- $(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
- -$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
-
diff --git a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
deleted file mode 100644
index 9468ac2013f..00000000000
--- a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="http://uriparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt5? ( dev-qt/qthelp:5 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- default
-
- if use doc && use qt5; then
- dodoc doc/*.qch
- docompress -x /usr/share/doc/${PF}/${P}.qch
- fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.5.ebuild b/dev-libs/uriparser/uriparser-0.8.5.ebuild
deleted file mode 100644
index 94133b73235..00000000000
--- a/dev-libs/uriparser/uriparser-0.8.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt5? ( dev-qt/qthelp:5 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- default
-
- if use doc && use qt5; then
- dodoc doc/*.qch
- docompress -x /usr/share/doc/${PF}/${P}.qch
- fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.8.6.ebuild b/dev-libs/uriparser/uriparser-0.8.6.ebuild
deleted file mode 100644
index 94133b73235..00000000000
--- a/dev-libs/uriparser/uriparser-0.8.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt5? ( dev-qt/qthelp:5 ) )
- test? ( >=dev-util/cpptest-1.1.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
- econf \
- --disable-sizedown \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- default
-
- if use doc && use qt5; then
- dodoc doc/*.qch
- docompress -x /usr/share/doc/${PF}/${P}.qch
- fi
-}
diff --git a/dev-libs/uriparser/uriparser-0.9.0.ebuild b/dev-libs/uriparser/uriparser-0.9.0.ebuild
deleted file mode 100644
index 8118165df67..00000000000
--- a/dev-libs/uriparser/uriparser-0.9.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig
- doc? ( >=app-doc/doxygen-1.5.8
- qt5? ( dev-qt/qthelp:5 ) )
- test? ( >=dev-cpp/gtest-1.8.1 )"
-
-REQUIRED_USE="test? ( unicode )"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
- econf \
- $(use_enable test) \
- --enable-char \
- $(use_enable unicode wchar_t) \
- $(use_enable doc) \
- --docdir=/usr/share/doc/${PF}/
-}
-
-src_install() {
- default
-
- if use doc && use qt5; then
- dodoc doc/*.qch
- docompress -x /usr/share/doc/${PF}/${P}.qch
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/uriparser/, dev-libs/uriparser/files/
@ 2019-04-28 15:42 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2019-04-28 15:42 UTC (permalink / raw
To: gentoo-commits
commit: 3d5e8cafbc84ddad509d424bd6d35c1d4e0c748b
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 15:42:10 2019 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:42:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5e8caf
dev-libs/uriparser: Fix tests for 0.9.3
Upstream: https://github.com/uriparser/uriparser/issues/67
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.64, Repoman-2.3.12
.../uriparser/files/uriparser-0.9.3-tests.patch | 23 ++++++++++++++++++++++
dev-libs/uriparser/uriparser-0.9.3.ebuild | 4 ++++
2 files changed, 27 insertions(+)
diff --git a/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch b/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
new file mode 100644
index 00000000000..ad6f1c1311d
--- /dev/null
+++ b/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
@@ -0,0 +1,23 @@
+From f870e6c68696a6018702caa5c8a2feba9b0f99fa Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 28 Apr 2019 17:35:31 +0200
+Subject: [PATCH] tests: No longer crash when compiled with -DNDEBUG (fixes
+ #67)
+
+---
+ test/MemoryManagerSuite.cpp | 2 ++
+ 1 files changed, 2 insertions(+)
+
+diff --git a/test/MemoryManagerSuite.cpp b/test/MemoryManagerSuite.cpp
+index 85f498b..4cda664 100644
+--- a/test/MemoryManagerSuite.cpp
++++ b/test/MemoryManagerSuite.cpp
+@@ -19,6 +19,8 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
++#undef NDEBUG // because we rely on assert(3) further down
++
+ #include <cassert>
+ #include <cerrno>
+ #include <cstring> // memcpy
diff --git a/dev-libs/uriparser/uriparser-0.9.3.ebuild b/dev-libs/uriparser/uriparser-0.9.3.ebuild
index 49ec684913d..0c33c807ef4 100644
--- a/dev-libs/uriparser/uriparser-0.9.3.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.3.ebuild
@@ -24,6 +24,10 @@ REQUIRED_USE="test? ( unicode )"
DOCS=( AUTHORS ChangeLog THANKS )
+PATCHES=(
+ "${FILESDIR}"/${P}-tests.patch
+)
+
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-28 15:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-31 20:09 [gentoo-commits] repo/gentoo:master commit in: dev-libs/uriparser/, dev-libs/uriparser/files/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2019-04-28 15:42 Sebastian Pipping
2018-01-24 20:48 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox