summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-12-31 18:53:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-12-31 18:53:33 +0000
commit9e7ecaf7ea39cacc014b533517a95c8abc838fd1 (patch)
treea8ba8986d94a59768edddfaa8513e0c8e6dbc32c /x11-misc/electricsheep
parentx86 stable, bug #298735 (diff)
downloadgentoo-2-9e7ecaf7ea39cacc014b533517a95c8abc838fd1.tar.gz
gentoo-2-9e7ecaf7ea39cacc014b533517a95c8abc838fd1.tar.bz2
gentoo-2-9e7ecaf7ea39cacc014b533517a95c8abc838fd1.zip
Remove versions that inherit deprecated kde-functions.eclass
(Portage version: 2.2_rc61/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'x11-misc/electricsheep')
-rw-r--r--x11-misc/electricsheep/Manifest20
-rw-r--r--x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild76
-rw-r--r--x11-misc/electricsheep/electricsheep-2.6.8-r2.ebuild82
-rw-r--r--x11-misc/electricsheep/electricsheep-2.6.8-r3.ebuild86
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch591
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch123
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch73
-rw-r--r--x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch36
-rw-r--r--x11-misc/electricsheep/files/electricsheep.desktop107
9 files changed, 0 insertions, 1194 deletions
diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
index f09232bd8834..5cbb4e3d8184 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX electricsheep-2.6.7-cflagsfix.patch 16890 RMD160 2ee5709fb7bfd2ae5a3fa11f271f5d8b8b9633fd SHA1 00c59e7196f69a066b16acca67350ea550070390 SHA256 b4d6343d1159c5c755d75412548c20ef6b27b18aeee6386e64cc84acc46f9ff0
-AUX electricsheep-2.6.7-libpng-1.2.10.patch 3598 RMD160 c1afb1197377c26c7a200d20eb90cbbcc488fa48 SHA1 0b024bad34d10141ad75d1a478dff05e8845c4b8 SHA256 9eada8e6a6f43185af306302ddb3b22df84d9798025a773773f13ffecb300ca9
-AUX electricsheep-2.6.8-cflagsfix.patch 2523 RMD160 528bf88fc30c065869b62e9425e3ca2b3e00ecf7 SHA1 28443bb1b4debd2a360036a3aad73a3ec187b4ee SHA256 489728c83a2a6ccb2bb223fb28e6a2b4636c0fe565e18737b313b4ecd7c07f26
-AUX electricsheep-2.6.8-multihead.patch 1701 RMD160 7c1c2a71f875370b11d8e526f48f4b2c0ee196af SHA1 ce59f726db1bcf65d141cfd3fb43bb1fef677c87 SHA256 c83dbdcca36aa627235efee39420012c386f11ba7f19968c46113088c623a417
AUX electricsheep-gnome.patch 970 RMD160 ab0203cea690f90e342ce24055d5f55a73cd2b71 SHA1 9854b43ba17a53e3fbfc369747401215ad9c596e SHA256 259a82dee3437ae24489811a1ddd430c573e82c859a89f4c4808e9e9aadb79a4
AUX electricsheep-xdg-utils.patch 556 RMD160 e2903425d868861f1e015373b975b15225e06140 SHA1 bae398d8b1082699db066de851d2b688cd3c58f8 SHA256 bc44dc82dcbe9f444a034bace50952940fa98091dbf0baa9457644db3a9228f9
-AUX electricsheep.desktop 3973 RMD160 d765b848da913d773617817612fe4f6ac961c644 SHA1 fa9ec961fb025a9c02b40889b9ed4953e95cd8f3 SHA256 56884adb9d05705617f37874b72de83b4d37ef411f3d90d7fb7ca78019045fe1
-DIST electricsheep-2.6.7.tar.gz 1387836 RMD160 b842ec3761294bb6501127daf9fc377752bd830d SHA1 e666abbad9146ccbe0b20e5ce39ca131770d5512 SHA256 f7b91f7a81a556a213543ab76c9595a738dd931fe2bc2acac6b704b5d09253f0
-DIST electricsheep-2.6.8.tar.gz 1355274 RMD160 96830985e3cf4d2f132ae7a0124c55cd922d49e5 SHA1 0a430a90dd003a3d59248bbf44013e85978c2220 SHA256 c593e4be3fc6674bfd77277e7e3326d48885b8b105f19221398f97a31d6698ba
DIST electricsheep-2.7_beta11.tar.bz2 224892 RMD160 dce0cec9cbc1fb25d00461855bacdd6079967bdd SHA1 c9ba55b62dfc7ddad679758a1cd3464b0de749ea SHA256 093ffdf65d24d0eb6c66e398c092bcf48d72e23151c0d572b2c327344f1261a1
-EBUILD electricsheep-2.6.7-r1.ebuild 2074 RMD160 d0fa26535a3662382357b2622ba286d423a1a428 SHA1 3aa1059b9fcd65d02588f6dac08a276258c0e90d SHA256 1f6caa1a842b38b3e9015534f8360473ab87eb7cc809c201e56447cc3fc3c5ae
-EBUILD electricsheep-2.6.8-r2.ebuild 2175 RMD160 7f6733053e4b360ce69431641be30d32a11bbfce SHA1 3c7557e177323dd753f6f8b4d3c1a234aca91366 SHA256 9503b8081a0b712d0182964176a7f0c8f9d2717bd9fd70884a1827d233181dd3
-EBUILD electricsheep-2.6.8-r3.ebuild 2258 RMD160 c8c4000fe6229022ca94334c42ffaa4a0ff756ad SHA1 e4ba81959aee0d67bf31d95ff3f267b3ac061030 SHA256 f631cb0cfb220d0cd92901f355f09331accb1b192387fdcdb656ad07c8854d99
EBUILD electricsheep-2.7_beta11.ebuild 1747 RMD160 856ba4fa628660dd84002b9f2f70f392ba437935 SHA1 29b5461c9ea5aea2b50430fa3c62eef324cbc81a SHA256 e66cd617a7804a75c31608ac981f7da8ed1c3b9d8b4503a744109a9f2fba1a5f
MISC ChangeLog 8145 RMD160 42627a10fdbc0dc4cef6c7865be01655a817c6a3 SHA1 2b37de7c245f5078314b37bb4341de644e3ab428 SHA256 7de238a6c65419f2e988d6e9a2a956a3a062cab2b33083ca532dcd1ff101fe1c
MISC metadata.xml 319 RMD160 8d2b4fb22841a8e8465a2cd5b6ebe73524b34a7a SHA1 eef4c6d4f7d83fecca5844d10e6efd0b9566a5e3 SHA256 ff313e851d928bdcbd4d7a4ee641ac93aef523b1524ff5bd72acb60ddfc2d2ed
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks87sAACgkQkKaRLQcq0GKO7wCaA2vRMnryx8cNM8RjH34CI8rs
-1+cAoK22JBhpNVGTTptNUKsGTpJ7CMzF
-=rEkb
------END PGP SIGNATURE-----
diff --git a/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild b/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild
deleted file mode 100644
index 15e0a080523d..000000000000
--- a/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.7-r1.ebuild,v 1.6 2009/09/23 14:43:40 ssuominen Exp $
-
-inherit eutils flag-o-matic kde-functions
-
-DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
-HOMEPAGE="http://electricsheep.org/"
-SRC_URI="http://electricsheep.org/${P}.tar.gz"
-IUSE="kde"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc x86"
-
-RDEPEND="x11-libs/libXv
- x11-libs/libICE
- x11-libs/libSM
- dev-libs/expat
- net-misc/curl
- media-libs/jpeg
- >=media-libs/libpng-1.2.10
- media-libs/libsdl
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-libs/libXt
- sys-apps/groff
- dev-lang/perl
- >=sys-apps/sed-4
- media-libs/libmpeg2
- sys-devel/libtool"
-
-src_unpack() {
- unpack ${A}
- # Detect PIC requirement from direct from compiler instead of
- # macro PIC.
- sed -i -e 's/def PIC/def __PIC__/' ${S}/mpeg2dec/src/cpu_accel.c
- epatch ${FILESDIR}/${P}-cflagsfix.patch
- cd ${S}
- epatch ${FILESDIR}/${P}-libpng-1.2.10.patch
-}
-
-# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
-# if they exist on the user machine although these aren't deps.
-
-src_install() {
-
- # prevent writing for xscreensaver
- sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
- Makefile || die "sed Makefile failed"
-
- # install the xscreensaver config file
- insinto /usr/share/xscreensaver/config
- doins electricsheep.xml
-
- make install DESTDIR="${D}" || die "make install failed"
-
- dodir /usr/share/electricsheep
- if [ ! -f /usr/share/electricsheep/electricsheep-uniqueid ]
- then
- "${D}/usr/bin/uniqueid" > \
- "${D}/usr/share/electricsheep/electricsheep-uniqueid"
- fi
-
- if use kde;
- then
- set-kdedir
- insinto /usr/share/applications
- doins "${FILESDIR}/${PN}.desktop"
- insinto "${KDEDIR}//share/applnk/System/ScreenSavers"
- doins "${FILESDIR}/${PN}.desktop"
- fi
-
- # remove header files that are installed over libmpeg2
- rm -rf "${D}/usr/include"
-}
diff --git a/x11-misc/electricsheep/electricsheep-2.6.8-r2.ebuild b/x11-misc/electricsheep/electricsheep-2.6.8-r2.ebuild
deleted file mode 100644
index 9c9b590658a8..000000000000
--- a/x11-misc/electricsheep/electricsheep-2.6.8-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.8-r2.ebuild,v 1.2 2009/09/23 14:43:40 ssuominen Exp $
-
-inherit eutils flag-o-matic kde-functions autotools
-
-DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
-HOMEPAGE="http://electricsheep.org/"
-SRC_URI="http://electricsheep.org/${P}.tar.gz"
-IUSE="kde"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-RDEPEND="x11-libs/libXv
- x11-libs/libICE
- x11-libs/libSM
- dev-libs/expat
- net-misc/curl
- media-libs/jpeg
- media-libs/libpng
- media-libs/libsdl
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-libs/libXt
- sys-apps/groff
- dev-lang/perl
- media-libs/libmpeg2
- sys-devel/libtool"
-
-src_unpack() {
- unpack ${A}
- # Detect PIC requirement from direct from compiler instead of
- # macro PIC.
- sed -i -e 's/def PIC/def __PIC__/' "${S}/mpeg2dec/src/cpu_accel.c"
- epatch "${FILESDIR}"/${P}-cflagsfix.patch
- epatch "${FILESDIR}"/${P}-multihead.patch
- #cd "${S}"
- #eautoreconf
-}
-
-# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
-# if they exist on the user machine although these aren't deps.
-
-src_compile() {
- econf
- find -name Makefile -exec sed -i -e 's/-Werror//' {} \;
- emake || die
-}
-
-src_install() {
-
- # prevent writing for xscreensaver
- sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
- Makefile || die "sed Makefile failed"
-
- # install the xscreensaver config file
- insinto /usr/share/xscreensaver/config
- doins electricsheep.xml
-
- emake install DESTDIR="${D}" || die "make install failed"
-
- dodir /usr/share/electricsheep
- if [ ! -f /usr/share/electricsheep/electricsheep-uniqueid ]
- then
- "${D}/usr/bin/uniqueid" > \
- "${D}/usr/share/electricsheep/electricsheep-uniqueid"
- fi
-
- if use kde;
- then
- set-kdedir
- insinto /usr/share/applications
- doins "${FILESDIR}/${PN}.desktop"
- insinto "${KDEDIR}//share/applnk/System/ScreenSavers"
- doins "${FILESDIR}/${PN}.desktop"
- fi
-
- # remove header files that are installed over libmpeg2
- rm -rf "${D}/usr/include"
-}
diff --git a/x11-misc/electricsheep/electricsheep-2.6.8-r3.ebuild b/x11-misc/electricsheep/electricsheep-2.6.8-r3.ebuild
deleted file mode 100644
index 34e9eaa81c6c..000000000000
--- a/x11-misc/electricsheep/electricsheep-2.6.8-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.8-r3.ebuild,v 1.2 2009/09/23 14:43:40 ssuominen Exp $
-
-inherit eutils flag-o-matic kde-functions
-
-DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
-HOMEPAGE="http://electricsheep.org/"
-SRC_URI="http://electricsheep.org/${P}.tar.gz"
-IUSE="kde"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-libs/libXv
- x11-libs/libICE
- x11-libs/libSM
- dev-libs/expat
- net-misc/curl
- media-gfx/flam3
- media-libs/jpeg
- media-libs/libpng
- media-libs/libsdl
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- x11-proto/xextproto
- x11-libs/libXt
- sys-apps/groff
- dev-lang/perl
- media-libs/libmpeg2
- sys-devel/libtool"
-
-src_unpack() {
- unpack ${A}
- # Detect PIC requirement from direct from compiler instead of
- # macro PIC.
- sed -i -e 's/def PIC/def __PIC__/' "${S}/mpeg2dec/src/cpu_accel.c"
- epatch "${FILESDIR}"/${P}-cflagsfix.patch
- epatch "${FILESDIR}"/${P}-multihead.patch
- #cd "${S}"
- #eautoreconf
-}
-
-# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
-# if they exist on the user machine although these aren't deps.
-
-src_compile() {
- econf
- find -name Makefile -exec sed -i -e 's/-Werror//' {} \;
- emake || die
-}
-
-src_install() {
-
- # prevent writing for xscreensaver
- sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
- Makefile || die "sed Makefile failed"
-
- # install the xscreensaver config file
- insinto /usr/share/xscreensaver/config
- doins electricsheep.xml
-
- emake install DESTDIR="${D}" || die "make install failed"
-
- dodir /usr/share/electricsheep
- if [ ! -f /usr/share/electricsheep/electricsheep-uniqueid ]
- then
- "${D}/usr/bin/uniqueid" > \
- "${D}/usr/share/electricsheep/electricsheep-uniqueid"
- fi
-
- if use kde;
- then
- set-kdedir
- insinto /usr/share/applications
- doins "${FILESDIR}/${PN}.desktop"
- insinto "${KDEDIR}//share/applnk/System/ScreenSavers"
- doins "${FILESDIR}/${PN}.desktop"
- fi
-
- # remove header files that are installed over libmpeg2
- rm -rf "${D}/usr/include"
-
- # remove files installed by flam3
- rm -rf "${D}/usr/lib"* "${D}/usr/bin/flam3-"*
-}
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch
deleted file mode 100644
index 75b2edb6cbbf..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch
+++ /dev/null
@@ -1,591 +0,0 @@
---- electricsheep-2.6.7/mpeg2dec/configure.in.orig 2005-07-20 16:19:40.000000000 +1000
-+++ electricsheep-2.6.7/mpeg2dec/configure.in 2006-06-06 10:55:02.000000000 +1000
-@@ -15,70 +15,6 @@
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
-
--dnl CC-specific flags
--if test x"$CC" = x"checkergcc"; then
-- enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
-- dnl GCC-specific flags
-- dnl -Wall -Werror moved to the end to not disturb the configure script
--
-- dnl -O3
-- changequote(<<,>>)
-- OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
-- changequote([,])
-- OPT_CFLAGS="$OPT_CFLAGS -O3"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
-- dnl -fomit-frame-pointer
-- OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
-- dnl arch-specific flags
-- case "$host_alias" in
-- i?86-* | k?-*)
-- AC_DEFINE([ARCH_X86],,[x86 architecture])
-- case "$host_alias" in
-- i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
-- i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
-- i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
-- i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
-- k6-*) OPT_CFLAGS="$CFLAGS -march=k6";;
-- esac
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- ppc-* | powerpc-*)
-- OPT_CFLAGS="$CFLAGS -Wa,-m7400"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],
-- [CFLAGS=$OPT_CFLAGS; AC_DEFINE([ARCH_PPC],,[ppc architecture])]);;
-- sparc-* | sparc64-*)
-- OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- mips-sgi-irix6.*) dnl do we need to be that specific ?
-- OPT_CFLAGS="$CFLAGS -mabi=64"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
-- dnl TenDRA portability checking compiler
-- TENDRA=yes
-- CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
-- enable_mlib=no
-- no_x=yes
-- enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
-- dnl Intel C++ compiler
-- CFLAGS="-g -O3 -unroll -ip"
--else
-- dnl non-gcc flags - we probably need exact configuration triplets here.
-- case "$host_alias" in
-- mips-sgi-irix6.*)
-- OPT_CFLAGS="$CFLAGS -64"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- sparc-sun-solaris*)
-- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- esac
--fi
--
- dnl Checks for libtool - this must be done after we set cflags
- AC_DISABLE_SHARED
- AC_LIBTOOL_WIN32_DLL
---- electricsheep-2.6.7/mpeg2dec/configure.orig 2005-07-20 16:24:34.000000000 +1000
-+++ electricsheep-2.6.7/mpeg2dec/configure 2006-06-06 10:55:02.000000000 +1000
-@@ -3245,515 +3245,6 @@
- fi
-
-
--if test x"$CC" = x"checkergcc"; then
-- enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
--
--
-- OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
--
-- OPT_CFLAGS="$OPT_CFLAGS -O3"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi
--
-- OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi
--
-- case "$host_alias" in
-- i?86-* | k?-*)
--
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_X86
--_ACEOF
--
-- case "$host_alias" in
-- i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
-- i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
-- i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
-- i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
-- k6-*) OPT_CFLAGS="$CFLAGS -march=k6";;
-- esac
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi;;
-- ppc-* | powerpc-*)
-- OPT_CFLAGS="$CFLAGS -Wa,-m7400"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS;
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_PPC
--_ACEOF
--
-- else
-- :
-- fi;;
-- sparc-* | sparc64-*)
-- OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi;;
-- mips-sgi-irix6.*) OPT_CFLAGS="$CFLAGS -mabi=64"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi;;
-- esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
-- TENDRA=yes
-- CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
-- enable_mlib=no
-- no_x=yes
-- enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
-- CFLAGS="-g -O3 -unroll -ip"
--else
-- case "$host_alias" in
-- mips-sgi-irix6.*)
-- OPT_CFLAGS="$CFLAGS -64"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi;;
-- sparc-sun-solaris*)
-- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
-- echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$OPT_CFLAGS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_try_cflags_ok=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
-- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
-- CFLAGS=$OPT_CFLAGS
-- else
-- :
-- fi;;
-- esac
--fi
--
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
- enableval="$enable_shared"
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch b/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch
deleted file mode 100644
index 8f41e1f296c5..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- electricsheep/client/flam3/png.c 2005/07/20 06:06:16 1.8
-+++ electricsheep/client/flam3/png.c 2006/06/26 19:36:49 1.9
-@@ -14,6 +14,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <png.h>
-+#include <setjmp.h>
-
- #include "img.h"
-
-@@ -67,7 +68,7 @@
- unsigned char sig_buf [SIG_CHECK_SIZE];
- png_struct *png_ptr;
- png_info *info_ptr;
-- png_byte **png_image;
-+ png_byte **png_image = NULL;
- int linesize, x, y;
- unsigned char *p, *q;
-
-@@ -85,6 +86,16 @@
- fprintf (stderr, "cannot allocate LIBPNG structure\n");
- return 0;
- }
-+ if (setjmp(png_jmpbuf(png_ptr))) {
-+ if (png_image) {
-+ for (y = 0 ; y < info_ptr->height ; y++)
-+ free (png_image[y]);
-+ free (png_image);
-+ }
-+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-+ perror("reading file");
-+ return;
-+ }
- info_ptr = png_create_info_struct (png_ptr);
- if (info_ptr == NULL) {
- png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
-@@ -155,9 +166,7 @@
- for (y = 0 ; y < info_ptr->height ; y++)
- free (png_image[y]);
- free (png_image);
-- png_read_destroy (png_ptr, info_ptr, (png_info *)0);
-- free (png_ptr);
-- free (info_ptr);
-+ png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
-
- return q;
- }
---- electricsheep/client/mpeg2dec/libvo/video_out_x11.c 2005/07/20 03:03:00 1.6
-+++ electricsheep/client/mpeg2dec/libvo/video_out_x11.c 2006/06/26 19:36:49 1.7
-@@ -39,6 +39,8 @@
- #include <X11/extensions/XShm.h>
- #include <inttypes.h>
- #include <sys/time.h>
-+#include <png.h>
-+#include <setjmp.h>
-
- #include "vroot.h"
- #include <sys/types.h>
-@@ -124,8 +126,6 @@
- tv_rate = tv_end;
- }
-
--#include <png.h>
--
- static char *overlay_luma = NULL;
- static char *overlay_alpha = NULL;
- static int overlay_width;
-@@ -165,7 +165,7 @@
- unsigned char sig_buf [SIG_CHECK_SIZE];
- png_struct *png_ptr;
- png_info *info_ptr;
-- png_byte **png_image;
-+ png_byte **png_image = NULL;
- int linesize, x, y;
- unsigned char *p, *q;
-
-@@ -183,6 +183,16 @@
- fprintf (stderr, "cannot allocate LIBPNG structure\n");
- return;
- }
-+ if (setjmp(png_jmpbuf(png_ptr))) {
-+ if (png_image) {
-+ for (y = 0 ; y < info_ptr->height ; y++)
-+ free (png_image[y]);
-+ free (png_image);
-+ }
-+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-+ perror("reading file");
-+ return;
-+ }
- info_ptr = png_create_info_struct (png_ptr);
- if (info_ptr == NULL) {
- png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
-@@ -271,10 +281,7 @@
- for (y = 0 ; y < info_ptr->height ; y++)
- free (png_image[y]);
- free (png_image);
-- png_read_destroy (png_ptr, info_ptr, (png_info *)0);
-- free (png_ptr);
-- free (info_ptr);
--
-+ png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
- }
-
- static void overlay_read_ppm(FILE *fin)
-@@ -535,6 +542,8 @@
- instance->corner_x = (w - instance->width)/2;
- instance->corner_y = (h - instance->height)/2;
- } else if (window_id == -1) {
-+ XTextProperty xname;
-+ char *nm = "Electric Sheep";
- /* create a window the same size as the video */
- instance->window =
- XCreateWindow (instance->display,
-@@ -544,6 +553,8 @@
- InputOutput, instance->vinfo.visual,
- (CWBackPixmap | CWBackingStore | CWBorderPixel |
- CWEventMask | CWColormap), &attr);
-+ XStringListToTextProperty(&nm, 1, &xname);
-+ XSetWMName(instance->display, instance->window, &xname);
- } else {
- /* zoomed to fit the window specified on the command line */
- XWindowAttributes xgwa;
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch
deleted file mode 100644
index d07b0d9b7a8d..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- electricsheep-2.6.8/mpeg2dec/configure.in.orig 2005-07-20 16:19:40.000000000 +1000
-+++ electricsheep-2.6.8/mpeg2dec/configure.in 2006-06-06 10:55:02.000000000 +1000
-@@ -15,70 +15,6 @@
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
-
--dnl CC-specific flags
--if test x"$CC" = x"checkergcc"; then
-- enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
-- dnl GCC-specific flags
-- dnl -Wall -Werror moved to the end to not disturb the configure script
--
-- dnl -O3
-- changequote(<<,>>)
-- OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
-- changequote([,])
-- OPT_CFLAGS="$OPT_CFLAGS -O3"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
-- dnl -fomit-frame-pointer
-- OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
-- dnl arch-specific flags
-- case "$host_alias" in
-- i?86-* | k?-*)
-- AC_DEFINE([ARCH_X86],,[x86 architecture])
-- case "$host_alias" in
-- i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
-- i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
-- i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
-- i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
-- k6-*) OPT_CFLAGS="$CFLAGS -march=k6";;
-- esac
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- ppc-* | powerpc-*)
-- OPT_CFLAGS="$CFLAGS -Wa,-m7400"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],
-- [CFLAGS=$OPT_CFLAGS; AC_DEFINE([ARCH_PPC],,[ppc architecture])]);;
-- sparc-* | sparc64-*)
-- OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- mips-sgi-irix6.*) dnl do we need to be that specific ?
-- OPT_CFLAGS="$CFLAGS -mabi=64"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
-- dnl TenDRA portability checking compiler
-- TENDRA=yes
-- CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
-- enable_mlib=no
-- no_x=yes
-- enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
-- dnl Intel C++ compiler
-- CFLAGS="-g -O3 -unroll -ip"
--else
-- dnl non-gcc flags - we probably need exact configuration triplets here.
-- case "$host_alias" in
-- mips-sgi-irix6.*)
-- OPT_CFLAGS="$CFLAGS -64"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- sparc-sun-solaris*)
-- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
-- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
-- esac
--fi
--
- dnl Checks for libtool - this must be done after we set cflags
- AC_DISABLE_SHARED
- AC_LIBTOOL_WIN32_DLL
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch b/x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch
deleted file mode 100644
index e355f824bd8d..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- electricsheep-2.6.8/electricsheep.c 2006-07-25 16:45:56.000000000 -0400
-+++ electricsheep-2.6.8-xinerama/electricsheep.c 2007-01-21 13:11:52.000000000 -0500
-@@ -2124,7 +2124,7 @@
- strcat(curl_cmd, " --show-error");
- }
-
-- srandom(time(0));
-+ srandom(time(0) + getpid());
-
- not_playing();
-
---- electricsheep-2.6.8/mpeg2dec/libvo/video_out_x11.c 2006-06-26 15:28:08.000000000 -0400
-+++ electricsheep-2.6.8-xinerama/mpeg2dec/libvo/video_out_x11.c 2007-01-21 01:44:45.000000000 -0500
-@@ -531,14 +531,18 @@
- if (window_id == -3) {
- /* display zoomed on the (virtual) root window */
- instance->window = DefaultRootWindow (instance->display);
-- instance->displaywidth = DisplayWidth(instance->display, DefaultScreen (instance->display));
-- instance->displayheight = DisplayHeight(instance->display, DefaultScreen (instance->display));
-+ XWindowAttributes xgwa;
-+ XGetWindowAttributes (instance->display, instance->window, &xgwa);
-+ instance->displaywidth = xgwa.width;
-+ instance->displayheight = xgwa.height;
- } else if (window_id == -2) {
- /* display non-zoomed on the (virtual) root window */
- int w, h;
-- w = DisplayWidth(instance->display, DefaultScreen (instance->display));
-- h = DisplayHeight(instance->display, DefaultScreen (instance->display));
- instance->window = DefaultRootWindow (instance->display);
-+ XWindowAttributes xgwa;
-+ XGetWindowAttributes (instance->display, instance->window, &xgwa);
-+ w = xgwa.width;
-+ h = xgwa.height;
- instance->corner_x = (w - instance->width)/2;
- instance->corner_y = (h - instance->height)/2;
- } else if (window_id == -1) {
diff --git a/x11-misc/electricsheep/files/electricsheep.desktop b/x11-misc/electricsheep/files/electricsheep.desktop
deleted file mode 100644
index 1ef106f22e8a..000000000000
--- a/x11-misc/electricsheep/files/electricsheep.desktop
+++ /dev/null
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=electricsheep
-Icon=kscreensaver
-Type=Application
-Actions=InWindow;Root
-X-KDE-Category=Fractals
-X-KDE-Type=OpenGL
-Name=ElectricSheep
-
-[Desktop Action InWindow]
-Exec=electricsheep -window-id %w
-Name=Display in specified window
-Name[af]=Vertoon in gespesifiseer venster
-Name[bg]=Стартиране в избран прозорец
-Name[br]=Diskwel er prenestr spisaet
-Name[bs]=Prikaži u navedenom prozoru
-Name[ca]=Mostra a la finestra especificada
-Name[cs]=Zobrazit v určeném okně
-Name[cy]=Dangos mewn ffenestr penodol
-Name[da]=Visning i angivet vindue
-Name[de]=In vorgegebenem Fenster anzeigen
-Name[el]=Προβολή στο καθορισμένο παράθυρο
-Name[eo]=Montru en indikita fenestro
-Name[es]=Mostrar en la pantalla especificada
-Name[et]=Määratud aknas näitamine
-Name[fi]=Näytä määrätyssä ikkunassa
-Name[fo]=Vís í givin gluggi
-Name[fr]=Affichage dans la fenêtre spécifiée
-Name[he]=הצג בחלון המצויין
-Name[hu]=Megjelenítés a megadott ablakban
-Name[is]=Birta í völdum glugga
-Name[it]=Mostra nella finestra specificata
-Name[ja]=特定のウィンドウで表示
-Name[lv]=Rādīt norādītajā logā
-Name[mt]=Uri f'window speċifika
-Name[nb]=Vis i angitt vindu
-Name[nl]=In een gedefinieerd venster weergeven
-Name[nn]=Vis i oppgitt vindauge
-Name[nso]=Bontsha kago di-window tseo di bontshitswego
-Name[pl]=Wyświetl w zadanym oknie
-Name[pt]=Mostrar na janela especificada
-Name[pt_BR]=Mostrar em janela especificada
-Name[ro]=Afişează în fereastra specificată
-Name[ru]=Отображать в указанном окне
-Name[sk]=Zobraziť v zadanom okne
-Name[sl]=Prikaz v določenemu oknu
-Name[sr]=Прикажи у задатом прозору
-Name[sv]=Visa i angivet fönster
-Name[th]=แสดงในหน้าต่างที่กำหนด
-Name[tr]=Belirtilen pencerede göster
-Name[uk]=Відобразити у вказаному вікні
-Name[ven]=Sumbedzani kha windo dzo bulwaho fhedzi
-Name[xh]=Bonisa kwi window ekhankanyiweyo
-Name[xx]=xxDisplay in specified windowxx
-Name[zh_CN]=在指定的窗口中显示
-Name[zh_TW]=在指定的視窗中顯示
-Name[zu]=Veza kwi-window ecacisiwe
-NoDisplay=true
-
-[Desktop Action Root]
-Exec=electricsheep --root 1 --zoom 1
-Name=Display in root window
-Name[af]=Vertoon in root venster
-Name[bg]=Стартиране в главния прозорец
-Name[bs]=Prikaži u korijenskom prozoru
-Name[ca]=Mostra a la finestra arrel
-Name[cs]=Zobrazit na pozadí plochy
-Name[cy]=Dangos mewn ffenestr gwraidd
-Name[da]=Visning i root-vindue
-Name[de]=In Hintergrundfenster anzeigen
-Name[el]=Προβολή στο βασικό παράθυρο
-Name[eo]=Montru en radika fenestro
-Name[es]=Mostrar en la ventana raíz
-Name[et]=Juuraknas näitamine
-Name[fi]=Näytä root-ikkunassa
-Name[fo]=Vís á bakgrundini
-Name[fr]=Affichage dans la fenêtre racine
-Name[he]=הצג בחלון השורש
-Name[hu]=Megjelenítés a gyökérablakban
-Name[is]=Birta í bakgrunni skjáborðs
-Name[it]=Mostra sullo sfondo
-Name[ja]=ルートウィンドウで表示
-Name[lv]=Rādīt saknes logā
-Name[mt]=Uri fuq l-isfond
-Name[nb]=Vis i root-vindu
-Name[nl]=In hoofdvenster weergeven
-Name[nn]=Vis i rotvindauget
-Name[nso]=Bontsha kago window ya modu
-Name[pl]=Wyświetl w oknie pierwotnym
-Name[pt]=Mostrar na janela de fundo
-Name[pt_BR]=Mostrar na janela-raiz
-Name[ru]=Отображать в корневом окне
-Name[sk]=Zobraziť v koreňovom okne
-Name[sl]=Prikaz v korenskem oknu
-Name[sr]=Прикажи у главном (root) прозору
-Name[sv]=Visa i rotfönstret
-Name[th]=แสดงในหน้าต่างหลัก
-Name[tr]=Kök pencerede göster
-Name[uk]=Відобразити на тлі екрана
-Name[ven]=Sumbedzani kha windo ya mudzi
-Name[xh]=Bonisa kwingcambu ye window
-Name[xx]=xxDisplay in root windowxx
-Name[zh_CN]=在根窗口中显示
-Name[zh_TW]=在根視窗中顯示
-Name[zu]=Veza kwimpande ye-window
-NoDisplay=true