[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2022-05-30 Thread Sam James
commit: 9c671ac48e02078dad50e8e97bc453bea777609e
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Mon May 30 22:49:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:05:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c671ac4

app-accessibility/edbrowse: respect flags and toolchain

Closes: https://bugs.gentoo.org/843059
Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Sam James  gentoo.org>

 .../edbrowse/edbrowse-3.8.2.1-r2.ebuild| 14 +++-
 .../edbrowse-3.8.2.1-quickjs-respect-flags.patch   | 41 ++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index 6c2cb5e77961..e9d16a2ecad8 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
+inherit toolchain-funcs
+
 QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
 QUICKJS_SHORT=2788d71
 QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
@@ -34,11 +37,20 @@ PATCHES=(
"${FILESDIR}/${P}"-respect-ldflags.patch
 )
 
+src_prepare() {
+   default
+
+   cd "${QUICKJS_S}" || die
+   eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch
+}
+
 src_compile() {
# First build quickjs so we can link to its static library.
# Also, quickjs doesn't appear to tag releases.
tools/quickjobfixup "${QUICKJS_S}" || die
-   emake -C "${QUICKJS_S}" libquickjs.a
+   emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a
+
+   tc-export CC
emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
 }
 

diff --git 
a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
new file mode 100644
index ..f0af474427f0
--- /dev/null
+++ 
b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
@@ -0,0 +1,41 @@
+* Don't overwrite CFLAGS
+* Respect CPPFLAGS
+
+--- a/Makefile
 b/Makefile
+@@ -66,7 +66,7 @@
+ ifdef CONFIG_CLANG
+   HOST_CC=clang
+   CC=$(CROSS_PREFIX)clang
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wextra
+   CFLAGS += -Wno-sign-compare
+   CFLAGS += -Wno-missing-field-initializers
+@@ -87,7 +87,7 @@
+ else
+   HOST_CC=gcc
+   CC=$(CROSS_PREFIX)gcc
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wno-array-bounds -Wno-format-truncation
+   ifdef CONFIG_LTO
+ AR=$(CROSS_PREFIX)gcc-ar
+@@ -110,7 +110,7 @@
+ CFLAGS+=$(DEFINES)
+ CFLAGS_DEBUG=$(CFLAGS) -O0
+ CFLAGS_SMALL=$(CFLAGS) -Os
+-CFLAGS_OPT=$(CFLAGS) -O2
++CFLAGS_OPT=$(CFLAGS)
+ CFLAGS_NOLTO:=$(CFLAGS_OPT)
+ LDFLAGS=-g
+ ifdef CONFIG_LTO
+@@ -269,7 +269,7 @@
+   $(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
+ 
+ $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR)
+-  $(CC) $(CFLAGS_NOLTO) -c -o $@ $<
++  $(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.m32.o: %.c | $(OBJDIR)
+   $(CC) -m32 $(CFLAGS_OPT) -c -o $@ $<



[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2022-05-06 Thread William Hubbs
commit: 07be3fee9291d14d24c36c3c5215ef90331b18f5
Author: William Hubbs  gentoo  org>
AuthorDate: Fri May  6 16:22:41 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri May  6 16:23:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07be3fee

app-accessibility/edbrowse: add 3.8.2.1

Closes: https://bugs.gentoo.org/732616
Closes: https://bugs.gentoo.org/838001
Signed-off-by: William Hubbs  gentoo.org>

 app-accessibility/edbrowse/Manifest|  2 +
 app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild | 50 ++
 .../files/edbrowse-3.8.2.1-respect-ldflags.patch   | 13 ++
 3 files changed, 65 insertions(+)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 383cdd368c26..85a299692e6d 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1 +1,3 @@
 DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 
7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e
 SHA512 
ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
+DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B 
e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b
 SHA512 
b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
+DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 
67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879
 SHA512 
4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0

diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
new file mode 100644
index ..53a246557d29
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
+QUICKJS_SHORT=2788d71
+QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
+QUICKJS_P="quickjs-${QUICKJS_SHORT}"
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
+HOMEPAGE="https://edbrowse.org";
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
+   https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> 
${QUICKJS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+   >=app-text/htmltidy-5.0.0:=
+   dev-libs/libpcre:=
+   net-misc/curl
+   sys-libs/readline:=
+   odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-lang/perl
+   sys-apps/ed
+   virtual/pkgconfig"
+
+   PATCHES=(
+   "${FILESDIR}/${P}"-respect-ldflags.patch
+   )
+
+src_compile() {
+   # First build quickjs so we can link to its static library.
+   # Also, quickjs doesn't appear to tag releases.
+   tools/quickjobfixup "${QUICKJS_S}" || die
+   emake -C "${QUICKJS_S}"
+   emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
+}
+
+src_install() {
+   dobin src/edbrowse
+   newman doc/man-edbrowse-debian.1 edbrowse.1
+   DOCS="doc/sample*"
+   HTML_DOCS="doc/*.html"
+   einstalldocs
+}

diff --git 
a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
new file mode 100644
index ..3b511e1d2b38
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index d65369a3..410d3e9d 100644
+--- a/src/makefile
 b/src/makefile
+@@ -31,7 +31,7 @@ endif
+ CFLAGS += $(DEBUGFLAGS)
+ 
+ #  Libraries and linker flags for edbrowse.
+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ 
+ # LDFLAGS for quickjs loading.
+ QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl



[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2022-05-06 Thread William Hubbs
commit: d3e4ffec4b46ce737b74a003a60cb97d475b2360
Author: William Hubbs  gentoo  org>
AuthorDate: Fri May  6 16:25:16 2022 +
Commit: William Hubbs  gentoo  org>
CommitDate: Fri May  6 16:25:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e4ffec

app-accessibility/edbrowse: drop 3.7.5.1-r3

Signed-off-by: William Hubbs  gentoo.org>

 app-accessibility/edbrowse/Manifest|  1 -
 .../edbrowse/edbrowse-3.7.5.1-r3.ebuild| 45 --
 .../files/edbrowse-3.7.5.1-fno-common.patch| 11 --
 .../edbrowse/files/edbrowse-3.7.5.1-manpage.patch  | 23 ---
 4 files changed, 80 deletions(-)

diff --git a/app-accessibility/edbrowse/Manifest 
b/app-accessibility/edbrowse/Manifest
index 85a299692e6d..d44dfe55ad02 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,3 +1,2 @@
-DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 
7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e
 SHA512 
ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
 DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B 
e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b
 SHA512 
b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
 DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 
67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879
 SHA512 
4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
deleted file mode 100644
index 5fc5f1ffa3c1..
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
-HOMEPAGE="http://edbrowse.org";
-SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
-
-RDEPEND="
-   >=app-text/htmltidy-5.0.0:=
-   dev-lang/duktape:=
-   dev-libs/libpcre:=
-   net-misc/curl
-   sys-libs/readline:=
-   odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-lang/perl
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fno-common.patch
-   "${FILESDIR}"/${P}-manpage.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" 
CMakeLists.txt || die
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_EDBR_ODBC=$(usex odbc)
-   )
-   cmake_src_configure
-}

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
deleted file mode 100644
index bf9fa08245da..
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/eb.h
-+++ b/src/eb.h
-@@ -287,7 +287,7 @@ extern char *sslCerts; /* ssl certificates to 
validate the secure server */
- extern int verifyCertificates;/* is a certificate required for the 
ssl connection? */
- extern int displayLength; // when printing a line
- extern int formatLineLength;  // when formatting html
--bool formatOverflow;
-+extern bool formatOverflow;
- extern int webTimeout, mailTimeout;
- extern uchar browseLocal;
- extern bool sqlPresent;   /* Was edbrowse compiled with SQL built 
in? */

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
deleted file mode 100644
index f0d667669113..
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -249,19 +249,7 @@ if (UNIX)
- endif()
- # copy to build dir
- configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
--# find 'gzip' - warn if not...
--find_program(GZIP_EXE gzip PATHS /bin )
--if (GZIP_EXE)
--# gzip it in place
--execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
--WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--INPUT_FILE edbrowse.1
--OUTPUT_FILE edbrowse.1.gz )
--# install it
--  install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION 
${UnixManDir})
--else ()
--message

[gentoo-commits] repo/gentoo:master commit in: app-accessibility/edbrowse/, app-accessibility/edbrowse/files/

2020-12-28 Thread David Seifert
commit: 45a96dfad92d10a438656a79f1e7a54abcb108bb
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Dec 28 14:15:29 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 28 14:15:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45a96dfa

app-accessibility/edbrowse: Fix build with gcc-10

* Thanks to Sam James for providing the patch link
* Port to cmake eclass
* Additional minor cleanup

Closes: https://bugs.gentoo.org/707500
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../edbrowse/edbrowse-3.7.5.1-r1.ebuild| 23 ++
 .../files/edbrowse-3.7.5.1-fno-common.patch| 11 +++
 .../edbrowse/files/edbrowse-3.7.5.1-manpage.patch  | 23 ++
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild 
b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
index 1f0f66a9bb1..fe983eda819 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+
+inherit cmake
 
 DESCRIPTION="Combination editor, browser, and mail client that is 100% text 
based"
 HOMEPAGE="http://edbrowse.org";
@@ -15,24 +16,30 @@ IUSE="odbc"
 
 RDEPEND="
app-text/tidy-html5
-   >=net-misc/curl-7.36.0
-   >=dev-libs/libpcre-7.8
-   >=sys-libs/readline-6.0
dev-lang/duktape:=
+   dev-libs/libpcre
+   net-misc/curl
+   sys-libs/readline:=
odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+BDEPEND="
dev-lang/perl
virtual/pkgconfig"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-fno-common.patch
+   "${FILESDIR}"/${P}-manpage.patch
+)
+
 src_prepare() {
-   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" 
CMakeLists.txt
-   cmake-utils_src_prepare
+   cmake_src_prepare
+
+   sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" 
CMakeLists.txt || die
 }
 
 src_configure() {
local mycmakeargs=(
-DBUILD_EDBR_ODBC=$(usex odbc)
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
new file mode 100644
index 000..bf9fa08245d
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/eb.h
 b/src/eb.h
+@@ -287,7 +287,7 @@ extern char *sslCerts; /* ssl certificates to 
validate the secure server */
+ extern int verifyCertificates;/* is a certificate required for the 
ssl connection? */
+ extern int displayLength; // when printing a line
+ extern int formatLineLength;  // when formatting html
+-bool formatOverflow;
++extern bool formatOverflow;
+ extern int webTimeout, mailTimeout;
+ extern uchar browseLocal;
+ extern bool sqlPresent;   /* Was edbrowse compiled with SQL built 
in? */

diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch 
b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
new file mode 100644
index 000..f0d66766911
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -249,19 +249,7 @@ if (UNIX)
+ endif()
+ # copy to build dir
+ configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
+-# find 'gzip' - warn if not...
+-find_program(GZIP_EXE gzip PATHS /bin )
+-if (GZIP_EXE)
+-# gzip it in place
+-execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
+-WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-INPUT_FILE edbrowse.1
+-OUTPUT_FILE edbrowse.1.gz )
+-# install it
+-  install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION 
${UnixManDir})
+-else ()
+-message(WARNING "Unable to locate 'gzip'! No man page...")
+-endif ()
++install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
+ # install user guide
+ install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc 
doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
+ endif ()