* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qrcodegen/
@ 2023-11-02 9:21 Rui Huang
0 siblings, 0 replies; 4+ messages in thread
From: Rui Huang @ 2023-11-02 9:21 UTC (permalink / raw
To: gentoo-commits
commit: f3c8cfbd6c882d32f2ab353b9c9e1b4477a17cca
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Nov 2 09:13:30 2023 +0000
Commit: Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Nov 2 09:13:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f3c8cfbd
dev-libs/qrcodegen: add metadata.xml, fix QA
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
dev-libs/qrcodegen/metadata.xml | 8 ++++++++
dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild | 14 ++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/dev-libs/qrcodegen/metadata.xml b/dev-libs/qrcodegen/metadata.xml
new file mode 100644
index 0000000000..a11f800c0f
--- /dev/null
+++ b/dev-libs/qrcodegen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">nayuki/QR-Code-generator</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild b/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
index fd75a52bc7..c530ac6953 100644
--- a/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
+++ b/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
@@ -5,16 +5,14 @@
EAPI=8
-DESCRIPTION="High-quality QR Code generator library in Java, TypeScript/JavaScript, Python, C++, C, Rust."
+DESCRIPTION="High-quality QR Code generator library"
HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"
SRC_URI="https://github.com/nayuki/QR-Code-generator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
-RDEPEND=""
DEPEND="${RDEPEND}
${PYTHON_DEPS}"
@@ -35,12 +33,12 @@ src_compile() {
src_install() {
pushd c
- emake DESTDIR=${D} install-header
- emake DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install-shared
+ emake DESTDIR="${D}" install-header
+ emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-shared
popd
pushd cpp
- emake DESTDIR=${D} install-header
- emake DESTDIR=${D} LIBDIR=${D}/usr/$(get_libdir) install-shared
+ emake DESTDIR="${D}" install-header
+ emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-shared
popd
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qrcodegen/
@ 2024-04-27 18:34 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-04-27 18:34 UTC (permalink / raw
To: gentoo-commits
commit: b2fde42814a624ea667530c2dbfb331a543d706f
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sat Apr 27 17:45:22 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Apr 27 17:45:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b2fde428
dev-libs/qrcodegen: drop 1.8.0
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild | 37 -------------------------------
1 file changed, 37 deletions(-)
diff --git a/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild b/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
deleted file mode 100644
index 06f95bd017..0000000000
--- a/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Forked from : https://github.com/gentoo-mirror/pg_overlay/blob/master/dev-libs/qrcodegen
-
-EAPI=8
-
-DESCRIPTION="High-quality QR Code generator library"
-HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"
-SRC_URI="https://github.com/nayuki/QR-Code-generator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/QR-Code-generator-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
- "${FILESDIR}/c_makefile_generate_libraries.patch"
- "${FILESDIR}/cpp_makefile_generate_libraries.patch"
-)
-
-src_compile() {
- for dir in c cpp
- do
- emake -C ${dir}
- done
-}
-
-src_install() {
- local -x DESTDIR="${ED}"
- for dir in c cpp
- do
- emake -C ${dir} install-header
- emake -C ${dir} LIBDIR="${ED}"/usr/$(get_libdir) VERSION=${PV} install-shared
- done
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qrcodegen/
@ 2024-04-27 18:34 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-04-27 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 684bc00a3a8ffd57d89b55af4af5a2db8df46048
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sat Apr 27 17:40:53 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Apr 27 17:43:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=684bc00a
dev-libs/qrcodegen: filter -O flag in Makefiles
Closes: https://bugs.gentoo.org/916700
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild | 42 ++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild b/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild
new file mode 100644
index 0000000000..59a43cdb7d
--- /dev/null
+++ b/dev-libs/qrcodegen/qrcodegen-1.8.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Forked from : https://github.com/gentoo-mirror/pg_overlay/blob/master/dev-libs/qrcodegen
+
+EAPI=8
+
+DESCRIPTION="High-quality QR Code generator library"
+HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"
+SRC_URI="https://github.com/nayuki/QR-Code-generator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/QR-Code-generator-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+ "${FILESDIR}/c_makefile_generate_libraries.patch"
+ "${FILESDIR}/cpp_makefile_generate_libraries.patch"
+)
+
+src_prepare() {
+ default
+ sed '/^C\(XX\)\?FLAGS/s/-O//' -i {c,cpp}/Makefile || die
+}
+
+src_compile() {
+ for dir in c cpp
+ do
+ emake -C ${dir}
+ done
+}
+
+src_install() {
+ local -x DESTDIR="${ED}"
+ for dir in c cpp
+ do
+ emake -C ${dir} install-header
+ emake -C ${dir} LIBDIR="${ED}"/usr/$(get_libdir) VERSION=${PV} install-shared
+ done
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qrcodegen/
@ 2024-04-27 18:34 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-04-27 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 9321d33a5a303f1906f657495be5a4a277c1448a
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sat Apr 27 17:18:19 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Apr 27 17:43:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9321d33a
dev-libs/qrcodegen: respect ${EPREFIX} for installation
Add ${PV} as suffix to shared lib, as intended in the patches
Fix variable order
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild | 41 +++++++++++++------------------
1 file changed, 17 insertions(+), 24 deletions(-)
diff --git a/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild b/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
index c530ac6953..06f95bd017 100644
--- a/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
+++ b/dev-libs/qrcodegen/qrcodegen-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Forked from : https://github.com/gentoo-mirror/pg_overlay/blob/master/dev-libs/qrcodegen
@@ -9,36 +9,29 @@ DESCRIPTION="High-quality QR Code generator library"
HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"
SRC_URI="https://github.com/nayuki/QR-Code-generator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/QR-Code-generator-${PV}"
+
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}"
-
-S=${WORKDIR}/QR-Code-generator-${PV}
-
-PATCHES=( "${FILESDIR}/c_makefile_generate_libraries.patch" )
-PATCHES+=( "${FILESDIR}/cpp_makefile_generate_libraries.patch" )
+PATCHES=(
+ "${FILESDIR}/c_makefile_generate_libraries.patch"
+ "${FILESDIR}/cpp_makefile_generate_libraries.patch"
+)
src_compile() {
- pushd c
- emake
- popd
-
- pushd cpp
- emake
- popd
+ for dir in c cpp
+ do
+ emake -C ${dir}
+ done
}
src_install() {
- pushd c
- emake DESTDIR="${D}" install-header
- emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-shared
- popd
-
- pushd cpp
- emake DESTDIR="${D}" install-header
- emake DESTDIR="${D}" LIBDIR="${D}"/usr/$(get_libdir) install-shared
- popd
+ local -x DESTDIR="${ED}"
+ for dir in c cpp
+ do
+ emake -C ${dir} install-header
+ emake -C ${dir} LIBDIR="${ED}"/usr/$(get_libdir) VERSION=${PV} install-shared
+ done
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-04-27 18:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-27 18:34 [gentoo-commits] repo/proj/guru:master commit in: dev-libs/qrcodegen/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-04-27 18:34 David Roman
2024-04-27 18:34 David Roman
2023-11-02 9:21 Rui Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox