* [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/files/, media-gfx/scrot/
@ 2020-06-29 7:02 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-06-29 7:02 UTC (permalink / raw
To: gentoo-commits
commit: 07340c794c69a86d20f9b14d46f24b847923a813
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 07:00:03 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 07:02:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07340c79
media-gfx/scrot: Update live ebuild
- Add libXcomposite
- Remove libXcursor[0]
[0] https://github.com/resurrecting-open-source-projects/scrot/pull/47
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
media-gfx/scrot/files/scrot-9999-Xcursor.patch | 18 ++++++++++++++++++
media-gfx/scrot/scrot-9999.ebuild | 5 ++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
new file mode 100644
index 00000000000..dbb935219b3
--- /dev/null
+++ b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
@@ -0,0 +1,18 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -34,4 +34,4 @@
+ bin_PROGRAMS = scrot
+ scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h \
+ options.c options.h debug.h imlib.c structs.h note.c note.h
+-scrot_LDADD = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@
++scrot_LDADD = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@
+--- a/src/scrot.h
++++ b/src/scrot.h
+@@ -40,7 +40,6 @@
+ #include <X11/cursorfont.h>
+ #include <X11/extensions/Xfixes.h>
+ #include <X11/extensions/Xcomposite.h>
+-#include <X11/Xcursor/Xcursor.h>
+
+ #include <stdio.h>
+ #include <string.h>
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
index a3ef577a9be..82d865e83c5 100644
--- a/media-gfx/scrot/scrot-9999.ebuild
+++ b/media-gfx/scrot/scrot-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
RDEPEND="
>=media-libs/giblib-1.2.3
x11-libs/libX11
- x11-libs/libXcursor
+ x11-libs/libXcomposite
x11-libs/libXfixes
|| (
media-libs/imlib2[gif]
@@ -31,6 +31,9 @@ DEPEND="
DOCS=(
AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
)
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-Xcursor.patch
+)
src_prepare() {
sed -i -e 's#-g -O3##g' src/Makefile.am || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/files/, media-gfx/scrot/
@ 2022-07-15 12:44 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-07-15 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 7fbb535baac36c4cad055adfa739ec085c8b58b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 12:43:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 12:43:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fbb535b
media-gfx/scrot: drop 1.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/scrot/Manifest | 1 -
media-gfx/scrot/files/ax_prefix_config_h.m4 | 203 ------------------------
media-gfx/scrot/files/scrot-1.2.bash-completion | 41 -----
media-gfx/scrot/scrot-1.4.ebuild | 48 ------
4 files changed, 293 deletions(-)
diff --git a/media-gfx/scrot/Manifest b/media-gfx/scrot/Manifest
index 7354016426cb..1e2a8e8b5831 100644
--- a/media-gfx/scrot/Manifest
+++ b/media-gfx/scrot/Manifest
@@ -1,2 +1 @@
-DIST scrot-1.4.tar.gz 157779 BLAKE2B ba844f8bc500c468d028ce62ae57bd6a9fa0e403df6f05dd217722a9115456b70a38aabd7ccb0da53d855b9971d0f5948f82545ca0c8cceb75ede0d4546e27c1 SHA512 8423e7b2658f3e0ccf30f61e122016469226328adf8b1e511aeb031dd2655ae66582651e2d046c7c35d23efb98656369a02b59e711980481ddc4db24c299ee11
DIST scrot-1.7.tar.gz 178463 BLAKE2B 021c68c5ebd19ec08c072cff73fe1ebb7ffd179dfcde6e13656779e2ee1357cf0fdbba1d4beb2fc5dc9c8c4cd28008acaa462068eec3192cea6687ac58cd653a SHA512 3ef2b547d561a85213ef0075af3034020f00168253d3b84ef94578f0b8534f9a7389c808f8fcd0c619358a14f41601fee407d08d63c397b9892ba9fc2db23f88
diff --git a/media-gfx/scrot/files/ax_prefix_config_h.m4 b/media-gfx/scrot/files/ax_prefix_config_h.m4
deleted file mode 100644
index 22acbac68d5e..000000000000
--- a/media-gfx/scrot/files/ax_prefix_config_h.m4
+++ /dev/null
@@ -1,203 +0,0 @@
-# ===========================================================================
-# https://www.gnu.org/software/autoconf-archive/ax_prefix_config_h.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-# AX_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])]
-#
-# DESCRIPTION
-#
-# Generate an installable config.h.
-#
-# A package should not normally install its config.h as a system header,
-# but if it must, this macro can be used to avoid namespace pollution by
-# making a copy of config.h with a prefix added to all the macro names.
-#
-# Each "#define SOMEDEF" line of the configuration header has the given
-# prefix added, in the same case as the first character of the macro name.
-#
-# Defaults:
-#
-# OUTPUT-HEADER = $PACKAGE-config.h
-# PREFIX = $PACKAGE
-# ORIG-HEADER, from AM_CONFIG_HEADER(config.h)
-#
-# Your configure.ac script should contain both macros in this order.
-#
-# Example:
-#
-# AC_INIT(config.h.in) # config.h.in as created by "autoheader"
-# AM_INIT_AUTOMAKE(testpkg, 0.1.1) # makes #undef VERSION and PACKAGE
-# AM_CONFIG_HEADER(config.h) # prep config.h from config.h.in
-# AX_PREFIX_CONFIG_H(mylib/_config.h) # prep mylib/_config.h from it..
-# AC_MEMORY_H # makes "#undef NEED_MEMORY_H"
-# AC_C_CONST_H # makes "#undef const"
-# AC_OUTPUT(Makefile) # creates the "config.h" now
-# # and also mylib/_config.h
-#
-# If the argument to AX_PREFIX_CONFIG_H would have been omitted then the
-# default output file would have been called simply "testpkg-config.h",
-# but even under the name "mylib/_config.h" it contains prefix-defines
-# like
-#
-# #ifndef TESTPKG_VERSION
-# #define TESTPKG_VERSION "0.1.1"
-# #endif
-# #ifndef TESTPKG_NEED_MEMORY_H
-# #define TESTPKG_NEED_MEMORY_H 1
-# #endif
-# #ifndef _testpkg_const
-# #define _testpkg_const _const
-# #endif
-#
-# and this "mylib/_config.h" can be installed along with other header
-# files, which is most convenient when creating a shared library (that has
-# some headers) whose functionality depends on features detected at
-# compile-time. No need to invent some "mylib-confdefs.h.in" manually.
-#
-# Note that some AC_DEFINEs that end up in the config.h file are actually
-# self-referential - e.g. AC_C_INLINE, AC_C_CONST, and the AC_TYPE_OFF_T
-# say that they "will define inline|const|off_t if the system does not do
-# it by itself". You might want to clean up about these - consider an
-# extra mylib/conf.h that reads something like:
-#
-# #include <mylib/_config.h>
-# #ifndef _testpkg_const
-# #define _testpkg_const const
-# #endif
-#
-# and then start using _testpkg_const in the header files. That is also a
-# good thing to differentiate whether some library-user has starting to
-# take up with a different compiler, so perhaps it could read something
-# like this:
-#
-# #ifdef _MSC_VER
-# #include <mylib/_msvc.h>
-# #else
-# #include <mylib/_config.h>
-# #endif
-# #ifndef _testpkg_const
-# #define _testpkg_const const
-# #endif
-#
-# LICENSE
-#
-# Copyright (c) 2014 Reuben Thomas <rrt@sc3d.org>
-# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-# Copyright (c) 2008 Marten Svantesson
-# Copyright (c) 2008 Gerald Point <Gerald.Point@labri.fr>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at your
-# option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-# Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# As a special exception, the respective Autoconf Macro's copyright owner
-# gives unlimited permission to copy, distribute and modify the configure
-# scripts that are the output of Autoconf when processing the Macro. You
-# need not follow the terms of the GNU General Public License when using
-# or distributing such scripts, even though portions of the text of the
-# Macro appear in them. The GNU General Public License (GPL) does govern
-# all other use of the material that constitutes the Autoconf Macro.
-#
-# This special exception to the GPL applies to versions of the Autoconf
-# Macro released by the Autoconf Archive. When you make and distribute a
-# modified version of the Autoconf Macro, you may extend this special
-# exception to the GPL to apply to your modified version as well.
-
-#serial 16
-
-AC_DEFUN([AX_PREFIX_CONFIG_H],[dnl
-AC_PREREQ([2.62])
-AC_BEFORE([AC_CONFIG_HEADERS],[$0])dnl
-AC_CONFIG_COMMANDS(m4_default([$1], [$PACKAGE-config.h]),[dnl
-AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl
-AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl
-AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl
-AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl
-AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl
-AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl
-m4_pushdef([_script],[conftest.prefix])dnl
-m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
-_OUT=`echo m4_default([$1], [$PACKAGE-config.h])`
-_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
-_PKG=`echo m4_default([$2], [$PACKAGE])`
-_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
-_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:" -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`
-_INP=`echo "$3" | sed -e 's/ *//'`
-if test ".$_INP" = "."; then
- for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
- case "$ac_file" in
- *.h) _INP=$ac_file ;;
- *)
- esac
- test ".$_INP" != "." && break
- done
-fi
-if test ".$_INP" = "."; then
- case "$_OUT" in
- */*) _INP=`basename "$_OUT"`
- ;;
- *-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"`
- ;;
- *) _INP=config.h
- ;;
- esac
-fi
-if test -z "$_PKG" ; then
- AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H])
-else
- if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then
- _INP="$srcdir/$_INP"
- fi fi
- AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
- if test -f $_INP ; then
- AS_ECHO(["s/^@%:@undef *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/"]) > _script
- AS_ECHO(["s/^@%:@undef *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/"]) >> _script
- AS_ECHO(["s/^@%:@def[]ine *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1\\"]) >> _script
- AS_ECHO(["@%:@def[]ine $_UPP""_\\1\\2\\"]) >> _script
- AS_ECHO(["@%:@endif/"]) >> _script
- AS_ECHO(["s/^@%:@def[]ine *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1\\"]) >> _script
- AS_ECHO(["@%:@define $_LOW""_\\1\\2\\"]) >> _script
- AS_ECHO(["@%:@endif/"]) >> _script
- # now executing _script on _DEF input to create _OUT output file
- echo "@%:@ifndef $_DEF" >$tmp/pconfig.h
- echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h
- echo ' ' >>$tmp/pconfig.h
- echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
-
- sed -f _script $_INP >>$tmp/pconfig.h
- echo ' ' >>$tmp/pconfig.h
- echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h
- echo "@%:@endif" >>$tmp/pconfig.h
- if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then
- AC_MSG_NOTICE([$_OUT is unchanged])
- else
- ac_dir=`AS_DIRNAME(["$_OUT"])`
- AS_MKDIR_P(["$ac_dir"])
- rm -f "$_OUT"
- mv $tmp/pconfig.h "$_OUT"
- fi
- else
- AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT])
- fi
- rm -f conftest.*
-fi
-m4_popdef([_symbol])dnl
-m4_popdef([_script])dnl
-AS_VAR_POPDEF([_INP])dnl
-AS_VAR_POPDEF([_UPP])dnl
-AS_VAR_POPDEF([_LOW])dnl
-AS_VAR_POPDEF([_PKG])dnl
-AS_VAR_POPDEF([_DEF])dnl
-AS_VAR_POPDEF([_OUT])dnl
-],[PACKAGE="$PACKAGE"])])
diff --git a/media-gfx/scrot/files/scrot-1.2.bash-completion b/media-gfx/scrot/files/scrot-1.2.bash-completion
deleted file mode 100644
index 53c80bc3cd36..000000000000
--- a/media-gfx/scrot/files/scrot-1.2.bash-completion
+++ /dev/null
@@ -1,41 +0,0 @@
-# bash-completion script for scrot
-# place this in /etc/bash_completion.d
-
-_scrot() {
- local cur prev opts
- COMPREPLY=()
- cur=${COMP_WORDS[COMP_CWORD]}
- prev=${COMP_WORDS[COMP_CWORD-1]}
- opts="
- -h --help -v --version -a --autoselect -b --border -c --count -d
- --delay -e --exec -q --quality -m --multidisp -s --select -u --focused
- -t --thumb -z --silent -p --pointer -f --freeze -o --overwrite -l
- --line -n --note
- "
-
- if [[ "${cur}" == -* ]] || [[ ${COMP_CWORD} -eq 1 ]]; then
- COMPREPLY=($(compgen -W "${opts}" -- "${cur}"))
- fi
-
- case "${prev}" in
- -h|--help) COMPREPLY=($(compgen -W "${opts/-h --help}" -- "${cur}")) ;;
- -v|--version) COMPREPLY=($(compgen -W "${opts/-v --version}" -- "${cur}")) ;;
- -a|--autoselect) COMPREPLY=($(compgen -W "${opts/-a --autoselect}" -- "${cur}")) ;;
- -b|--border) COMPREPLY=($(compgen -W "${opts/-b --border}" -- "${cur}")) ;;
- -c|--count) COMPREPLY=($(compgen -W "${opts/-c --count}" -- "${cur}")) ;;
- -d|--delay) COMPREPLY=($(compgen -W "${opts/-d --delay}" -- "${cur}")) ;;
- -e|--exec) COMPREPLY=($(compgen -A command -- "${cur}")) ;;
- -q|--quality) COMPREPLY=($(compgen -W "${opts/-q --quality}" -- "${cur}")) ;;
- -m|--multidisp) COMPREPLY=($(compgen -W "${opts/-m --multidisp}" -- "${cur}")) ;;
- -s|--select) COMPREPLY=($(compgen -W "${opts/-s --select}" -- "${cur}")) ;;
- -u|--focused) COMPREPLY=($(compgen -W "${opts/-u --focused}" -- "${cur}")) ;;
- -t|--thumb) COMPREPLY=($(compgen -W "${opts/-t --thumb}" -- "${cur}")) ;;
- -z|--silent) COMPREPLY=($(compgen -W "${opts/-z --silent}" -- "${cur}")) ;;
- -p|--pointer) COMPREPLY=($(compgen -W "${opts/-p --pointer}" -- "${cur}")) ;;
- -f|--freeze) COMPREPLY=($(compgen -W "${opts/-f --freeze}" -- "${cur}")) ;;
- -o|--overwrite) COMPREPLY=($(compgen -W "${opts/-o --overwrite}" -- "${cur}")) ;;
- -l|--line) COMPREPLY=($(compgen -W "${opts/-l --line}" -- "${cur}")) ;;
- -n|--note) COMPREPLY=($(compgen -W "${opts/-n --note}" -- "${cur}")) ;;
- esac
-}
-complete -F _scrot scrot
diff --git a/media-gfx/scrot/scrot-1.4.ebuild b/media-gfx/scrot/scrot-1.4.ebuild
deleted file mode 100644
index 11c9a2db3274..000000000000
--- a/media-gfx/scrot/scrot-1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Screen capture utility using imlib2 library"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/scrot"
-SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="feh LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
- >=media-libs/giblib-1.2.3
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXfixes
- || (
- media-libs/imlib2[gif]
- media-libs/imlib2[jpeg]
- media-libs/imlib2[png]
- media-libs/imlib2[tiff]
- )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-DOCS=(
- AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
-)
-
-src_prepare() {
- sed -i -e 's#-g -O3##g' src/Makefile.am || die
- cat "${FILESDIR}"/ax_prefix_config_h.m4 >> acinclude.m4 || die
-
- default
-
- eautoreconf
-}
-
-src_install() {
- default
-
- newbashcomp "${FILESDIR}"/${PN}-1.2.bash-completion ${PN}
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-15 12:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-15 12:44 [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/files/, media-gfx/scrot/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-06-29 7:02 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox