* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgnt/files/, dev-libs/libgnt/
@ 2020-06-11 19:21 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2020-06-11 19:21 UTC (permalink / raw
To: gentoo-commits
commit: caf07e799877ea3e933b35b7402bc916c246132d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 18:58:18 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 19:21:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf07e79
dev-libs/libgnt: Initial commit
Use same KEYWORDS like in pidgin as this is an outsourced pidgin plugin
Bug: https://bugs.gentoo.org/727878
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/libgnt/Manifest | 1 +
.../libgnt/files/libgnt-2.14.0-optional_docs.patch | 15 +++++++++
dev-libs/libgnt/files/libgnt-2.14.0-tinfo.patch | 18 +++++++++++
dev-libs/libgnt/libgnt-2.14.0.ebuild | 37 ++++++++++++++++++++++
dev-libs/libgnt/metadata.xml | 8 +++++
5 files changed, 79 insertions(+)
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
new file mode 100644
index 00000000000..088bdd50ab9
--- /dev/null
+++ b/dev-libs/libgnt/Manifest
@@ -0,0 +1 @@
+DIST libgnt-2.14.0.tar.xz 102444 BLAKE2B 303dc33e60571ba4b5b9cc8ce477807b9b2ed6b4d1ed14e40c43e146a6d3d156741597befdf3e6c0c6816e9d43955f57f9e1b61e3f1f2d2fc451bf53f7236022 SHA512 0d9c5550374696a0e6ede5246cda3c372d7055d21b9ffaf10be88d6a469bdf18c7dd1113ec612acf4889c0e5686ea87bb0e8348ca8985fd5ff8913afc5813b38
diff --git a/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch b/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch
new file mode 100644
index 00000000000..aded0c04767
--- /dev/null
+++ b/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch
@@ -0,0 +1,15 @@
+--- libgnt-2.14.0/meson.build
++++ libgnt-2.14.0/meson.build
+@@ -231,4 +231,6 @@
+
+ subdir('wms')
+ subdir('test')
+-subdir('doc')
++if get_option('doc')
++ subdir('doc')
++endif
+--- libgnt-2.14.0/meson_options.txt
++++ libgnt-2.14.0/meson_options.txt
+@@ -0,0 +1,2 @@
++option('doc', type : 'boolean', value : true,
++ description : 'build documentation with gtk-doc')
diff --git a/dev-libs/libgnt/files/libgnt-2.14.0-tinfo.patch b/dev-libs/libgnt/files/libgnt-2.14.0-tinfo.patch
new file mode 100644
index 00000000000..1e4ab49020b
--- /dev/null
+++ b/dev-libs/libgnt/files/libgnt-2.14.0-tinfo.patch
@@ -0,0 +1,18 @@
+--- libgnt-2.14.0/meson.build
++++ libgnt-2.14.0/meson.build
+@@ -72,6 +72,7 @@
+ ncurses_available = true
+ ncurses_inc = []
+ ncurses_libs = [
++ compiler.find_library('tinfow', required : false),
+ compiler.find_library('ncursesw', required : false),
+ compiler.find_library('panelw', required : false)
+ ]
+@@ -113,6 +114,7 @@
+ else
+ # ncursesw was not found. Look for plain old ncurses
+ ncurses_libs = [
++ compiler.find_library('tinfo', required : false),
+ compiler.find_library('ncurses', required : false),
+ compiler.find_library('panel', required : false)
+ ]
diff --git a/dev-libs/libgnt/libgnt-2.14.0.ebuild b/dev-libs/libgnt/libgnt-2.14.0.ebuild
new file mode 100644
index 00000000000..74cd1cd5670
--- /dev/null
+++ b/dev-libs/libgnt/libgnt-2.14.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
+HOMEPAGE="https://bitbucket.org/pidgin/libgnt"
+SRC_URI="mirror://sourceforge/pidgin/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="doc"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+ sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
+ "${FILESDIR}/${PN}-2.14.0-tinfo.patch"
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use doc)
+ )
+ meson_src_configure
+}
diff --git a/dev-libs/libgnt/metadata.xml b/dev-libs/libgnt/metadata.xml
new file mode 100644
index 00000000000..c7be278b645
--- /dev/null
+++ b/dev-libs/libgnt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgnt/files/, dev-libs/libgnt/
@ 2024-09-10 13:21 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2024-09-10 13:21 UTC (permalink / raw
To: gentoo-commits
commit: ff128d804b7e3dd69f9f14af21f9fc851631dd86
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 10 12:32:54 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 13:20:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff128d80
dev-libs/libgnt: drop 2.14.2
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-libs/libgnt/Manifest | 1 -
.../libgnt/files/libgnt-2.14.0-optional_docs.patch | 15 --------
dev-libs/libgnt/libgnt-2.14.2.ebuild | 40 ----------------------
3 files changed, 56 deletions(-)
diff --git a/dev-libs/libgnt/Manifest b/dev-libs/libgnt/Manifest
index d1a9a822a089..ca3ee2ff7a3e 100644
--- a/dev-libs/libgnt/Manifest
+++ b/dev-libs/libgnt/Manifest
@@ -1,2 +1 @@
-DIST libgnt-2.14.2.tar.xz 106128 BLAKE2B d3db0ba3a297c14f32cc49b4e5b3392f47031e9406d862520a2f014f4d4e93c13e2ba5a2d61df81637f9dd7961d64ba69b393ee5b3cfebd7eb2768e3f16f29d0 SHA512 17b39e132b44b23486d7d39fa02761997a28abf53f67bf71bbad86d35124e5deb0363d670b2fb5ac99d47256282b0ef6ad1886e12984c868bb0d13ea7ba7d860
DIST libgnt-2.14.3.tar.xz 106388 BLAKE2B bba785c998e53c75ed9c3b0b4ad1d96d63628a6e2b0ac7abec76a671ddfc0284fd787cd6793433aef83e6b31c6efecce0c656e131ca9b8bf548486de1010e1f9 SHA512 7131834cfe585177865bebf26167de08a04fced3da4e9a072d9b09b3becd1194914757b1a1fc8f129ae6c8fefe3ec1ce0d80d6c50cb624a5698b66ee2e06c6c8
diff --git a/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch b/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch
deleted file mode 100644
index aded0c047674..000000000000
--- a/dev-libs/libgnt/files/libgnt-2.14.0-optional_docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgnt-2.14.0/meson.build
-+++ libgnt-2.14.0/meson.build
-@@ -231,4 +231,6 @@
-
- subdir('wms')
- subdir('test')
--subdir('doc')
-+if get_option('doc')
-+ subdir('doc')
-+endif
---- libgnt-2.14.0/meson_options.txt
-+++ libgnt-2.14.0/meson_options.txt
-@@ -0,0 +1,2 @@
-+option('doc', type : 'boolean', value : true,
-+ description : 'build documentation with gtk-doc')
diff --git a/dev-libs/libgnt/libgnt-2.14.2.ebuild b/dev-libs/libgnt/libgnt-2.14.2.ebuild
deleted file mode 100644
index b5bce4a12ebd..000000000000
--- a/dev-libs/libgnt/libgnt-2.14.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
-HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
-SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- !<net-im/pidgin-2.14.0
- dev-libs/glib:2
- dev-libs/libxml2
- sys-libs/ncurses:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.14.0-optional_docs.patch"
- "${FILESDIR}/${PN}-2.14.0-tinfo.patch"
-)
-
-src_configure() {
- local emesonargs=(
- $(meson_use doc)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgnt/files/, dev-libs/libgnt/
@ 2024-12-24 5:06 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-12-24 5:06 UTC (permalink / raw
To: gentoo-commits
commit: 3d72f18d045dae13ac30a61429ab2efa58296e5a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 05:02:07 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 05:02:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d72f18d
dev-libs/libgnt: fix build w/ opaque ncurses structures
Closes: https://bugs.gentoo.org/928976
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libgnt-2.14.3-ncurses-opaque.patch | 61 ++++++++++++++++++++++
dev-libs/libgnt/libgnt-2.14.3.ebuild | 5 +-
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/dev-libs/libgnt/files/libgnt-2.14.3-ncurses-opaque.patch b/dev-libs/libgnt/files/libgnt-2.14.3-ncurses-opaque.patch
new file mode 100644
index 000000000000..19e4a4d82121
--- /dev/null
+++ b/dev-libs/libgnt/files/libgnt-2.14.3-ncurses-opaque.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/928976
+https://src.fedoraproject.org/rpms/libgnt/blob/rawhide/f/libgnt-2.14.1-gcc-14-fix.patch
+--- a/gntwm.c
++++ b/gntwm.c
+@@ -166,38 +166,40 @@
+ int sx, ex, sy, ey, w, y;
+ cchar_t ch;
+ PANEL *below = panel;
++ WINDOW *window = panel_window(panel);
+
+- sx = getbegx(panel->win);
+- ex = getmaxx(panel->win) + sx;
+- sy = getbegy(panel->win);
+- ey = getmaxy(panel->win) + sy;
++ sx = getbegx(window);
++ ex = getmaxx(window) + sx;
++ sy = getbegy(window);
++ ey = getmaxy(window) + sy;
+
+ while ((below = panel_below(below)) != NULL) {
+- if (sy > getbegy(below->win) + getmaxy(below->win) ||
+- ey < getbegy(below->win))
++ window = panel_window(below);
++ if (sy > getbegy(window) + getmaxy(window) ||
++ ey < getbegy(window))
+ continue;
+- if (sx > getbegx(below->win) + getmaxx(below->win) ||
+- ex < getbegx(below->win))
++ if (sx > getbegx(window) + getmaxx(window) ||
++ ex < getbegx(window))
+ continue;
+- for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
+- if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
++ for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) {
++ if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK)
+ goto right;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && (ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ right:
+- if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
++ if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK)
+ continue;
+ w = widestringwidth(ch.chars);
+ if (w > 1 && !(ch.attr & 1)) {
+ ch.chars[0] = ' ';
+ ch.attr &= ~ A_CHARTEXT;
+- mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
+- touchline(below->win, y - getbegy(below->win), 1);
++ mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch);
++ touchline(window, y - getbegy(window), 1);
+ }
+ }
+ }
+
diff --git a/dev-libs/libgnt/libgnt-2.14.3.ebuild b/dev-libs/libgnt/libgnt-2.14.3.ebuild
index ed67e5575771..cacf0932823e 100644
--- a/dev-libs/libgnt/libgnt-2.14.3.ebuild
+++ b/dev-libs/libgnt/libgnt-2.14.3.ebuild
@@ -8,9 +8,9 @@ inherit flag-o-matic meson
DESCRIPTION="Pidgin's GLib Ncurses Toolkit"
HOMEPAGE="https://keep.imfreedom.org/libgnt/libgnt"
SRC_URI="https://downloads.sourceforge.net/pidgin/${P}.tar.xz"
+
LICENSE="GPL-2"
SLOT="0"
-
KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
@@ -18,7 +18,7 @@ RDEPEND="
!<net-im/pidgin-2.14.0
dev-libs/glib:2
dev-libs/libxml2
- sys-libs/ncurses:0=
+ sys-libs/ncurses:=
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -29,6 +29,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-2.14.0-tinfo.patch"
+ "${FILESDIR}/${PN}-2.14.3-ncurses-opaque.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-24 5:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-24 5:06 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgnt/files/, dev-libs/libgnt/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-10 13:21 Petr Vaněk
2020-06-11 19:21 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox