* [gentoo-commits] repo/gentoo:master commit in: x11-misc/gtkdialog/, x11-misc/gtkdialog/files/
@ 2020-09-16 9:33 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-09-16 9:33 UTC (permalink / raw
To: gentoo-commits
commit: a4e572995f1367fe4c0e850ec59316066e2f1f1d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 09:33:05 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 09:33:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e57299
x11-misc/gtkdialog: Fix building with CC=clang
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Closes: https://bugs.gentoo.org/742764
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../files/gtkdialog-0.8.3-do_variables_count_widgets.patch | 11 +++++++++++
x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild | 1 +
x11-misc/gtkdialog/gtkdialog-99999.ebuild | 1 +
3 files changed, 13 insertions(+)
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
new file mode 100644
index 00000000000..21697cfc78f
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
@@ -0,0 +1,11 @@
+--- a/src/variables.c
++++ b/src/variables.c
+@@ -1113,7 +1113,7 @@
+ actual = root;
+
+ if (actual == NULL)
+- return;
++ return 0;
+
+ if (actual->left != NULL)
+ n = do_variables_count_widgets(actual->left, n);
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index 5c51b9d790b..aaa806d0824 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -32,6 +32,7 @@ DEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+ "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
)
src_prepare() {
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index 131519d09a4..bea5590a20b 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+ "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/gtkdialog/, x11-misc/gtkdialog/files/
@ 2021-02-07 20:19 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-02-07 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 11b2bc4621a421a7bd4430ac23b0b1b8f173f67e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 19:57:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 20:18:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b2bc46
x11-misc/gtkdialog: Drop 0.8.3-r3 and 0.8.3-r4
Bug: https://bugs.gentoo.org/769131
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/gtkdialog/Manifest | 1 -
.../gtkdialog/files/gtkdialog-0.8.3-optdeps.patch | 62 ----------------------
x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild | 47 ----------------
x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild | 55 -------------------
x11-misc/gtkdialog/metadata.xml | 2 -
5 files changed, 167 deletions(-)
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index 72634e17225..374ad281420 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,2 +1 @@
-DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
deleted file mode 100644
index e032c129021..00000000000
--- a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,32 +25,40 @@
- AC_PROG_YACC
- AC_SUBST(YACC)
-
-+PKG_PROG_PKG_CONFIG([0.24])
-+
- # Checks for libraries.
--pkg_modules="gtk+-2.0 >= 2.0.0"
--PKG_CHECK_MODULES(GTK, [$pkg_modules])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
--pkg_modules="gthread-2.0"
--PKG_CHECK_MODULES(GTHREAD, [$pkg_modules])
-+PKG_CHECK_MODULES(GTHREAD, [gthread-2.0])
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
-
--glade_lib="libglade-2.0"
--PKG_CHECK_MODULES([GLADE_LIB], \
-- [$glade_lib], \
-- AC_SUBST(HAVE_GLADE_LIB, 1),\
-- AC_SUBST(HAVE_GLADE_LIB, 0))
--AC_SUBST(GLADE_LIB_CFLAGS)
--AC_SUBST(GLADE_LIB_LIBS)
--
--vte_lib="vte >= 0.23.5"
--PKG_CHECK_MODULES([VTE], \
-- [$vte_lib], \
-- AC_SUBST(HAVE_VTE, 1),\
-- AC_SUBST(HAVE_VTE, 0))
--AC_SUBST(VTE_CFLAGS)
--AC_SUBST(VTE_LIBS)
-+AC_ARG_WITH([glade],
-+ AS_HELP_STRING([--with-glade], [enable support for libglade])
-+)
-+
-+AC_ARG_WITH([vte],
-+ AS_HELP_STRING([--with-vte], [enable support for vte])
-+)
-+
-+AS_IF(
-+ [test "x$with_glade" = "xyes"],
-+ [PKG_CHECK_MODULES([GLADE_LIB], [libglade-2.0], [have_glade_lib=1], AC_MSG_ERROR([glade requested but not found]))],
-+ [test "x$with_glade" = "xno"],
-+ [have_glade_lib=0]
-+)
-+AC_SUBST([HAVE_GLADE_LIB], [$have_glade_lib])
-+
-+AS_IF(
-+ [test "x$with_vte" = "xyes"],
-+ [PKG_CHECK_MODULES([VTE], [vte >= 0.23.5], [have_vte=1], AC_MSG_ERROR([vte requested but not found]))],
-+ [test "x$with_vte" = "xno"],
-+ [have_vte=0]
-+)
-+AC_SUBST([HAVE_VTE], [$have_vte])
-
- # Checks for header files.
- AC_CHECK_HEADERS([locale.h])
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
deleted file mode 100644
index 5e5b48165a4..00000000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="glade vte"
-
-RDEPEND="
- x11-libs/gtk+:2
- glade? ( gnome-base/libglade )
- vte? ( x11-libs/vte:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- virtual/yacc
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.3-fno-common.patch
- "${FILESDIR}"/${PN}-0.8.3-optdeps.patch
-)
-
-src_prepare() {
- mv configure.{in,ac} || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with glade) $(use_with vte)
-}
-
-src_install() {
- # Stop make install from running gtk-update-icon-cache
- emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
- einstalldocs
-}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
deleted file mode 100644
index f6947de4958..00000000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg-utils
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="glade vte"
-
-RDEPEND="
- x11-libs/gtk+:2
- glade? ( gnome-base/libglade )
- vte? ( x11-libs/vte:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- sys-devel/flex
- virtual/yacc
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.3-fno-common.patch
- "${FILESDIR}"/${PN}-0.8.3-optdeps.patch
-)
-
-src_prepare() {
- mv configure.{in,ac} || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with glade) $(use_with vte)
-}
-
-src_install() {
- # Stop make install from running gtk-update-icon-cache
- emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 7d0ca79e2c4..69360f95aa4 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -18,8 +18,6 @@ provided.
<remote-id type="google-code">gtkdialog</remote-id>
</upstream>
<use>
-<flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
-<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-07 20:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-07 20:19 [gentoo-commits] repo/gentoo:master commit in: x11-misc/gtkdialog/, x11-misc/gtkdialog/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-09-16 9:33 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox