From c9688d27e634df13abff7aa1e6cc38cfb75ed437 Mon Sep 17 00:00:00 2001 From: Ciaran McCreesh Date: Mon, 6 Sep 2004 23:24:22 +0000 Subject: Move the patches around, since we're going to end up with lots of them... --- x11-wm/fluxbox/ChangeLog | 7 ++++++- x11-wm/fluxbox/Manifest | 12 ++++++------ .../files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch | 15 +++++++++++++++ x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch | 15 --------------- x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild | 4 ++-- 5 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch delete mode 100644 x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch (limited to 'x11-wm') diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index a46192fe0f6e..841934ed65b6 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/fluxbox # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.117 2004/09/04 23:37:25 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.118 2004/09/06 23:24:22 ciaranm Exp $ + + 07 Sep 2004; Ciaran McCreesh + -files/fluxbox-0.9.10.amd64_fix.patch, + +files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch, fluxbox-0.9.10-r1.ebuild: + Move the patches around, since we're going to end up with lots of them... 05 Sep 2004; Ciaran McCreesh fluxbox-0.9.10-r1.ebuild, -fluxbox-0.9.10.ebuild: diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index 6941cd15b081..10eedbf0a954 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -2,20 +2,20 @@ Hash: SHA1 MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628 -MD5 e4adb1e77b8b44123388ef448c33ba5e ChangeLog 21973 -MD5 e2cbad89f55f3744bcc2a9db7a139442 fluxbox-0.9.10-r1.ebuild 1812 +MD5 a372ee49f6deffde6ac0d01bb07ff1cb ChangeLog 22222 +MD5 e32e90cae45649a244643d82e3738ab3 fluxbox-0.9.10-r1.ebuild 1823 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437 MD5 010fb64778d2657638b423bd53e90e58 fluxbox-0.9.9.ebuild 1695 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65 -MD5 ee36523cd5cf3281d0261244260840c9 files/fluxbox-0.9.10.amd64_fix.patch 774 MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67 MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202 +MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) -iD8DBQFBOlEOLLFUmVNQ7rkRAphOAKCKGu9EWu8VLkXX6Np8iPfI/2FaRgCdG62T -b4HrRAYwe2HzS6Rm0hwznKo= -=Vwgf +iD8DBQFBPPEALLFUmVNQ7rkRAtS/AJoC/s0XLnrzzWKMh/0KYotJoMTOwwCgiss7 +2Vl7fjE3j4PeQ8G1iDKn4T4= +=ToLf -----END PGP SIGNATURE----- diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch new file mode 100644 index 000000000000..f4e1e5fd3d10 --- /dev/null +++ b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch @@ -0,0 +1,15 @@ +diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/XmbFontImp.cc fluxbox.toolbar/src/FbTk/XmbFontImp.cc +--- fluxbox.real/src/FbTk/XmbFontImp.cc 2004-09-01 01:26:39.000000000 +1000 ++++ fluxbox.toolbar/src/FbTk/XmbFontImp.cc 2004-09-04 03:03:16.000000000 +1000 +@@ -173,9 +173,9 @@ + } + + getFontElement(fontname, weight, FONT_ELEMENT_SIZE, +- "-medium-", "-bold-", "-demibold-", "-regular-", 0); ++ "-medium-", "-bold-", "-demibold-", "-regular-", NULL); + getFontElement(fontname, slant, FONT_ELEMENT_SIZE, +- "-r-", "-i-", "-o-", "-ri-", "-ro-", 0); ++ "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL); + getFontSize(fontname, &pixel_size); + + if (! strcmp(weight, "*")) diff --git a/x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch b/x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch deleted file mode 100644 index f4e1e5fd3d10..000000000000 --- a/x11-wm/fluxbox/files/fluxbox-0.9.10.amd64_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/XmbFontImp.cc fluxbox.toolbar/src/FbTk/XmbFontImp.cc ---- fluxbox.real/src/FbTk/XmbFontImp.cc 2004-09-01 01:26:39.000000000 +1000 -+++ fluxbox.toolbar/src/FbTk/XmbFontImp.cc 2004-09-04 03:03:16.000000000 +1000 -@@ -173,9 +173,9 @@ - } - - getFontElement(fontname, weight, FONT_ELEMENT_SIZE, -- "-medium-", "-bold-", "-demibold-", "-regular-", 0); -+ "-medium-", "-bold-", "-demibold-", "-regular-", NULL); - getFontElement(fontname, slant, FONT_ELEMENT_SIZE, -- "-r-", "-i-", "-o-", "-ri-", "-ro-", 0); -+ "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL); - getFontSize(fontname, &pixel_size); - - if (! strcmp(weight, "*")) diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild index 8207efb27d37..c2beeb31c869 100644 --- a/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild +++ b/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild,v 1.2 2004/09/04 23:37:25 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild,v 1.3 2004/09/06 23:24:22 ciaranm Exp $ inherit eutils @@ -31,7 +31,7 @@ src_unpack() { cd ${S} # Fix crashy badness on amd64. Upstream sanctioned this, so we'll # apply it to everyone... - epatch ${FILESDIR}/${PN}-${PV}.amd64_fix.patch + epatch ${FILESDIR}/${PV}/${PN}-${PV}-amd64-font-fix.patch } src_compile() { -- cgit v1.2.3-65-gdbad