From c18bf4cf9fd4150796961ce9830957d1d453c723 Mon Sep 17 00:00:00 2001 From: Yuri Vasilevski Date: Wed, 14 Jun 2006 21:50:45 +0000 Subject: [PATCH] Allows to build with USE=-png Package-Manager: portage-2.1 --- x11-wm/matchbox-window-manager/ChangeLog | 7 ++++- x11-wm/matchbox-window-manager/Manifest | 26 ++++++++++-------- ...atchbox-window-manager-1.0-use-nopng.patch | 27 +++++++++++++++++++ .../matchbox-window-manager-1.0.ebuild | 12 +++++++-- 4 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch diff --git a/x11-wm/matchbox-window-manager/ChangeLog b/x11-wm/matchbox-window-manager/ChangeLog index 18cd1ac0ac35..74099fc6097a 100644 --- a/x11-wm/matchbox-window-manager/ChangeLog +++ b/x11-wm/matchbox-window-manager/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/matchbox-window-manager # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/ChangeLog,v 1.3 2006/06/04 21:47:11 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/ChangeLog,v 1.4 2006/06/14 21:50:45 yvasilev Exp $ + + 14 Jun 2006; + +files/matchbox-window-manager-1.0-use-nopng.patch, + matchbox-window-manager-1.0.ebuild: + Allows to build with USE=-png *matchbox-window-manager-1.0 (04 Jun 2006) diff --git a/x11-wm/matchbox-window-manager/Manifest b/x11-wm/matchbox-window-manager/Manifest index b4b3a1666070..62173c402fe5 100644 --- a/x11-wm/matchbox-window-manager/Manifest +++ b/x11-wm/matchbox-window-manager/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX matchbox-window-manager-1.0-use-nopng.patch 810 RMD160 f6173013aa3a6548baf0e254ee81a84a0a4c6fc7 SHA1 fc4f5f398b0948241e56f08bee872434dde70383 SHA256 3e4480a588227dd05da7b042bf649199781df83a86ea7f6bbe7255a275a2d390 +MD5 1c048626780502663deb36c7e27e386d files/matchbox-window-manager-1.0-use-nopng.patch 810 +RMD160 f6173013aa3a6548baf0e254ee81a84a0a4c6fc7 files/matchbox-window-manager-1.0-use-nopng.patch 810 +SHA256 3e4480a588227dd05da7b042bf649199781df83a86ea7f6bbe7255a275a2d390 files/matchbox-window-manager-1.0-use-nopng.patch 810 DIST matchbox-window-manager-0.9.5.tar.bz2 194444 RMD160 877fab047f3ae97892ae79285ab779bd027b7336 SHA1 bc0c71fc8278ad3ef072170fc91e67b910e47362 SHA256 404b96e165c746f1e44102895349a8659ed628b2bd358d127b27d3f9b82fe4ac DIST matchbox-window-manager-1.0.tar.bz2 200627 RMD160 5b792894f14c9ef776880f77b2907ea36b470266 SHA1 7362232889421f4f0374c3f8fb4c61128509e05e SHA256 34e7957d3afde9ce52682de510b39d3fc749cc96e10950b111d297278e9ed5fa EBUILD matchbox-window-manager-0.9.5.ebuild 1214 RMD160 dfa46ad4b3c558e94c39df70f6f92eb3d9c5aa99 SHA1 1eb5f2ba857ea6313ef16383493d0e4f64d4b906 SHA256 3bf23726e47f9f0be7d93bc5717a18c852611601027a42893d9f1bdeb27b0c22 MD5 bf9834a416efa1179a55db9ed27369ba matchbox-window-manager-0.9.5.ebuild 1214 RMD160 dfa46ad4b3c558e94c39df70f6f92eb3d9c5aa99 matchbox-window-manager-0.9.5.ebuild 1214 SHA256 3bf23726e47f9f0be7d93bc5717a18c852611601027a42893d9f1bdeb27b0c22 matchbox-window-manager-0.9.5.ebuild 1214 -EBUILD matchbox-window-manager-1.0.ebuild 1353 RMD160 b49a32c5e0391e132aa6480be8aba53439129e80 SHA1 aaaaaf9f9cd74715945b9a2d0a4dae03e48ead4a SHA256 3dcbf20cbe5fc70efa7ff35974e8c82f1dedd669aac464c62d5fd8db6d1ce831 -MD5 fee5487381f577f5b0b137acc4a71567 matchbox-window-manager-1.0.ebuild 1353 -RMD160 b49a32c5e0391e132aa6480be8aba53439129e80 matchbox-window-manager-1.0.ebuild 1353 -SHA256 3dcbf20cbe5fc70efa7ff35974e8c82f1dedd669aac464c62d5fd8db6d1ce831 matchbox-window-manager-1.0.ebuild 1353 -MISC ChangeLog 709 RMD160 15a6393f1518a11b9d9ac6243e5ab9c6586f81e4 SHA1 1133d29488d9f3454281ecd63b918a14eb7b43a1 SHA256 f17f4a98423aa9db586b9c8dec4671e1e270d9e21dc994107ea824aefffd6f3d -MD5 9752ba8607d709971addbd5041952023 ChangeLog 709 -RMD160 15a6393f1518a11b9d9ac6243e5ab9c6586f81e4 ChangeLog 709 -SHA256 f17f4a98423aa9db586b9c8dec4671e1e270d9e21dc994107ea824aefffd6f3d ChangeLog 709 +EBUILD matchbox-window-manager-1.0.ebuild 1477 RMD160 9ff22e2706827398c23f8144e8ad724c854561f6 SHA1 f85fc2e7186e907b6fbbdfc7f599fa71e711ac54 SHA256 919df987430e096faee02fa366f332fdab4172aebb03d55fb9f2b3e381597e5e +MD5 5e92f905d5f6dcec5b60a14f53195f0b matchbox-window-manager-1.0.ebuild 1477 +RMD160 9ff22e2706827398c23f8144e8ad724c854561f6 matchbox-window-manager-1.0.ebuild 1477 +SHA256 919df987430e096faee02fa366f332fdab4172aebb03d55fb9f2b3e381597e5e matchbox-window-manager-1.0.ebuild 1477 +MISC ChangeLog 871 RMD160 e28ebc373a22292f05f82b2e7388a397350bb61e SHA1 93e6b2981f781f0c4e0eec1918e80b29dc6ca9b5 SHA256 138349ffbdd4aab16c89d59ebd95253729cbbca5a7d7cfda7298a5c2f5c7a12c +MD5 55cec91b89b5ff8d7fea277630e13d02 ChangeLog 871 +RMD160 e28ebc373a22292f05f82b2e7388a397350bb61e ChangeLog 871 +SHA256 138349ffbdd4aab16c89d59ebd95253729cbbca5a7d7cfda7298a5c2f5c7a12c ChangeLog 871 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55 MD5 a80bc50cf196a9e5a2764d6f6081b56a metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 metadata.xml 247 @@ -28,7 +32,7 @@ SHA256 a786ccf39804a6b27037b334c340e5ac7ce95daf7a72dcd4ddeed3241e2f7f9b files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEg1SkyZl4piiTjjYRAolzAKD6PC1h/sA+utvrlIiv0Zr9WULGjwCg3o6Y -g5bzs3C3H91N/2/6uecY9Lg= -=Cf0/ +iD8DBQFEkITByZl4piiTjjYRAs4hAJ45bg9Pt0iCuUWiCXfw/7XWcrQHJQCeKf6a +XglsDNIFOOi80nAZBrZJR/4= +=Ojme -----END PGP SIGNATURE----- diff --git a/x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch b/x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch new file mode 100644 index 000000000000..881567d9b96d --- /dev/null +++ b/x11-wm/matchbox-window-manager/files/matchbox-window-manager-1.0-use-nopng.patch @@ -0,0 +1,27 @@ +diff -Naurp matchbox-window-manager-1.0.orig/src/structs.h matchbox-window-manager-1.0/src/structs.h +--- matchbox-window-manager-1.0.orig/src/structs.h 2006-02-19 16:00:52.000000000 -0500 ++++ matchbox-window-manager-1.0/src/structs.h 2006-06-12 18:52:53.000000000 -0400 +@@ -81,23 +81,12 @@ + + #define GENERIC_ICON PKGDATADIR "/mbnoapp.xpm" + +-#ifdef MB_HAVE_PNG +- + #define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" +- + #define DEFAULTTHEME DATADIR "/themes/Default/matchbox/theme.xml" + + #define DEFAULT_THEMENAME "Default" +- + #define DEFAULTTHEMENAME "Default" + +-#else +- +-#define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" +-#define DEFAULT_THEME_NAME "Default" +- +-#endif +- + #define CONFDEFAULTS PKGDATADIR "/defaults" + + /* Simple Macros */ diff --git a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.0.ebuild b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.0.ebuild index 6c3917f599bd..2c02ba1c7de2 100644 --- a/x11-wm/matchbox-window-manager/matchbox-window-manager-1.0.ebuild +++ b/x11-wm/matchbox-window-manager/matchbox-window-manager-1.0.ebuild @@ -1,8 +1,8 @@ # Copyright 2006-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.0.ebuild,v 1.1 2006/06/04 21:47:11 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-window-manager/matchbox-window-manager-1.0.ebuild,v 1.2 2006/06/14 21:50:45 yvasilev Exp $ -inherit versionator +inherit eutils versionator DESCRIPTION="Light weight WM designed for use on PDA computers" HOMEPAGE="http://projects.o-hand.com/matchbox/" @@ -23,6 +23,14 @@ DEPEND=">=x11-libs/libmatchbox-1.5 x11-libs/libXdamage ) virtual/x11 ) )" +src_unpack() { + unpack ${A} + cd ${S} + + # Allows to build with USE=-png + epatch "${FILESDIR}/${P}-use-nopng.patch" +} + src_compile() { econf --enable-keyboard \ --enable-ping-protocol \ -- 2.26.2