summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2013-04-22 09:48:14 +0000
committerMichael Weber <xmw@gentoo.org>2013-04-22 09:48:14 +0000
commit4dac15dae3881827c643c0e9a5ccac7c615374b3 (patch)
treed7501e1b9b55498809b912563ede457f5e1c5b0b /sci-electronics
parentx11-misc/google-gadgets removed from tree (diff)
downloadhistorical-4dac15dae3881827c643c0e9a5ccac7c615374b3.tar.gz
historical-4dac15dae3881827c643c0e9a5ccac7c615374b3.tar.bz2
historical-4dac15dae3881827c643c0e9a5ccac7c615374b3.zip
More complete include patch.
Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/magic/ChangeLog6
-rw-r--r--sci-electronics/magic/Manifest10
-rw-r--r--sci-electronics/magic/files/magic-7.5.202-include.patch10
3 files changed, 20 insertions, 6 deletions
diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 2b6740e95ca2..f1b9b69eb298 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-electronics/magic
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.65 2013/04/22 09:18:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.66 2013/04/22 09:47:37 xmw Exp $
+
+ 22 Apr 2013; Michael Weber <xmw@gentoo.org>
+ files/magic-7.5.202-include.patch:
+ More complete include patch.
*magic-8.0.131 (22 Apr 2013)
*magic-7.5.202-r1 (22 Apr 2013)
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 5e8751c966b7..aa074155188d 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX magic-7.5.202-include.patch 223 SHA256 be4e97f6958d6caa8e70818c9bb55f2981d82ac15e02426bb1b2cf962189c2ca SHA512 f9b62b48c7926bab001d14189aed2048834955555a0e3489ffb55f71a070aaa60855e8ca621cecf00e1a036a708f7209c54bfe99ff639655804a9be9deb6284c WHIRLPOOL c8906dd328e9598a645090a7c098956f70cf44ba9f33f7bdf7c6b5a99f2cdd114d74483a10728c07158ec56528adc8888a39ce8549db65cf69de5569859a9f7d
+AUX magic-7.5.202-include.patch 430 SHA256 a4d98e36678e5cdfdd8682b84f5eff782efe4f529b0d2972b8cfdabf5f9d8466 SHA512 0ff649589b65ac608586a425ca5d2b72e8608d513dae51be7b6e8fd5a2af494b2d186025777af2389358a3be6bd86efee312b4b1c3829d1eb3e9c28bef557e2f WHIRLPOOL 2b738613bea594b096b7d4258e74fcbb50ced9f552c4ece0584365319181978f0034bebe5f7975a97b8842f957dc7ad91c6ca9883c1d1960f020527e0ce1fd8d
AUX magic-7.5.202-install.patch 566 SHA256 421ab4e98e8377d04c2cc5a07cfeac3ef52dc904c1c4dad488f85e7e5baf72b4 SHA512 332882e4557d0b5fc9fd4d681edc74e501578a5e1d00c144b5d656b8f95a5c6497cff3a6b620305cde032f9628ae169ea478927820ea085dfb52507f5de7722d WHIRLPOOL 439a4eb7eb0c62f928ddd6c389bdd57f308a8315e6862c0073b9fea31a710afc9c170675ce4c5e150313e31cf5da1cbb2669b4e715cdf144c570daa028e8d16a
AUX magic-8.0.109-ldflags.patch 1045 SHA256 ef73a525bfee39da9c6535873eb6f1c23aa60721e7c1b20ade85c9c9d4c8e4c6 SHA512 0a2c7b24112d3bae46c4ea1c110b42712faa16d3ceb63aa68589946e337e65e67fd862191fb17dd76638a5a18a201f49dc1be38134851a3914dda3a9bd792aea WHIRLPOOL 59713a15ff3e7bbf92a55670cb9d3f633a448b4e7b06d873f85b5e6efc101543ed91537fb454eae15d7882c6b0af0caec6335e71292aacd32cc3dbf02deb0ee2
AUX magic-8.0.131-sed.patch 511 SHA256 bd2d1f3f2523501cf0aed3b26bf859b0798b0a59404227e4c9813cda9b5cda68 SHA512 360fb648ca656dddbb45153879f1ff6c65e2bbcd21c4994beaa4eb574c286f2d5b2ffd9066da74767ca4dea79f8b06ba055cfd2b9a3bbd6ddb32c583b1165873 WHIRLPOOL 700d48526bd6440126a44a3ae79c57134aa4387989c9c2c6273fc4752a28b327d97aff366a6386c221f9c627a0e655953c6aacaab7cf16e6383918a5a5dea6dc
@@ -16,12 +16,12 @@ EBUILD magic-7.5.202-r1.ebuild 1830 SHA256 e7823df6d451e8b3b52eb258bab7217cb9579
EBUILD magic-7.5.202.ebuild 1715 SHA256 a8e64a2c2b3ec4d09122a6a070fa0a5186afa1036ca4dd058266af5dd58069ee SHA512 3dc2b6aee04a590e22415e3051aa1b91c27e4cf9a506834d34ad8078861c10172e82f798a39133d747715c74f6f949cfdcf23f28e875a5cb25c7cced1f7ccaf1 WHIRLPOOL 2d10cb24a82ee17864118a1c6b12848784f544de63a1cb37733b847cc4ff89b5156dea47f61655ce550f7e106cc86cdb4e567eb9fa87b63c83ef39870567ad05
EBUILD magic-7.5.230.ebuild 1845 SHA256 56e0b3809c572bd216413fe6378b5ae1140ba247cd07004249ae0df682c65a33 SHA512 b1f3429737adb84dab3fa15b38d832860bfc6d724f13fbed939cbe49a59e454f79e3f84d513b37873401e661e8174a97a627f17606a3123adc1b1da3c3c7ee92 WHIRLPOOL ae69d268c8bb908ff2fe3ae66f50560ee56775d6bdbc941dcf18a65f38baa7ab43a71da3dd8ac2fffe4368d23e2cb6b8a4a2d07069312997b22ade1962bf19bc
EBUILD magic-8.0.131.ebuild 1841 SHA256 aa4cd9368258633f2ecefe30a42982c8e6c53d601d2c4a1edaa349c19a7f19bb SHA512 abbe81bc1847db6fb31bddfe8484f142ac8fae1b6c56c620e47a82fdfca3785b8cefbab967f67813ed90298db411e54f284d0ce55a792f46802ef8cf3e84b95c WHIRLPOOL 5dae6255b395b49a2b4914c4bbf3899f26f4c10457e2caa55766c8cfd70f313b574080c476d83af5b4d3e475037a374bd50ff9cca14f3496a0ed5f939707de49
-MISC ChangeLog 11410 SHA256 2c93378a46164550c45730bd6f5e43546506cc2479c4e4b45722ec417be4d29e SHA512 bcaffd25b2e8bc81f0ec9ae1c8082477f0c7c2a5538011a82e1cc9d9c8f1d8540f187978e7278e1332decb4525627312b9e2c4517bed8a295170866615e32987 WHIRLPOOL 32d50aa79c0b3d876c153334bcab831bab85ca0b501ae0d286d80c7a28bad8bfde210dac732396f51b92ca35e0bd5a043269aa2025d07cd5835c4efdbacebfe5
+MISC ChangeLog 11525 SHA256 da20c5eabb7316ed0d7fef3fd7fa5f86b25281bb34cf1a4fa5d5c399b518d610 SHA512 dc1bea1971b67d713ab232e24c193b263ec0f6f10e8affa71dae18bca94d45ac20d2c1d7111e68348bbaf5bf440aef324e47303551d4dccdebc2881d4eebf75a WHIRLPOOL 8bd7dc1f8ef7206bc76066b59a80ae1a587856c8591af443443bb560b24ad001cf50f6a20e7d6af2d0332f32324d6a7210851256294e5ab6e0f7e873519d46b3
MISC metadata.xml 898 SHA256 cea05f737ec2d259cfd66d5b6e7acc43789ec3703af8ee120724ba66dd9021de SHA512 7de757551b4c91fedbcd7dc71205110593ce2a58db157244278cf6fdabdd6c8ec1ccf914273eded80b6252d618f5845601032cf56de717716566f2a1b8c9d922 WHIRLPOOL 3cf848ed2c97aae62683f2e8ebe28ca4f94c04f499a19084cb6e45b18ad1e8f67dcb57e021dcc3c6cfaa75cedcc641f6ee5fd7a7c31b046c20959af31b1cb10f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlF1AFwACgkQknrdDGLu8JB4cwD+JR+dNtFhGLhB8A2Bm4J7eZcH
-FbjQVH5cIbwkj5LLRr4BAJqGMbdxVx9iFLQS00jVJb1ngtP67ReVhU7x6bWavpEo
-=NCy0
+iF4EAREIAAYFAlF1B1QACgkQknrdDGLu8JCMlwEAgjZgIlYCiNxnyREqMxK4uZoO
+kxkB/Itvi7DQDb62dn8BAIojWrg9STYQutc8H1/cbjLZNKiBjphDQ7Cge00DZRr2
+=Z0b+
-----END PGP SIGNATURE-----
diff --git a/sci-electronics/magic/files/magic-7.5.202-include.patch b/sci-electronics/magic/files/magic-7.5.202-include.patch
index d04c4b9cc646..f1fc95a60b32 100644
--- a/sci-electronics/magic/files/magic-7.5.202-include.patch
+++ b/sci-electronics/magic/files/magic-7.5.202-include.patch
@@ -8,3 +8,13 @@
#include <string.h>
#include <sys/time.h>
#include <sys/types.h>
+--- magic-8.0.131/graphics/grX11su3.c
++++ magic-8.0.131/graphics/grX11su3.c
+@@ -20,6 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
++#include <math.h>
+ #include <X11/Xlib.h>
+
+ #include "utils/magic.h"