From 05b8b0e0af1d72e51a3ee61522941bf7605cd01c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Jul 2020 14:05:23 +0100 Subject: gentoo resync : 04.07.2020 --- x11-misc/xnee/Manifest | 3 +- .../xnee-3.19-libgnomeui-only-for-applets.patch | 117 +++++++++++++++++++++ x11-misc/xnee/xnee-3.19-r1.ebuild | 73 ------------- x11-misc/xnee/xnee-3.19-r2.ebuild | 77 ++++++++++++++ 4 files changed, 196 insertions(+), 74 deletions(-) create mode 100644 x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch delete mode 100644 x11-misc/xnee/xnee-3.19-r1.ebuild create mode 100644 x11-misc/xnee/xnee-3.19-r2.ebuild (limited to 'x11-misc/xnee') diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest index 334a44f73444..e6bdcd40f148 100644 --- a/x11-misc/xnee/Manifest +++ b/x11-misc/xnee/Manifest @@ -1,4 +1,5 @@ AUX xnee-3.18-linker.patch 273 BLAKE2B 11c8552d2543879edf599dc0d9b820d5283abeba0edbc850079f268a92e95a26c28f90b119dff4f461d181b18dbad7493751b6964d20a9e1dcff6ba7d6ae8601 SHA512 2223bcd952b828d0704b3e3a0f3d55742a9837753187e4a8df84b6fa40a272174506de9341894b56024d9ac81ab1fff326012c13a3dedd0921dc7802e36761f0 +AUX xnee-3.19-libgnomeui-only-for-applets.patch 3491 BLAKE2B e11ab2405e5321b30c10b35b581a4c621fd17275f1384286cc6a398cd638e6d4e99b2bc0d8a10fe409ee66ae12a15291ab19a7610bb65e724d36c77896de5de7 SHA512 7c6557957c44ce546983a1c900eb37979d44b99606414fe1338716d9775374c5e24bfc279beccdf8be03ce3534819e736401747c7f9c38e2b0feba1fc7e2cfe8 DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8 -EBUILD xnee-3.19-r1.ebuild 1489 BLAKE2B c10e91bde193dd4dc73034ae58f25153e1e8ce5de9a5e83e8650bb5fe74a8f38b928d378807bc8f228fe5e50836e318eff5a371cdc4f3c1a2b368411770ebcfa SHA512 98abc0d6dba1739e42aa063a1527e6c9f550b8bbbbfa8a38d7b05cdc0f4b949cda36fc85ca031e25ff2bf5def00b0647e63dbb9f1155228e42ee7a58e60658c5 +EBUILD xnee-3.19-r2.ebuild 1508 BLAKE2B ad53866e527588047339dcfcf4e71b04783fecd828f6d388948d784b0c7bb26fce71d513db1f9b7444e068f566abfc296fdba15841d11a6aa807ab052820e6e5 SHA512 479ac8adac9e6f4863836a7c2e49a695f933a5a42383b6f72a1732e0dc4e17683c733c823f903567cb8fe648e686aa100806e038192d30f80fce353d2249b679 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b diff --git a/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch b/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch new file mode 100644 index 000000000000..4e80dacd20b0 --- /dev/null +++ b/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch @@ -0,0 +1,117 @@ +--- a/configure.in 2014/05/06 14:13:59 1.134 ++++ b/configure.in 2018/01/01 23:06:56 1.135 +@@ -382,62 +382,63 @@ + fi + + +- GNOMEUI2_MODULE="libgnomeui-2.0" +- GNOMEUI2_VERSION="2.0.0" +- +- +- if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION` +- then +- GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE" +- GTK_ERR=1 +- fi +- +- libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE ` +- libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE ` +- +- +- AC_SUBST(libgnomeui_CFLAGS) +- AC_SUBST(libgnomeui_LIBS) +- + PIXMAP_DIR=pixmap + +- +- if test x$buildgapplet = xtrue ; ++ if test x$buildgapplet = xtrue; + then +- +- if test x$GTKCONF = x ; +- then +- echo " **************************************** " +- echo " * WARNING, missing program: gtk-config *" +- echo " **************************************** " +- echo "" +- echo " On Debian based distros, install sth like: libgtk2.0-dev" +- echo "" +- echo "However, I will try my best to continue without gtk-config. " +- echo "Will not be able to check for gtk/gnome header files properly" +- echo "On most platforms this implies no problem" +- echo "" +- else +- GTK_PREFIX=`$GTKCONF --prefix` +- GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/ +- GNOME_H_FILE=$GTK_INC_PATH/gnome.h +- +- ls -l $GNOME_H_FILE 2>/dev/null >/dev/null +- +- MISSING_GNOME_H=$? + +- if test x$MISSING_GNOME_H != x0 ; ++ GNOMEUI2_MODULE="libgnomeui-2.0" ++ GNOMEUI2_VERSION="2.0.0" ++ ++ ++ if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION` ++ then ++ GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE" ++ GTK_ERR=1 ++ fi ++ ++ libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE ` ++ libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE ` ++ ++ ++ AC_SUBST(libgnomeui_CFLAGS) ++ AC_SUBST(libgnomeui_LIBS) ++ ++ ++ ++ if test x$GTKCONF = x ; + then +- echo "Missing GNOME header file (gnome.h), you need to install development packages" +- echo "On a Debian based distro system do:" +- echo "" +- echo " sudo apt-get install libgnome2-dev" +- echo "" +-echo exit 1 +- fi +- fi +- +- fi ++ echo " **************************************** " ++ echo " * WARNING, missing program: gtk-config *" ++ echo " **************************************** " ++ echo "" ++ echo " On Debian based distros, install sth like: libgtk2.0-dev" ++ echo "" ++ echo "However, I will try my best to continue without gtk-config. " ++ echo "Will not be able to check for gtk/gnome header files properly" ++ echo "On most platforms this implies no problem" ++ echo "" ++ else ++ GTK_PREFIX=`$GTKCONF --prefix` ++ GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/ ++ GNOME_H_FILE=$GTK_INC_PATH/gnome.h ++ ++ ls -l $GNOME_H_FILE 2>/dev/null >/dev/null ++ ++ MISSING_GNOME_H=$? ++ ++ if test x$MISSING_GNOME_H != x0 ; ++ then ++ echo "Missing GNOME header file (gnome.h), you need to install development packages" ++ echo "On a Debian based distro system do:" ++ echo "" ++ echo " sudo apt-get install libgnome2-dev" ++ echo "" ++ echo exit 1 ++ fi ++ fi ++ ++ fi + fi + + diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild deleted file mode 100644 index 0d71add730d5..000000000000 --- a/x11-misc/xnee/xnee-3.19-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools desktop flag-o-matic - -DESCRIPTION="Program suite to record, replay and distribute user actions" -HOMEPAGE="https://xnee.wordpress.com/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="gnome static-libs xosd" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXtst - x11-libs/libxcb - gnome? ( - x11-libs/gtk+:2 - >=gnome-base/libgnomeui-2 - >=gnome-base/gconf-2 - ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - virtual/pkgconfig - sys-devel/gettext - gnome? ( virtual/imagemagick-tools[jpeg,png] ) -" - -# This needs RECORD extension from X.org server which isn't necessarily -# enabled. Xlib: extension "RECORD" missing on display ":0.0". -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-3.18-linker.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cflags -fcommon - econf \ - $(use_enable gnome gui) \ - $(use_enable static-libs static) \ - $(use_enable xosd buffer_verbose) \ - $(use_enable xosd verbose) \ - $(use_enable xosd) \ - --disable-gnome-applet \ - --disable-static-programs \ - --enable-cli \ - --enable-lib -} - -src_test() { - Xemake check -} - -src_install() { - default - dodoc AUTHORS BUGS ChangeLog FAQ NEWS README TODO - use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK" - find "${ED}" -name '*.la' -delete || die -} diff --git a/x11-misc/xnee/xnee-3.19-r2.ebuild b/x11-misc/xnee/xnee-3.19-r2.ebuild new file mode 100644 index 000000000000..0a3540a531d3 --- /dev/null +++ b/x11-misc/xnee/xnee-3.19-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic + +DESCRIPTION="Program suite to record, replay and distribute user actions" +HOMEPAGE="https://xnee.wordpress.com/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnome xosd" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXtst + x11-libs/libxcb + gnome? ( + >=gnome-base/gconf-2 + x11-libs/gtk+:2 + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + virtual/pkgconfig + sys-devel/gettext + gnome? ( virtual/imagemagick-tools[jpeg,png] ) +" + +# This needs RECORD extension from X.org server which isn't necessarily +# enabled. Xlib: extension "RECORD" missing on display ":0.0". +RESTRICT="test" + +DOCS=( AUTHORS BUGS ChangeLog FAQ NEWS README TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.18-linker.patch + "${FILESDIR}"/${P}-libgnomeui-only-for-applets.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cflags -fcommon + econf \ + $(use_enable gnome gui) \ + $(use_enable xosd buffer_verbose) \ + $(use_enable xosd verbose) \ + $(use_enable xosd) \ + --disable-gnome-applet \ + --disable-static \ + --disable-static-programs \ + --enable-cli \ + --enable-lib +} + +src_test() { + virtx emake check +} + +src_install() { + default + use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK" + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3