commit: d5d0c8fded27c8f3ede3eff469c73dcd8489cdab Author: Ferenc Erki <erkiferenc <AT> gmail <DOT> com> AuthorDate: Mon Apr 17 15:52:29 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Apr 17 15:52:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d0c8fd
x11-misc/xsel: bump snapshot to 1.2.0_p20220310 Signed-off-by: Ferenc Erki <erkiferenc <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-misc/xsel/Manifest | 1 + .../xsel/files/xsel-1.2.0_p20220310-Werror.patch | 32 ++++++++ .../files/xsel-1.2.0_p20220310-modernize.patch | 91 ++++++++++++++++++++++ x11-misc/xsel/xsel-1.2.0_p20220310.ebuild | 31 ++++++++ 4 files changed, 155 insertions(+) diff --git a/x11-misc/xsel/Manifest b/x11-misc/xsel/Manifest index 65168a048074..46702656e76d 100644 --- a/x11-misc/xsel/Manifest +++ b/x11-misc/xsel/Manifest @@ -1 +1,2 @@ DIST xsel-1.2.0.tar.gz 169155 BLAKE2B 59b5c2f03058be1a584f12bd5c129a008ae581545b7aed3a54240f6a0b9c29e857c7425cbf6fa6421ccd577a1907a9a6c1d7213e4ccc43309a5e8933e707847d SHA512 e28623e6cc180f2e2210c20697d21d336633f0a5272ca9b62150a1c535e8de89731acc07230a9977e391e37d3943a9d687f1f967765a15bca5092a6c6d8c4d8f +DIST xsel-1.2.0_p20220310.tar.gz 51746 BLAKE2B b4de6c40b48d54f7ba83d92908e82032975511bb1cd974d8b060fcf8f93e66840dcd832d4ded8111695aa581ab1314c16db3514d40f26b868c22214ee69ea9c5 SHA512 4d4fad1dc6cdbbd8915ea303cd905b7a2a3a1efd866c2f174afd170f5372e4a272eab57b1a40c714c64d3c0178acc78d18cae6e4a621edd0e81534c203d0d4da diff --git a/x11-misc/xsel/files/xsel-1.2.0_p20220310-Werror.patch b/x11-misc/xsel/files/xsel-1.2.0_p20220310-Werror.patch new file mode 100644 index 000000000000..5589f81a36d7 --- /dev/null +++ b/x11-misc/xsel/files/xsel-1.2.0_p20220310-Werror.patch @@ -0,0 +1,32 @@ +From 2a47fb141cc317a8eec7542a22c348f6abcec8a2 Mon Sep 17 00:00:00 2001 +From: David Seifert <[email protected]> +Date: Mon, 17 Apr 2023 12:21:52 +0200 +Subject: [PATCH] configure.ac: do not add `-Werror` to compile line + +* With every new compiler release, it breaks: + https://flameeyes.blog/2009/02/25/future-proof-your-code-dont-use-werror/ +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77dc524..fd20279 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,7 @@ AM_CONFIG_HEADER(config.h) + # Checks for programs. + AC_ISC_POSIX + AC_PROG_CC ++AC_PROG_CC_C99 + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_MAKE_SET +@@ -24,7 +25,7 @@ AC_SEARCH_LIBS([XOpenDisplay], [X11], [], [AC_MSG_ERROR([libX11 is required])]) + dnl Add some useful warnings if we have gcc. + dnl changequote(,)dnl + if test "x$ac_cv_prog_gcc" = xyes ; then +- CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Werror -g -std=gnu99 -Wdeclaration-after-statement -Wno-unused" ++ CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wdeclaration-after-statement -Wno-unused" + fi + dnl changequote([,])dnl + diff --git a/x11-misc/xsel/files/xsel-1.2.0_p20220310-modernize.patch b/x11-misc/xsel/files/xsel-1.2.0_p20220310-modernize.patch new file mode 100644 index 000000000000..0d25ce13ac0f --- /dev/null +++ b/x11-misc/xsel/files/xsel-1.2.0_p20220310-modernize.patch @@ -0,0 +1,91 @@ +From 633443e093845d61b16049081c17d6f08f266c6e Mon Sep 17 00:00:00 2001 +From: David Seifert <[email protected]> +Date: Mon, 17 Apr 2023 12:21:53 +0200 +Subject: [PATCH] configure.ac: modernize + +--- + Makefile.am | 8 +++----- + configure.ac | 23 ++++++----------------- + 2 files changed, 9 insertions(+), 22 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 2f55306..b72bc23 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,12 +1,10 @@ + ## Process this file with automake to produce Makefile.in + +-EXTRA_DIST = xsel.1x +- +-AM_CFLAGS = @X_CFLAGS@ +-LDADD = @X_LIBS@ ++AM_CPPFLAGS = $(X_CFLAGS) ++LDADD = $(X_LIBS) + + bin_PROGRAMS = xsel + + xsel_SOURCES = xsel.c xsel.h + +-man_MANS = xsel.1x ++dist_man_MANS = xsel.1x +diff --git a/configure.ac b/configure.ac +index fd20279..5e78b86 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,36 +1,27 @@ + # Process this file with autoconf to produce a configure script. +-AC_INIT([xsel.c]) +-AM_INIT_AUTOMAKE(xsel, 1.2.0) ++AC_INIT([xsel],[1.2.0]) ++AM_INIT_AUTOMAKE([1.14 foreign dist-xz subdir-objects]) + AC_CONFIG_SRCDIR([xsel.c]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) + + # Checks for programs. +-AC_ISC_POSIX + AC_PROG_CC +-AC_PROG_CC_C99 + AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_MAKE_SET + + # Checks for libraries. +-AC_PATH_XTRA +-AC_SUBST(X_CFLAGS) +-AC_SUBST(X_LDFLAGS) +-AC_SUBST(X_LIBS) +-AC_SUBST(X_EXTRA_LIBS) +- +-AC_SEARCH_LIBS([XOpenDisplay], [X11], [], [AC_MSG_ERROR([libX11 is required])]) ++PKG_CHECK_MODULES([X], [x11]) + + # Error out on compile warnings + dnl Add some useful warnings if we have gcc. + dnl changequote(,)dnl +-if test "x$ac_cv_prog_gcc" = xyes ; then ++AS_IF([test "x$ac_cv_c_compiler_gnu" = xyes], [ + CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wdeclaration-after-statement -Wno-unused" +-fi ++]) + dnl changequote([,])dnl + + # Checks for header files. +-AC_HEADER_STDC + AC_CHECK_HEADERS([errno.h fcntl.h stdlib.h string.h sys/time.h unistd.h]) + + # Checks for typedefs, structures, and compiler characteristics. +@@ -38,13 +29,11 @@ AC_C_CONST + AC_TYPE_PID_T + AC_TYPE_SIZE_T + AC_CHECK_MEMBERS([struct stat.st_blksize]) +-AC_HEADER_TIME + AC_TYPE_UID_T + + # Checks for library functions. + AC_FUNC_FORK + AC_FUNC_MALLOC +-AC_TYPE_SIGNAL + AC_CHECK_FUNCS([dup2 select strdup strerror strtol]) + + AC_CONFIG_FILES([Makefile]) diff --git a/x11-misc/xsel/xsel-1.2.0_p20220310.ebuild b/x11-misc/xsel/xsel-1.2.0_p20220310.ebuild new file mode 100644 index 000000000000..bd499f87e976 --- /dev/null +++ b/x11-misc/xsel/xsel-1.2.0_p20220310.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +GIT_COMMIT="9fc4e3e4e3f1231cabfdc2e1438155f9390bc517" + +DESCRIPTION="Command-line program for getting and setting the contents of the X selection" +HOMEPAGE="https://vergenet.net/~conrad/software/xsel"; +SRC_URI="https://github.com/kfish/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${GIT_COMMIT}" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" + +DEPEND="x11-libs/libX11" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-Werror.patch + "${FILESDIR}"/${P}-modernize.patch +) + +src_prepare() { + default + eautoreconf +}
