From 41b20fd7fd9712db1f0ca12b6dc403649f6528c3 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Fri, 23 Apr 2010 09:24:16 +0000 Subject: [PATCH] Clean up old revisions. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- x11-libs/gtk+/ChangeLog | 17 +- x11-libs/gtk+/Manifest | 22 +- .../gtk+-2.10.11-update-icon-subdirs.patch | 132 ------ .../files/gtk+-2.10.7-mozilla-dnd-fix.patch | 72 ---- .../files/gtk+-2.12.0-flash-workaround.patch | 12 - ...-2.12.0-openoffice-freeze-workaround.patch | 10 - .../gtk+-2.12.1-firefox-print-preview.patch | 29 -- .../gtk+/files/gtk+-2.12.10-fix-nocxx.patch | 21 - .../gtk+/files/gtk+-2.12.10-no-libintl.patch | 26 -- .../gtk+/files/gtk+-2.12.9-libtool-2.patch | 25 -- .../gtk+/files/gtk+-2.14.7-filechooser.patch | 392 ------------------ .../files/gtk+-2.14.7-ignore-gtkcurve.patch | 70 ---- .../files/gtk+-2.14.7-uncertain-mime.patch | 19 - .../gtk+/files/gtk+-2.8.10-xinerama.patch | 32 -- x11-libs/gtk+/gtk+-2.12.11.ebuild | 171 -------- x11-libs/gtk+/gtk+-2.12.12.ebuild | 171 -------- x11-libs/gtk+/gtk+-2.14.7-r2.ebuild | 168 -------- x11-libs/gtk+/gtk+-2.18.5.ebuild | 181 -------- 18 files changed, 17 insertions(+), 1553 deletions(-) delete mode 100644 x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.12.10-fix-nocxx.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.12.10-no-libintl.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch delete mode 100644 x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch delete mode 100644 x11-libs/gtk+/gtk+-2.12.11.ebuild delete mode 100644 x11-libs/gtk+/gtk+-2.12.12.ebuild delete mode 100644 x11-libs/gtk+/gtk+-2.14.7-r2.ebuild delete mode 100644 x11-libs/gtk+/gtk+-2.18.5.ebuild diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index f90cba281ebb..d2bcd2f8f011 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.451 2010/04/11 11:30:59 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.452 2010/04/23 09:24:15 eva Exp $ + + 23 Apr 2010; Gilles Dartiguelongue + -files/gtk+-2.8.10-xinerama.patch, + -files/gtk+-2.10.7-mozilla-dnd-fix.patch, + -files/gtk+-2.10.11-update-icon-subdirs.patch, + -files/gtk+-2.12.0-flash-workaround.patch, + -files/gtk+-2.12.0-openoffice-freeze-workaround.patch, + -files/gtk+-2.12.1-firefox-print-preview.patch, + -files/gtk+-2.12.9-libtool-2.patch, -files/gtk+-2.12.10-fix-nocxx.patch, + -files/gtk+-2.12.10-no-libintl.patch, -gtk+-2.12.11.ebuild, + -gtk+-2.12.12.ebuild, -gtk+-2.14.7-r2.ebuild, + -files/gtk+-2.14.7-filechooser.patch, + -files/gtk+-2.14.7-ignore-gtkcurve.patch, + -files/gtk+-2.14.7-uncertain-mime.patch, -gtk+-2.18.5.ebuild: + Clean up old revisions. 11 Apr 2010; gtk+-2.18.7.ebuild: ppc stable #304777 diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index a4b3b9736a36..6ce7a373ba6a 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -3,44 +3,24 @@ AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2 AUX gtk+-1.2.10-cleanup.patch 246 RMD160 edc29b9cbf43115f8630c465e1ba91a631e733c7 SHA1 2766b89116c95ec13b7eb740f5ff79de6a48862d SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c383157d65f2d42e4300e2b6a35f AUX gtk+-1.2.10-m4.patch 220 RMD160 c3f0ac9022a32aeef80ccf77493779fd58884b10 SHA1 898e6846de5d4c57ecc2e2503ed56355324fd2ee SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 -AUX gtk+-2.10.11-update-icon-subdirs.patch 3756 RMD160 60c3abb77f6484b8700a5f42ffa5b0784503fea0 SHA1 ffb3d5b1d1d346d3a38899d93883874232e86baf SHA256 41d31835a5feaaf5eafdd0ab173be30c8d9579c4d08824105db2a12ad765436e -AUX gtk+-2.10.7-mozilla-dnd-fix.patch 2866 RMD160 b1f6a44d0b4ac4b7cd28c2fe0543402ba166e99c SHA1 c993ce1bae01614415a4c321db449e7ed29b6418 SHA256 1a441665e0be6cb4898a0583188dd1f16245d595b20b6042a80cd73c28bcbe0c -AUX gtk+-2.12.0-flash-workaround.patch 532 RMD160 24d6d96f11c1fd8c8d6fe3702de2dc4d824d7ee5 SHA1 7db980e782a5b04d27bffb55e3dc0190ad22e118 SHA256 da2ce04a400e45cc5e5cf78547699006e70e91e6620b4232a8fd7eea4de90007 -AUX gtk+-2.12.0-openoffice-freeze-workaround.patch 363 RMD160 40ee74aece5ce7a24d9e091bafddd880a8589a02 SHA1 783920d179ba0755ccab9186b6bff9f293828a96 SHA256 4c8d1873c8f972d8d840f1eb12a175931ecb47fb102fe701c965b38c2f35ecce -AUX gtk+-2.12.1-firefox-print-preview.patch 888 RMD160 6fedfd6e63e61ec7f7301d2d881d3e69a44176dd SHA1 5eb4779ee1a8cbfb672a2b19f15dc20b96bcda84 SHA256 eadd5a4c4084ecd39317f3eb39e7d4e35aa7d26a8b7010bdd6aeb94c69f362aa -AUX gtk+-2.12.10-fix-nocxx.patch 609 RMD160 14dc65ddadca384a54024306dd0a3ce39025b844 SHA1 bc84db0615a6d5c5be8fd1b771244300e2774fce SHA256 31e7ad2c500be99cdcdccd5cc5b5df12648ea463f2c01ef61a498d892b31a5a6 -AUX gtk+-2.12.10-no-libintl.patch 691 RMD160 2290b968d630720e73225f08eefd5ccbba9e5dea SHA1 1e85f38d3ab139453ab7a41e76240c44675c9f39 SHA256 101973cc02023475fb96c4d8235d0ef90a7eeeab5489d56e0e7b0d29ca711b90 -AUX gtk+-2.12.9-libtool-2.patch 920 RMD160 3ef1dfe66e89af4fe9b51d662e6cc3f7fdaa6e3d SHA1 2e788ff62ed2bffc7c3f5e7900466a3fa0f95b3b SHA256 0f9c8c0700d22c55dff1e943651a20165dc3de510e00169e6f03c7e57063abfb AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734 -AUX gtk+-2.14.7-filechooser.patch 13798 RMD160 0c1ef9582cb82693bb2cf0e80478b30276b9b835 SHA1 d163af3af1a19f2c88a0d811f87615448e40a45e SHA256 38cdee07dadf6d8612b55958f6af57e0e70a0f0974c30452d6b8a9943653caf4 -AUX gtk+-2.14.7-ignore-gtkcurve.patch 4458 RMD160 c74312ebe9febae6449f61d757e587d30d237ce0 SHA1 ee0fe90c1c2262d94e67ca5e6561591a52e82e72 SHA256 748d23b31c29b93f168599b579bbb2ee7beba518f18a8e12b69f62d4835c35b7 -AUX gtk+-2.14.7-uncertain-mime.patch 770 RMD160 141ed81f793a74e193f814b6f118e926e10a0f93 SHA1 fd5e6282f7fca578de521011e2b1b2d3a35a533b SHA256 767d0c2d8a5d63b1ae63868e731c7e21cdae57f1f5930a62c7385ef98869fa43 AUX gtk+-2.16.5-jpeg-backward-compatibility.patch 937 RMD160 f72974e2c5b6f7d0f9ad453b2770e394edc483c0 SHA1 6919f1b87172341693152165f6912fc81dd557fe SHA256 7be9129b2b259b4c5be0150d55eb1e5b7c6ef6f1db4f188a48f2c8cb9a72de8f AUX gtk+-2.16.6-fix-pltcheck-test.patch 567 RMD160 5f17d717cd7479fb477c8be407ce41f99b5e537f SHA1 49f802b744dc5775d889902c168f669a7710d432 SHA256 67b3649bc2e57de17af2919d49d759a0e358da878cb36f8d7b083dec2738ca5d AUX gtk+-2.18.5-macosx-aqua.patch 5521 RMD160 2f61c470952043229de027b23f67f634eaa86ffa SHA1 b0babc33bc3abca2069a5674996aeffd6fbf4120 SHA256 53cab4a8880c1add44304c7bdb83831adc16b69d938759ab3fc996d744d9e5b6 AUX gtk+-2.18.7-destroy-crash.patch 1236 RMD160 e266ee532854f01a7b6dbcf61626d83e2133d0b2 SHA1 76671cca0245d8b0e25acb43eb6f65442461a573 SHA256 61ead70a439f873cc66676ef8a0b4076d2c0f44534c1e5d8898c42ef3a659b33 AUX gtk+-2.18.9-notifications-gtkentry.patch 1274 RMD160 d397d677b76be6ea2614b33c328dcd5d237423f1 SHA1 1f9b4de6827798f7358b38ede143d2d29482a06c SHA256 fd656e194d3e734d21b6afd0d8cf9e002679d8f41da73ec41790341a0d355798 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd -AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 -DIST gtk+-2.12.11.tar.bz2 16232428 RMD160 189baa48d16736ab60fd2ed2b124cd4fa2448d78 SHA1 c3e3b9f9f5dd46e88a8433dbb60c54d99a8e526b SHA256 c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9 -DIST gtk+-2.12.12.tar.bz2 16222631 RMD160 2aeeeb6557530d6062e799e11138186a57ddaed2 SHA1 e3c247783da930ff3bdce7f4cdc738d74ee1a03f SHA256 eeacb49b99312e89c611d9ee72b4351b36a136c1344064af2c831d452dd92116 -DIST gtk+-2.14.7.tar.bz2 17475873 RMD160 2ed6451d3de050e9b2423f6509d15e39ba69a6ab SHA1 f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f SHA256 e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14 DIST gtk+-2.16.6.tar.bz2 18518781 RMD160 1048704042ffbbabe0de60278f49f8b7700f2d1f SHA1 f69cb48311d60664bac7cf68351c175c7a214ae6 SHA256 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af -DIST gtk+-2.18.5.tar.bz2 18126480 RMD160 712098237fc31dcb99189645f0320aa165855577 SHA1 ddb004f0f92f7c8e3b84237e05fcf0ef5affc79c SHA256 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4 DIST gtk+-2.18.6.tar.bz2 18137401 RMD160 1e9b36cd2de8a472a3e550a1995978a3b783e455 SHA1 6190838c6c5e5cd3b0499d2a59ae06e517598bc9 SHA256 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d DIST gtk+-2.18.7.tar.bz2 18304767 RMD160 0ac304503a23eb6911254a64218e3fe6aed9ff69 SHA1 92a40180ef4a097a867dc2eca1f209328581c5b3 SHA256 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464 DIST gtk+-2.18.9.tar.bz2 18194639 RMD160 4499af3cef1c53cddda989f35aaf2e030aab5bcf SHA1 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b SHA256 5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b -EBUILD gtk+-2.12.11.ebuild 4958 RMD160 940e8c7b465316386f7878590a274ce3b74b4593 SHA1 db01e240a5e17bc78c616c47f27b2bab8bbb0f23 SHA256 ac75435bc30144c72351b7075140719deeb9ba78bb1ae575d453ed337706e9d7 -EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61 SHA1 c8a3e1340574f3603f1a4ff335be2bbac802c20b SHA256 712d43258904b8254aab79598c1d9d25a92f5b8e671fdc3ce39063b60a352ca9 -EBUILD gtk+-2.14.7-r2.ebuild 4837 RMD160 d4756b6e99afefee642f0939e645c9382983e1db SHA1 d32b99bbcf345438c3f812f755eca0a0e92f46ba SHA256 8dc785991f9cd614edf3b6f0e3c4adfcd2691dcc4ef963727ffaefb4eafaf0aa EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 SHA1 66db2a66ad200ad7e2d740bcc898dc4d850841dc SHA256 78efc032b7dc0f442f132ffe1223288522b3cf2c7f13ab0f788a9ae9e5909d93 -EBUILD gtk+-2.18.5.ebuild 5684 RMD160 0def12d4c0c32ccb7054109b3551b884fb729a60 SHA1 bd0e71c796cde19ebbf6056ab9726694fbaedf05 SHA256 6aeca6febb61ddb2680ea25241cab9cf1b072287429dfab965c15950c88a2886 EBUILD gtk+-2.18.6.ebuild 5681 RMD160 29723e376b21e0de5f78087475a285d45a178c77 SHA1 cec7a2d06bbf9521c9ac4f1da972bc4d469a3e8c SHA256 300e69ab474356341118333586fed3521ed74a3ac70ee3a70a47454e0f47b1f3 EBUILD gtk+-2.18.7.ebuild 5887 RMD160 e37eefe2c7ed7e8d791652ada978ee0c27e515d6 SHA1 75f77c727113aeb8194df3946498d2006818fc15 SHA256 aec4a574ee73692b28814baf1d16f3ca2e0be1c055e941c888b6c9fb9484ec9b EBUILD gtk+-2.18.9.ebuild 6028 RMD160 a4c500b5b7e96868fe8e227bf2a4807b17d70dbe SHA1 ea6915a1f1cc1c7a7ecb522f9773449a5f5b36e5 SHA256 b993d9e69f761ee53aff857d7cbd0483db01f90df437741ee743a290665290c2 -MISC ChangeLog 66027 RMD160 fe48db56212a517f3a452cec4aedfa383817bc27 SHA1 4de5eec85f82c4343d50a7447ad50d1c81867d0c SHA256 764e52d2b6bef34ca05208185fefae6427c39b09f48c55ca231093a16230e297 +MISC ChangeLog 66720 RMD160 5e008d041be2649a9f937ba5e3cd503b48404360 SHA1 dd183eb3ded0822d8b88a17c828e81b3e8acf4ea SHA256 11ad5bfa0c4d236eb55b716ec17c019b085829c964256ce0e2fb57ce88db79de MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d diff --git a/x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch b/x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch deleted file mode 100644 index 64cbb0f75942..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.10.11-update-icon-subdirs.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtk+-2.10.11.orig/gtk/updateiconcache.c gtk+-2.10.11/gtk/updateiconcache.c ---- gtk+-2.10.11.orig/gtk/updateiconcache.c 2007-03-14 00:07:02.000000000 -0400 -+++ gtk+-2.10.11/gtk/updateiconcache.c 2007-05-01 17:01:46.000000000 -0400 -@@ -43,6 +43,7 @@ static gboolean force_update = FALSE; - static gboolean ignore_theme_index = FALSE; - static gboolean quiet = FALSE; - static gboolean index_only = FALSE; -+static gboolean check_subdirs = FALSE; - static gchar *var_name = "-"; - - #define CACHE_NAME "icon-theme.cache" -@@ -61,8 +62,82 @@ static gchar *var_name = "-"; - #define ALIGN_VALUE(this, boundary) \ - (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) - -+/* returns >0 if dir is newer than time, 0 if dir is older than time, -+ * <0 if stat fails */ -+int -+dir_check (const gchar *path, time_t cache_time) -+{ -+ struct stat path_stat; -+ -+ if (g_stat (path, &path_stat) < 0) -+ { -+ return -1; -+ } -+ return cache_time < path_stat.st_mtime; -+} -+ -+/* Check the subdirectories of the cache dir to see if the cache is up-to-date -+ * We check first and second level subdirs. */ -+gboolean -+is_cache_up_to_date_subdirs (const gchar *toppath, time_t cache_time) -+{ -+ GDir *topdir, *subdir; -+ const gchar *name, *subname; -+ gchar *path, *subpath; -+ int dir_state; -+ -+ topdir = g_dir_open (toppath, 0, NULL); -+ if (!topdir) -+ { -+ /* we can't open dir, assume updated cache */ -+ return TRUE; -+ } -+ -+ while ((name = g_dir_read_name (topdir))) -+ { -+ path = g_build_filename (toppath, name, NULL); -+ dir_state = dir_check (path, cache_time); -+ if (dir_state < 0) -+ { -+ /* cannot stat dir, for some reason; skip */ -+ g_free (path); -+ continue; -+ } -+ else if (dir_state > 0) -+ { -+ /* cache is out of date */ -+ g_free (path); -+ return FALSE; -+ } -+ -+ subdir = g_dir_open (path, 0, NULL); -+ if (!subdir) -+ { -+ /* Cannot open subdir; skip */ -+ g_free (path); -+ continue; -+ } -+ while ((subname = g_dir_read_name (subdir))) -+ { -+ subpath = g_build_filename (path, subname, NULL); -+ dir_state = dir_check (subpath, cache_time); -+ g_free (subpath); -+ -+ if (dir_state > 0) -+ { -+ /* Cache out of date */ -+ return FALSE; -+ } -+ } -+ g_free (path); -+ } -+ -+ /* If we get here, the cache is up to date */ -+ return TRUE; -+} -+ - gboolean --is_cache_up_to_date (const gchar *path) -+is_cache_up_to_date (const gchar *path, gboolean check_subdirs) - { - struct stat path_stat, cache_stat; - gchar *cache_path; -@@ -88,7 +163,18 @@ is_cache_up_to_date (const gchar *path) - } - - /* Check mtime */ -- return cache_stat.st_mtime >= path_stat.st_mtime; -+ if (cache_stat.st_mtime < path_stat.st_mtime) -+ { -+ /* Cache is out of date */ -+ return FALSE; -+ } -+ if (check_subdirs) -+ { -+ return is_cache_up_to_date_subdirs (path, cache_stat.st_mtime); -+ } -+ -+ /* Cache is up to date */ -+ return TRUE; - } - - gboolean -@@ -1284,6 +1370,7 @@ static GOptionEntry args[] = { - { "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL }, - { "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" }, - { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL }, -+ { "check-subdirs", 's', 0, G_OPTION_ARG_NONE, &check_subdirs, N_("Check subdirectories when determining if cache is up-to-date"), NULL }, - { NULL } - }; - -@@ -1316,7 +1403,7 @@ main (int argc, char **argv) - return 1; - } - -- if (!force_update && is_cache_up_to_date (path)) -+ if (!force_update && is_cache_up_to_date (path, check_subdirs)) - return 0; - - g_type_init (); diff --git a/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch b/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch deleted file mode 100644 index b179d9083b40..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.10.7-mozilla-dnd-fix.patch +++ /dev/null @@ -1,72 +0,0 @@ -This patch is applied upstream to fix http://bugzilla.gnome.org/show_bug.cgi?id=122688 -As this regresses mozilla products drag-and-drop (bug 162362) we are reverse applying -it as what it fixed is a corner case while mozilla case is a big problem. -The real problem is inside mozilla code, see http://bugzilla.gnome.org/show_bug.cgi?id=394525 -but we can't fix this for binary thunderbird/firefox/seamonkey packages - ---- a/gtk/gtkdnd.c 2006/11/05 08:55:47 16711 -+++ b/gtk/gtkdnd.c 2006/11/06 17:16:37 16712 -@@ -285,6 +285,9 @@ - static gboolean gtk_drag_grab_broken_event_cb (GtkWidget *widget, - GdkEventGrabBroken *event, - gpointer data); -+static void gtk_drag_grab_notify_cb (GtkWidget *widget, -+ gboolean was_grabbed, -+ gpointer data); - static gboolean gtk_drag_button_release_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer data); -@@ -2331,6 +2334,8 @@ - - g_signal_connect (info->ipc_widget, "grab_broken_event", - G_CALLBACK (gtk_drag_grab_broken_event_cb), info); -+ g_signal_connect (info->ipc_widget, "grab_notify", -+ G_CALLBACK (gtk_drag_grab_notify_cb), info); - g_signal_connect (info->ipc_widget, "button_release_event", - G_CALLBACK (gtk_drag_button_release_cb), info); - g_signal_connect (info->ipc_widget, "motion_notify_event", -@@ -3762,6 +3767,9 @@ - gtk_drag_grab_broken_event_cb, - info); - g_signal_handlers_disconnect_by_func (info->ipc_widget, -+ gtk_drag_grab_notify_cb, -+ info); -+ g_signal_handlers_disconnect_by_func (info->ipc_widget, - gtk_drag_button_release_cb, - info); - g_signal_handlers_disconnect_by_func (info->ipc_widget, -@@ -3926,6 +3934,9 @@ - gtk_drag_grab_broken_event_cb, - info); - g_signal_handlers_disconnect_by_func (info->ipc_widget, -+ gtk_drag_grab_notify_cb, -+ info); -+ g_signal_handlers_disconnect_by_func (info->ipc_widget, - gtk_drag_button_release_cb, - info); - g_signal_handlers_disconnect_by_func (info->ipc_widget, -@@ -4117,6 +4128,24 @@ - return TRUE; - } - -+static void -+gtk_drag_grab_notify_cb (GtkWidget *widget, -+ gboolean was_grabbed, -+ gpointer data) -+{ -+ GtkDragSourceInfo *info = (GtkDragSourceInfo *)data; -+ -+ if (!was_grabbed) -+ { -+ /* We have to block callbacks to avoid recursion here, because -+ gtk_drag_cancel calls gtk_grab_remove (via gtk_drag_end) */ -+ g_signal_handlers_block_by_func (widget, gtk_drag_grab_notify_cb, data); -+ gtk_drag_cancel (info, gtk_get_current_event_time ()); -+ g_signal_handlers_unblock_by_func (widget, gtk_drag_grab_notify_cb, data); -+ } -+} -+ -+ - /************************************************************* - * gtk_drag_button_release_cb: - * "button_release_event" callback during drag. diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch deleted file mode 100644 index 7beccc39c872..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.12.0-flash-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gtk+2.0-2.11.6/gtk/gtkclipboard.c -=================================================================== ---- gtk+2.0-2.11.6.orig/gtk/gtkclipboard.c 2007-08-31 16:52:48.000000000 +0200 -+++ gtk+2.0-2.11.6/gtk/gtkclipboard.c 2007-08-31 16:53:16.000000000 +0200 -@@ -287,6 +287,7 @@ - gtk_clipboard_get_for_display (GdkDisplay *display, - GdkAtom selection) - { -+ g_return_val_if_fail (display != NULL, NULL); - g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); - g_return_val_if_fail (!display->closed, NULL); - diff --git a/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch b/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch deleted file mode 100644 index 453bd5da76a2..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.12.0-openoffice-freeze-workaround.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gdk/gdkscreen.c.orig 2007-09-13 23:36:09.000000000 +0300 -+++ gdk/gdkscreen.c 2007-09-25 18:16:53.000000000 +0300 -@@ -417,6 +417,7 @@ - const cairo_font_options_t * - gdk_screen_get_font_options (GdkScreen *screen) - { -+ g_return_val_if_fail (screen != NULL, NULL); - g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); - - return screen->font_options; diff --git a/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch b/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch deleted file mode 100644 index f474c2af3e59..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.12.1-firefox-print-preview.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=482531 - firefox crashed on print preview [@IA__gdk_window_get_toplevel] [@gdk_window_is_toplevel_frozen] - -Index: gtk+/gdk/gdkwindow.c -=================================================================== ---- gtk+/gdk/gdkwindow.c (revision 18802) -+++ gtk+/gdk/gdkwindow.c (working copy) -@@ -615,7 +615,11 @@ gdk_window_get_toplevel (GdkWindow *wind - - obj = (GdkWindowObject *)window; - while (GDK_WINDOW_TYPE (obj) == GDK_WINDOW_CHILD) -- obj = (GdkWindowObject *)obj->parent; -+ { -+ obj = (GdkWindowObject *)obj->parent; -+ if (!obj) -+ return NULL; -+ } - - return GDK_WINDOW (obj); - } -@@ -2297,6 +2301,9 @@ gdk_window_is_toplevel_frozen (GdkWindow - - toplevel = (GdkWindowObject *)gdk_window_get_toplevel (window); - -+ if (!toplevel) -+ return FALSE; -+ - return toplevel->update_and_descendants_freeze_count > 0; - } - diff --git a/x11-libs/gtk+/files/gtk+-2.12.10-fix-nocxx.patch b/x11-libs/gtk+/files/gtk+-2.12.10-fix-nocxx.patch deleted file mode 100644 index 9fe0c829b4aa..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.12.10-fix-nocxx.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix build on a system with a USE=nocxx gcc - -From http://svn.gnome.org/viewvc/gtk%2B?view=revision&revision=19688 and backported, -as the order of tests listed was juggled around in trunk: - -2008-03-02 Johan Dahlin - - * tests/Makefile.am (noinst_PROGRAMS): Remove autotestkeywords, it's added later, - fixes non-C++ build. - (#496032, Nelson Benitez) - ---- trunk/tests/Makefile.am 2008/03/02 15:31:49 19687 -+++ trunk/tests/Makefile.am 2008/03/02 17:19:52 19688 -@@ -54,7 +54,6 @@ - - noinst_PROGRAMS = $(TEST_PROGS) \ - autotestfilechooser \ -- autotestkeywords \ - floatingtest \ - buildertest \ - simple \ diff --git a/x11-libs/gtk+/files/gtk+-2.12.10-no-libintl.patch b/x11-libs/gtk+/files/gtk+-2.12.10-no-libintl.patch deleted file mode 100644 index 4781acabf051..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.12.10-no-libintl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Use glib/gi18n.h instead of libintl.h, as is done everywhere else. -In addition to following the common style, this allows building against -a patched glib on an embedded uclibc system - ---- gtk/gtktrayicon-x11.c.orig 2008-06-10 11:15:21 +0000 -+++ gtk/gtktrayicon-x11.c 2008-06-10 11:15:32 +0000 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - - #include "gtkintl.h" - #include "gtkprivate.h" ---- tests/buildertest.c.orig 2008-06-10 13:25:32 +0000 -+++ tests/buildertest.c 2008-06-10 13:26:12 +0000 -@@ -20,7 +20,7 @@ - */ - - #include --#include -+#include - #include - #include - diff --git a/x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch b/x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch deleted file mode 100644 index b4570cafb10d..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.12.9-libtool-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -############# -# Taken from -# http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg135168.html -############# - ---- gtk+-2.12.9/configure.in.orig 2008-03-12 05:17:28.000000000 +0100 -+++ gtk+-2.12.9/configure.in 2008-04-22 14:48:55.434333756 +0200 -@@ -166,6 +166,8 @@ - - AC_LIBTOOL_WIN32_DLL - AM_PROG_LIBTOOL -+dnl when using libtool 2.x create libtool early, because it's used in configure -+m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - - # Make sure we use 64-bit versions of various file stuff. - AC_SYS_LARGEFILE -@@ -377,7 +379,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh` -+ deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else diff --git a/x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch b/x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch deleted file mode 100644 index 0010b20754d9..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.14.7-filechooser.patch +++ /dev/null @@ -1,392 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechooserdefault.c gtk+-2.14.7/gtk/gtkfilechooserdefault.c ---- gtk+-2.14.7.orig/gtk/gtkfilechooserdefault.c 2009-01-07 11:32:57.000000000 -0500 -+++ gtk+-2.14.7/gtk/gtkfilechooserdefault.c 2009-01-29 14:51:40.000000000 -0500 -@@ -34,6 +34,7 @@ - #include "gtkexpander.h" - #include "gtkfilechooserprivate.h" - #include "gtkfilechooserdefault.h" -+#include "gtkfilechooserdialog.h" - #include "gtkfilechooserembed.h" - #include "gtkfilechooserentry.h" - #include "gtkfilechoosersettings.h" -@@ -273,6 +274,7 @@ static void gtk_file_chooser_default - GParamSpec *pspec); - static void gtk_file_chooser_default_dispose (GObject *object); - static void gtk_file_chooser_default_show_all (GtkWidget *widget); -+static void gtk_file_chooser_default_realize (GtkWidget *widget); - static void gtk_file_chooser_default_map (GtkWidget *widget); - static void gtk_file_chooser_default_unmap (GtkWidget *widget); - static void gtk_file_chooser_default_hierarchy_changed (GtkWidget *widget, -@@ -565,6 +567,7 @@ _gtk_file_chooser_default_class_init (Gt - gobject_class->dispose = gtk_file_chooser_default_dispose; - - widget_class->show_all = gtk_file_chooser_default_show_all; -+ widget_class->realize = gtk_file_chooser_default_realize; - widget_class->map = gtk_file_chooser_default_map; - widget_class->unmap = gtk_file_chooser_default_unmap; - widget_class->hierarchy_changed = gtk_file_chooser_default_hierarchy_changed; -@@ -1156,9 +1159,6 @@ change_folder_and_display_error (GtkFile - static void - emit_default_size_changed (GtkFileChooserDefault *impl) - { -- if (!GTK_WIDGET_MAPPED (impl)) -- return; -- - profile_msg (" emit default-size-changed start", NULL); - g_signal_emit_by_name (impl, "default-size-changed"); - profile_msg (" emit default-size-changed end", NULL); -@@ -1192,7 +1192,8 @@ update_preview_widget_visibility (GtkFil - else - gtk_widget_hide (impl->preview_box); - -- emit_default_size_changed (impl); -+ if (!GTK_WIDGET_MAPPED (impl)) -+ emit_default_size_changed (impl); - } - - static void -@@ -5986,6 +5987,31 @@ settings_load (GtkFileChooserDefault *im - } - - static void -+save_dialog_geometry (GtkFileChooserDefault *impl, GtkFileChooserSettings *settings) -+{ -+ GtkWindow *toplevel; -+ int x, y, width, height; -+ -+ /* We don't save the geometry in non-expanded "save" mode, so that the "little -+ * dialog" won't make future Open dialogs too small. -+ */ -+ if (!(impl->action == GTK_FILE_CHOOSER_ACTION_OPEN -+ || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER -+ || impl->expand_folders)) -+ return; -+ -+ toplevel = get_toplevel (GTK_WIDGET (impl)); -+ -+ if (!(toplevel && GTK_IS_FILE_CHOOSER_DIALOG (toplevel))) -+ return; -+ -+ gtk_window_get_position (toplevel, &x, &y); -+ gtk_window_get_size (toplevel, &width, &height); -+ -+ _gtk_file_chooser_settings_set_geometry (settings, x, y, width, height); -+} -+ -+static void - settings_save (GtkFileChooserDefault *impl) - { - GtkFileChooserSettings *settings; -@@ -5996,12 +6022,28 @@ settings_save (GtkFileChooserDefault *im - _gtk_file_chooser_settings_set_show_hidden (settings, gtk_file_chooser_get_show_hidden (GTK_FILE_CHOOSER (impl))); - _gtk_file_chooser_settings_set_expand_folders (settings, impl->expand_folders); - -+ save_dialog_geometry (impl, settings); -+ - /* NULL GError */ - _gtk_file_chooser_settings_save (settings, NULL); - - g_object_unref (settings); - } - -+/* GtkWidget::realize method */ -+static void -+gtk_file_chooser_default_realize (GtkWidget *widget) -+{ -+ GtkFileChooserDefault *impl; -+ char *current_working_dir; -+ -+ impl = GTK_FILE_CHOOSER_DEFAULT (widget); -+ -+ GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->realize (widget); -+ -+ emit_default_size_changed (impl); -+} -+ - /* GtkWidget::map method */ - static void - gtk_file_chooser_default_map (GtkWidget *widget) -@@ -6055,8 +6097,6 @@ gtk_file_chooser_default_map (GtkWidget - - settings_load (impl); - -- emit_default_size_changed (impl); -- - profile_end ("end", NULL); - } - -@@ -7886,6 +7926,20 @@ gtk_file_chooser_default_get_default_siz - || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - || impl->expand_folders) - { -+ GtkFileChooserSettings *settings; -+ int x, y, width, height; -+ -+ settings = _gtk_file_chooser_settings_new (); -+ _gtk_file_chooser_settings_get_geometry (settings, &x, &y, &width, &height); -+ g_object_unref (settings); -+ -+ if (x >= 0 && y >= 0 && width > 0 && height > 0) -+ { -+ *default_width = width; -+ *default_height = height; -+ return; -+ } -+ - find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height); - - if (impl->preview_widget_active && -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechooserdialog.c gtk+-2.14.7/gtk/gtkfilechooserdialog.c ---- gtk+-2.14.7.orig/gtk/gtkfilechooserdialog.c 2009-01-07 11:32:57.000000000 -0500 -+++ gtk+-2.14.7/gtk/gtkfilechooserdialog.c 2009-01-29 14:51:40.000000000 -0500 -@@ -25,6 +25,7 @@ - #include "gtkfilechooserwidget.h" - #include "gtkfilechooserutils.h" - #include "gtkfilechooserembed.h" -+#include "gtkfilechoosersettings.h" - #include "gtkfilesystem.h" - #include "gtktypebuiltins.h" - #include "gtkintl.h" -@@ -154,37 +155,33 @@ file_chooser_widget_file_activated (GtkF - g_list_free (children); - } - -+#if 0 -+/* FIXME: to see why this function is ifdef-ed out, see the comment below in -+ * file_chooser_widget_default_size_changed(). -+ */ - static void --clamp_to_screen (GtkWidget *widget, -- gint *width, -- gint *height) --{ -- GdkScreen *screen; -- int monitor_num; -- GdkRectangle monitor; -- -- g_return_if_fail (GTK_WIDGET_REALIZED (widget)); -- -- screen = gtk_widget_get_screen (widget); -- monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); -- -- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); -+load_position (int *out_xpos, int *out_ypos) -+{ -+ GtkFileChooserSettings *settings; -+ int x, y, width, height; - -- if (width) -- *width = MIN (*width, (monitor.width * 3) / 4); -+ settings = _gtk_file_chooser_settings_new (); -+ _gtk_file_chooser_settings_get_geometry (settings, &x, &y, &width, &height); -+ g_object_unref (settings); - -- if (height) -- *height = MIN (*height, (monitor.height * 3) / 4); -+ *out_xpos = x; -+ *out_ypos = y; - } -+#endif - - static void - file_chooser_widget_default_size_changed (GtkWidget *widget, - GtkFileChooserDialog *dialog) - { - GtkFileChooserDialogPrivate *priv; -- gint width, height; - gint default_width, default_height; - GtkRequisition req, widget_req; -+ int xpos, ypos; - - priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); - -@@ -197,27 +194,29 @@ file_chooser_widget_default_size_changed - * that widget->requisition is meaningful. */ - gtk_widget_size_request (GTK_WIDGET (dialog), &req); - gtk_widget_size_request (widget, &widget_req); -- -- width = req.width - widget_req.width; -- height = req.height - widget_req.height; -- } -- else -- { -- width = GTK_WIDGET (dialog)->allocation.width - widget->allocation.width; -- height = GTK_WIDGET (dialog)->allocation.height - widget->allocation.height; - } - - _gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget), - &default_width, &default_height); - -- /* Ideal target size plus any extra size */ -- width = default_width + width + (2 * GTK_CONTAINER (dialog)->border_width); -- height = default_height + height + (2 * GTK_CONTAINER (dialog)->border_width); -- -- if (GTK_WIDGET_REALIZED (dialog)) -- clamp_to_screen (GTK_WIDGET (dialog), &width, &height); -+ gtk_window_resize (GTK_WINDOW (dialog), default_width, default_height); - -- gtk_window_resize (GTK_WINDOW (dialog), width, height); -+ if (!GTK_WIDGET_MAPPED (dialog)) -+ { -+#if 0 -+ /* FIXME: the code to restore the position does not work yet. It is not -+ * clear whether it is actually desirable --- if enabled, applications -+ * would not be able to say "center the file chooser on top of my toplevel -+ * window". So, we don't use this code at all. -+ */ -+ load_position (&xpos, &ypos); -+ if (xpos >= 0 && ypos >= 0) -+ { -+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_NONE); -+ gtk_window_move (GTK_WINDOW (dialog), xpos, ypos); -+ } -+#endif -+ } - } - - static void -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.c gtk+-2.14.7/gtk/gtkfilechoosersettings.c ---- gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.c 2009-01-07 11:32:57.000000000 -0500 -+++ gtk+-2.14.7/gtk/gtkfilechoosersettings.c 2009-01-29 14:53:10.000000000 -0500 -@@ -41,6 +41,10 @@ - #define LOCATION_MODE_KEY "LocationMode" - #define SHOW_HIDDEN_KEY "ShowHidden" - #define EXPAND_FOLDERS_KEY "ExpandFolders" -+#define GEOMETRY_X_KEY "GeometryX" -+#define GEOMETRY_Y_KEY "GeometryY" -+#define GEOMETRY_WIDTH_KEY "GeometryWidth" -+#define GEOMETRY_HEIGHT_KEY "GeometryHeight" - - #define MODE_PATH_BAR "path-bar" - #define MODE_FILENAME_ENTRY "filename-entry" -@@ -60,6 +64,24 @@ get_config_filename (void) - } - - static void -+get_int_key (GKeyFile *key_file, const char *group, const char *key, int *out_value) -+{ -+ GError *error; -+ int val; -+ -+ error = NULL; -+ val = g_key_file_get_integer (key_file, group, key, &error); -+ -+ if (val == 0 && error != NULL) -+ { -+ *out_value = -1; -+ g_error_free (error); -+ } -+ else -+ *out_value = val; -+} -+ -+static void - ensure_settings_read (GtkFileChooserSettings *settings) - { - GError *error; -@@ -127,6 +149,11 @@ ensure_settings_read (GtkFileChooserSett - else - settings->expand_folders = value != FALSE; - -+ get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_X_KEY, &settings->geometry_x); -+ get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_Y_KEY, &settings->geometry_y); -+ get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_WIDTH_KEY, &settings->geometry_width); -+ get_int_key (key_file, SETTINGS_GROUP, GEOMETRY_HEIGHT_KEY, &settings->geometry_height); -+ - out: - - g_key_file_free (key_file); -@@ -148,6 +175,10 @@ _gtk_file_chooser_settings_init (GtkFile - settings->location_mode = LOCATION_MODE_PATH_BAR; - settings->show_hidden = FALSE; - settings->expand_folders = FALSE; -+ settings->geometry_x = -1; -+ settings->geometry_y = -1; -+ settings->geometry_width = -1; -+ settings->geometry_height = -1; - } - - GtkFileChooserSettings * -@@ -198,6 +229,34 @@ _gtk_file_chooser_settings_set_expand_fo - settings->expand_folders = expand_folders != FALSE; - } - -+void -+_gtk_file_chooser_settings_get_geometry (GtkFileChooserSettings *settings, -+ int *out_x, -+ int *out_y, -+ int *out_width, -+ int *out_height) -+{ -+ ensure_settings_read (settings); -+ -+ *out_x = settings->geometry_x; -+ *out_y = settings->geometry_y; -+ *out_width = settings->geometry_width; -+ *out_height = settings->geometry_height; -+} -+ -+void -+_gtk_file_chooser_settings_set_geometry (GtkFileChooserSettings *settings, -+ int x, -+ int y, -+ int width, -+ int height) -+{ -+ settings->geometry_x = x; -+ settings->geometry_y = y; -+ settings->geometry_width = width; -+ settings->geometry_height = height; -+} -+ - gboolean - _gtk_file_chooser_settings_save (GtkFileChooserSettings *settings, - GError **error) -@@ -238,6 +297,14 @@ _gtk_file_chooser_settings_save (GtkFile - SHOW_HIDDEN_KEY, settings->show_hidden); - g_key_file_set_boolean (key_file, SETTINGS_GROUP, - EXPAND_FOLDERS_KEY, settings->expand_folders); -+ g_key_file_set_integer (key_file, SETTINGS_GROUP, -+ GEOMETRY_X_KEY, settings->geometry_x); -+ g_key_file_set_integer (key_file, SETTINGS_GROUP, -+ GEOMETRY_Y_KEY, settings->geometry_y); -+ g_key_file_set_integer (key_file, SETTINGS_GROUP, -+ GEOMETRY_WIDTH_KEY, settings->geometry_width); -+ g_key_file_set_integer (key_file, SETTINGS_GROUP, -+ GEOMETRY_HEIGHT_KEY, settings->geometry_height); - - contents = g_key_file_to_data (key_file, &len, error); - g_key_file_free (key_file); -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.h gtk+-2.14.7/gtk/gtkfilechoosersettings.h ---- gtk+-2.14.7.orig/gtk/gtkfilechoosersettings.h 2009-01-07 11:32:57.000000000 -0500 -+++ gtk+-2.14.7/gtk/gtkfilechoosersettings.h 2009-01-29 14:53:44.000000000 -0500 -@@ -38,6 +38,11 @@ struct _GtkFileChooserSettings - - LocationMode location_mode; - -+ int geometry_x; -+ int geometry_y; -+ int geometry_width; -+ int geometry_height; -+ - guint settings_read : 1; - - guint show_hidden : 1; -@@ -66,6 +71,17 @@ gboolean _gtk_file_chooser_settings_get_ - void _gtk_file_chooser_settings_set_expand_folders (GtkFileChooserSettings *settings, - gboolean expand_folders); - -+void _gtk_file_chooser_settings_get_geometry (GtkFileChooserSettings *settings, -+ int *out_x, -+ int *out_y, -+ int *out_width, -+ int *out_heigth); -+void _gtk_file_chooser_settings_set_geometry (GtkFileChooserSettings *settings, -+ int x, -+ int y, -+ int width, -+ int heigth); -+ - gboolean _gtk_file_chooser_settings_save (GtkFileChooserSettings *settings, - GError **error); - diff --git a/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch b/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch deleted file mode 100644 index 74372445bc34..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch +++ /dev/null @@ -1,70 +0,0 @@ -# https://bugzilla.gnome.org/show_bug.cgi?id=525550 -# Fix test suite failure by ignoring gtkcurve altogether. -diff --git a/gtk/tests/object.c b/gtk/tests/object.c -index c243913..e2bc63b 100644 ---- a/gtk/tests/object.c -+++ b/gtk/tests/object.c -@@ -55,6 +55,7 @@ list_ignore_properties (gboolean buglist) - { - /* currently untestable properties */ - static const IgnoreProperty ignore_properties[] = { -+ { "GtkCurve", "", NULL, }, /* Just ignore it, not worth fixing */ - { "GtkContainer", "child", NULL, }, /* needs working child widget */ - { "GtkRadioMenuItem", "group", NULL, }, /* needs working sibling */ - { "GtkWidget", "parent", NULL, }, /* needs working parent widget */ -@@ -89,11 +90,6 @@ list_ignore_properties (gboolean buglist) - static const IgnoreProperty bug_properties[] = { - { "GtkComboBox", "active", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL model bug */ - { "GtkCTree", "spacing", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers signedness bug */ -- { "GtkCurve", "curve-type", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers OOM */ -- { "GtkCurve", "min-x", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */ -- { "GtkCurve", "min-y", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */ -- { "GtkCurve", "max-x", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */ -- { "GtkCurve", "max-y", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */ - { "GtkFileChooserButton", "local-only", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL path assertion */ - { "GtkFileChooserDialog", "local-only", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL path assertion */ - { "GtkFileChooserWidget", "local-only", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL path assertion */ -@@ -227,7 +223,8 @@ object_test_property (GObject *object, - /* ignore untestable properties */ - ignore_properties = list_ignore_properties (FALSE); - for (i = 0; ignore_properties[i].name; i++) -- if (g_type_is_a (G_OBJECT_TYPE (object), g_type_from_name (ignore_properties[i].type_name)) && -+ if (g_strcmp0 ("", ignore_properties[i].name) || -+ g_type_is_a (G_OBJECT_TYPE (object), g_type_from_name (ignore_properties[i].type_name)) && - strcmp (pspec->name, ignore_properties[i].name) == 0 && - (MATCH_ANY_VALUE == ignore_properties[i].value || - value_as_pointer (&value) == ignore_properties[i].value || -@@ -235,7 +232,7 @@ object_test_property (GObject *object, - strcmp (g_value_get_string (&value), ignore_properties[i].value) == 0))) - break; - /* ignore known property bugs if not testing thoroughly */ -- if (ignore_properties[i].name == NULL && !g_test_thorough()) -+ if (ignore_properties[i].name == NULL && !g_test_thorough ()) - { - ignore_properties = list_ignore_properties (TRUE); - for (i = 0; ignore_properties[i].name; i++) -@@ -250,7 +247,7 @@ object_test_property (GObject *object, - /* assign unignored properties */ - if (ignore_properties[i].name == NULL) - { -- if (g_test_verbose()) -+ if (g_test_verbose ()) - g_print ("PropertyTest: %s::%s := (%s value (%s): %p)\n", - g_type_name (G_OBJECT_TYPE (object)), pspec->name, - SELECT_NAME (dvalue), g_type_name (G_VALUE_TYPE (&value)), -@@ -330,7 +327,7 @@ main (int argc, - /* initialize test program */ - pixbuf_init (); - gtk_test_init (&argc, &argv); -- gtk_test_register_all_types(); -+ gtk_test_register_all_types (); - /* install a property test for each widget type */ - otypes = gtk_test_list_all_types (NULL); - for (i = 0; otypes[i]; i++) -@@ -342,5 +339,5 @@ main (int argc, - g_test_add_data_func (testpath, (void*) otypes[i], widget_property_tests); - g_free (testpath); - } -- return g_test_run(); -+ return g_test_run (); - } diff --git a/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch b/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch deleted file mode 100644 index f12a3f0dd531..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch +++ /dev/null @@ -1,19 +0,0 @@ -# http://bugzilla.gnome.org/show_bug.cgi?id=569671 -# If pure sniffing yields uncertain results, try again with the filename. -# Patch by Tyler Lawson ---- a/gdk-pixbuf/gdk-pixbuf-io.c 2009-02-09 11:33:45.000000000 -0600 -+++ b/gdk-pixbuf/gdk-pixbuf-io.c 2009-02-09 11:36:32.000000000 -0600 -@@ -793,8 +793,12 @@ - gchar **mimes; - gchar *type; - gint j; -+ gboolean mimetype_uncertain; - -- mime_type = g_content_type_guess (NULL, buffer, size, NULL); -+ mime_type = g_content_type_guess (NULL, buffer, size, &mimetype_uncertain); -+ if (mimetype_uncertain) -+ mime_type = g_content_type_guess (filename, buffer, size, NULL); -+ - - for (modules = get_file_formats (); modules; modules = g_slist_next (modules)) { - GdkPixbufModule *module = (GdkPixbufModule *)modules->data; diff --git a/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch b/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch deleted file mode 100644 index 429e083c4e50..000000000000 --- a/x11-libs/gtk+/files/gtk+-2.8.10-xinerama.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: gtk+-2.8.9/configure.in -=================================================================== ---- gtk+-2.8.9.orig/configure.in -+++ gtk+-2.8.9/configure.in -@@ -195,6 +195,10 @@ AC_ARG_ENABLE(shm, - [AC_HELP_STRING([--enable-shm], - [support shared memory if available [default=yes]])],, - [enable_shm="yes"]) -+AC_ARG_ENABLE(xinerama, -+ [AC_HELP_STRING([--enable-xinerama], -+ [support xinerama extension if available [default=yes]])],, -+ [enable_xinerama="yes"]) - AC_ARG_ENABLE(xkb, - [AC_HELP_STRING([--enable-xkb], - [support XKB [default=maybe]])],, -@@ -1193,7 +1197,7 @@ if test "x$gdktarget" = "xx11"; then - fi - - # Check for Xinerama extension (Solaris impl or Xfree impl) -- -+ if test "x$enable_xinerama" = "xyes"; then - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $x_cflags" - -@@ -1241,6 +1245,7 @@ if test "x$gdktarget" = "xx11"; then - fi - ;; - esac -+ fi - - # set up things for XInput - diff --git a/x11-libs/gtk+/gtk+-2.12.11.ebuild b/x11-libs/gtk+/gtk+-2.12.11.ebuild deleted file mode 100644 index bf990fa938c3..000000000000 --- a/x11-libs/gtk+/gtk+-2.12.11.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.11.ebuild,v 1.9 2009/02/15 12:40:44 armin76 Exp $ - -WANT_AUTOMAKE="1.7" - -inherit gnome.org flag-o-matic eutils autotools virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="cups debug doc jpeg tiff vim-syntax xinerama" - -RDEPEND="x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - xinerama? ( x11-libs/libXinerama ) - >=dev-libs/glib-2.13.5 - >=x11-libs/pango-1.17.3 - >=dev-libs/atk-1.10.1 - >=x11-libs/cairo-1.2.0 - media-libs/fontconfig - x11-misc/shared-mime-info - >=media-libs/libpng-1.2.1 - cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 )" -DEPEND="${RDEPEND} - sys-devel/autoconf - >=dev-util/pkgconfig-0.9 - x11-proto/xextproto - x11-proto/xproto - x11-proto/inputproto - x11-proto/damageproto - xinerama? ( x11-proto/xineramaproto ) - >=dev-util/gtk-doc-am-1.8 - doc? ( - >=dev-util/gtk-doc-1.8 - ~app-text/docbook-xml-dtd-4.1.2 - )" -PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" - -pkg_setup() { - if ! built_with_use x11-libs/cairo X; then - eerror "Please re-emerge x11-libs/cairo with the X USE flag set" - die "cairo needs the X flag set" - fi -} - -set_gtk2_confdir() { - # An arch specific config directory is used on multilib systems - has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" - GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # use an arch-specific config directory so that 32bit and 64bit versions - # dont clash on multilib systems - has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch" - - # Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11 - epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch" - - # OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513 - epatch "${FILESDIR}/${PN}-2.12.0-openoffice-freeze-workaround.patch" - - # Firefox print review crash fix, bug #195644 - epatch "${FILESDIR}/${PN}-2.12.1-firefox-print-preview.patch" - - # Compile without libintl.h (uclibc) - epatch "${FILESDIR}/${PN}-2.12.10-no-libintl.patch" - - # Work without C++ - epatch "${FILESDIR}/${PN}-2.12.10-fix-nocxx.patch" - - # -O3 and company cause random crashes in applications. Bug #133469 - replace-flags -O3 -O2 - strip-flags - - use ppc64 && append-flags -mminimal-toc - - # Fix libtool usage for configure stage, bug #213789 - epatch "${FILESDIR}/${PN}-2.12.9-libtool-2.patch" - - # remember, eautoreconf applies elibtoolize. - # if you remove this, you should manually run elibtoolize - eautoreconf -} - -src_compile() { - # png always on to display icons (foser) - local myconf="$(use_enable doc gtk-doc) \ - $(use_with jpeg libjpeg) \ - $(use_with tiff libtiff) \ - $(use_enable xinerama) \ - $(use_enable cups cups auto) \ - --with-libpng \ - --with-gdktarget=x11 \ - --with-xinput" - - # Passing --disable-debug is not recommended for production use - use debug && myconf="${myconf} --enable-debug=yes" - - econf ${myconf} || die "configure failed" - - emake || die "compile failed" -} - -src_test() { - Xemake check || die -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - - set_gtk2_confdir - dodir ${GTK2_CONFDIR} - keepdir ${GTK2_CONFDIR} - - # see bug #133241 - echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc" - - # Enable xft in environment as suggested by - dodir /etc/env.d - echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2" - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - # This has to be removed, because it's multilib specific; generated in - # postinst - rm "${D}/etc/gtk-2.0/gtk.immodules" -} - -pkg_postinst() { - set_gtk2_confdir - - if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then - gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - else - ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;" - ewarn "to complete the installation of GTK+, please create the" - ewarn "directory and then manually run:" - ewarn " cd ${ROOT}${GTK2_CONFDIR}" - ewarn " gtk-query-immodules-2.0 > gtk.immodules" - ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" - fi - - if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)" - fi - - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." -} diff --git a/x11-libs/gtk+/gtk+-2.12.12.ebuild b/x11-libs/gtk+/gtk+-2.12.12.ebuild deleted file mode 100644 index 0c14d7ce8019..000000000000 --- a/x11-libs/gtk+/gtk+-2.12.12.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.12.12.ebuild,v 1.2 2008/11/30 13:13:59 eva Exp $ - -WANT_AUTOMAKE="1.7" - -inherit gnome.org flag-o-matic eutils autotools virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="cups debug doc jpeg tiff vim-syntax xinerama" - -RDEPEND="x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - xinerama? ( x11-libs/libXinerama ) - >=dev-libs/glib-2.13.5 - >=x11-libs/pango-1.17.3 - >=dev-libs/atk-1.10.1 - >=x11-libs/cairo-1.2.0 - media-libs/fontconfig - x11-misc/shared-mime-info - >=media-libs/libpng-1.2.1 - cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 )" -DEPEND="${RDEPEND} - sys-devel/autoconf - >=dev-util/pkgconfig-0.9 - x11-proto/xextproto - x11-proto/xproto - x11-proto/inputproto - x11-proto/damageproto - xinerama? ( x11-proto/xineramaproto ) - >=dev-util/gtk-doc-am-1.8 - doc? ( - >=dev-util/gtk-doc-1.8 - ~app-text/docbook-xml-dtd-4.1.2 - )" -PDEPEND="vim-syntax? ( app-vim/gtk-syntax )" - -pkg_setup() { - if ! built_with_use x11-libs/cairo X; then - eerror "Please re-emerge x11-libs/cairo with the X USE flag set" - die "cairo needs the X flag set" - fi -} - -set_gtk2_confdir() { - # An arch specific config directory is used on multilib systems - has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" - GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0} -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # use an arch-specific config directory so that 32bit and 64bit versions - # dont clash on multilib systems - has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch" - - # Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11 - epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch" - - # OpenOffice.org might hang at startup (on non-gnome env) without this workaround, bug #193513 - epatch "${FILESDIR}/${PN}-2.12.0-openoffice-freeze-workaround.patch" - - # Firefox print review crash fix, bug #195644 - epatch "${FILESDIR}/${PN}-2.12.1-firefox-print-preview.patch" - - # Compile without libintl.h (uclibc) - epatch "${FILESDIR}/${PN}-2.12.10-no-libintl.patch" - - # Work without C++ - epatch "${FILESDIR}/${PN}-2.12.10-fix-nocxx.patch" - - # -O3 and company cause random crashes in applications. Bug #133469 - replace-flags -O3 -O2 - strip-flags - - use ppc64 && append-flags -mminimal-toc - - # Fix libtool usage for configure stage, bug #213789 - epatch "${FILESDIR}/${PN}-2.12.9-libtool-2.patch" - - # remember, eautoreconf applies elibtoolize. - # if you remove this, you should manually run elibtoolize - eautoreconf -} - -src_compile() { - # png always on to display icons (foser) - local myconf="$(use_enable doc gtk-doc) \ - $(use_with jpeg libjpeg) \ - $(use_with tiff libtiff) \ - $(use_enable xinerama) \ - $(use_enable cups cups auto) \ - --with-libpng \ - --with-gdktarget=x11 \ - --with-xinput" - - # Passing --disable-debug is not recommended for production use - use debug && myconf="${myconf} --enable-debug=yes" - - econf ${myconf} || die "configure failed" - - emake || die "compile failed" -} - -src_test() { - Xemake check || die -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - - set_gtk2_confdir - dodir ${GTK2_CONFDIR} - keepdir ${GTK2_CONFDIR} - - # see bug #133241 - echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc" - - # Enable xft in environment as suggested by - dodir /etc/env.d - echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2" - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - # This has to be removed, because it's multilib specific; generated in - # postinst - rm "${D}/etc/gtk-2.0/gtk.immodules" -} - -pkg_postinst() { - set_gtk2_confdir - - if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then - gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - else - ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;" - ewarn "to complete the installation of GTK+, please create the" - ewarn "directory and then manually run:" - ewarn " cd ${ROOT}${GTK2_CONFDIR}" - ewarn " gtk-query-immodules-2.0 > gtk.immodules" - ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" - fi - - if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)" - fi - - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." -} diff --git a/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild b/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild deleted file mode 100644 index cace24d36332..000000000000 --- a/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild,v 1.8 2009/04/27 13:08:12 jer Exp $ - -WANT_AUTOMAKE="1.7" - -inherit gnome.org flag-o-matic eutils libtool virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama" - -RDEPEND="x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - >=x11-libs/libXrandr-1.2 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - xinerama? ( x11-libs/libXinerama ) - >=dev-libs/glib-2.17.6 - >=x11-libs/pango-1.20 - >=dev-libs/atk-1.13 - >=x11-libs/cairo-1.6 - media-libs/fontconfig - x11-misc/shared-mime-info - >=media-libs/libpng-1.2.1 - cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.5.7 ) - ! "${D}/${GTK2_CONFDIR}/gtkrc" - - # Enable xft in environment as suggested by - dodir /etc/env.d - echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2" - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - # This has to be removed, because it's multilib specific; generated in - # postinst - rm "${D}/etc/gtk-2.0/gtk.immodules" -} - -pkg_postinst() { - set_gtk2_confdir - - if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then - gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - else - ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;" - ewarn "to complete the installation of GTK+, please create the" - ewarn "directory and then manually run:" - ewarn " cd ${ROOT}${GTK2_CONFDIR}" - ewarn " gtk-query-immodules-2.0 > gtk.immodules" - ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" - fi - - if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)" - fi - - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." -} diff --git a/x11-libs/gtk+/gtk+-2.18.5.ebuild b/x11-libs/gtk+/gtk+-2.18.5.ebuild deleted file mode 100644 index 581d1ddadaab..000000000000 --- a/x11-libs/gtk+/gtk+-2.18.5.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.18.5.ebuild,v 1.4 2010/01/19 18:52:39 ssuominen Exp $ - -EAPI="2" - -inherit gnome.org flag-o-matic eutils libtool virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama" - -# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -RDEPEND="!aqua? ( - x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - >=x11-libs/libXrandr-1.2 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - >=x11-libs/cairo-1.6[X,svg] - ) - aqua? ( - >=x11-libs/cairo-1.6[aqua,svg] - ) - xinerama? ( x11-libs/libXinerama ) - >=dev-libs/glib-2.21.3 - >=x11-libs/pango-1.20 - >=dev-libs/atk-1.13 - media-libs/fontconfig - x11-misc/shared-mime-info - >=media-libs/libpng-1.2.1 - cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2:0 ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.5.7 ) - ! "${T}/gtkrc" - insinto ${GTK2_CONFDIR} - doins "${T}"/gtkrc - - # Enable xft in environment as suggested by - echo "GDK_USE_XFT=1" > "${T}"/50gtk2 - doenvd "${T}"/50gtk2 - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" - - # This has to be removed, because it's multilib specific; generated in - # postinst - rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules" - - # add -framework Carbon to the .pc files - use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do - sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed" - done -} - -pkg_postinst() { - set_gtk2_confdir - - if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then - gtk-query-immodules-2.0 > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - else - ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;" - ewarn "to complete the installation of GTK+, please create the" - ewarn "directory and then manually run:" - ewarn " cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" - ewarn " gtk-query-immodules-2.0 > gtk.immodules" - ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" - fi - - if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" - fi - - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." -} -- 2.26.2