* [gentoo-commits] repo/gentoo:master commit in: dev-libs/input-pad/files/, dev-libs/input-pad/
@ 2020-08-11 13:51 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2020-08-11 13:51 UTC (permalink / raw
To: gentoo-commits
commit: 01f98a2ce07d3047b7bd2c7e8bc41af631af1317
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 13:47:24 2020 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 13:50:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01f98a2c
dev-libs/input-pad: do not compress man pages
Closes: https://bugs.gentoo.org/734262
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-libs/input-pad/files/input-pad-man.patch | 23 ++++++++++++++++++++++
.../input-pad/input-pad-1.0.99_pre20140916.ebuild | 7 +++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dev-libs/input-pad/files/input-pad-man.patch b/dev-libs/input-pad/files/input-pad-man.patch
new file mode 100644
index 00000000000..f54580f776e
--- /dev/null
+++ b/dev-libs/input-pad/files/input-pad-man.patch
@@ -0,0 +1,23 @@
+--- a/input-pad/Makefile.am
++++ b/input-pad/Makefile.am
+@@ -226,19 +226,15 @@
+ endif
+
+ man_one_in_files = input-pad.1.in
+-man_one_files = $(man_one_in_files:.1.in=.1)
+-man_one_DATA =$(man_one_files:.1=.1.gz)
++man_one_DATA = $(man_one_in_files:.1.in=.1)
+ man_onedir = $(mandir)/man1
+ %.1: %.1.in
+ $(AM_V_GEN) sed \
+ -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
+ mv $@.tmp $@
+-%.1.gz: %.1
+- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@
+
+ CLEANFILES += \
+ $(BUILT_SOURCES) \
+- $(man_one_files) \
+ $(man_one_DATA) \
+ $(NULL)
+
diff --git a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
index f884a5d7fb2..1ee24ba778e 100644
--- a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
+++ b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-inherit ltprune xdg-utils
+inherit autotools ltprune xdg-utils
MY_P="${P/_pre/.}"
MY_PV="${PV/_pre/.}"
@@ -33,8 +33,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+
src_prepare() {
default
+ eautoreconf
xdg_environment_reset
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/input-pad/files/, dev-libs/input-pad/
@ 2020-08-20 13:53 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2020-08-20 13:53 UTC (permalink / raw
To: gentoo-commits
commit: e40886348cdc6e038ced85c97f2fcc86437b20c8
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 13:53:10 2020 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 13:53:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4088634
dev-libs/input-pad: fix build with Clang
Closes: https://bugs.gentoo.org/737132
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
.../input-pad/files/input-pad-Wreturn-type.patch | 23 ++++++++++++++++++++++
.../input-pad/input-pad-1.0.99_pre20140916.ebuild | 5 ++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/dev-libs/input-pad/files/input-pad-Wreturn-type.patch b/dev-libs/input-pad/files/input-pad-Wreturn-type.patch
new file mode 100644
index 00000000000..2e50f8bce2b
--- /dev/null
+++ b/dev-libs/input-pad/files/input-pad-Wreturn-type.patch
@@ -0,0 +1,23 @@
+--- a/input-pad/window-gtk.c
++++ b/input-pad/window-gtk.c
+@@ -5462,7 +5462,7 @@
+
+ app = INPUT_PAD_GTK_APPLICATION (window_data);
+
+- g_return_if_fail (app->window != NULL);
++ g_return_val_if_fail (app->window != NULL, 0);
+
+ return gtk_widget_get_visible (GTK_WIDGET (app->window));
+ }
+@@ -5661,8 +5661,9 @@
+ {
+ InputPadGtkApplication *app;
+
+- g_return_if_fail (window_data != NULL &&
+- INPUT_PAD_IS_GTK_APPLICATION (window_data));
++ g_return_val_if_fail (window_data != NULL &&
++ INPUT_PAD_IS_GTK_APPLICATION (window_data),
++ -1);
+
+ app = INPUT_PAD_GTK_APPLICATION (window_data);
+
diff --git a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
index 6675baa16c6..2294addb77a 100644
--- a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
+++ b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
@@ -33,7 +33,10 @@ BDEPEND="dev-util/intltool
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-Wreturn-type.patch
+ "${FILESDIR}"/${PN}-man.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-20 13:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-20 13:53 [gentoo-commits] repo/gentoo:master commit in: dev-libs/input-pad/files/, dev-libs/input-pad/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2020-08-11 13:51 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox