root
8 years ago
parent
e0aa06e8a0
commit
a2a8e1322c
@ -1,5 +1,7 @@
|
||||
DIST btrbk-0.23.3.tar.xz 69388 SHA256 779636116261e3e0fe64ec986e39be594c04454d87be8005115c8577f62b1725 SHA512 d9fc29b8e2a6e191be93c7845c7f1f99ab60fb4ec910d8b60947ef902b7fdaf789bc73a4884bdd6060f1b180cafaacd5fa8f93dc29624dfea8a2890618ce4012 WHIRLPOOL 4cc9aa102c46feccfb0b90e65d03dd53bed07d78e5a9ddd2afeccfe21fb29f9a2aeba8389771ee7c203598858fb94d59c0d19b73ce1fa29b3772e916bbf4f23b
|
||||
DIST btrbk-0.24.0.tar.xz 72308 SHA256 032671c2905005d91a87b85acf8daec05df09bfad9e191092610094fb9a65906 SHA512 fbe180743743ead1241968765b5ae6eff37b2925bee8379443568c126426f2098d280a3f62d13e5f5b63f967ac9889ad9331d73f354d0cd441c907ba92258267 WHIRLPOOL 19052093dcec40d4a8bd5593538f6ec44ea2bbaf6a846f966cebb1f1ff76b9c94700a0bad6f16f33258f92fa05180efc2ba770f02db5553e755beb21b6761ed9
|
||||
EBUILD btrbk-0.23.3.ebuild 739 SHA256 635a74f1b680c2a304ca0da9b7fae526f18c86fdd00c12b202338344ec72a083 SHA512 806cc53207e21b8bf0f81b7c79a3b6f578ed76135548a333e824fef739859151f40b7d8f98fad8c594f73e635a0536cfa19c8f4ccba168064950c182b1715b0a WHIRLPOOL 03e0eeae096e94051115dd22ac7f8e98cb01567f56c7181719625b71833005a1e1455e1c0334bb9a31d59621754fe1920b8d0e4a7d31b67b83aff68955ba8139
|
||||
EBUILD btrbk-0.24.0.ebuild 739 SHA256 635a74f1b680c2a304ca0da9b7fae526f18c86fdd00c12b202338344ec72a083 SHA512 806cc53207e21b8bf0f81b7c79a3b6f578ed76135548a333e824fef739859151f40b7d8f98fad8c594f73e635a0536cfa19c8f4ccba168064950c182b1715b0a WHIRLPOOL 03e0eeae096e94051115dd22ac7f8e98cb01567f56c7181719625b71833005a1e1455e1c0334bb9a31d59621754fe1920b8d0e4a7d31b67b83aff68955ba8139
|
||||
EBUILD btrbk-9999.ebuild 734 SHA256 b8ea69f8bcfcce54c85dce07d12288ecbba1dc04c8ddbeb4a8262c926deb29ef SHA512 251bdca12730064ed3d5c9f1fff95fb24413f3d4cb9f7dc0eb55bbdfb87bfbd316ada6d1207a1bd470d3677e75229baf6456363977b0dd618f02457978701454 WHIRLPOOL d59562d1242dcd2ba7f3dce124835198bb1e091ab76fd5c70690bb983e583904dea1ff66ab65bdb815bdec8a4575c754072a986c3ea8b142a55679f8d1653056
|
||||
MISC ChangeLog 895 SHA256 9b59afce21b79f69d1aaefb4fc1e6b6f5848d405aa9f3e8f2ce40b80240bb8e5 SHA512 72a378cb5f0cd3321dd4eab547f4914c1dc01544a548f45491d682d3109710520fc3e8dbd21d6b16696e71c0c2b198832b04bd94f80c6a69f14a3037499c30ca WHIRLPOOL 8df6dd6dcd285e7d46a4d8ae5cb2561ba344670f4414e71d96260be496a885a61803775a8ce5f9b6741b1c7bf3bbd00eb7df050c9f61eb6e18be3ca783593cfc
|
||||
MISC ChangeLog 1142 SHA256 da9bd0da09d5546553041061f4cc0f9e84fe7c12e8f745f925a75de71ca3f504 SHA512 845d00dec0afa0c9f6087a2bf08dc406109dc1186e816d0e58aa2119b80411940742e082aebc4ce97e7a4cf9b60fda0619bf3f19b26b7c928932be9fe95fe3e6 WHIRLPOOL 81929c5144db0acd87741faa1449a991fe808e5a99174733ca188e3fc14da18da3b271d98aa6f5cf4d17056680acc93244ecf2891e627152b6913096b7b72709
|
||||
MISC metadata.xml 1217 SHA256 c31206a142829afbbebbe1f909dba4b501dc16a22cff21a052a95786752efc79 SHA512 456f29255c4a04f4f3b3559f3ffd81822127ce64325a4851277f2ab9bd889fefcf628f41b911d09b420883e3ed0f157ef3687044701afaf667682acf6edc30ff WHIRLPOOL 59f2d994963000d9cc31ab491716149f2e2752f601315eb567cdb6ae828a1e5676f4f111981919ae7ba0728943c843e3c6e27cf8681c5e666df76cf6c53550b2
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit systemd
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git"
|
||||
inherit git-r3
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
|
||||
HOMEPAGE="https://digint.ch/btrbk/"
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
IUSE="+pv"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="dev-lang/perl
|
||||
net-misc/openssh
|
||||
pv? ( sys-apps/pv )
|
||||
>=sys-fs/btrfs-progs-3.18.2"
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" SYSTEMDDIR="$(systemd_get_systemunitdir)" install
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=MONSIEURP
|
||||
MODULE_VERSION=0.004000
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Readily merge Pull Requests from the Gentoo Github repository"
|
||||
HOMEPAGE="https://github.com/monsieurp/Gentoo-App-Pram"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="
|
||||
dev-perl/Module-Build-Tiny
|
||||
dev-perl/File-Which
|
||||
dev-vcs/git
|
||||
${RDEPEND}"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -1,4 +1,6 @@
|
||||
DIST Gentoo-App-Pram-0.003000.tar.gz 11035 SHA256 c7731bc329204844f8fe5be6ca60d478bc619a3b071c29fc8fe3ec000f4dfbea SHA512 beebd27fa63f45308cfe9e43a392f33157556bd427a350d16b13d4c953f09d14737260226e1804ef10d597437cbb57301c7ea7595c2a947889563b7bc5142310 WHIRLPOOL 5abbc0d6871f64d180a3c6d462b866a9f6ca7ac6689339e56922b5d519c310a702034c8990e5868b7b27c869fe44ebb9f6270fe3f50a57b5ea1fb368dbaecfb0
|
||||
DIST Gentoo-App-Pram-0.004000.tar.gz 10992 SHA256 47de2c596f7ca43a8cf60d4d075d81ebd9b87f9cf73a74bd5d368145a28bee30 SHA512 2ed50f524702a729a0f7bfc88ee6569e7706151586d1ca63b275868a6584684a1a9c8c58b63e2dd5e0ed98fa8b0395579975adedc031236fd8915cf195e88453 WHIRLPOOL 12df8300deec0d33f531da0628af133626144ece6782f22b6983de51cded0d7d50769dcffb5212dd8b9dff87031ffccaf14b574232affbd0ba952f3d8d4e89d0
|
||||
EBUILD Gentoo-App-Pram-0.3.0.ebuild 489 SHA256 2c62ef50477c35152f5990a54fff93bb0dd253b12f8a9ec255553f73d706b3be SHA512 ce0397055390bd51b41c4547c9f7e4af732114c70015b59c6c53367b76e3df21f71e163a59a4d30abbdc05bbbac604a87be2918eeaa8494b5270baec6eefc1b7 WHIRLPOOL bb43eddb59f80fba2f191025e14c35d32c62c79c8a79e21cb2f05f1300957848a7eb0ef6277c078c990a9a4fbb7a482ebe7f288aac9fc05f64e8273f96c3d056
|
||||
MISC ChangeLog 1636 SHA256 ec36aca98883912e0e63600d93b6950ccead82ac5ebfda4f3dfcb663acc69aab SHA512 6e1d7fbde69f6a4a213281b410a9a0aa2d0a70757bbeec8296b063890365828a1c0812cc4cd573d210cdf9b759071a7ecce9a11e337d19104cbd8dee397d2c0d WHIRLPOOL a14791a4db37b59bff905639eccf1311931730df3ddd388431c89f8b7c0a05a77fc6019dc17d26e8ac40123c23bf1180d92bfeace2ae7e75d9eb97d151f82ccf
|
||||
EBUILD Gentoo-App-Pram-0.4.0.ebuild 492 SHA256 6d1d3cd51f4adabd207305b9baba2e12b7579f8f97707233071b54bd78c67901 SHA512 3a5db00d76c970ac92990b34168fc61c092c1582d032bb15f2262338c30de85b86c6fa1593fc01b3e2540a93626ac4e1afcad2eab7166532e139b32a11b95355 WHIRLPOOL 99b97e98f4e2c7a944e37ec071bc5ee58bb04076aa07fd9e491713364f7b1a1f617e3196f729333ad567e18800cca27cdb12f40be36b18fe1a756fe6c077ea96
|
||||
MISC ChangeLog 1812 SHA256 0b6780cbf0224abdb91986c99a953fd1416d276b1b568c7f56b3a6464dff3c47 SHA512 fad8bacbd060fcd62a94f56b780d61b3f76879243e32012ebdcff202fb9caa67f668b7250637b29c22c321a975a131e52849fd2cd3a5fac463a788ae117ecb2f WHIRLPOOL de7d8adbb0d2cfa275d05255affc2804d9284c7b7cde2ef05427cf230a73a43c8dd592d2b2dffda464b68fbda4471e067309c362d89503a5a8d802289f0451a5
|
||||
MISC metadata.xml 585 SHA256 a1079b0bdfb3afec4abb3f01bfda86d89e66781632bc9a49eda41c784e77afee SHA512 71123fc4e7a36b37eaaebff0e310fb23e3c3ae9247fb1efa9557e0b7d53833942782e863ce5aab368c40114a23243f46672e6cbdfa0002abfb49e1b464f6f8f5 WHIRLPOOL 98f5ddb5f476076edc57bfca8c3963c5d487e3f8e1ca4f09b9371b7b8dfafce220dc3625f3374aa9bee3b2b9f94ea4a33cefdce5fdd0503f44cbf4ab2abb7911
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
DIST gh-0.14.0.gem 15360 SHA256 a243023cbd972df27799b3949a59efeae284d4189155681fb6bbcfdfab34f548 SHA512 05f5c520698c7424efeb1da7d166463c61d003085053e35534ad3fdbaf2282ee025f1a7336b585805051dd0e93974d0c437fcbed77c64db36ee52032984cf33a WHIRLPOOL 8f29664d04b7c8dbe8ffd730bfc4a4bafce29d1f37d0f7b880e5c6b852535b0c0c5393e74ded4b92044535f1a0aeb8aa2d8a6b34fbeac4de7d9f2e4b6fad02a4
|
||||
DIST gh-0.14.0.tar.gz 64205 SHA256 ddc973a2835ca2eaddaf3663413c7f3f1da6188104630cddfbab4a2b8f4d0b68 SHA512 8fd4c7bac702c57d98ee509d35dbbc81291f45977bb0e2c3b1f06e2cc3d8635d0656adafa5569ef6b3f9d6acbc563f8db7c69b43cf177dd379335d673f5ef781 WHIRLPOOL 164621c8121e0d5a9d31c39cd37f69f73bd34d71409e143ecca99df7085e1ff82e530714a2ba5e0c12f22adbc16e49c7067572e8664632a9f19638fce16ed7d8
|
||||
EBUILD gh-0.14.0-r1.ebuild 679 SHA256 edbe7fb2d2a4d3f8227c068ff4fa0d05ac87fa2bf127afb77051bf72434ef3fc SHA512 2d3b1492ffb344f4078e6b486cc5125e4d757120b2390e55a1254199dd1cb2574053e837fe8676046f9ad9bbe6e1d4013553a26d8c527ed1d80cafe191b850b8 WHIRLPOOL 2bbc54ee37acc5dea6b07049382e8c99d4485773ac099cd7e243c5957843753bba6bbbc7db4771be675bb92dd72d142628b09b00643cf8f052bf049f01c37b51
|
||||
EBUILD gh-0.14.0.ebuild 586 SHA256 aa04295c8fd6db4c2b9b71255d693266f1ff6949a73c993ba8a3b4bd4de02544 SHA512 06da59df9e3f208e4e97c27fcf6ade8f5e04f8ea1fe9bf54113be950c7fb47dd853b54447ed2518d7adb5c33ec8cba753dcbf84760d95b7f03564e80c5cbfba4 WHIRLPOOL d8e0fcd28c2d5cfb2c54eace82ea5111f7d799dee5d6c91e9d4ac99ffce32e0ccf6d7211c6bbb69a1f3fbe5f54efc7d2f699eb49c56bcf05eed5ba0a740d65e5
|
||||
MISC ChangeLog 300 SHA256 0c087a1b319701feb3fa575c07ca78df0d6eb6ec99b1579840ceec9af53934f8 SHA512 0f0eba4a3d79d59e334e34b64eb22e13b85e55bb575fd2241cfe7326494c2e15dda39d78a95c67ece40624a36065db6d92ef67809dd8e6c250d67c543226ad52 WHIRLPOOL 9b190b363e74873c4ec0848ac8c46a875bade270b0395646e609c88cf443209c815b18931208051ac30cac99e1f9fa96b28eef86f5d4ff8e4f8e527521f3748a
|
||||
MISC ChangeLog 456 SHA256 9d4c51a134f45accd12f6114a00de9dc0446a34f93fbd3a459ed95b9ecd88d80 SHA512 4f4d51bd315f4c61bcb2f2196678bb289556157b7182a3aaa6031a88cd92d2e73d73bed27c554db4cc798f6f5c485f1c4ba960ec887198f804ed1817185d61ee WHIRLPOOL ffa95baa3cf900f7729b4745694f784f7bae690515e4f0c548ec91ee00ad480d3c585794a7663663b9fdfa0cc10a9c51267002de3c719bc3df228a517b5f7002
|
||||
MISC metadata.xml 334 SHA256 e671f500a040e2031515581988f0c5a4796bdc95eaf6d72ad3e0ff28865e2477 SHA512 d65f5adfb644204e693f51a9a0c5551905fb211aec82a0210e793b5041941df4b4dcce3d1eef0afc579c7d303418655b0191b1ac26d46770af6d47376b2747c2 WHIRLPOOL 8677370e4c2c3ea57cbe3ed9e7fd453f638a33e538529c8637061a3c8c2ec850a9645eebca36a1c16784b85f2474181cad66b033b080603a87a832dad00a3adc
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby20 ruby21"
|
||||
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="multi-layer client for the github api v3"
|
||||
HOMEPAGE="https://github.com/travis-ci/gh"
|
||||
SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend "
|
||||
dev-ruby/webmock
|
||||
"
|
||||
|
||||
ruby_add_rdepend "
|
||||
dev-ruby/addressable
|
||||
dev-ruby/backports
|
||||
>dev-ruby/faraday-0.8
|
||||
>dev-ruby/multi_json-1.0
|
||||
>=dev-ruby/net-http-persistent-2.7
|
||||
dev-ruby/net-http-pipeline
|
||||
"
|
||||
@ -1,4 +1,5 @@
|
||||
AUX net-http-pipeline-accept-encoding.patch 654 SHA256 48c6b7de42be91cd05cf8a22098f06a0b8db7a9aa4ea8499f3e607181f5391e5 SHA512 43c6382f01538faaedc38047d6099d26c6d91805c45eddd043fba0e98b4331fa42a2826ea8a3216ddd5ab047b37e8a7ce1ba4c52b9ed5c0c645a5483d2cd1931 WHIRLPOOL 65dd7a781ba1e0ccfacf3dfe3431ff4bb03892b7a756f221b0ca94b28a120b624876d0da50420559bdf982cf69a15dba84131bc0c15b925338cd2bbd1b22fff7
|
||||
DIST net-http-pipeline-1.0.1.gem 12800 SHA256 6923ce2f28bfde589a9f385e999395eead48ccfe4376d4a85d9a77e8c7f0b22f SHA512 1377c20038176f6c246a7d4adbce2c6972970d730902f9faefc31b2f6446f4237603f45f0f59de70eb9545e3c1e150fe6e63cf350551203166611bef7845f4e2 WHIRLPOOL 691e995dbe5f3fc4605923511f0bea634f5a3558acb629b3694ffe5757392f8943c5c070b814f2a442c1cc3fefa89fd4f3da08773aae340e0b2b7bcfd2769be8
|
||||
EBUILD net-http-pipeline-1.0.1.ebuild 439 SHA256 1d6fec8af6540446672ab162ef991117f1465bed8b0e45b998229d88133ea966 SHA512 ce7961e3d5a73ad07b5dab3b6b7bcd2c52c27534cc39ae731ae0dc202a6ec515214b7f3435334a8eafac01c770f37d8af94217643d24cdeab717f5a5a416b0d7 WHIRLPOOL 27fcf493c7c1c9585b5e2fdcbd746c1abad570a6c3c8d1d1a8be3ab8f5705969ce9321134692358a933407b64a2a4953fa158cad97b73fbfe26be472693ad34a
|
||||
MISC ChangeLog 343 SHA256 4c77bdc805172f34cdb5cb43cbcfd3b67b4745354083b114950fe712d73ce43c SHA512 3736cda571ff65ef5f550c8f962cf8ece3a8244bf21e44d752e49ef208fdf09f3e66ac506146ce9a634c004991eba46b998cdeeb21352df9444c3d2fc536aa17 WHIRLPOOL 667a67d968b8fee79ae9a1a684a60bc8da54f904122e28f8026775759cadbb9d6bffc616c4773a3229bbd95c12f61e20e005b9442ceb84faaf0f6491600bd850
|
||||
EBUILD net-http-pipeline-1.0.1.ebuild 499 SHA256 5005f1b444a3948785594d01910a9739d348ca538fadce2bc34bc05214ddd782 SHA512 8f6ea33e064a4b43bfa79b6ba7398c48f3978facb967b2828b36c5f6cdae4e2c558e29a32346de936aef5b3a2eb75887941e2b197f2bf252f1e7f9883397560f WHIRLPOOL abbc82efd316f22a13f8b4293d737e016179ffa6128a609753500b43ed1fcf128c0d3533c9920d8107f7c6c36f6a4202b767cc1fcaeba679230e48fe80513d9a
|
||||
MISC ChangeLog 544 SHA256 049728a415b13d6b4db0de82074a949e7939f0a544fa6518cdaa18cb12e4e94f SHA512 f60ff7076134e9f102495a0444f1c8865a003531064153dc576e4464ec3014aea459cd0f15a92b89356d227f7625e797f335e2c0b9ea49d871759cffa324674f WHIRLPOOL a4241a4b1b62efc5622d3821bf48990da1b7cf5cfab9a6737277fa241756284ee1549a5a9231482fed94eb253225bb6832d81932ec36b7a2fc0535c86df85004
|
||||
MISC metadata.xml 347 SHA256 80e79512abd88bc875333a7a3bc03d5dc7e5afc8a11d0108394f3df6280950c7 SHA512 6dcbad5588fb9362b1be0ce300b0032ac5f83fc5216257a4af079e8b327d25db1494809a9596b8684bee95654dcab8037f9218db0581a3ec2ade8d3563bd7121 WHIRLPOOL 2c664de8dbeae37aa956c946a85b4fc03bdef9c62bbdaa8c8f8ec57a6c3e1d99fb7e99131ac2df4987b66ebe6ed633cbabf033602b0701218d1792ccc385a9b9
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
--- test/test_net_http_pipeline.rb.old 2016-11-17 07:58:57.284997283 +0100
|
||||
+++ test/test_net_http_pipeline.rb 2016-11-17 07:58:50.345168508 +0100
|
||||
@@ -96,6 +96,7 @@
|
||||
def http_get
|
||||
get = []
|
||||
get << 'GET / HTTP/1.1'
|
||||
+ get << 'Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
|
||||
get << 'Accept: */*'
|
||||
get << 'User-Agent: Ruby' if RUBY_VERSION > '1.9'
|
||||
get.push nil, nil
|
||||
@@ -106,6 +107,7 @@
|
||||
def http_post
|
||||
get = []
|
||||
get << 'POST / HTTP/1.1'
|
||||
+ get << 'Accept-Encoding: gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
|
||||
get << 'Accept: */*'
|
||||
get << 'User-Agent: Ruby' if RUBY_VERSION > '1.9'
|
||||
get.push nil, nil
|
||||
@ -1,9 +1,11 @@
|
||||
DIST spring-1.6.4.tar.gz 39370 SHA256 d7584ecb01fb980451c12d65bbb0175c7b15fb3bf8c117058145de5ecc8c349b SHA512 9dffdcef750bd25028761da8e69c44ae3eace843dff9f81d5566085d3a8c7f944f4c99b6d455078ff564b7135116ae38dcf1aaf6dcc127ac351eae85e15dc143 WHIRLPOOL b7fd0e1520b77e1dc150f270e1cb222915ab98322b9ec0f75242fbfeceec7bd6155262a2fdeee8cf8c5651e9b03e1ce441159042c877675ddc3c4e07fbb2e1cb
|
||||
DIST spring-1.7.1.tar.gz 41162 SHA256 36f422666a20cd9ae930993f14056e9072e350a24025a26cc5ec59c76725ec33 SHA512 bf561ae5c9bb5e9f6af640c42bedd0e4992713b90c42e984491d77002c729ffa51723b7f691d14443531243150e37f8bfb67cca1f06aefd4c76548f66728103f WHIRLPOOL f934c5484d27a1d54eaf305d604f006d7ef2797b6209de1e6e4802e6ebdddc85f59c6891b5bafde4878d0c8d99f6d5b94738f987320976f7cf49a23769d24924
|
||||
DIST spring-1.7.2.tar.gz 41340 SHA256 652c12950a04b3f342428137b7167bf579b73cb04c7b72e48fa2eacb8047a5b5 SHA512 737bdd3597eeef2c2a832a4060c626f83fe2bc3d6941421c8451408bbbb6392cfe91f408d9e5cceadfcda03d62a589b6758da6d9c029f5336fca5130e6b6857e WHIRLPOOL a00867a08b99d6207063ef8dabc69a488308ad72e8a6986409ccd4f185cd8e6f3b665bef352bce53db9ca1098a7e8fd5fdd6bb76c321b6934ce7d9b5b9a1e962
|
||||
DIST spring-2.0.0.tar.gz 41972 SHA256 5bc0d1c7a05654cad6821da66b3e224a839b8ed44dba0fadd0d6d596238e0990 SHA512 8e26ebc33289341c5716002d575eb52b004a7e0f3c5bc657f8afabac2f596f03630cb8be172d8a00d7f68e9b7cda373cc0c3fef404b9082c6dae2375398b1f5d WHIRLPOOL 8c32d4773bf4a0429eb0d6ebf643e7de44152348897fabcf1a607911502069f9136193a10bb6dbc5d4495e29105279e127a1d8b62c5b6b40130e7f6d0599f15c
|
||||
EBUILD spring-1.6.4.ebuild 836 SHA256 aaf5c7446a262893ab9858439d02b456e21cc6461886854b0b1c33dbdc578b1c SHA512 96ac8420609153e17b95f1f1d6c9ae7e3aa53e308bdbb72faa285bbba3d258405a84c76f680c1e0366d89558d36f8926251a1744ca9e676508b07be074a29821 WHIRLPOOL bafad02dc6f545262aa7ad292e78e4cb0ec954b45d3ab9004421cac98a2b6a04fe0fa07280bcb52968a3ae942f54129f4c68739e2633d94ae7b77c64efa495b1
|
||||
EBUILD spring-1.7.1.ebuild 836 SHA256 aaf5c7446a262893ab9858439d02b456e21cc6461886854b0b1c33dbdc578b1c SHA512 96ac8420609153e17b95f1f1d6c9ae7e3aa53e308bdbb72faa285bbba3d258405a84c76f680c1e0366d89558d36f8926251a1744ca9e676508b07be074a29821 WHIRLPOOL bafad02dc6f545262aa7ad292e78e4cb0ec954b45d3ab9004421cac98a2b6a04fe0fa07280bcb52968a3ae942f54129f4c68739e2633d94ae7b77c64efa495b1
|
||||
EBUILD spring-1.7.2.ebuild 843 SHA256 6965b8b8674d921a5c4b6563170ba80442f1ee7c22a01d2008ff1046bd71083c SHA512 88b54b58b459a5edec48155946501c1d9a578dc2e27a9ed4513591054370c69bd1082f79820d3287b58be38f45607fff944a78855c686de49d9d9c04309c1b4e WHIRLPOOL e7b285abad756c2fbff8af21c5fc562c72162f7fd4ccb08ce968a0bd1372b8556dc3c3a80068259739752d3f4af420cf55ed9578576499f840d4f7cdfa5a667a
|
||||
MISC ChangeLog 5802 SHA256 c2feb8c4516d32953291aa07882791199ab81ae8e6df8eb33675142bf28f44cd SHA512 97e3d72cf12385c15c31de7290e04e4614efc6cfcf31fc40586b8b48c478082999b3b36fcff9e9f83f0adcb489ef934f5a77dd5b161272c774ebf24e70d20019 WHIRLPOOL a481671014191e9e09155b27cabf9c14de6897afa245c3beb982e38bdbf91239c416dc2daa4f7263ed638f0351a6128c467466677259f3c27c0a08ff2ec71f66
|
||||
EBUILD spring-2.0.0.ebuild 848 SHA256 d6e8d161d6903c45e6ba2053b9a3984eb15bfe8dd3acee1963dd4027639dc1a9 SHA512 5af49bdc8d788bb29aa2d04003b6e76879ea4a3516a569f430de5c83d8fe2fc1341398787d4edd35902dfbc25d5b47cc1c1b01f79b7df7f092aead46ef674ad9 WHIRLPOOL 6c63f5b4d9699138dd464f8d76fdb3b524fe85d609316a4a6bcc695f3f95404750a4e07b2cf1da655320ff120ad14c26564ef5b482a7e4105d4dbd31b06ba7eb
|
||||
MISC ChangeLog 6070 SHA256 6cb64bf878c5589441ad14e814394426d21f4580f734d3a86dac2809c9b05afb SHA512 1ecf93129ced9e40e0b8585c406b2e98c3939a300342dd758d4a612efebe112fe4a2e59dcb527336cbf0382fcf67f0264407664005ceb016bfa3131e1abb9206 WHIRLPOOL 58e637d792a4e92674c501ddaab3843e1b54fc64876fa99b69f31c01af6384e7528475605dca668c66f9c06e3d625d43b88f7d82ee8647559cf55aa27a058b12
|
||||
MISC ChangeLog-2015 806 SHA256 4a8ee4aacd085a092f32cd4aa4b021a3002c6d2ec633af08047111a89ad35e87 SHA512 8e2e89882e6de42528b870862255675d890afc9a633752ad2cf56eab9336e45e14d915310bd6f368fa057af63e3b76f4328e423b1dd08d492a5abfdffac52498 WHIRLPOOL add342ee682dddecddac1e2d1e939ad4a548d9da7e385f9cbca9d88e2ee7b0609c050bd9d3ff886b0978e6ac130f4d780dfca04b21ef2e462a7000bf46d8c08b
|
||||
MISC metadata.xml 338 SHA256 641ecba16397a93ee25e1a4100dd4509351f1533b926af98e2e0476fa7b65235 SHA512 ed274c75491299ebefa755f0776c8895c7640101c22652f92defadb839d0a476a0e00ad407d1769a62f20d56da532f750bf639e7f5d75831c50f2957c17cc9c8 WHIRLPOOL 99298521e0757fa9956bbefce3be95a980c24fa8574701f1808da0dee9e7af8b50cca56307362d96e39756f06a0dee389426692aef9f7f2f6622c35b7b367a5d
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="test:unit"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Rails application preloader"
|
||||
HOMEPAGE="https://github.com/rails/spring"
|
||||
SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="1.1"
|
||||
KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*"
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e '/files/d' \
|
||||
-e '/bump/d' ${PN}.gemspec || die
|
||||
sed -i -e '/bump/d' Rakefile || die
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -urN ./bakefile-0.2.6.orig/src/bottlenecks.c ./bakefile-0.2.6/src/bottlenecks.c
|
||||
--- ./bakefile-0.2.6.orig/src/bottlenecks.c 2009-03-26 20:34:42.000000000 +0100
|
||||
+++ ./bakefile-0.2.6/src/bottlenecks.c 2009-07-21 22:36:18.111411153 +0200
|
||||
@@ -37,7 +37,7 @@
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
#define TEXTBUF_COUNT 8
|
||||
-#define TEXTBUF_SIZE 102400
|
||||
+#define TEXTBUF_SIZE 120000
|
||||
|
||||
static char *textbuf[TEXTBUF_COUNT] =
|
||||
{NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
|
||||
@ -1,91 +0,0 @@
|
||||
--- a/src/include/scripting/bindings/sc_base_types.h
|
||||
+++ b/src/include/scripting/bindings/sc_base_types.h
|
||||
@@ -33,6 +33,7 @@ DECLARE_INSTANCE_TYPE(wxPoint);
|
||||
DECLARE_INSTANCE_TYPE(wxSize);
|
||||
DECLARE_INSTANCE_TYPE(wxString);
|
||||
|
||||
+using SqPlus::GetTypeName;
|
||||
// C::B primitives and types
|
||||
DECLARE_INSTANCE_TYPE(ConfigManager);
|
||||
DECLARE_INSTANCE_TYPE(EditorManager);
|
||||
@@ -59,6 +60,7 @@ namespace SqPlus \
|
||||
inline T Get(TypeWrapper<T>,HSQUIRRELVM v,int idx) { SQInteger i; SQPLUS_CHECK_GET(sq_getinteger(v,idx,&i)); return (T)i; } \
|
||||
}
|
||||
|
||||
+using SqPlus::Push;
|
||||
DECLARE_ENUM_TYPE(wxPathFormat);
|
||||
DECLARE_ENUM_TYPE(wxPathNormalize);
|
||||
DECLARE_ENUM_TYPE(PrintColourMode);
|
||||
--- /dev/null
|
||||
+++ b/src/include/scripting/squirrel/sqmem.h
|
||||
@@ -0,0 +1,8 @@
|
||||
+/* see copyright notice in squirrel.h */
|
||||
+#ifndef _SQMEM_H_
|
||||
+#define _SQMEM_H_
|
||||
+
|
||||
+void *sq_vm_malloc(SQUnsignedInteger size);
|
||||
+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
|
||||
+void sq_vm_free(void *p,SQUnsignedInteger size);
|
||||
+#endif //_SQMEM_H_
|
||||
--- a/src/include/scripting/squirrel/sqstate.h
|
||||
+++ b/src/include/scripting/squirrel/sqstate.h
|
||||
@@ -136,8 +136,4 @@ extern SQObjectPtr _one_;
|
||||
extern SQObjectPtr _minusone_;
|
||||
|
||||
bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
|
||||
-
|
||||
-void *sq_vm_malloc(SQUnsignedInteger size);
|
||||
-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
|
||||
-void sq_vm_free(void *p,SQUnsignedInteger size);
|
||||
#endif //_SQSTATE_H_
|
||||
--- a/src/include/scripting/squirrel/squtils.h
|
||||
+++ b/src/include/scripting/squirrel/squtils.h
|
||||
@@ -2,6 +2,7 @@
|
||||
#ifndef _SQUTILS_H_
|
||||
#define _SQUTILS_H_
|
||||
|
||||
+#include "sqmem.h"
|
||||
#define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
|
||||
#define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
|
||||
#define SQ_MALLOC(__size) sq_vm_malloc((__size));
|
||||
--- a/src/plugins/contrib/help_plugin/defs.h
|
||||
+++ b/src/plugins/contrib/help_plugin/defs.h
|
||||
@@ -289,7 +289,7 @@ class QMap : public std::map<Key, T>
|
||||
|
||||
if (i.second == false && overwrite)
|
||||
{
|
||||
- find(k)->second = t;
|
||||
+ this->find(k)->second = t;
|
||||
}
|
||||
|
||||
return i.first;
|
||||
@@ -297,7 +297,7 @@ class QMap : public std::map<Key, T>
|
||||
|
||||
int remove(const Key &k)
|
||||
{
|
||||
- return erase(k);
|
||||
+ return this->erase(k);
|
||||
}
|
||||
};
|
||||
|
||||
--- a/src/plugins/contrib/help_plugin/man2html.cpp
|
||||
+++ b/src/plugins/contrib/help_plugin/man2html.cpp
|
||||
@@ -123,7 +123,7 @@
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
-//#include <unistd.h>
|
||||
+#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <stdio.h>
|
||||
--- a/src/plugins/debuggergdb/gdb_driver.cpp
|
||||
+++ b/src/plugins/debuggergdb/gdb_driver.cpp
|
||||
@@ -72,6 +72,7 @@ static wxRegEx reChildPid3(_T("Thread[ \t]+[xA-Fa-f0-9-]+[ \t]+\\(LWP ([0-9]+)\\
|
||||
|
||||
|
||||
// scripting support
|
||||
+using SqPlus::Push;
|
||||
DECLARE_INSTANCE_TYPE(GDB_driver);
|
||||
|
||||
GDB_driver::GDB_driver(DebuggerGDB* plugin)
|
||||
@ -1,34 +0,0 @@
|
||||
codeblocks crashes when a wxChartCtrl is added with wxSmith
|
||||
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=372837
|
||||
https://developer.berlios.de/bugs/?func=detailbug&bug_id=18182&group_id=5358
|
||||
|
||||
|
||||
--- a/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
|
||||
+++ b/src/plugins/contrib/wxSmithContribItems/wxchart/wxchart-1.0/src/chartwindow.cpp
|
||||
@@ -156,7 +156,13 @@ void wxChartWindow::DrawHLines(
|
||||
}
|
||||
|
||||
wxChartSizes *sizes = GetSizes();
|
||||
-
|
||||
+
|
||||
+ // sizes may be NULL, in this case do nothing
|
||||
+ // not sure if this is the right way to do things
|
||||
+ // gw.fossdev@gmail.com
|
||||
+ if (!sizes)
|
||||
+ return;
|
||||
+
|
||||
hp->SetPen( *wxBLACK_DASHED_PEN );
|
||||
|
||||
double current = lower;
|
||||
@@ -188,6 +194,10 @@ ChartValue wxChartWindow::GetVirtualWidth() const
|
||||
int iNodes = static_cast<int>(ceil( GetVirtualMaxX() ));
|
||||
wxChartSizes *sizes = GetSizes();
|
||||
|
||||
+ /// sizes may be NULL, in this case return a fixes value
|
||||
+ if (!sizes)
|
||||
+ return 1;
|
||||
+
|
||||
ChartValue x = 0;
|
||||
|
||||
for ( int iNode = 0; iNode <= iNodes; ++ iNode )
|
||||
@ -1,128 +0,0 @@
|
||||
--- savagewheels-1.6.0/CMakeLists.txt.old 2016-04-02 16:45:40.416146450 -0700
|
||||
+++ savagewheels-1.6.0/CMakeLists.txt 2016-04-02 16:57:14.930931857 -0700
|
||||
@@ -9,22 +9,33 @@ set(APP_VER_PATCH "0")
|
||||
|
||||
### check for required libs
|
||||
find_package(SDL REQUIRED)
|
||||
|
||||
### Install targets (see: http://www.cmake.org/Wiki/CMake_RPATH_handling)
|
||||
-if (NOT INSTALL_DIR)
|
||||
- set(INSTALL_DIR "./")
|
||||
+if (UNIX)
|
||||
+ include (GNUInstallDirs)
|
||||
+else()
|
||||
+ if (NOT INSTALL_DIR)
|
||||
+ set(INSTALL_DIR "./")
|
||||
+ endif()
|
||||
+ set(CMAKE_INSTALL_BINDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_SBINDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_LIBEXECDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_SYSCONFDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_SHAREDSTATEDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_LOCALSTATEDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_LIBDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_INCLUDEDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_OLDINCLUDEDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_DATAROOTDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_DATADIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_INFODIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_LOCALEDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_MANDIR "${INSTALL_DIR}")
|
||||
+ set(CMAKE_INSTALL_DOCDIR "${INSTALL_DIR}")
|
||||
endif()
|
||||
|
||||
-# when building, don't use the install RPATH already
|
||||
-# (but later on when installing)
|
||||
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
|
||||
-
|
||||
-# add the automatically determined parts of the RPATH
|
||||
-SET(CMAKE_INSTALL_RPATH "${INSTALL_DIR}/")
|
||||
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
-
|
||||
### sources
|
||||
include_directories(src/)
|
||||
include_directories(tinyxml/)
|
||||
|
||||
set(
|
||||
@@ -113,11 +124,11 @@ if (SOUND STREQUAL "NO")
|
||||
message(STATUS "Found SOUND=NO option. Compiling without sound support!")
|
||||
elseif(SOUND STREQUAL "FMOD")
|
||||
# FModEx API
|
||||
|
||||
# check if path to FMod is defined
|
||||
- if(NOT DEFINED ${FMOD_PATH})
|
||||
+ if(NOT DEFINED FMOD_PATH)
|
||||
set(FMOD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libs/fmod/api")
|
||||
endif()
|
||||
|
||||
add_definitions(-I${FMOD_PATH}/inc)
|
||||
link_directories(${FMOD_PATH}/lib)
|
||||
@@ -164,17 +175,19 @@ elseif(SOUND STREQUAL "FMOD")
|
||||
else()
|
||||
message(STATUS "Found FModEx lib at ${FMOD_LIBRARY}. Found FModEx DLL at ${FMOD_LIBRARY_SO_PATH}.")
|
||||
|
||||
add_definitions(-DWITH_FMOD)
|
||||
|
||||
- add_custom_command(TARGET savagewheels POST_BUILD
|
||||
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
- ${FMOD_LIBRARY_SO_PATH}
|
||||
- $<TARGET_FILE_DIR:savagewheels>)
|
||||
-
|
||||
- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${FMOD_SO_NAME}"
|
||||
- DESTINATION ${INSTALL_DIR})
|
||||
+ if (WIN32)
|
||||
+ add_custom_command(TARGET savagewheels POST_BUILD
|
||||
+ COMMAND "${CMAKE_COMMAND}" -E copy_if_different
|
||||
+ "${FMOD_LIBRARY_SO_PATH}"
|
||||
+ "$<TARGET_FILE_DIR:savagewheels>")
|
||||
+
|
||||
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${FMOD_SO_NAME}"
|
||||
+ DESTINATION "${INSTALL_DIR}")
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
else()
|
||||
# SDL_mixer API
|
||||
find_package(SDL_mixer REQUIRED)
|
||||
@@ -234,19 +247,36 @@ endif()
|
||||
### Configure compile time header file
|
||||
configure_file (
|
||||
"${PROJECT_SOURCE_DIR}/Config.h.in"
|
||||
"${PROJECT_SOURCE_DIR}/src/Config.h")
|
||||
|
||||
-INSTALL(TARGETS savagewheels RUNTIME DESTINATION ${INSTALL_DIR})
|
||||
-INSTALL(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/run.sh" DESTINATION ${INSTALL_DIR})
|
||||
+
|
||||
+INSTALL(TARGETS savagewheels RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}")
|
||||
+if (WIN32 AND NOT UNIX)
|
||||
+ INSTALL(PROGRAMS "${CMAKE_CURRENT_SOURCE_DIR}/run.sh" DESTINATION "${INSTALL_DIR}")
|
||||
+else()
|
||||
+ configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/savagewheels.in"
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/savagewheels.sh"
|
||||
+ @ONLY)
|
||||
+ INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/savagewheels.sh"
|
||||
+ DESTINATION "${CMAKE_INSTALL_BINDIR}" RENAME savagewheels)
|
||||
+endif()
|
||||
+
|
||||
INSTALL(FILES
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/README.md"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/HISTORY"
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/bin/LICENSE.mikmod.txt"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/bin/Readme.html"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/bin/README-SDL_mixer.txt"
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/bin/README-SDL.txt"
|
||||
- DESTINATION ${INSTALL_DIR})
|
||||
+ DESTINATION "${CMAKE_INSTALL_DOCDIR}")
|
||||
-INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/"
|
||||
- DESTINATION ${INSTALL_DIR}
|
||||
+INSTALL(FILES
|
||||
+ "${CMAKE_CURRENT_SOURCE_DIR}/bin/bindings.xml"
|
||||
+ DESTINATION "${CMAKE_INSTALL_DATADIR}")
|
||||
+INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin/help"
|
||||
+ DESTINATION "${CMAKE_INSTALL_DOCDIR}/help"
|
||||
PATTERN "debug.html" EXCLUDE
|
||||
PATTERN "pref" EXCLUDE)
|
||||
|
||||
### build a CPack driven installer package
|
||||
include (InstallRequiredSystemLibraries)
|
||||
@ -1,359 +0,0 @@
|
||||
--- savagewheels-1.6.0/src/Main.cpp.old 2016-04-14 21:18:38.115071742 -0700
|
||||
+++ savagewheels-1.6.0/src/Main.cpp 2016-04-14 22:01:42.375422000 -0700
|
||||
@@ -43,10 +43,17 @@
|
||||
* Alpha Release: 29.06.2003
|
||||
*/
|
||||
|
||||
#include "Main.h"
|
||||
|
||||
+const char *sys_datadir;
|
||||
+const char *usr_cfgdir;
|
||||
+const char *usr_datadir;
|
||||
+
|
||||
+char *ART_FILE;
|
||||
+char *BINDINGS_FILE;
|
||||
+
|
||||
int main( int argc, char *argv[] )
|
||||
{
|
||||
bool hardware_support = true;
|
||||
/*
|
||||
* Start the game in a window by default.
|
||||
@@ -57,16 +64,92 @@ int main( int argc, char *argv[] )
|
||||
* Linux Note: Running the game in fullscreen would sometimes crash the gfx manager.
|
||||
* This is probably due to some video drivers. I was so far able to reproduce it on
|
||||
* ATI Mobility type of video cards.
|
||||
*/
|
||||
bool fullscreen = false;
|
||||
+ String tmp;
|
||||
|
||||
#ifdef LINUX_BUILD
|
||||
+ sys_datadir = getenv("SAVAGEWHEELS_SYS_DATADIR");
|
||||
+ if (sys_datadir == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "SAVAGEWHEELS_SYS_DATADIR not set.\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+ sys_datadir = strdup(sys_datadir);
|
||||
+
|
||||
+ usr_cfgdir = getenv("SAVAGEWHEELS_USR_CONFDIR");
|
||||
+ if (usr_cfgdir == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "SAVAGEWHEELS_USR_CONFDIR not set.\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+ usr_cfgdir = strdup(usr_cfgdir);
|
||||
+
|
||||
+ usr_datadir = getenv("SAVAGEWHEELS_USR_DATADIR");
|
||||
+ if (usr_datadir == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "SAVAGEWHEELS_USR_DATADIR not set.\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+ usr_datadir = strdup(usr_datadir);
|
||||
+
|
||||
+ if (sys_datadir == NULL || usr_cfgdir == NULL || usr_datadir == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "Insufficient memory. Execution aborted.\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
setenv("SDL_VIDEO_CENTERED", "1", 1);
|
||||
#else
|
||||
+ sys_datadir = usr_cfgdir = usr_datadir = "./";
|
||||
_putenv("SDL_VIDEO_CENTERED=1");
|
||||
#endif
|
||||
+ int len;
|
||||
+ len = snprintf(NULL, 0, "%s/graphics/gfxdata.kdf", sys_datadir);
|
||||
+ if (len < 0)
|
||||
+ {
|
||||
+ fprintf(stderr,
|
||||
+ "Unable to store '%s/graphics/gfxdata.kdf': %s\n",
|
||||
+ sys_datadir, strerror(errno));
|
||||
+ return 1;
|
||||
+ }
|
||||
+ if (len == INT_MAX)
|
||||
+ {
|
||||
+ fprintf(stderr, "Unable to store '%s/graphics/gfxdata.kdf': "
|
||||
+ "Path too log\n", sys_datadir);
|
||||
+ return 1;
|
||||
+ }
|
||||
+ ART_FILE = new (std::nothrow) char[len + 1];
|
||||
+ if (ART_FILE == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "Insufficent memory. Execution aborted.\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+ sprintf(ART_FILE, "%s/graphics/gfxdata.kdf", sys_datadir);
|
||||
+
|
||||
+ len = snprintf(NULL, 0, "%s/bindings.xml", usr_cfgdir);
|
||||
+ if (len < 0)
|
||||
+ {
|
||||
+ fprintf(stderr,
|
||||
+ "Unable to store '%s/bindings.xml': %s\n", usr_cfgdir,
|
||||
+ strerror(errno));
|
||||
+ return 1;
|
||||
+ }
|
||||
+ if (len == INT_MAX)
|
||||
+ {
|
||||
+ fprintf(stderr, "Unable to store '%s/bindings.xml': "
|
||||
+ "Path too log\n", usr_cfgdir);
|
||||
+ return 1;
|
||||
+ }
|
||||
+ BINDINGS_FILE = new (std::nothrow) char[len + 1];
|
||||
+ if (BINDINGS_FILE == NULL)
|
||||
+ {
|
||||
+ fprintf(stderr, "Insufficent memory. Execution aborted.\n");
|
||||
+ return 1;
|
||||
+ }
|
||||
+ sprintf(BINDINGS_FILE, "%s/bindings.xml", usr_cfgdir);
|
||||
|
||||
if (argc > 1) {
|
||||
for (int i = 1; i < argc; i++) {
|
||||
if (!strncmp(argv[i], "-wnd", 4)) {
|
||||
fullscreen = false;
|
||||
@@ -104,11 +187,12 @@
|
||||
|
||||
/*
|
||||
* Load & Start Game
|
||||
*/
|
||||
|
||||
- OpenLog("debug.html");
|
||||
+ tmp = String(usr_datadir).append("/debug.html");
|
||||
+ OpenLog(tmp.c_str());
|
||||
|
||||
CGame game;
|
||||
game.Execute(fullscreen, hardware_support);
|
||||
game.Close();
|
||||
|
||||
--- savagewheels-1.6.0/src/Main.h.old 2016-04-14 21:20:27.443522441 -0700
|
||||
+++ savagewheels-1.6.0/src/Main.h 2016-04-14 21:56:22.449964486 -0700
|
||||
@@ -35,10 +35,11 @@
|
||||
#include <cstdlib>
|
||||
#include <cmath>
|
||||
#include <cstdarg>
|
||||
#include <cassert>
|
||||
#include <exception>
|
||||
+#include <cerrno>
|
||||
|
||||
#include <ctime>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/timeb.h>
|
||||
@@ -84,12 +85,10 @@
|
||||
|
||||
// --- version
|
||||
#include "Config.h"
|
||||
|
||||
// --- global game defines
|
||||
-#define ART_FILE "graphics/gfxdata.kdf"
|
||||
-#define BINDINGS_FILE "bindings.xml"
|
||||
#define LOAD_OK (-1)
|
||||
#define LOAD_FAILED (0)
|
||||
#define HRESULT(x) ( (x) == NULL : LOAD_OK ? LOAD_FAILED )
|
||||
#define NLPTR_SURF 0 //((SDL_Surface *)NULL)
|
||||
|
||||
@@ -100,10 +99,16 @@
|
||||
#endif
|
||||
|
||||
typedef std::string String;
|
||||
typedef std::ostringstream OutputSStream;
|
||||
|
||||
+extern const char *sys_datadir;
|
||||
+extern const char *usr_cfgdir;
|
||||
+extern const char *usr_datadir;
|
||||
+
|
||||
+extern char *ART_FILE;
|
||||
+extern char *BINDINGS_FILE;
|
||||
//#include "pstdint.h" // portable types
|
||||
#include "Utils.h"
|
||||
#include "CKdf.h"
|
||||
#include "CSdl.h"
|
||||
#include "CSwv_module.h"
|
||||
--- savagewheels-1.6.0/src/Utils.cpp.old 2016-04-15 19:28:21.757879157 -0700
|
||||
+++ savagewheels-1.6.0/src/Utils.cpp 2016-04-15 19:28:28.478786779 -0700
|
||||
@@ -261,11 +261,11 @@ inline String GetFormattedTime()
|
||||
bool OpenLog ( const char* filename )
|
||||
{
|
||||
String time( GetFormattedTime() );
|
||||
|
||||
// open debug file
|
||||
- debug_file.open ( "debug.html", std::ios::out ); //ios::ate );
|
||||
+ debug_file.open ( filename, std::ios::out ); //ios::ate );
|
||||
if ( ! debug_file.good() )
|
||||
return false;
|
||||
|
||||
debug_file << "<html><head><title>Savage Wheels Log File</title></head><body><h1>Savage Wheels V" << VER_MAJ << "." << VER_MIN << " - Log File</h1>";
|
||||
debug_file << "<hr/><pre>";
|
||||
--- savagewheels-1.6.0/src/CGame.cpp.old 2016-04-15 20:43:37.479330001 -0700
|
||||
+++ savagewheels-1.6.0/src/CGame.cpp 2016-04-15 21:04:48.044721904 -0700
|
||||
@@ -116,10 +116,11 @@ void CGame::Close()
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
bool CGame::LoadGame()
|
||||
{
|
||||
char buf[255];
|
||||
int i = 0;
|
||||
+ String tmp (sys_datadir);
|
||||
|
||||
AppendToLog( LOG_DASH );
|
||||
AppendToLog("Loading Game...");
|
||||
|
||||
// global screen rect
|
||||
@@ -161,11 +162,14 @@ bool CGame::LoadGame()
|
||||
srand( (unsigned)SDL_GetTicks() );
|
||||
|
||||
UpdateSplash(); // UPDATESPLASH...
|
||||
|
||||
// search for vehicles
|
||||
- if ( Swv.SearchAndLoad( "autos" ) != SWV_SUCCESS ) return false;
|
||||
+ tmp.resize(strlen(sys_datadir));
|
||||
+ tmp.append("/autos");
|
||||
+ if ( Swv.SearchAndLoad( tmp.c_str() ) != SWV_SUCCESS )
|
||||
+ return false;
|
||||
|
||||
// check for vehicle number
|
||||
if ( Swv.GetVehicles() < 4 )
|
||||
{
|
||||
AppendToLog( "Not enough vehicles in the /auto dir!" );
|
||||
--- savagewheels-1.6.0/src/CSdl.cpp.old 2016-04-16 16:00:56.600502348 -0700
|
||||
+++ savagewheels-1.6.0/src/CSdl.cpp 2016-04-16 16:01:16.152226435 -0700
|
||||
@@ -1298,13 +1298,10 @@
|
||||
return NULL;
|
||||
#else
|
||||
|
||||
SDL_Surface *sdl_surf = NULL;
|
||||
|
||||
- char filename_buf[255];
|
||||
- sprintf( filename_buf, "../%s", filename );
|
||||
-
|
||||
if ( ( sdl_surf = SDL_LoadBMP( filename_buf )) == NULL )
|
||||
{
|
||||
LOG("...failed to load graphics from : " << filename_buf );
|
||||
return NULL;
|
||||
}
|
||||
--- savagewheels-1.6.0/src/CSounds.cpp.old 2016-04-16 16:06:43.887600441 -0700
|
||||
+++ savagewheels-1.6.0/src/CSounds.cpp 2016-04-16 16:17:44.729332218 -0700
|
||||
@@ -46,22 +46,39 @@
|
||||
// Name: Initialize()
|
||||
// Desc: Load all ingame sounds
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
bool CSounds::Initialize( CSdl *pSdl )
|
||||
{
|
||||
- ASSERT( _sdl != NULL );
|
||||
+ ASSERT( pSdl != NULL );
|
||||
this->_sdl = pSdl;
|
||||
|
||||
#if defined(WITH_FMOD) || defined(WITH_SDLMIXER)
|
||||
+ String tmp (sys_datadir);
|
||||
|
||||
-#define LOAD_SOUND( container, name, buffered ) if ( (sounds[container] = _sdl->LoadSound( name, buffered )) == -1 ) { \
|
||||
- LOG( "Failed to load " << name << " ! "); \
|
||||
- return false; }
|
||||
+#define LOAD_SOUND( container, name, buffered) \
|
||||
+ do { \
|
||||
+ tmp.append("/").append(name); \
|
||||
+ sounds[container] = \
|
||||
+ _sdl->LoadSound( tmp.c_str(), buffered ); \
|
||||
+ if ( sounds[container] == -1 ) { \
|
||||
+ LOG( "Failed to load " << name << " ! " ); \
|
||||
+ return false; \
|
||||
+ } \
|
||||
+ tmp.resize(strlen(sys_datadir)); \
|
||||
+ } while(0)
|
||||
|
||||
-#define LOAD_MUSIC( container, name ) if ( (music[container] = _sdl->LoadSound( name, false, true )) == -1 ) { \
|
||||
- LOG( "Failed to load music " << name << " ! "); \
|
||||
- return false; }
|
||||
+#define LOAD_MUSIC( container, name) \
|
||||
+ do { \
|
||||
+ tmp.append("/").append(name); \
|
||||
+ music[container] = \
|
||||
+ _sdl->LoadSound( tmp.c_str(), false, true ); \
|
||||
+ if ( music[container] == -1 ) { \
|
||||
+ LOG( "Failed to load music " << name << " ! " ); \
|
||||
+ return false; \
|
||||
+ } \
|
||||
+ tmp.resize(strlen(sys_datadir)); \
|
||||
+ } while(0)
|
||||
|
||||
LOAD_SOUND( SND_CRASHLIGHT1, "sound/crash3.wav", true );
|
||||
LOAD_SOUND( SND_CRASHLIGHT2, "sound/crash2.wav", true );
|
||||
LOAD_SOUND( SND_CRASHLIGHT3, "sound/crash1.wav", true );
|
||||
LOAD_SOUND( SND_EXPLOSION1, "sound/exp.wav", true );
|
||||
--- savagewheels-1.6.0/src/CSwv_module.cpp.old 2016-04-16 20:58:04.366973388 -0700
|
||||
+++ savagewheels-1.6.0/src/CSwv_module.cpp 2016-04-16 20:58:13.026851358 -0700
|
||||
@@ -204,12 +204,10 @@ int CSwv_module::Load( char *filename, S
|
||||
// DBG("pos: " << swv_file->pfiles[i].pos
|
||||
// << " size (KB): " << swv_file->pfiles[i].length
|
||||
// << " name: " << swv_file->pfiles[i].filename);
|
||||
// }
|
||||
|
||||
- // set module filename
|
||||
- sprintf( swv_file->filename, "%s", filename );
|
||||
|
||||
if ( fp != NULL )
|
||||
fclose( fp );
|
||||
|
||||
return SWV_SUCCESS;
|
||||
--- savagewheels-1.6.0/src/CSdl.cpp.old 2016-04-16 21:02:07.680544534 -0700
|
||||
+++ savagewheels-1.6.0/src/CSdl.cpp 2016-04-16 21:06:59.400432874 -0700
|
||||
@@ -1336,12 +1339,25 @@ SDL_Surface* CSdl::LoadBitmap( const cha
|
||||
SDL_Surface* CSdl::LoadBitmap( const char *filename, int32_t file_offset, Uint32 file_size, Uint32 color_key, Uint16 alpha_value )
|
||||
{
|
||||
SDL_Surface *sdl_surf = NULL; // temp surface
|
||||
FILE *fp = NULL; // file pointer
|
||||
SDL_RWops *sdl_rw = NULL; // sdl_read_write_operations
|
||||
+ String tmp;
|
||||
|
||||
- if ( ( fp = fopen( filename, "rb")) == NULL )
|
||||
+#ifdef LINUX_BUILD
|
||||
+ if ( filename[0] != '/' )
|
||||
+ {
|
||||
+ tmp = String(sys_datadir).append("/autos/").append(filename);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ tmp = String(filename);
|
||||
+ }
|
||||
+#else
|
||||
+ tmp = String(filename);
|
||||
+#endif
|
||||
+ if ( ( fp = fopen( tmp.c_str(), "rb")) == NULL )
|
||||
{
|
||||
LOG("...failed to open file : " << filename );
|
||||
return NULL;
|
||||
}
|
||||
|
||||
--- savagewheels-1.6.0/src/CMainMenu.cpp.old 2016-04-16 22:13:23.442523534 -0700
|
||||
+++ savagewheels-1.6.0/src/CMainMenu.cpp 2016-04-16 22:13:17.701605381 -0700
|
||||
@@ -1121,12 +1121,13 @@ void CMainMenu::SaveSettings()
|
||||
if ( _game == NULL )
|
||||
return;
|
||||
|
||||
FILE *fp = NULL;
|
||||
char header[3] = { 'S', 'W', 'P' };
|
||||
+ String strPref(String(usr_cfgdir) + "/pref");
|
||||
|
||||
- if ( ( fp = fopen( "pref", "wb" ) ) == NULL )
|
||||
+ if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
|
||||
{
|
||||
AppendToLog( "Error writing to /pref file !" );
|
||||
return;
|
||||
}
|
||||
|
||||
--- savagewheels-1.6.0/src/CMainMenu.cpp.old 2016-04-17 07:38:09.417653268 -0700
|
||||
+++ savagewheels-1.6.0/src/CMainMenu.cpp 2016-04-17 07:38:24.277437113 -0700
|
||||
@@ -1168,12 +1167,13 @@ void CMainMenu::SaveSettings()
|
||||
void CMainMenu::LoadSettings()
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
char header[3];
|
||||
bool success = true;
|
||||
+ String strPref(String(usr_cfgdir) + "/pref");
|
||||
|
||||
- if ( ( fp = fopen( "pref", "rb" ) ) == NULL )
|
||||
+ if ( ( fp = fopen( strPref.c_str(), "wb" ) ) == NULL )
|
||||
{
|
||||
AppendToLog( "Error opening /pref file !" );
|
||||
success = false;
|
||||
}
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From 1515497ab88dc2452ed0db20a4610663cd04ff21 Mon Sep 17 00:00:00 2001
|
||||
From: comex <comexk@gmail.com>
|
||||
Date: Tue, 7 Jul 2015 07:49:46 -0400
|
||||
Subject: [PATCH] Make the LLVM detect script verify that the dynamic library actually exists.
|
||||
|
||||
For some dumb reason, llvm-config doesn't provide the flags to link
|
||||
against the dynamic library copy of LLVM (as opposed to static), so the
|
||||
script has to guess the library name. However, in some installations
|
||||
(such as mine), there is no dynamic copy, which caused Dolphin to fail
|
||||
to link. Change the script to do a link test. If it fails, one option
|
||||
would be to fall back on static linking, but I just have it fail to
|
||||
detect LLVM, because statically linking Dolphin against LLVM is really
|
||||
not a great idea - huge binary, long link time.
|
||||
---
|
||||
CMakeTests/FindLLVM.cmake | 12 +++++++++---
|
||||
1 file changed, 9 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeTests/FindLLVM.cmake b/CMakeTests/FindLLVM.cmake
|
||||
index 7fe664f..cfcfaed 100644
|
||||
--- a/CMakeTests/FindLLVM.cmake
|
||||
+++ b/CMakeTests/FindLLVM.cmake
|
||||
@@ -1,6 +1,9 @@
|
||||
# This file only exists because LLVM's cmake files are broken.
|
||||
# This affects both LLVM 3.4 and 3.5.
|
||||
# Hopefully when they fix their cmake system we don't need this garbage.
|
||||
+
|
||||
+include(CheckLibraryExists)
|
||||
+
|
||||
list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config")
|
||||
list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.5")
|
||||
list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.4")
|
||||
@@ -11,13 +14,16 @@ foreach(LLVM_CONFIG_NAME ${LLVM_CONFIG_EXECUTABLES})
|
||||
execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_PACKAGE_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE )
|
||||
if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.3")
|
||||
- set(LLVM_FOUND 1)
|
||||
execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE )
|
||||
execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE )
|
||||
- set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
|
||||
- break()
|
||||
+ check_library_exists(LLVM-${LLVM_PACKAGE_VERSION} LLVMVerifyFunction "${LLVM_LDFLAGS}" HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
|
||||
+ if (HAVE_DYNAMIC_LLVM_${LLVM_PACKAGE_VERSION})
|
||||
+ set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}")
|
||||
+ set(LLVM_FOUND 1)
|
||||
+ break()
|
||||
+ endif()
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
--
|
||||
2.6.2
|
||||
|
||||
@ -1,137 +0,0 @@
|
||||
From 8c5744bca705a0895bd51c966a30171ee2bab43a Mon Sep 17 00:00:00 2001
|
||||
From: Marisa Kirisame <marisa@sayachan.org>
|
||||
Date: Tue, 29 Sep 2015 23:10:31 +0200
|
||||
Subject: [PATCH] miniupnpc API version 14 changed the upnpDiscover functions,
|
||||
adding an argument for TTL (should default to 2) this enables support for
|
||||
that should the build system have that specific version installed, the
|
||||
miniupnpc bundled in the project is unchanged
|
||||
|
||||
---
|
||||
CMakeLists.txt | 5 ++++-
|
||||
CMakeTests/FindMiniupnpc.cmake | 39 +++++++++++++++++++++++++++++++++-----
|
||||
Source/Core/Core/NetPlayServer.cpp | 4 ++++
|
||||
3 files changed, 42 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 291efee..7ac0679 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -690,9 +690,12 @@ if(USE_UPNP)
|
||||
if(NOT APPLE AND NOT ANDROID)
|
||||
include(FindMiniupnpc)
|
||||
endif()
|
||||
- if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+ if(MINIUPNP_FOUND AND (MINIUPNPC_VERSION_1_7_OR_HIGHER OR MINIUPNPC_VERSION_API14_OR_HIGHER))
|
||||
message("Using shared miniupnpc")
|
||||
include_directories(${MINIUPNP_INCLUDE_DIR})
|
||||
+ if (MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
+ add_definitions(-DUPNPDISCOVER_HAS_TTL)
|
||||
+ endif()
|
||||
else()
|
||||
message("Using static miniupnpc from Externals")
|
||||
add_subdirectory(Externals/miniupnpc)
|
||||
diff --git a/CMakeTests/FindMiniupnpc.cmake b/CMakeTests/FindMiniupnpc.cmake
|
||||
index bb1048c..5301d40 100644
|
||||
--- a/CMakeTests/FindMiniupnpc.cmake
|
||||
+++ b/CMakeTests/FindMiniupnpc.cmake
|
||||
@@ -58,6 +58,30 @@ if (MINIUPNP_FOUND)
|
||||
#include <stdio.h>
|
||||
int main()
|
||||
{
|
||||
+ struct UPNPDev *devlist = NULL;
|
||||
+ int upnp_delay = 5000;
|
||||
+ const char *upnp_multicastif = NULL;
|
||||
+ const char *upnp_minissdpdsock = NULL;
|
||||
+ int upnp_sameport = 0;
|
||||
+ int upnp_ipv6 = 0;
|
||||
+ unsigned char upnp_ttl = 2;
|
||||
+ int upnp_error = 0;
|
||||
+ devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
|
||||
+
|
||||
+ return 0;
|
||||
+ }"
|
||||
+ MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
+
|
||||
+IF (NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
+ set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
|
||||
+ set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
|
||||
+ check_cxx_source_runs("
|
||||
+ #include <miniwget.h>
|
||||
+ #include <miniupnpc.h>
|
||||
+ #include <upnpcommands.h>
|
||||
+ #include <stdio.h>
|
||||
+ int main()
|
||||
+ {
|
||||
static struct UPNPUrls urls;
|
||||
static struct IGDdatas data;
|
||||
|
||||
@@ -66,8 +90,9 @@ if (MINIUPNP_FOUND)
|
||||
return 0;
|
||||
}"
|
||||
MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+ ENDIF()
|
||||
|
||||
-IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
|
||||
check_cxx_source_runs("
|
||||
@@ -91,7 +116,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
MINIUPNPC_VERSION_PRE1_7)
|
||||
ENDIF()
|
||||
|
||||
- IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+ IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
|
||||
check_cxx_source_runs("
|
||||
@@ -116,7 +141,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
|
||||
ENDIF()
|
||||
|
||||
- IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+ IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
|
||||
check_cxx_source_runs("
|
||||
@@ -136,7 +161,7 @@ IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
MINIUPNPC_VERSION_1_5_OR_HIGHER)
|
||||
ENDIF()
|
||||
|
||||
- IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+ IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
|
||||
check_cxx_source_runs("
|
||||
@@ -167,10 +192,14 @@ IF(MINIUPNPC_VERSION_PRE1_7)
|
||||
message(STATUS "Found miniupnpc version is pre v1.7")
|
||||
ENDIF()
|
||||
|
||||
-IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
|
||||
+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_API14_OR_HIGHER)
|
||||
message(STATUS "Found miniupnpc version is v1.7 or higher")
|
||||
ENDIF()
|
||||
|
||||
+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
|
||||
+ message(STATUS "Found miniupnpc version is v1.9 API version 14 or higher")
|
||||
+ENDIF()
|
||||
+
|
||||
else ()
|
||||
message (STATUS "Could not find miniupnp")
|
||||
endif ()
|
||||
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
|
||||
index 7ed283a..27b46c9 100644
|
||||
--- a/Source/Core/Core/NetPlayServer.cpp
|
||||
+++ b/Source/Core/Core/NetPlayServer.cpp
|
||||
@@ -904,7 +904,11 @@ bool NetPlayServer::initUPnP()
|
||||
memset(&m_upnp_data, 0, sizeof(IGDdatas));
|
||||
|
||||
// Find all UPnP devices
|
||||
+#ifdef UPNPDISCOVER_HAS_TTL
|
||||
+ UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &upnperror);
|
||||
+#else
|
||||
UPNPDev *devlist = upnpDiscover(2000, nullptr, nullptr, 0, 0, &upnperror);
|
||||
+#endif
|
||||
if (!devlist)
|
||||
{
|
||||
WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
|
||||
@ -1,211 +0,0 @@
|
||||
--- Externals/Bochs_disasm/PowerPCDisasm.cpp 2013-05-04 10:01:04.218490222 +0200
|
||||
+++ Externals/Bochs_disasm/PowerPCDisasm.cpp 2013-05-04 10:01:19.159459773 +0200
|
||||
@@ -580,7 +580,7 @@
|
||||
if (me < mb)
|
||||
mask = ~mask;
|
||||
//rotate the mask so it can be applied to source reg
|
||||
- return _rotl(mask, 32 - r);
|
||||
+ return __rotl(mask, 32 - r);
|
||||
}
|
||||
|
||||
|
||||
--- Source/Core/Common/Src/CommonFuncs.h 2013-05-04 10:01:04.139490384 +0200
|
||||
+++ Source/Core/Common/Src/CommonFuncs.h 2013-05-04 10:02:18.181339068 +0200
|
||||
@@ -65,7 +65,7 @@
|
||||
#endif
|
||||
#define ARRAYSIZE(A) (sizeof(A)/sizeof((A)[0]))
|
||||
|
||||
-inline u32 _rotl(u32 x, int shift) {
|
||||
+inline u32 __rotl(u32 x, int shift) {
|
||||
shift &= 31;
|
||||
if (!shift) return x;
|
||||
return (x << shift) | (x >> (32 - shift));
|
||||
@@ -76,7 +76,7 @@
|
||||
return (x << n) | (x >> (64 - n));
|
||||
}
|
||||
|
||||
-inline u32 _rotr(u32 x, int shift) {
|
||||
+inline u32 __rotr(u32 x, int shift) {
|
||||
shift &= 31;
|
||||
if (!shift) return x;
|
||||
return (x >> shift) | (x << (32 - shift));
|
||||
--- Source/Core/Common/Src/Hash.cpp 2013-05-04 10:01:04.140490382 +0200
|
||||
+++ Source/Core/Common/Src/Hash.cpp 2013-05-04 10:01:19.161459756 +0200
|
||||
@@ -362,15 +362,15 @@
|
||||
inline void bmix32(u32 & h1, u32 & h2, u32 & k1, u32 & k2, u32 & c1, u32 & c2)
|
||||
{
|
||||
k1 *= c1;
|
||||
- k1 = _rotl(k1,11);
|
||||
+ k1 = __rotl(k1,11);
|
||||
k1 *= c2;
|
||||
h1 ^= k1;
|
||||
h1 += h2;
|
||||
|
||||
- h2 = _rotl(h2,17);
|
||||
+ h2 = __rotl(h2,17);
|
||||
|
||||
k2 *= c2;
|
||||
- k2 = _rotl(k2,11);
|
||||
+ k2 = __rotl(k2,11);
|
||||
k2 *= c1;
|
||||
h2 ^= k2;
|
||||
h2 += h1;
|
||||
--- Source/Core/Core/Src/ARDecrypt.cpp 2013-05-04 10:01:04.193490273 +0200
|
||||
+++ Source/Core/Core/Src/ARDecrypt.cpp 2013-05-04 10:01:19.161459756 +0200
|
||||
@@ -270,26 +270,26 @@
|
||||
{
|
||||
u32 tmp;
|
||||
|
||||
- *val = _rotl(*val,4);
|
||||
+ *val = __rotl(*val,4);
|
||||
|
||||
tmp = ((*addr^*val)&0xF0F0F0F0);
|
||||
*addr ^= tmp;
|
||||
- *val = _rotr((*val^tmp),0x14);
|
||||
+ *val = __rotr((*val^tmp),0x14);
|
||||
|
||||
tmp = ((*addr^*val)&0xFFFF0000);
|
||||
*addr ^= tmp;
|
||||
- *val = _rotr((*val^tmp),0x12);
|
||||
+ *val = __rotr((*val^tmp),0x12);
|
||||
|
||||
tmp = ((*addr^*val)&0x33333333);
|
||||
*addr ^= tmp;
|
||||
- *val = _rotr((*val^tmp),6);
|
||||
+ *val = __rotr((*val^tmp),6);
|
||||
|
||||
tmp = ((*addr^*val)&0x00FF00FF);
|
||||
*addr ^= tmp;
|
||||
- *val = _rotl((*val^tmp),9);
|
||||
+ *val = __rotl((*val^tmp),9);
|
||||
|
||||
tmp = ((*addr^*val)&0xAAAAAAAA);
|
||||
- *addr = _rotl((*addr^tmp),1);
|
||||
+ *addr = __rotl((*addr^tmp),1);
|
||||
*val ^= tmp;
|
||||
}
|
||||
|
||||
@@ -297,27 +297,27 @@
|
||||
{
|
||||
u32 tmp;
|
||||
|
||||
- *val = _rotr(*val,1);
|
||||
+ *val = __rotr(*val,1);
|
||||
|
||||
tmp = ((*addr^*val)&0xAAAAAAAA);
|
||||
*val ^= tmp;
|
||||
- *addr = _rotr((*addr^tmp),9);
|
||||
+ *addr = __rotr((*addr^tmp),9);
|
||||
|
||||
tmp = ((*addr^*val)&0x00FF00FF);
|
||||
*val ^= tmp;
|
||||
- *addr = _rotl((*addr^tmp),6);
|
||||
+ *addr = __rotl((*addr^tmp),6);
|
||||
|
||||
tmp = ((*addr^*val)&0x33333333);
|
||||
*val ^= tmp;
|
||||
- *addr = _rotl((*addr^tmp),0x12);
|
||||
+ *addr = __rotl((*addr^tmp),0x12);
|
||||
|
||||
tmp = ((*addr^*val)&0xFFFF0000);
|
||||
*val ^= tmp;
|
||||
- *addr = _rotl((*addr^tmp),0x14);
|
||||
+ *addr = __rotl((*addr^tmp),0x14);
|
||||
|
||||
tmp = ((*addr^*val)&0xF0F0F0F0);
|
||||
*val ^= tmp;
|
||||
- *addr = _rotr((*addr^tmp),4);
|
||||
+ *addr = __rotr((*addr^tmp),4);
|
||||
}
|
||||
|
||||
void decryptcode(u32 *seeds, u32 *code)
|
||||
@@ -330,11 +330,11 @@
|
||||
unscramble1(&addr,&val);
|
||||
while (i < 32)
|
||||
{
|
||||
- tmp = (_rotr(val,4)^seeds[i++]);
|
||||
+ tmp = (__rotr(val,4)^seeds[i++]);
|
||||
tmp2 = (val^seeds[i++]);
|
||||
addr ^= (table6[tmp&0x3F]^table4[(tmp>>8)&0x3F]^table2[(tmp>>16)&0x3F]^table0[(tmp>>24)&0x3F]^table7[tmp2&0x3F]^table5[(tmp2>>8)&0x3F]^table3[(tmp2>>16)&0x3F]^table1[(tmp2>>24)&0x3F]);
|
||||
|
||||
- tmp = (_rotr(addr,4)^seeds[i++]);
|
||||
+ tmp = (__rotr(addr,4)^seeds[i++]);
|
||||
tmp2 = (addr^seeds[i++]);
|
||||
val ^= (table6[tmp&0x3F]^table4[(tmp>>8)&0x3F]^table2[(tmp>>16)&0x3F]^table0[(tmp>>24)&0x3F]^table7[tmp2&0x3F]^table5[(tmp2>>8)&0x3F]^table3[(tmp2>>16)&0x3F]^table1[(tmp2>>24)&0x3F]);
|
||||
}
|
||||
--- Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp 2013-05-04 10:01:04.187490286 +0200
|
||||
+++ Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp 2013-05-04 10:01:19.162459748 +0200
|
||||
@@ -194,21 +194,21 @@
|
||||
void Interpreter::rlwimix(UGeckoInstruction _inst)
|
||||
{
|
||||
u32 mask = Helper_Mask(_inst.MB,_inst.ME);
|
||||
- m_GPR[_inst.RA] = (m_GPR[_inst.RA] & ~mask) | (_rotl(m_GPR[_inst.RS],_inst.SH) & mask);
|
||||
+ m_GPR[_inst.RA] = (m_GPR[_inst.RA] & ~mask) | (__rotl(m_GPR[_inst.RS],_inst.SH) & mask);
|
||||
if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
|
||||
}
|
||||
|
||||
void Interpreter::rlwinmx(UGeckoInstruction _inst)
|
||||
{
|
||||
u32 mask = Helper_Mask(_inst.MB,_inst.ME);
|
||||
- m_GPR[_inst.RA] = _rotl(m_GPR[_inst.RS],_inst.SH) & mask;
|
||||
+ m_GPR[_inst.RA] = __rotl(m_GPR[_inst.RS],_inst.SH) & mask;
|
||||
if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
|
||||
}
|
||||
|
||||
void Interpreter::rlwnmx(UGeckoInstruction _inst)
|
||||
{
|
||||
u32 mask = Helper_Mask(_inst.MB,_inst.ME);
|
||||
- m_GPR[_inst.RA] = _rotl(m_GPR[_inst.RS], m_GPR[_inst.RB] & 0x1F) & mask;
|
||||
+ m_GPR[_inst.RA] = __rotl(m_GPR[_inst.RS], m_GPR[_inst.RB] & 0x1F) & mask;
|
||||
|
||||
if (_inst.Rc) Helper_UpdateCR0(m_GPR[_inst.RA]);
|
||||
}
|
||||
--- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp 2013-05-04 10:01:04.185490290 +0200
|
||||
+++ Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp 2013-05-04 10:01:19.190459657 +0200
|
||||
@@ -1672,7 +1672,7 @@
|
||||
{
|
||||
unsigned result = (int)gpr.R(s).offset;
|
||||
if (inst.SH != 0)
|
||||
- result = _rotl(result, inst.SH);
|
||||
+ result = __rotl(result, inst.SH);
|
||||
result &= Helper_Mask(inst.MB, inst.ME);
|
||||
gpr.SetImmediate32(a, result);
|
||||
if (inst.Rc)
|
||||
@@ -1739,7 +1739,7 @@
|
||||
if (gpr.R(a).IsImm() && gpr.R(s).IsImm())
|
||||
{
|
||||
u32 mask = Helper_Mask(inst.MB,inst.ME);
|
||||
- gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (_rotl((u32)gpr.R(s).offset,inst.SH) & mask));
|
||||
+ gpr.SetImmediate32(a, ((u32)gpr.R(a).offset & ~mask) | (__rotl((u32)gpr.R(s).offset,inst.SH) & mask));
|
||||
if (inst.Rc)
|
||||
{
|
||||
ComputeRC(gpr.R(a));
|
||||
@@ -1824,7 +1824,7 @@
|
||||
u32 mask = Helper_Mask(inst.MB, inst.ME);
|
||||
if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
|
||||
{
|
||||
- gpr.SetImmediate32(a, _rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask);
|
||||
+ gpr.SetImmediate32(a, __rotl((u32)gpr.R(s).offset, (u32)gpr.R(b).offset & 0x1F) & mask);
|
||||
if (inst.Rc)
|
||||
{
|
||||
ComputeRC(gpr.R(a));
|
||||
--- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp 2013-05-04 10:01:04.188490284 +0200
|
||||
+++ Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp 2013-05-04 10:01:19.191459655 +0200
|
||||
@@ -248,7 +248,7 @@
|
||||
return 0;
|
||||
case Rol:
|
||||
if (isImm(*getOp2(I))) {
|
||||
- return _rotl(ComputeKnownZeroBits(getOp1(I)),
|
||||
+ return __rotl(ComputeKnownZeroBits(getOp1(I)),
|
||||
GetImmValue(getOp2(I)));
|
||||
}
|
||||
default:
|
||||
@@ -844,7 +844,7 @@
|
||||
InstLoc IRBuilder::FoldRol(InstLoc Op1, InstLoc Op2) {
|
||||
if (isImm(*Op2)) {
|
||||
if (isImm(*Op1))
|
||||
- return EmitIntConst(_rotl(GetImmValue(Op1),
|
||||
+ return EmitIntConst(__rotl(GetImmValue(Op1),
|
||||
GetImmValue(Op2)));
|
||||
if (!(GetImmValue(Op2) & 31)) return Op1;
|
||||
}
|
||||
@ -0,0 +1,124 @@
|
||||
commit 65706d3878d556c7a1eac18984ec41b1a1d96d56
|
||||
Author: Roman Gilg <subdiff@gmail.com>
|
||||
Date: Wed Oct 19 18:51:15 2016 +0200
|
||||
|
||||
New bool to use activated signal as toggle of expanded
|
||||
|
||||
The launcher applets couldn't be closed with Meta alone and on Wayland
|
||||
in general by any global shortcut, since we used for that the focusOutEvent
|
||||
triggered only on X and only on global shortcuts (on default Alt+F1).
|
||||
|
||||
This patch introduces the new bool activationTogglesExpanded, which allowes
|
||||
QML applets to decide if they wish to use the activated signal also to end
|
||||
their expanded state.
|
||||
|
||||
The default value is false, in order to not break any legacy applets.
|
||||
|
||||
REVIEW: 129204
|
||||
BUG: 367685
|
||||
|
||||
diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
|
||||
index ce2b82a..e2fd40e 100644
|
||||
--- a/src/plasmaquick/appletquickitem.cpp
|
||||
+++ b/src/plasmaquick/appletquickitem.cpp
|
||||
@@ -48,7 +48,8 @@ AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickIte
|
||||
switchWidth(-1),
|
||||
switchHeight(-1),
|
||||
applet(a),
|
||||
- expanded(false)
|
||||
+ expanded(false),
|
||||
+ activationTogglesExpanded(false)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -727,6 +728,20 @@ void AppletQuickItem::setExpanded(bool expanded)
|
||||
emit expandedChanged(expanded);
|
||||
}
|
||||
|
||||
+bool AppletQuickItem::isActivationTogglesExpanded() const
|
||||
+{
|
||||
+ return d->activationTogglesExpanded;
|
||||
+}
|
||||
+
|
||||
+void AppletQuickItem::setActivationTogglesExpanded(bool activationTogglesExpanded)
|
||||
+{
|
||||
+ if (d->activationTogglesExpanded == activationTogglesExpanded) {
|
||||
+ return;
|
||||
+ }
|
||||
+ d->activationTogglesExpanded = activationTogglesExpanded;
|
||||
+ emit activationTogglesExpandedChanged(activationTogglesExpanded);
|
||||
+}
|
||||
+
|
||||
////////////Internals
|
||||
|
||||
KDeclarative::QmlObject *AppletQuickItem::qmlObject()
|
||||
diff --git a/src/plasmaquick/appletquickitem.h b/src/plasmaquick/appletquickitem.h
|
||||
index 943e227..7df364d 100644
|
||||
--- a/src/plasmaquick/appletquickitem.h
|
||||
+++ b/src/plasmaquick/appletquickitem.h
|
||||
@@ -81,6 +81,12 @@ class PLASMAQUICK_EXPORT AppletQuickItem : public QQuickItem
|
||||
Q_PROPERTY(bool expanded WRITE setExpanded READ isExpanded NOTIFY expandedChanged)
|
||||
|
||||
/**
|
||||
+ * True when the applet wants the activation signal act in toggle mode, i.e. while being expanded
|
||||
+ * the signal shrinks the applet to its not exanded state instead of reexpanding it.
|
||||
+ */
|
||||
+ Q_PROPERTY(bool activationTogglesExpanded WRITE setActivationTogglesExpanded READ isActivationTogglesExpanded NOTIFY activationTogglesExpandedChanged)
|
||||
+
|
||||
+ /**
|
||||
* the applet root QML item: sometimes is the same as fullRepresentationItem
|
||||
* if a fullrepresentation was not declared explicitly
|
||||
*/
|
||||
@@ -126,6 +132,9 @@ public:
|
||||
bool isExpanded() const;
|
||||
void setExpanded(bool expanded);
|
||||
|
||||
+ bool isActivationTogglesExpanded() const;
|
||||
+ void setActivationTogglesExpanded(bool activationTogglesExpanded);
|
||||
+
|
||||
////NEEDED BY QML TO CREATE ATTACHED PROPERTIES
|
||||
static AppletQuickItem *qmlAttachedProperties(QObject *object);
|
||||
|
||||
@@ -135,6 +144,7 @@ Q_SIGNALS:
|
||||
void switchHeightChanged(int height);
|
||||
|
||||
void expandedChanged(bool expanded);
|
||||
+ void activationTogglesExpandedChanged(bool activationTogglesExpanded);
|
||||
|
||||
void compactRepresentationChanged(QQmlComponent *compactRepresentation);
|
||||
void fullRepresentationChanged(QQmlComponent *fullRepresentation);
|
||||
diff --git a/src/plasmaquick/private/appletquickitem_p.h b/src/plasmaquick/private/appletquickitem_p.h
|
||||
index 1436935..ffd2bf2 100644
|
||||
--- a/src/plasmaquick/private/appletquickitem_p.h
|
||||
+++ b/src/plasmaquick/private/appletquickitem_p.h
|
||||
@@ -104,6 +104,7 @@ public:
|
||||
Plasma::Package containmentPackage;
|
||||
|
||||
bool expanded : 1;
|
||||
+ bool activationTogglesExpanded : 1;
|
||||
|
||||
static QHash<QObject *, AppletQuickItem *> s_rootObjects;
|
||||
};
|
||||
diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp
|
||||
index 1cd6934..f24bc51 100644
|
||||
--- a/src/scriptengines/qml/plasmoid/appletinterface.cpp
|
||||
+++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp
|
||||
@@ -142,11 +142,16 @@ void AppletInterface::init()
|
||||
emit busyChanged();
|
||||
|
||||
applet()->updateConstraints(Plasma::Types::UiReadyConstraint);
|
||||
+
|
||||
connect(applet(), &Plasma::Applet::activated,
|
||||
[ = ]() {
|
||||
- setExpanded(true);
|
||||
+ // in case the applet doesn't want to get shrinked on reactivation,
|
||||
+ // we always expand it again (only in order to conform with legacy behaviour)
|
||||
+ bool activate = !( isExpanded() && isActivationTogglesExpanded() );
|
||||
+
|
||||
+ setExpanded(activate);
|
||||
if (QQuickItem *i = qobject_cast<QQuickItem *>(fullRepresentationItem())) {
|
||||
- i->setFocus(true, Qt::ShortcutFocusReason);
|
||||
+ i->setFocus(activate, Qt::ShortcutFocusReason);
|
||||
}
|
||||
});
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
KMNAME="${PN}-framework"
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Plasma framework"
|
||||
LICENSE="LGPL-2+"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE="egl gles2 X"
|
||||
|
||||
COMMON_DEPEND="
|
||||
$(add_frameworks_dep kactivities)
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kdeclarative)
|
||||
$(add_frameworks_dep kglobalaccel)
|
||||
$(add_frameworks_dep kguiaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep knotifications)
|
||||
$(add_frameworks_dep kpackage)
|
||||
$(add_frameworks_dep kservice)
|
||||
$(add_frameworks_dep kwindowsystem)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtdeclarative)
|
||||
$(add_qt_dep qtgui 'gles2=')
|
||||
$(add_qt_dep qtquickcontrols)
|
||||
$(add_qt_dep qtsql)
|
||||
$(add_qt_dep qtsvg)
|
||||
$(add_qt_dep qtwidgets)
|
||||
egl? ( media-libs/mesa[egl] )
|
||||
!gles2? ( virtual/opengl )
|
||||
X? (
|
||||
$(add_qt_dep qtx11extras)
|
||||
x11-libs/libX11
|
||||
x11-libs/libxcb
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
$(add_frameworks_dep kdoctools)
|
||||
X? ( x11-proto/xproto )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<kde-apps/kapptemplate-15.08.3-r1:5
|
||||
!<kde-plasma/kdeplasma-addons-5.4.3-r1:5
|
||||
"
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-5.26.0-activationTogglesExpanded.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package egl EGL)
|
||||
$(cmake-utils_use_find_package !gles2 OpenGL)
|
||||
$(cmake-utils_use_find_package X X11)
|
||||
$(cmake-utils_use_find_package X XCB)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
@ -1,441 +1,23 @@
|
||||
From 3f859c3dbdded68cc96d4c695ff27d15c387da09 Mon Sep 17 00:00:00 2001
|
||||
From: Aleix Pol <aleixpol@kde.org>
|
||||
Date: Mon, 10 Oct 2016 16:30:24 +0200
|
||||
Subject: [PATCH] Port to new plasma-framework API
|
||||
|
||||
Reduces unnecessary castings.
|
||||
Ports away the WindowedWidgets runner from KService
|
||||
|
||||
REVIEW: 129101
|
||||
---
|
||||
applets/systemtray/systemtray.cpp | 30 +++++++-------
|
||||
.../shellprivate/widgetexplorer/widgetexplorer.cpp | 14 +++----
|
||||
plasma-windowed/plasmawindowedcorona.cpp | 2 +-
|
||||
runners/windowedwidgets/windowedwidgetsrunner.cpp | 46 ++++++++++------------
|
||||
runners/windowedwidgets/windowedwidgetsrunner.h | 2 +-
|
||||
shell/alternativeshelper.cpp | 6 +--
|
||||
shell/containmentconfigview.cpp | 2 +-
|
||||
shell/scripting/containment.cpp | 4 +-
|
||||
shell/scripting/widget.cpp | 2 +-
|
||||
shell/shellcorona.cpp | 15 +++----
|
||||
10 files changed, 60 insertions(+), 63 deletions(-)
|
||||
|
||||
diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
|
||||
index e1cd610..ecc23a4 100644
|
||||
--- a/applets/systemtray/systemtray.cpp
|
||||
+++ b/applets/systemtray/systemtray.cpp
|
||||
@@ -99,19 +99,19 @@ void SystemTray::init()
|
||||
{
|
||||
Containment::init();
|
||||
|
||||
- for (const auto &info: Plasma::PluginLoader::self()->listAppletInfo(QString())) {
|
||||
- if (!info.isValid() || info.property(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
|
||||
+ for (const auto &info: Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
|
||||
+ if (!info.isValid() || info.value(QStringLiteral("X-Plasma-NotificationArea")) != "true") {
|
||||
continue;
|
||||
}
|
||||
- m_systrayApplets[info.pluginName()] = info;
|
||||
+ m_systrayApplets[info.pluginId()] = KPluginInfo(info);
|
||||
|
||||
- if (info.isPluginEnabledByDefault()) {
|
||||
- m_defaultPlasmoids += info.pluginName();
|
||||
+ if (info.isEnabledByDefault()) {
|
||||
+ m_defaultPlasmoids += info.pluginId();
|
||||
}
|
||||
- const QString dbusactivation = info.property(QStringLiteral("X-Plasma-DBusActivationService")).toString();
|
||||
+ const QString dbusactivation = info.value(QStringLiteral("X-Plasma-DBusActivationService"));
|
||||
if (!dbusactivation.isEmpty()) {
|
||||
- qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginName() << dbusactivation;
|
||||
- m_dbusActivatableTasks[info.pluginName()] = dbusactivation;
|
||||
+ qCDebug(SYSTEM_TRAY) << "ST Found DBus-able Applet: " << info.pluginId() << dbusactivation;
|
||||
+ m_dbusActivatableTasks[info.pluginId()] = dbusactivation;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -119,12 +119,12 @@ void SystemTray::init()
|
||||
void SystemTray::newTask(const QString &task)
|
||||
{
|
||||
foreach (Plasma::Applet *applet, applets()) {
|
||||
- if (!applet->pluginInfo().isValid()) {
|
||||
+ if (!applet->pluginMetaData().isValid()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
//only allow one instance per applet
|
||||
- if (task == applet->pluginInfo().pluginName()) {
|
||||
+ if (task == applet->pluginMetaData().pluginId()) {
|
||||
//Applet::destroy doesn't delete the applet from Containment::applets in the same event
|
||||
//potentially a dbus activated service being restarted can be added in this time.
|
||||
if (!applet->destroyed()) {
|
||||
@@ -156,7 +156,7 @@ void SystemTray::newTask(const QString &task)
|
||||
void SystemTray::cleanupTask(const QString &task)
|
||||
{
|
||||
foreach (Plasma::Applet *applet, applets()) {
|
||||
- if (!applet->pluginInfo().isValid() || task == applet->pluginInfo().pluginName()) {
|
||||
+ if (!applet->pluginMetaData().isValid() || task == applet->pluginMetaData().pluginId()) {
|
||||
//we are *not* cleaning the config here, because since is one
|
||||
//of those automatically loaded/unloaded by dbus, we want to recycle
|
||||
//the config the next time it's loaded, in case the user configured something here
|
||||
@@ -255,11 +255,11 @@ Q_INVOKABLE QString SystemTray::plasmoidCategory(QQuickItem *appletInterface) co
|
||||
}
|
||||
|
||||
Plasma::Applet *applet = appletInterface->property("_plasma_applet").value<Plasma::Applet*>();
|
||||
- if (!applet || !applet->pluginInfo().isValid()) {
|
||||
+ if (!applet || !applet->pluginMetaData().isValid()) {
|
||||
return "UnknownCategory";
|
||||
}
|
||||
|
||||
- const QString cat = applet->pluginInfo().property(QStringLiteral("X-Plasma-NotificationAreaCategory")).toString();
|
||||
+ const QString cat = applet->pluginMetaData().value(QStringLiteral("X-Plasma-NotificationAreaCategory"));
|
||||
|
||||
if (cat.isEmpty()) {
|
||||
return "UnknownCategory";
|
||||
@@ -385,11 +385,11 @@ void SystemTray::restorePlasmoids()
|
||||
foreach (Plasma::Applet *applet, applets()) {
|
||||
//Here it should always be valid.
|
||||
//for some reason it not always is.
|
||||
- if (!applet->pluginInfo().isValid()) {
|
||||
+ if (!applet->pluginMetaData().isValid()) {
|
||||
applet->config().parent().deleteGroup();
|
||||
applet->deleteLater();
|
||||
} else {
|
||||
- const QString task = applet->pluginInfo().pluginName();
|
||||
+ const QString task = applet->pluginMetaData().pluginId();
|
||||
if (!m_allowedPlasmoids.contains(task)) {
|
||||
//in those cases we do delete the applet config completely
|
||||
//as they were explicitly disabled by the user
|
||||
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
|
||||
index c2b38a8..b445897 100644
|
||||
--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
|
||||
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
|
||||
@@ -249,14 +249,14 @@ void WidgetExplorerPrivate::addContainment(Containment *containment)
|
||||
QObject::connect(containment, SIGNAL(appletRemoved(Plasma::Applet*)), q, SLOT(appletRemoved(Plasma::Applet*)));
|
||||
|
||||
foreach (Applet *applet, containment->applets()) {
|
||||
- if (applet->pluginInfo().isValid()) {
|
||||
+ if (applet->pluginMetaData().isValid()) {
|
||||
Containment *childContainment = applet->property("containment").value<Containment*>();
|
||||
if (childContainment) {
|
||||
addContainment(childContainment);
|
||||
}
|
||||
- runningApplets[applet->pluginInfo().pluginName()]++;
|
||||
+ runningApplets[applet->pluginMetaData().pluginId()]++;
|
||||
} else {
|
||||
- qDebug() << "Invalid plugininfo. :(";
|
||||
+ qDebug() << "Invalid plugin metadata. :(";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -268,10 +268,10 @@ void WidgetExplorerPrivate::containmentDestroyed()
|
||||
|
||||
void WidgetExplorerPrivate::appletAdded(Plasma::Applet *applet)
|
||||
{
|
||||
- if (!applet->pluginInfo().isValid()) {
|
||||
+ if (!applet->pluginMetaData().isValid()) {
|
||||
return;
|
||||
}
|
||||
- QString name = applet->pluginInfo().pluginName();
|
||||
+ QString name = applet->pluginMetaData().pluginId();
|
||||
|
||||
runningApplets[name]++;
|
||||
appletNames.insert(applet, name);
|
||||
@@ -471,9 +471,9 @@ void WidgetExplorer::uninstall(const QString &pluginName)
|
||||
const auto &applets = c->applets();
|
||||
|
||||
foreach (Applet *applet, applets) {
|
||||
- const auto &appletInfo = applet->pluginInfo();
|
||||
+ const auto &appletInfo = applet->pluginMetaData();
|
||||
|
||||
- if (appletInfo.isValid() && appletInfo.pluginName() == pluginName) {
|
||||
+ if (appletInfo.isValid() && appletInfo.pluginId() == pluginName) {
|
||||
applet->destroy();
|
||||
}
|
||||
}
|
||||
diff --git a/plasma-windowed/plasmawindowedcorona.cpp b/plasma-windowed/plasmawindowedcorona.cpp
|
||||
index fbacbf8..b68d270 100644
|
||||
--- a/plasma-windowed/plasmawindowedcorona.cpp
|
||||
+++ b/plasma-windowed/plasmawindowedcorona.cpp
|
||||
@@ -51,7 +51,7 @@ void PlasmaWindowedCorona::loadApplet(const QString &applet, const QVariantList
|
||||
|
||||
//forbid more instances per applet (todo: activate the correpsponding already loaded applet)
|
||||
for (Plasma::Applet *a : cont->applets()) {
|
||||
- if (a->pluginInfo().pluginName() == applet) {
|
||||
+ if (a->pluginMetaData().pluginId() == applet) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
commit 238ec3ee671bcf6716348122bebefb20c25d1101
|
||||
Author: David Edmundson <kde@davidedmundson.co.uk>
|
||||
Date: Thu, 17 Nov 2016 10:53:48 +0000
|
||||
|
||||
[Windowed Widgets Runner] Don't access invalid KPluginInfo
|
||||
|
||||
BUG: 372017
|
||||
FIXED-IN: 5.8.4
|
||||
|
||||
diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
|
||||
index 5ccbd27..7f093a7 100644
|
||||
index 5ccbd27..f86159a 100644
|
||||
--- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
|
||||
+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
|
||||
@@ -60,24 +60,22 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
|
||||
|
||||
QList<Plasma::QueryMatch> matches;
|
||||
|
||||
- foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
|
||||
- KService::Ptr service = info.service();
|
||||
-
|
||||
- if (((service->name().contains(term, Qt::CaseInsensitive) ||
|
||||
- service->genericName().contains(term, Qt::CaseInsensitive) ||
|
||||
- service->comment().contains(term, Qt::CaseInsensitive)) ||
|
||||
- service->categories().contains(term, Qt::CaseInsensitive) ||
|
||||
+ foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
|
||||
+ if (((md.name().contains(term, Qt::CaseInsensitive) ||
|
||||
+ md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
|
||||
+ md.description().contains(term, Qt::CaseInsensitive)) ||
|
||||
+ md.category().contains(term, Qt::CaseInsensitive) ||
|
||||
term.startsWith(i18nc("Note this is a KRunner keyword", "mobile applications"))) &&
|
||||
- !info.property(QStringLiteral("NoDisplay")).toBool()) {
|
||||
+ !md.rawData().value(QStringLiteral("NoDisplay")).toBool()) {
|
||||
|
||||
- QVariant val = info.property(QStringLiteral("X-Plasma-StandAloneApp"));
|
||||
+ QVariant val = md.value(QStringLiteral("X-Plasma-StandAloneApp"));
|
||||
if (!val.isValid() || !val.toBool()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Plasma::QueryMatch match(this);
|
||||
- setupMatch(service, match);
|
||||
- if (service->name().compare(term, Qt::CaseInsensitive) == 0) {
|
||||
+ setupMatch(md, match);
|
||||
+ if (md.name().compare(term, Qt::CaseInsensitive) == 0) {
|
||||
match.setType(Plasma::QueryMatch::ExactMatch);
|
||||
match.setRelevance(1);
|
||||
} else {
|
||||
@@ -85,8 +83,6 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
|
||||
match.setRelevance(0.7);
|
||||
}
|
||||
matches << match;
|
||||
-
|
||||
- qDebug() << service;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,27 +96,27 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
|
||||
void WindowedWidgetsRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
|
||||
{
|
||||
Q_UNUSED(context);
|
||||
- KService::Ptr service = KService::serviceByStorageId(match.data().toString());
|
||||
- if (service) {
|
||||
- QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << service->property(QStringLiteral("X-KDE-PluginInfo-Name"), QVariant::String).toString());
|
||||
+ KPluginMetaData md(match.data().toString());
|
||||
+ if (md.isValid()) {
|
||||
+ QProcess::startDetached(QStringLiteral("plasmawindowed"), QStringList() << md.pluginId());
|
||||
}
|
||||
}
|
||||
|
||||
-void WindowedWidgetsRunner::setupMatch(const KService::Ptr &service, Plasma::QueryMatch &match)
|
||||
+void WindowedWidgetsRunner::setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &match)
|
||||
{
|
||||
- const QString name = service->name();
|
||||
+ const QString name = md.pluginId();
|
||||
|
||||
match.setText(name);
|
||||
- match.setData(service->storageId());
|
||||
+ match.setData(md.metaDataFileName());
|
||||
|
||||
- if (!service->genericName().isEmpty() && service->genericName() != name) {
|
||||
- match.setSubtext(service->genericName());
|
||||
- } else if (!service->comment().isEmpty()) {
|
||||
- match.setSubtext(service->comment());
|
||||
+ if (!md.name().isEmpty() && md.name() != name) {
|
||||
+ match.setSubtext(md.name());
|
||||
+ } else if (!md.description().isEmpty()) {
|
||||
+ match.setSubtext(md.description());
|
||||
}
|
||||
|
||||
- if (!service->icon().isEmpty()) {
|
||||
- match.setIconName(service->icon());
|
||||
+ if (!md.iconName().isEmpty()) {
|
||||
+ match.setIconName(md.iconName());
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/runners/windowedwidgets/windowedwidgetsrunner.h b/runners/windowedwidgets/windowedwidgetsrunner.h
|
||||
index 2294965..fbc8006 100644
|
||||
--- a/runners/windowedwidgets/windowedwidgetsrunner.h
|
||||
+++ b/runners/windowedwidgets/windowedwidgetsrunner.h
|
||||
@@ -48,7 +48,7 @@ protected Q_SLOTS:
|
||||
|
||||
|
||||
protected:
|
||||
- void setupMatch(const KService::Ptr &service, Plasma::QueryMatch &action);
|
||||
+ void setupMatch(const KPluginMetaData &md, Plasma::QueryMatch &action);
|
||||
};
|
||||
|
||||
#endif
|
||||
diff --git a/shell/alternativeshelper.cpp b/shell/alternativeshelper.cpp
|
||||
index d0f5dfd..6d76307 100644
|
||||
--- a/shell/alternativeshelper.cpp
|
||||
+++ b/shell/alternativeshelper.cpp
|
||||
@@ -38,12 +38,12 @@ AlternativesHelper::~AlternativesHelper()
|
||||
|
||||
QStringList AlternativesHelper::appletProvides() const
|
||||
{
|
||||
- return m_applet->pluginInfo().property(QStringLiteral("X-Plasma-Provides")).toStringList();
|
||||
+ return KPluginMetaData::readStringList(m_applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
|
||||
}
|
||||
@@ -60,6 +60,9 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
|
||||
|
||||
QString AlternativesHelper::currentPlugin() const
|
||||
{
|
||||
- return m_applet->pluginInfo().pluginName();
|
||||
+ return m_applet->pluginMetaData().pluginId();
|
||||
}
|
||||
|
||||
QQuickItem *AlternativesHelper::applet() const
|
||||
@@ -53,7 +53,7 @@ QQuickItem *AlternativesHelper::applet() const
|
||||
|
||||
void AlternativesHelper::loadAlternative(const QString &plugin)
|
||||
{
|
||||
- if (plugin == m_applet->pluginInfo().pluginName() || m_applet->isContainment()) {
|
||||
+ if (plugin == m_applet->pluginMetaData().pluginId() || m_applet->isContainment()) {
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/shell/containmentconfigview.cpp b/shell/containmentconfigview.cpp
|
||||
index cec067e..4c9d146 100644
|
||||
--- a/shell/containmentconfigview.cpp
|
||||
+++ b/shell/containmentconfigview.cpp
|
||||
@@ -104,7 +104,7 @@ QAbstractItemModel *ContainmentConfigView::currentContainmentActionsModel()
|
||||
|
||||
QString ContainmentConfigView::containmentPlugin() const
|
||||
{
|
||||
- return m_containment->pluginInfo().pluginName();
|
||||
+ return m_containment->pluginMetaData().pluginId();
|
||||
}
|
||||
|
||||
void ContainmentConfigView::setContainmentPlugin(const QString &plugin)
|
||||
diff --git a/shell/scripting/containment.cpp b/shell/scripting/containment.cpp
|
||||
index 6040e62..96e2009 100644
|
||||
--- a/shell/scripting/containment.cpp
|
||||
+++ b/shell/scripting/containment.cpp
|
||||
@@ -248,7 +248,7 @@ QScriptValue Containment::widgets(QScriptContext *context, QScriptEngine *engine
|
||||
int count = 0;
|
||||
|
||||
foreach (Plasma::Applet *widget, c->d->containment.data()->applets()) {
|
||||
- if (widgetType.isEmpty() || widget->pluginInfo().pluginName() == widgetType) {
|
||||
+ if (widgetType.isEmpty() || widget->pluginMetaData().pluginId() == widgetType) {
|
||||
widgets.setProperty(count, env->wrap(widget));
|
||||
++count;
|
||||
}
|
||||
@@ -273,7 +273,7 @@ QString Containment::type() const
|
||||
return QString();
|
||||
}
|
||||
|
||||
- return d->containment.data()->pluginInfo().pluginName();
|
||||
+ return d->containment.data()->pluginMetaData().pluginId();
|
||||
}
|
||||
|
||||
void Containment::remove()
|
||||
diff --git a/shell/scripting/widget.cpp b/shell/scripting/widget.cpp
|
||||
index a651c2a..b58822b 100644
|
||||
--- a/shell/scripting/widget.cpp
|
||||
+++ b/shell/scripting/widget.cpp
|
||||
@@ -65,7 +65,7 @@ uint Widget::id() const
|
||||
QString Widget::type() const
|
||||
{
|
||||
if (d->applet) {
|
||||
- return d->applet.data()->pluginInfo().pluginName();
|
||||
+ return d->applet.data()->pluginMetaData().pluginId();
|
||||
}
|
||||
|
||||
return QString();
|
||||
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
|
||||
index 33259da..598fdb0 100644
|
||||
--- a/shell/shellcorona.cpp
|
||||
+++ b/shell/shellcorona.cpp
|
||||
@@ -406,7 +406,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
|
||||
|| cont->location() == Plasma::Types::BottomEdge
|
||||
|| cont->location() == Plasma::Types::LeftEdge
|
||||
|| cont->location() == Plasma::Types::RightEdge) &&
|
||||
- cont->pluginInfo().pluginName() != QStringLiteral("org.kde.plasma.private.systemtray");
|
||||
+ cont->pluginMetaData().pluginId() != QStringLiteral("org.kde.plasma.private.systemtray");
|
||||
};
|
||||
|
||||
auto isDesktop = [] (Plasma::Containment *cont) {
|
||||
@@ -493,7 +493,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
|
||||
|
||||
KConfigGroup appletConfig = applet->config();
|
||||
|
||||
- appletJson.insert("plugin", applet->pluginInfo().pluginName());
|
||||
+ appletJson.insert("plugin", applet->pluginMetaData().pluginId());
|
||||
appletJson.insert("config", dumpconfigGroupJS(appletConfig));
|
||||
|
||||
appletsJsonArray << appletJson;
|
||||
@@ -560,7 +560,7 @@ QByteArray ShellCorona::dumpCurrentLayoutJS() const
|
||||
QJsonObject appletJson;
|
||||
|
||||
appletJson.insert("title", applet->title());
|
||||
- appletJson.insert("plugin", applet->pluginInfo().pluginName());
|
||||
+ appletJson.insert("plugin", applet->pluginMetaData().pluginId());
|
||||
|
||||
appletJson.insert("geometry.x", geometry.x() / gridUnit);
|
||||
appletJson.insert("geometry.y", geometry.y() / gridUnit);
|
||||
@@ -1238,11 +1238,11 @@ void ShellCorona::handleContainmentAdded(Plasma::Containment *c)
|
||||
|
||||
void ShellCorona::executeSetupPlasmoidScript(Plasma::Containment *containment, Plasma::Applet *applet)
|
||||
{
|
||||
- if (!applet->pluginInfo().isValid() || !containment->pluginInfo().isValid()) {
|
||||
+ if (!applet->pluginMetaData().isValid() || !containment->pluginMetaData().isValid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
- const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginInfo().pluginName() + ".js");
|
||||
+ const QString scriptFile = m_lookAndFeelPackage.filePath("plasmoidsetupscripts", applet->pluginMetaData().pluginId() + ".js");
|
||||
|
||||
if (scriptFile.isEmpty()) {
|
||||
return;
|
||||
@@ -1541,7 +1541,7 @@ Plasma::Containment *ShellCorona::setContainmentTypeForScreen(int screen, const
|
||||
//if creation failed or invalid plugin, give up
|
||||
if (!newContainment) {
|
||||
return oldContainment;
|
||||
- } else if (!newContainment->pluginInfo().isValid()) {
|
||||
+ } else if (!newContainment->pluginMetaData().isValid()) {
|
||||
newContainment->deleteLater();
|
||||
return oldContainment;
|
||||
}
|
||||
@@ -1975,7 +1975,8 @@ void ShellCorona::activateLauncherMenu()
|
||||
for (auto it = m_panelViews.constBegin(), end = m_panelViews.constEnd(); it != end; ++it) {
|
||||
const auto applets = it.key()->applets();
|
||||
for (auto applet : applets) {
|
||||
- if (applet->pluginInfo().property("X-Plasma-Provides").toStringList().contains(QStringLiteral("org.kde.plasma.launchermenu"))) {
|
||||
+ const auto provides = KPluginMetaData::readStringList(applet->pluginMetaData().rawData(), QStringLiteral("X-Plasma-Provides"));
|
||||
+ if (provides.contains(QLatin1String("org.kde.plasma.launchermenu"))) {
|
||||
if (!applet->globalShortcut().isEmpty()) {
|
||||
emit applet->activated();
|
||||
return;
|
||||
--
|
||||
2.7.3
|
||||
|
||||
From 59b2d1effcee8d449cbbcd237ba8cebaeb4dd949 Mon Sep 17 00:00:00 2001
|
||||
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
||||
Date: Mon, 14 Nov 2016 15:23:00 +0100
|
||||
Subject: [PATCH] [Windowed Widgets Runner] Don't access invalid
|
||||
KPluginMetaData
|
||||
|
||||
BUG: 372017
|
||||
FIXED-IN: 5.8.4
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D3356
|
||||
---
|
||||
runners/windowedwidgets/windowedwidgetsrunner.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/runners/windowedwidgets/windowedwidgetsrunner.cpp b/runners/windowedwidgets/windowedwidgetsrunner.cpp
|
||||
index 7f093a7..706b1bb 100644
|
||||
--- a/runners/windowedwidgets/windowedwidgetsrunner.cpp
|
||||
+++ b/runners/windowedwidgets/windowedwidgetsrunner.cpp
|
||||
@@ -61,6 +61,10 @@ void WindowedWidgetsRunner::match(Plasma::RunnerContext &context)
|
||||
QList<Plasma::QueryMatch> matches;
|
||||
|
||||
foreach (const KPluginMetaData &md, Plasma::PluginLoader::self()->listAppletMetaData(QString())) {
|
||||
+ if (!md.isValid()) {
|
||||
foreach (const KPluginInfo &info, Plasma::PluginLoader::self()->listAppletInfo(QString())) {
|
||||
KService::Ptr service = info.service();
|
||||
+ if (!service || !service->isValid()) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
if (((md.name().contains(term, Qt::CaseInsensitive) ||
|
||||
md.value(QLatin1String("GenericName")).contains(term, Qt::CaseInsensitive) ||
|
||||
md.description().contains(term, Qt::CaseInsensitive)) ||
|
||||
--
|
||||
2.7.3
|
||||
|
||||
|
||||
if (((service->name().contains(term, Qt::CaseInsensitive) ||
|
||||
service->genericName().contains(term, Qt::CaseInsensitive) ||
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
--- a/docs/CMakeLists.txt 2013-01-08 03:19:23.649162615 +0400
|
||||
+++ b/docs/CMakeLists.txt 2013-01-08 03:22:29.647329174 +0400
|
||||
@@ -81,7 +81,7 @@
|
||||
ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
|
||||
|
||||
add_custom_target(doc ALL
|
||||
- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
|
||||
+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
|
||||
DEPENDS
|
||||
OpenColorIO
|
||||
PyOpenColorIO
|
||||
@@ -93,20 +93,18 @@
|
||||
COMMENT "Building html docs"
|
||||
SOURCES ${DOCFILES})
|
||||
|
||||
-# note: ExternalProject will not build when added to a add_custom_target this
|
||||
-# works around this problem. This seems to be fixed in the cmake ^HEAD
|
||||
-add_dependencies(doc Sphinx)
|
||||
-
|
||||
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
|
||||
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html
|
||||
PATTERN .* EXCLUDE
|
||||
)
|
||||
|
||||
+if(OCIO_BUILD_PDF_DOCS)
|
||||
+
|
||||
find_package(LATEX)
|
||||
if(PDFLATEX_COMPILER)
|
||||
|
||||
add_custom_target(latex
|
||||
- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
|
||||
+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
|
||||
DEPENDS
|
||||
OpenColorIO
|
||||
${CMAKE_BINARY_DIR}/docs/conf.py
|
||||
@@ -116,7 +114,6 @@
|
||||
${RSTDOC_OUTPUT}
|
||||
COMMENT "Building latex doc"
|
||||
SOURCES ${DOCFILES})
|
||||
- add_dependencies(latex Sphinx)
|
||||
|
||||
add_custom_target(pdf ALL
|
||||
COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
|
||||
@@ -126,6 +123,8 @@
|
||||
add_dependencies(pdf latex)
|
||||
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
|
||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
|
||||
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/)
|
||||
|
||||
endif()
|
||||
+
|
||||
+endif()
|
||||
@ -1 +1 @@
|
||||
Thu, 17 Nov 2016 07:13:23 +0000
|
||||
Thu, 17 Nov 2016 12:43:13 +0000
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
|
||||
<glsa id="201611-10">
|
||||
<title>libuv: Privilege escalation</title>
|
||||
<synopsis>A vulnerability in libuv could lead to privilege escalation.</synopsis>
|
||||
<product type="ebuild"></product>
|
||||
<announced>November 17, 2016</announced>
|
||||
<revised>November 17, 2016: 1</revised>
|
||||
<bug>540826</bug>
|
||||
<access>local, remote</access>
|
||||
<affected>
|
||||
<package name="dev-libs/libuv" auto="yes" arch="*">
|
||||
<unaffected range="ge">1.4.2</unaffected>
|
||||
<vulnerable range="lt">1.4.2</vulnerable>
|
||||
</package>
|
||||
</affected>
|
||||
<background>
|
||||
<p>libuv is a multi-platform support library with a focus on asynchronous
|
||||
I/O.
|
||||
</p>
|
||||
</background>
|
||||
<description>
|
||||
<p>It was discovered that libuv does not call setgroups before calling
|
||||
setuid/setgid. If this is not called, then even though the uid has been
|
||||
dropped, there may still be groups associated that permit superuser
|
||||
privileges.
|
||||
</p>
|
||||
</description>
|
||||
<impact type="normal">
|
||||
<p>Context-dependent attackers could escalate privileges via unspecified
|
||||
vectors.
|
||||
</p>
|
||||
</impact>
|
||||
<workaround>
|
||||
<p>There is no known workaround at this time.</p>
|
||||
</workaround>
|
||||
<resolution>
|
||||
<p>All libuv users should upgrade to the latest version:</p>
|
||||
|
||||
<code>
|
||||
# emerge --sync
|
||||
# emerge --ask --verbose --oneshot ">=dev-libs/libuv-1.4.2"
|
||||
</code>
|
||||
</resolution>
|
||||
<references>
|
||||
<uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-0278">CVE-2015-0278</uri>
|
||||
</references>
|
||||
<metadata tag="requester" timestamp="Thu, 17 Nov 2016 08:33:56 +0000">b-man</metadata>
|
||||
<metadata tag="submitter" timestamp="Thu, 17 Nov 2016 10:08:59 +0000">b-man</metadata>
|
||||
</glsa>
|
||||
@ -1 +1 @@
|
||||
Thu, 17 Nov 2016 07:13:23 +0000
|
||||
Thu, 17 Nov 2016 12:43:13 +0000
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=install
|
||||
DEPEND=virtual/pkgconfig
|
||||
DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
|
||||
EAPI=6
|
||||
HOMEPAGE=https://digint.ch/btrbk/
|
||||
IUSE=+pv
|
||||
KEYWORDS=~amd64 ~arm ~x86
|
||||
LICENSE=GPL-3+
|
||||
RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
|
||||
SLOT=0
|
||||
SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.24.0.tar.xz
|
||||
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
|
||||
_md5_=f4a0e2f629c4caf139939fe2f980493d
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare test unpack
|
||||
DEPEND=dev-perl/Module-Build-Tiny dev-perl/File-Which dev-vcs/git dev-lang/perl:=[-build(-)]
|
||||
DESCRIPTION=Readily merge Pull Requests from the Gentoo Github repository
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/monsieurp/Gentoo-App-Pram
|
||||
IUSE=test
|
||||
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
|
||||
LICENSE=|| ( Artistic GPL-1+ )
|
||||
RDEPEND=dev-lang/perl:=[-build(-)]
|
||||
SLOT=0
|
||||
SRC_URI=mirror://cpan/authors/id/M/MO/MONSIEURP/Gentoo-App-Pram-0.004000.tar.gz
|
||||
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module f6549146ea31a902e20b5f2e6f244358 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 unpacker 45d07319df5f40ee6af58418b0f930be
|
||||
_md5_=e4ca8e487b9134a938c4ef37e6d6505b
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||
DEPEND=ruby_targets_ruby20? ( dev-ruby/webmock[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
|
||||
DESCRIPTION=multi-layer client for the github api v3
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/travis-ci/gh
|
||||
IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=MIT
|
||||
RDEPEND=ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
|
||||
REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/travis-ci/gh/archive/v0.14.0.tar.gz -> gh-0.14.0.tar.gz
|
||||
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng e7d26f9077ef49f07eaa5d0c7758fe7b ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=b3d529e830d449c5b825b14ed0fe66b3
|
||||
@ -1,14 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||
DEPEND=ruby_targets_ruby20? ( dev-ruby/hoe[ruby_targets_ruby20] test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
|
||||
DEPEND=ruby_targets_ruby20? ( dev-ruby/hoe[ruby_targets_ruby20] test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/hoe[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/hoe[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
|
||||
DESCRIPTION=An HTTP/1.1 pipelining implementation atop Net::HTTP
|
||||
EAPI=5
|
||||
HOMEPAGE=http://docs.seattlerb.org/net-http-pipeline/
|
||||
IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
|
||||
IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
|
||||
KEYWORDS=~amd64
|
||||
LICENSE=MIT
|
||||
RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
|
||||
REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
|
||||
RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
|
||||
REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
|
||||
SLOT=1
|
||||
SRC_URI=mirror://rubygems/net-http-pipeline-1.0.1.gem
|
||||
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng e7d26f9077ef49f07eaa5d0c7758fe7b ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=356ad9663d8e6e674d64911e6b4cfc82
|
||||
_md5_=cdce813a0ec6a2df9db2177956bbd805
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test unpack
|
||||
DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bundler[ruby_targets_ruby20] dev-ruby/activesupport[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/activesupport[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/activesupport[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/activesupport[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
|
||||
DESCRIPTION=Rails application preloader
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/rails/spring
|
||||
IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
|
||||
KEYWORDS=~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=MIT
|
||||
RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
|
||||
REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
|
||||
SLOT=1.1
|
||||
SRC_URI=https://github.com/rails/spring/archive/v2.0.0.tar.gz -> spring-2.0.0.tar.gz
|
||||
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng e7d26f9077ef49f07eaa5d0c7758fe7b ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=3859ec9a82e1d010814b3ad6cd42ea53
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
|
||||
DEPEND=>=kde-frameworks/kactivities-5.26:5 >=kde-frameworks/karchive-5.26:5 >=kde-frameworks/kconfig-5.26:5 >=kde-frameworks/kconfigwidgets-5.26:5 >=kde-frameworks/kcoreaddons-5.26:5 >=kde-frameworks/kdeclarative-5.26:5 >=kde-frameworks/kglobalaccel-5.26:5 >=kde-frameworks/kguiaddons-5.26:5 >=kde-frameworks/ki18n-5.26:5 >=kde-frameworks/kiconthemes-5.26:5 >=kde-frameworks/kio-5.26:5 >=kde-frameworks/knotifications-5.26:5 >=kde-frameworks/kpackage-5.26:5 >=kde-frameworks/kservice-5.26:5 >=kde-frameworks/kwindowsystem-5.26:5 >=kde-frameworks/kxmlgui-5.26:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[gles2=] >=dev-qt/qtquickcontrols-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 egl? ( media-libs/mesa[egl] ) !gles2? ( virtual/opengl ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.26:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
|
||||
DESCRIPTION=Plasma framework
|
||||
EAPI=6
|
||||
HOMEPAGE=https://www.kde.org/
|
||||
IUSE=egl gles2 X test debug test
|
||||
KEYWORDS=~amd64 ~arm ~x86
|
||||
LICENSE=LGPL-2+
|
||||
RDEPEND=>=kde-frameworks/kactivities-5.26:5 >=kde-frameworks/karchive-5.26:5 >=kde-frameworks/kconfig-5.26:5 >=kde-frameworks/kconfigwidgets-5.26:5 >=kde-frameworks/kcoreaddons-5.26:5 >=kde-frameworks/kdeclarative-5.26:5 >=kde-frameworks/kglobalaccel-5.26:5 >=kde-frameworks/kguiaddons-5.26:5 >=kde-frameworks/ki18n-5.26:5 >=kde-frameworks/kiconthemes-5.26:5 >=kde-frameworks/kio-5.26:5 >=kde-frameworks/knotifications-5.26:5 >=kde-frameworks/kpackage-5.26:5 >=kde-frameworks/kservice-5.26:5 >=kde-frameworks/kwindowsystem-5.26:5 >=kde-frameworks/kxmlgui-5.26:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtdeclarative-5.6.1:5 >=dev-qt/qtgui-5.6.1:5[gles2=] >=dev-qt/qtquickcontrols-5.6.1:5 >=dev-qt/qtsql-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 egl? ( media-libs/mesa[egl] ) !gles2? ( virtual/opengl ) X? ( >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 x11-libs/libxcb ) !<kde-apps/kapptemplate-15.08.3-r1:5 !<kde-plasma/kdeplasma-addons-5.4.3-r1:5 >=kde-frameworks/kf-env-3 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
|
||||
RESTRICT=test
|
||||
SLOT=5/5.26
|
||||
SRC_URI=mirror://kde/stable/frameworks/5.26/plasma-framework-5.26.0.tar.xz
|
||||
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 kde5 b80ab2c131e6011994cf3b553fc21f63 kde5-functions 391cd05771548da2a3942eb1992669b1 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
|
||||
_md5_=7bef02f7a066ef800ff725a6118bac57
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare setup unpack
|
||||
DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
|
||||
DESCRIPTION=A network protocol analyzer formerly known as ethereal
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.wireshark.org/
|
||||
IUSE=adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark cpu_flags_x86_sse4_2 ssl zlib +filecaps
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
|
||||
REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
|
||||
SLOT=0/2.0.7
|
||||
SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.0.7.tar.bz2
|
||||
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c base 3fe4f8980633fd7bc69e9887209ba2fe eutils b83a2420b796f7c6eff682679d08fe25 fcaps 6a1091a98b1dde01cc26ab3252da1a9b flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
|
||||
_md5_=d4fd34e88f41e609e86adaccaff33c16
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=configure install prepare
|
||||
DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
|
||||
EAPI=6
|
||||
HOMEPAGE=http://lftp.tech/
|
||||
IUSE=convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN linguas_zh_HK linguas_zh_TW
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
|
||||
SLOT=0
|
||||
SRC_URI=http://lftp.tech/ftp/lftp-4.7.4.tar.xz
|
||||
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
|
||||
_md5_=fe2e8309f867b8a95b8f88518b868689
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue