diff options
-rw-r--r-- | kde-base/katepart/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/katepart/Manifest | 25 | ||||
-rw-r--r-- | kde-base/katepart/files/katepart-4.10.0-plugins.patch | 55 | ||||
-rw-r--r-- | kde-base/kdeplasma-addons/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kdeplasma-addons/Manifest | 25 | ||||
-rw-r--r-- | kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch | 44 | ||||
-rw-r--r-- | kde-base/kig/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kig/Manifest | 25 | ||||
-rw-r--r-- | kde-base/kig/files/kig-4.9.0-boostpython.patch | 448 | ||||
-rw-r--r-- | kde-base/perlqt/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/perlqt/Manifest | 25 | ||||
-rw-r--r-- | kde-base/perlqt/files/perlqt-4.8.1-tests.patch | 21 |
12 files changed, 56 insertions, 636 deletions
diff --git a/kde-base/katepart/ChangeLog b/kde-base/katepart/ChangeLog index f53d59466b15..7ea56b51911a 100644 --- a/kde-base/katepart/ChangeLog +++ b/kde-base/katepart/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/katepart # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.67 2013/04/01 16:03:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.68 2013/04/02 12:37:09 kensington Exp $ + + 02 Apr 2013; Michael Palimaka <kensington@gentoo.org> + -files/katepart-4.10.0-plugins.patch: + Remove unused patch. 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -katepart-4.10.0-r1.ebuild, -katepart-4.10.0.ebuild, -katepart-4.9.5.ebuild: diff --git a/kde-base/katepart/Manifest b/kde-base/katepart/Manifest index 089672e55da7..5ec7bfb3a65c 100644 --- a/kde-base/katepart/Manifest +++ b/kde-base/katepart/Manifest @@ -1,25 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX katepart-4.10.0-plugins.patch 1902 SHA256 f3f0722eb1dca274934ed9b21f5a23236419ac66a6a12c829411379deec558d1 SHA512 bcc4237746fe084422d2d548cc7199aadfbb9466ca527200804f83fd68d493a7b4f66e72c4ae1e708bf4525ddc3e6de0f64dc3f6e4399e27ca6e756c502a8c83 WHIRLPOOL ac9b00f55a9373b31b0d3654dc7c00a1617e540066c48280da181c8f63b9c773c28949fae2bd7564d0a78f08ab66c8ffdb77f750e18b33eb1da1bb3b9146ad71 DIST kate-4.10.1.tar.xz 2555700 SHA256 e7c273046998ac5dcc776345411091b20ef0b002c04e0f8ae37f8b5f0d99aa4f SHA512 52ccfbe520c43a7b071407eb5af847c8a18462eac78b610d68ba4e9279d48e696cc7ea65694b2fd3f23a6d591bbf77653b2f9aa161603185ab019bace37ceee4 WHIRLPOOL 93201bcd47fc1a3241d23f18baab7cff4831bda19101c28b714017f31ad5db75a81a484851fc9908e28fe8c21047a238c8f88b98653d5e7ac6d14756db419651 EBUILD katepart-4.10.1.ebuild 584 SHA256 9c89c37000eed1967aace042d6a032f5c0170cbd38bbc7147d3e3395e945ae61 SHA512 7341e433e88700b2bd67890f7002a4fad0f3f1da46b7f5a2034542350dc3426b6d08ef7c49be51cee2cf9fa5b87db06259cbcb001caf8c8e3b32a5656262c4a0 WHIRLPOOL aa23b2bab2be3ff9e88c61e494d8e5631c3bfb20b5aa216a2d7352ecf67a8c23163c34aa95214f629ec0439ad6f4024652fae2b3282be0dc9b0ad1e62ff7e06b -MISC ChangeLog 7942 SHA256 ca8ead2d2a90f0219bd70af858afc818ea8f4b2b3a387ad96a39d0dcbc6daa26 SHA512 4f41bda90ad3193e96729d5c158c78b603d16953280f8d97c7af0ca9bbc669f15973fbadd884e51ae1ad9128e50f294620de83bf35c5706d90f35de714271857 WHIRLPOOL c9ff75c223ca210bbd98a91fdce946a9b31d56a4064481fad5397d3866fa90a6d892be77a9e832442c524f560eaa111e2d467f2d651a648964cbc464d4e303a8 +MISC ChangeLog 8069 SHA256 cc72f7ad6d3371cc4f5ad546638e2d5685dd87b721889c05eef769e177533ccb SHA512 c4b8f09f888c1c72428ea50811714c67e75bcb35d937ba3c1cb22e486a667777cc396e69eabd741d49bb7839a7376746842a57701e78cf73d15482691e1da934 WHIRLPOOL 3e668e46b0635d2b27cd4468d6e56b64d0b5e334acdaffbf317d49dea2b127a18e42426cf1deb129bcca048d25721f6426624324a613a5977fc13756f2a45a85 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRWa9xAAoJELp701BxlEWf6pEP/j1GDjvmGbrRjaXDHj4I/YDb -coNTmH6rQ6rGgj77kB+8lqkrNPF+O+oSlgo5YsJYL/7T3Is+x9oJQkYF3HolaWkY -3z52nI0m1oLCsg+9aRJA7k38r/6n/6e61gjRLAR8N5feO6MN3UUwNR8isBb3qlPU -BK1NhQsOW5dcM6dlZtva6ri7y8CxRAenmO+JARSUXNOwP5SXyfM+iKeNee9D6gx2 -M5Q2pdpE0dhX8bbTi1J1BAP7sOAQ/PzpW3PBlri247NyH1xtovVW1itQsYcuvB4z -OJYU7DaP0iM1huwWC2mK3/jAWdDRN9JZ957d6CafYIMt/dpdyjyIZIOIzZ9F2o61 -14+yO4IDj/DYgqC2tKgGhqmOePxrQEtI96pmt7qQ1D3Dt8k5BO0WeqR2ucjh4rBu -sk4C2CCriyykg8upeVYYSWWs7fjftTbS+wp8+vieqJ8Dnkly7Vr9Ia4yKaaZuHt6 -Z6W70uS7ui8eaulX1tO22wkS2hS/DrsaHLl9S/1lM2y3R7eJkgDjEj0tvGyiqy4E -A23OeamoDxKu5gZ92ovTvZ6hYez9gt30A9ZPKyUgHzsvr6oniN5wpIDkVqLxWzxx -1jdj47VWrWgsIPRFB9iLAgdzBwri0tp/yvfgeVAUOQdq4fSS54LoZxVk2kSzJ7y9 -M0aGqZ49M9TGU+tjQQnL -=H/C1 +iQEcBAEBCAAGBQJRWtDSAAoJEMbwO6tnXQ0sKikH/R/QI9KjlGJYRosA1qEvpvqg +RtR9nNUuYSs/Fv8YKqQIhcrVhm1n2SI7HHh4t0RKzvrY2bwNZ80ASqidlwiWxB4y +1HCEZSD16nFmnBJkRjQKt6KHICw5/Trd6bBc18UCQzyC8mrSEx4FFMIwasbwNnAl +iagRaJpb7V4OWFKk+UKzQ4sVBQfLsGxof4/P6a0cF9UAId+kVfuk1xCx7gM1XGCP +swQBBJ/O1Qz6YIAUkmp2C7/HPd60EX3lIrX4BJvp7JNYWwrIb8gXG3LBMJqD4dgJ +imL+0VmWuq71PPZXeVTHIBFKC/+CIWQ4vv4iSR+K99Ep8zxf4zGizt2YaHfkcr4= +=B8VV -----END PGP SIGNATURE----- diff --git a/kde-base/katepart/files/katepart-4.10.0-plugins.patch b/kde-base/katepart/files/katepart-4.10.0-plugins.patch deleted file mode 100644 index 3b52bfae6a6c..000000000000 --- a/kde-base/katepart/files/katepart-4.10.0-plugins.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f934575613d7efc60b9b6be6203c777d42ab7ffc Mon Sep 17 00:00:00 2001 -From: Dominik Haumann <dhaumann@kde.org> -Date: Sun, 10 Feb 2013 22:18:38 +0100 -Subject: [PATCH] fix plugin loading in KDE SC 4.10.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks to Dorian and Loïc for finding the root of this issue. - -BUG: 314530 -FIXED-IN: 4.10.1 ---- - part/utils/katepartpluginmanager.cpp | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp -index e9cb258..18fe6f0 100644 ---- a/part/utils/katepartpluginmanager.cpp -+++ b/part/utils/katepartpluginmanager.cpp -@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self() - void KatePartPluginManager::setupPluginList () - { - KService::List traderList = KServiceTypeTrader::self()-> -- query("KTextEditor/Plugin", -- "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')'); -+ query("KTextEditor/Plugin"); - - foreach(const KService::Ptr &ptr, traderList) - { -- KatePartPluginInfo info(ptr); -+ QVariant version = ptr->property("X-KDE-Version", QVariant::String); -+ QStringList numbers = qvariant_cast<QString>(version).split('.'); -+ unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(), -+ numbers.value(1).toUInt(), -+ numbers.value(2).toUInt()); - -- info.load = false; -- info.plugin = 0L; -+ if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version()) -+ { -+ KatePartPluginInfo info(ptr); -+ -+ info.load = false; -+ info.plugin = 0L; - -- m_pluginList.push_back (info); -+ m_pluginList.push_back (info); -+ } - } - } - --- -1.8.1.2 - diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog index 8d4d7bf83eae..1e278cdbfba3 100644 --- a/kde-base/kdeplasma-addons/ChangeLog +++ b/kde-base/kdeplasma-addons/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdeplasma-addons # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.174 2013/04/01 16:03:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.175 2013/04/02 12:31:11 kensington Exp $ + + 02 Apr 2013; Michael Palimaka <kensington@gentoo.org> + -files/kdeplasma-addons-4.10.0-microblog-build.patch: + Remove unused patch. 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -kdeplasma-addons-4.10.0.ebuild, -kdeplasma-addons-4.9.5.ebuild: diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest index b26b15d8a261..2da287d589c3 100644 --- a/kde-base/kdeplasma-addons/Manifest +++ b/kde-base/kdeplasma-addons/Manifest @@ -1,25 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX kdeplasma-addons-4.10.0-microblog-build.patch 1679 SHA256 c4b91549db62ebdb65a5f422b0ee3396b0b2f6d5cb6b19e40d6f076a3ab312b0 SHA512 1facbc3d722e4a59c7f23c4e07e770eb2224d9455748e8838949640ed156e1c8228a6f5f443d24f4676d14e56bffd53fc1fa3c15f538c72d5af967c29f25cb4a WHIRLPOOL 70a374a313ed119a453fc6dd6d3e9291d1cfc943d40a46da45a01a3d55feb3e8ee8f27f3419176a218c23effbbf25d5e640da0cafe521a6a6894c67144e8ad0b DIST kdeplasma-addons-4.10.1.tar.xz 1782948 SHA256 c1b318705ad02c738502da1d80c8e1c3b3a68f2dbe128d532ab0dc9973bed9c4 SHA512 0b96959de45b0bc901f8bcdac5061cb14a46f76420eec310d92e7b1f92db8db602618883b350ded8d8a1a87b0117f13d84ee76ac752d5fcc6765e9fe40ce74bf WHIRLPOOL df054170595dcfc132630c7856e6002370faa15d0f50842c7a0201e32a3eb58c9da65f88ec7f4119b5daf220cecc28dfad31093840fc99e7d9f8919489c29145 EBUILD kdeplasma-addons-4.10.1.ebuild 1888 SHA256 8393524005f511b0f92647fe3b04daec4b483d8e1634f9a8cf998314ddf5528e SHA512 a42049e38dca259907109fb55e02123cb6f7db90c58b0bc5ce17f4665513fd4efadafe9bb59444d62af7cab32564ddea9becc4b86bc50b32466538763d67c94a WHIRLPOOL 8768792b746433da189257a3cd1f35a0fe807b5c81c36cfd862356ef038bdc6e3c221ba5a820f41e4db4a1baa0488f57a51c3f4a82b414b81bf1002c9e93a172 -MISC ChangeLog 24593 SHA256 e807322fe37fb5df50350673319c2c6c84ead9db912d21eff3696c81ccf321a2 SHA512 0b222434c0cd49a52372def04085554766fc82d7295448416cfb37fd93fcd57e7f1093b5c8ab4009c2f9535a07f7f262b14da366e3bd1def538d3a7c94935149 WHIRLPOOL 33ea8e07111dbb75f7b606a8ab9540e229a659f07cc29e288c4a77f28fe98e62e8d95f703db307a63c33ef12c3b5d5374b2a96dad45bf31765bfd111c4f01b2d +MISC ChangeLog 24736 SHA256 8059e934aff2cf3873273d24dc659a0d702e32ab6a8a080913fa102c89ef63d1 SHA512 611ebf1e6145518cdd762211fea8212f094e98dd98e8eeb4c3353a609e29787e2db2eec58986965ccdd68f6c93badd3bde276e0d4a9912c505e224a93ced4511 WHIRLPOOL c161c17532c9b1370cd440775430a462128534655a9c2a28bd96cff65d8a08348939cda024334b65be39243120958635c9d8133d50244c6d3ffcce7459cdc310 MISC metadata.xml 902 SHA256 8ad805248edd55aa85c63be7f913d767f2472dde758f5dc0afcd660c50324678 SHA512 1ed8fc2a73986e2673c146267e2c7dc7048e8865a2d4bec44f7882ff4ea38e1bfa47197e98ac212f00cd637aeca1546bdbfb117cb232bdc7e640c0c4ef733ba3 WHIRLPOOL f2b980d92f1ee250ab59472db049033280fcde1ab0c069119cf5679c9c5db898bfd9d38031e36ce295d296b1b74ec541bd2d83a88b73bf4aed7e6c056710bdb7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRWa97AAoJELp701BxlEWfhHAQALeJp9MPVxm7STf20imCdS2d -tzCI9A9zsYzW3ujDVTPOYYtdvcm3Q1DGmA/T0JihdjjPvlej/jpR4m57+AFzkyIS -NsJZJrkR1tV74LuSaF2eI0shgZ2MiG4rEH3GeCxmVzDM0e2Ihhu5DClUP/Hw+6uA -tRM+jFntyzgBAvHJunOK6aNFeZmXXpTXDaKfXWv+olnOixjn/C/HQz3JSN+bv16S -TTMOi/0eM3S1Ls2GqY2uJhlP1GraavLQrfhocOYfiP2Umpn7lZ5jTzXuyTTzaKB7 -9tDkyBnylxaYgvQpm2NEpMUJcaRBI21pme0lWbloRwG2yQ3MZaED1w/iztwl6xuL -2K2jmFItWRlDQmciOPqe0I+8vuwg48JEDxuoLJNGVYi2Q7mLTHKlCNRBWIV8iNlI -Hi20nVKrJ4ITmEX5Pd0+EnlOqrGZGpgoTq/WWmhLcyivkOg1WDIXG7AdylPsb5PT -rY2UbdJWjn+mxK3U7tw+1QBuoEX/GlpGtCwlLbCmAkLVNtQyNhzAvNwe37hJo0+H -tmCWCC7DGdfTKNv9fcChO/dhhWUIihW2IBTBMAxAzffHl1QzhgVTwa1RdBqLu5PG -QAX2mT6KBAN1gGfI2a0Zyfmx+Q+VrDZmSaMNM3WOADhO0MHneIYufmImsSjqqFDO -GC/5HXi4EqZ1u8vpnNNR -=c21c +iQEcBAEBCAAGBQJRWs9sAAoJEMbwO6tnXQ0sq60H/R1g+CnfenFl5iQT5A2cfkbI +GQeZl6lNTM58MXiy3pwKgWnZDZckFXTZGM4mY+vEktrGsnZP+h9k8x+8NGdK7eXz ++nAMI4s73rWCR0VO1EHmwsTBpzz0PqwbsWNGZtfdqQWLxU9eZpucJJZ/QQKfWdzq +f8HI0uTkv77hQTq0t7cLGysNQaNOrn6orQJz9c2Leof0vdH1/4fZW094AB2dpRZS +4/4t2nkibfV+boLn8SHmjoTAy/v5ao9JWHUNVxfUj72YTy4WWax0nxqL5JDqbwfe +2QqCtJvVUQHs5vH5rAKYzERg0l6nor3KZ1VSUfseOhhLoZZlBN1kDC5/VuFJyo4= +=z7v7 -----END PGP SIGNATURE----- diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch deleted file mode 100644 index 90c10ef96c7b..000000000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.0-microblog-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7cc088acb353f7903c780e55126a5ec18946cb92 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Tue, 26 Feb 2013 15:11:26 +1100 -Subject: [PATCH] Fix build with OAuth present and QJson missing. - -Building with OAuth enabled and QJSon disabled fails, since microblog unconditionally requires QJson. - -REVIEW: 108662 ---- - CMakeLists.txt | 2 +- - dataengines/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eba537c..20f070a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,7 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK) - - - macro_optional_find_package(QJSON) --macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for parsing API responses" "" FALSE "" "") -+macro_log_feature(QJSON_FOUND "QJSon" "Used for various Internet runners, for parsing API responses, and the microblog dataengine" "" FALSE "" "") - - macro_optional_find_package(QtOAuth) - macro_log_feature(QTOAUTH_FOUND "QtOAuth" "QtOAuth Library - required to build the Plasma Microblog DataEngine" "https://github.com/ayoy/qoauth" FALSE "" "Needed for building Plasma Microblog DataEngine") -diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt -index c86be79..15c1aab 100644 ---- a/dataengines/CMakeLists.txt -+++ b/dataengines/CMakeLists.txt -@@ -1,8 +1,8 @@ - add_subdirectory(comic) - --if (QCA2_FOUND AND QTOAUTH_FOUND) -+if (QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND) - add_subdirectory(microblog) --endif(QCA2_FOUND AND QTOAUTH_FOUND) -+endif(QCA2_FOUND AND QJSON_FOUND AND QTOAUTH_FOUND) - - if(LIBATTICA_FOUND) - add_subdirectory(ocs) --- -1.8.1.4 - diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog index 540e75f8a1c8..c44aad10a4bf 100644 --- a/kde-base/kig/ChangeLog +++ b/kde-base/kig/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kig # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.252 2013/04/01 16:03:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.253 2013/04/02 12:29:04 kensington Exp $ + + 02 Apr 2013; Michael Palimaka <kensington@gentoo.org> + -files/kig-4.9.0-boostpython.patch: + Remove unused patch. 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -kig-4.10.0.ebuild, -kig-4.9.5.ebuild: diff --git a/kde-base/kig/Manifest b/kde-base/kig/Manifest index 2d7172805866..0a3ed1657a26 100644 --- a/kde-base/kig/Manifest +++ b/kde-base/kig/Manifest @@ -1,26 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX kig-4.10.0-boostpython.patch 15010 SHA256 281b99a2c774c84e94505c325eea0736bc7aedc6aba923cdb91860f456401815 SHA512 9b9b818da1de68068fdd523f0ce2893e5ae34b11365a580f959a0e24f3e26ff402229b02c64988f9172d604d03cc2ae9310996e21c0917b2aa7fd8406b7b8c2c WHIRLPOOL a861957ea5aca9f1cfa011323c90a6b6b69c78890d7281e5c0747cd8d0dd97c36222c6b04ae9b6d39237e8c2155bc680e87b333ba9aa54b20cd007bcfe1f8cad -AUX kig-4.9.0-boostpython.patch 15733 SHA256 02ebd454100c70e7d4a8baae1d9b9fb79eb830718b1334e5ae2d0cbf1f6570a6 SHA512 8f2edfb3d4498e73dfff65ee532e6ba220fdff5c746dec8137c777b440cf8a911cb12aa6a3578d2b373f39179797685b4656f15a0e08396c8f4edd2a31f2b83c WHIRLPOOL 08b64893383692c71af2c15dd28391c02ecc7f8dd903609da339bc6e5010584baf529c29e4078c8967dcae4d262ea60b05b6c1e6d7fe60efecd182e76e9087f2 DIST kig-4.10.1.tar.xz 1527316 SHA256 5c817fd2a835e4eed1c52e3583cae96548660a1b48a2b2b49ed7648321e2fa76 SHA512 0bd8b98fb234bd6c68c6d4906065295409bbaef955e985bb0561e0261f67a6e67976603631a647984f1f8771ba73198a31ecfe68e7a8b7bb4de899ab2f7f52ea WHIRLPOOL 7542ef3fa705038927a0f8bf3a4c1ad0e828fba22bc94618646c0facdc79f5518d06fea8761854164a6a7e90fceb83b0c3a78726439dcb6e5991ac594150e616 EBUILD kig-4.10.1.ebuild 628 SHA256 a04812bf5386e3496ff9b182217b0f4ed7835d717425b56528b6e74ec2cbc1d1 SHA512 facc8e819bd65efa4697e9842295e86eb7592b68817ae3446f317dc405a85f5900701d7b9675c839eb421b1751aa47dcf66edf0ecbccff898514ec17fd3d0a6e WHIRLPOOL 1b3e151de003af8fa2830afcc637fd42663c29d7923981d7fecb66b659f162613dcfd513f13121b278853534a589acded08fd4afd39aef93c7d28fb43b3398ab -MISC ChangeLog 28785 SHA256 792c49e6c119ed5f83b6c48636dd64936244ed64f56b4493b3c7261a3b479957 SHA512 7465aba2c79a68ae21d029a1c587629f130f7e8bdab6f45a2bd6c7069966fc7be3ad85552caa0108f3924ab7b5710f092ad79044e2cc0e723e4e0d95e270f3f2 WHIRLPOOL e5049ac9003a187d68397c205481863b9e71b2cbdea6bed3296ccad37f8fb23c3f1c11d004daf1bc3c351a8e979730a307e0d41fa5c81931e7c8857e4213cbf9 +MISC ChangeLog 28910 SHA256 646c02c46eaf7a05f01069da132ac3e6535e975a87bd0ad1c21f140e65233a0d SHA512 bd32b74b77b40e4015ceb481430b480128cac75726c8603fe6c72ab726784bd591521bf3b15419151ecce1facabccb6ccb631ce090c8f9623a200e022913f390 WHIRLPOOL 558c115cdd9d6af654b1d16ecf48b57b258fc63206f265be0bb87f74a0ac64d72b17964e01ad39a752afbc1462d3e301c9ef432b47fee85cf6c6a0e99193c391 MISC metadata.xml 225 SHA256 d8e71ad960756b687369d4278755ce54044aed78ab70d603568ffb080a60f3ca SHA512 48bde5093d05011e08bc726705574668440d2ac110071a0700e0f7ba4d25da76e23537fe9b5edc3299f80ccbafea27457a04a12032859856ec3f73a91e3918b6 WHIRLPOOL 4e052f92cb34a46f89fbaae077fca03ea2cc4de9eb26f11ea4d00189850f1fe50b4ae9e64b739d73b0eb3d1bb12e34efb63aa88d2672bdee4a76624d79853fe0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRWa+BAAoJELp701BxlEWfxRkP/jm2e8s7eFrSfHiLfak6r9II -hvn07XhdQWq9FPvhpNKhvyWQKkFpQ0Oh8v23hNJG80+ISLKXYPKtjvko4Ae5nPol -Hc7Kk12dPAT3jwcidKuyaIe0NcNt4VZU83KiiaxWCP37gPNJERgn3f/PofPSoarO -SswTRkiC/6IQtTVe0rywFJgrKaPmnSMxNJxxx9YWSPjL1K0/kkepxX967AY8eFiw -yog2XpSevU8tK/nnLAXaeujWFLiBLfGQAnL0Ie1DyW0sanNBvScmFRT0koVT55zi -ztIDF/g2dn0v/nz9bbGy624LIcAOkq4yzKRFb6kQCZcDhoH2mvNasy3KrKv/K8r+ -a/fOq/J0dIQhVobv2/kPVgVpjKIvqakVA9o3e0Lq4HzdL27zVMHD6TN2oXw6iOd4 -i5+lKy8OBo1trnfoWId3NCR1boekjZGRoCF/wmCklGluP754hwjZLrFvDVKZQDMB -BKu+Yfy/p7tobGI84itQ31KuIRYeW5G3CoI/2+B8oodDhljfqU8FdrUyk8pl+9at -SozHZAdnPuy2MmDhPBRus9x2Xzisg1WL3hlovEVv8AidoZgMtUzozr8QqqfXUJ8X -lE1b1psU/TYMKBp/S7JC2bgAXddBpH/80eerRPaDn9H3oTww/gjeukn7HVTsCsmN -3X6hZE4n8anTrv6qjTCm -=LMEV +iQEcBAEBCAAGBQJRWs7uAAoJEMbwO6tnXQ0saYcH/iO00SXYZEWjUFw1SBsrS7EM +2+2uibPKZByVkPpyN9WzSFF43/dwFEgntRL8CpXuiI1rGlHhJp5RHPE9O987oJlk +1l+CZuFrVfTp26BoOAoQft7M9SwQUxHG6+cYbFf151kijFhT5wb4i039tp69qdTY +eXYIvzCoUJ4nd/v3Pl2VdN8iB8f/7cPQzDcuSwz2A3Z/DoVyaP14aduRCfSzl5xz +0nO0T+36amKxLE37UzqjQ323bDKJsO10BOty/ansxP1PnvG+B1NPwzxhg127LgdK +ZIFesKFZI4+VdPmoBBUN1KghLh39VIO/8/ohs0R+5jl6h8aCUbt5nVPOb6INck8= +=HRzf -----END PGP SIGNATURE----- diff --git a/kde-base/kig/files/kig-4.9.0-boostpython.patch b/kde-base/kig/files/kig-4.9.0-boostpython.patch deleted file mode 100644 index c2035b1e9485..000000000000 --- a/kde-base/kig/files/kig-4.9.0-boostpython.patch +++ /dev/null @@ -1,448 +0,0 @@ -From 0eb0768a4c66543b4ce716869eea744cb09b55ad Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Thu, 30 Aug 2012 14:02:44 +0200 -Subject: [PATCH] Use standard cmake module to find boost python. - ---- - CMakeLists.txt | 34 ++++---- - KigConfigureChecks.cmake | 4 +- - cmake/COPYING-CMAKE-SCRIPTS | 22 ------ - cmake/FindBoostPython.cmake | 153 ------------------------------------ - cmake/modules/FindBoostPython.cmake | 134 ------------------------------- - 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 327 Zeilen entfernt(-) - delete mode 100644 cmake/COPYING-CMAKE-SCRIPTS - delete mode 100644 cmake/FindBoostPython.cmake - delete mode 100644 cmake/modules/FindBoostPython.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ba3e377..092fde3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,6 @@ - project(kig) - --# --# taken from kdeedu/CMakeList.txt --# from here... --set(CMAKE_MODULE_PATH ${kig_SOURCE_DIR}/cmake ) -+option(WITH_SCRIPTING "Enable python scripting support" ON) - - # search packages used by KDE - find_package(KDE4 4.3.80 REQUIRED) -@@ -30,7 +27,14 @@ include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_D - - # ...to here - --find_package(BoostPython) -+if(WITH_SCRIPTING) -+ find_package(PythonLibs) -+ find_package(Boost COMPONENTS python) -+endif(WITH_SCRIPTING) -+ -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ set(KIG_ENABLE_PYTHON_SCRIPTING 1) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - kde4_no_enable_final(kig) - -@@ -45,14 +49,14 @@ add_subdirectory( macros ) - #add_subdirectory( kfile ) - add_subdirectory( data ) - add_subdirectory( pykig ) --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - add_subdirectory( scripting ) --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BOOST_PYTHON_FOUND) -- include_directories(${BOOST_PYTHON_INCLUDES}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ include_directories(${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - # kigpart - -@@ -173,7 +177,7 @@ kde4_add_ui_files(kigpart_PART_SRCS - misc/kigcoordinateprecisiondialog.ui - ) - --if(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - set(kigpart_PART_SRCS ${kigpart_PART_SRCS} - scripting/newscriptwizard.cc - scripting/python_scripter.cc -@@ -183,15 +187,15 @@ if(BOOST_PYTHON_FOUND) - ) - - set_source_files_properties(scripting/python_scripter.cc PROPERTIES COMPILE_FLAGS "${KDE4_ENABLE_EXCEPTIONS}") --endif(BOOST_PYTHON_FOUND) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - - kde4_add_plugin(kigpart ${kigpart_PART_SRCS}) - - target_link_libraries(kigpart ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ) --if(BOOST_PYTHON_FOUND) -- target_link_libraries(kigpart ${BOOST_PYTHON_LIBS} ${KDE4_KTEXTEDITOR_LIBS}) --endif(BOOST_PYTHON_FOUND) -+if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) -+ target_link_libraries(kigpart ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS}) -+endif(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND) - - install(TARGETS kigpart DESTINATION ${PLUGIN_INSTALL_DIR}) - -diff --git a/KigConfigureChecks.cmake b/KigConfigureChecks.cmake -index fed38b3..a53ea73 100644 ---- a/KigConfigureChecks.cmake -+++ b/KigConfigureChecks.cmake -@@ -9,8 +9,6 @@ check_function_exists(trunc HAVE_TRUNC) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - --macro_optional_find_package(BoostPython) -- - # at the end, output the configuration - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config-kig.h.cmake -@@ -18,7 +16,7 @@ configure_file( - ) - - macro_log_feature( -- BOOST_PYTHON_FOUND -+ Boost_PYTHON_FOUND - "Boost.Python" - "Kig can optionally use Boost.Python for Python scripting" - "http://www.boost.org/" -diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS -deleted file mode 100644 -index 4b41776..0000000 ---- a/cmake/COPYING-CMAKE-SCRIPTS -+++ /dev/null -@@ -1,22 +0,0 @@ --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions --are met: -- --1. Redistributions of source code must retain the copyright -- notice, this list of conditions and the following disclaimer. --2. Redistributions in binary form must reproduce the copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. --3. The name of the author may not be used to endorse or promote products -- derived from this software without specific prior written permission. -- --THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR --IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES --OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. --IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, --INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT --NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, --DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY --THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT --(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF --THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -diff --git a/cmake/FindBoostPython.cmake b/cmake/FindBoostPython.cmake -deleted file mode 100644 -index 6d5f05e..0000000 ---- a/cmake/FindBoostPython.cmake -+++ /dev/null -@@ -1,153 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --find_package(PkgConfig) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- # try pkg-config next -- set(_found FALSE) -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- pkg_check_modules(_python QUIET ${_pyver}) -- if (_python_FOUND) -- find_package(Boost 1.33 COMPONENTS python) -- if (Boost_PYTHON_FOUND) -- set(_found TRUE) -- set(BOOST_PYTHON_INCLUDES "${_python_INCLUDE_DIRS};${Boost_INCLUDE_DIRS}") -- set(BOOST_PYTHON_LIBS "${_python_LDFLAGS} ${Boost_PYTHON_LIBRARY}") -- endif(Boost_PYTHON_FOUND) -- endif(_python_FOUND) -- endif(NOT _found) -- endforeach(_pyver ${PYTHON_VERSIONS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP AND NOT _found) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: libs ${BOOST_PYTHON_LIBS}, headers ${BOOST_PYTHON_INCLUDES}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) -diff --git a/cmake/modules/FindBoostPython.cmake b/cmake/modules/FindBoostPython.cmake -deleted file mode 100644 -index 72aae54..0000000 ---- a/cmake/modules/FindBoostPython.cmake -+++ /dev/null -@@ -1,134 +0,0 @@ --# - Try to find the a valid boost+python combination --# Once done this will define --# --# BOOST_PYTHON_FOUND - system has a valid boost+python combination --# BOOST_PYTHON_INCLUDES - the include directory for boost+python --# BOOST_PYTHON_LIBS - the needed libs for boost+python -- --# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it> --# --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- # Already in cache, be silent -- set(BOOST_PYTHON_FIND_QUIETLY TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --# some needed includes --include(CheckCXXSourceCompiles) --include(CheckIncludeFileCXX) --include(CheckLibraryExists) -- --# reset vars --set(BOOST_PYTHON_INCLUDES) --set(BOOST_PYTHON_LIBS) -- --# handy arrays --set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") --set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") --set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") --set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") -- --# 1st: check for boost/shared_ptr.hpp --check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) -- --if(HAVE_BOOST_SHARED_PTR_HPP) -- -- set(_found FALSE) -- -- # save the old flags and setting the new ones -- set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") -- -- foreach(_pyver ${PYTHON_VERSIONS}) -- if(NOT _found) -- foreach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) -- string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) -- -- if(EXISTS ${_pydir}) -- if(EXISTS ${_pydir}/Python.h) -- -- foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- if(NOT _found) -- string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) -- -- foreach(_pblib ${PYTHON_LIBS}) -- -- if(NOT _found) -- -- set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") -- set(CMAKE_REQUIRED_INCLUDES ${_pydir}) -- set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) -- -- check_cxx_source_compiles(" --#include <boost/python.hpp> --const char* greet() { return \"Hello world!\"; } --BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } -- --int main() { return 0; } -- --// some vars, in case of the compilation fail... --// python include dir: ${_pydir} --// python lib dir: ${_pylibdir} --// boost python lib: ${_pblib} -- --" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) -- -- set(CMAKE_REQUIRED_FLAGS) -- set(CMAKE_REQUIRED_INCLUDES) -- set(CMAKE_REQUIRED_LIBRARIES) -- -- if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- set(_found TRUE) -- -- set(BOOST_PYTHON_INCLUDES ${_pydir}) -- set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") -- -- endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) -- -- endif(NOT _found) -- -- endforeach(_pblib ${PYTHON_LIBS}) -- -- endif(NOT _found) -- -- endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) -- -- endif(EXISTS ${_pydir}/Python.h) -- endif(EXISTS ${_pydir}) -- -- endif(NOT _found) -- -- endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) -- -- endif(NOT _found) -- -- endforeach(_pyver ${PYTHON_VERSIONS}) -- -- set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) -- --endif(HAVE_BOOST_SHARED_PTR_HPP) -- --if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- set(BOOST_PYTHON_FOUND TRUE) --endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) -- --if(BOOST_PYTHON_FOUND) -- if(NOT BoostPython_FIND_QUIETLY) -- message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}") -- endif(NOT BoostPython_FIND_QUIETLY) -- set(KIG_ENABLE_PYTHON_SCRIPTING 1) --else (BOOST_PYTHON_FOUND) -- if (BoostPython_FIND_REQUIRED) -- message(FATAL_ERROR "Could NOT find Boost+Python") -- endif(BoostPython_FIND_REQUIRED) -- set(KIG_ENABLE_PYTHON_SCRIPTING 0) --endif(BOOST_PYTHON_FOUND) -- --mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) --- -1.7.12 - diff --git a/kde-base/perlqt/ChangeLog b/kde-base/perlqt/ChangeLog index d77d2076e0d0..ea0258bcd8ef 100644 --- a/kde-base/perlqt/ChangeLog +++ b/kde-base/perlqt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/perlqt # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.69 2013/04/01 16:04:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/perlqt/ChangeLog,v 1.70 2013/04/02 12:34:02 kensington Exp $ + + 02 Apr 2013; Michael Palimaka <kensington@gentoo.org> + -files/perlqt-4.8.1-tests.patch: + Remove unused patch. 01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> -perlqt-4.10.0.ebuild, -perlqt-4.9.5.ebuild: diff --git a/kde-base/perlqt/Manifest b/kde-base/perlqt/Manifest index e88dc4b50e42..695234319150 100644 --- a/kde-base/perlqt/Manifest +++ b/kde-base/perlqt/Manifest @@ -1,26 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX perlqt-4.7.2-vendor.patch 677 SHA256 24f1a0931a3ec0472570e3e488aa5ca5636aa764e9bd5d788fe7e6e5abd9e214 SHA512 e75ac9d3513cc34c39d7d554385ea599d4f64514f913208aec9277545775f9911e75b362a4ec72fc0fa607a3e5e18e0a44e3f5bc7b12d2643d40f5ce80b390b4 WHIRLPOOL b09927864cc91f1735fdc8494868f51b65b6771f9612152a301f50d5e3cd255345219069c3245f590eeeba13b27662763a105740faec9d86578230452e48dc6b -AUX perlqt-4.8.1-tests.patch 1383 SHA256 512ca266f1440e4681204b7a299ca85bdc1e855fb71cc5c5430c89a61e103726 SHA512 2d9c7cd24cc07f96b920bc0dc7ad4041ce8fe245a3af7b5378945cfd2d6f25bf1efa9dd8954845a07d8b20f34b14e9f0f1210b4b6ae5f0534a017920f3a98c80 WHIRLPOOL 3db237e7cc56927ad2fac65ae2f81d2d3b13f3aaf3cdcec13711bf532caceaac735c641a390d239d0b0c42755fec4765a939dbf26f94ed43fd53545286acaf10 DIST perlqt-4.10.1.tar.xz 1837288 SHA256 0708cece4c8ad6b8dce25cfd96509f5cddb0095a09f851dd1a4f8c1a0ebdf930 SHA512 ba5a32ce9f2291344bdf8e196c47c0d8753931ce8d228b0aefc73e909f2d5b5274b17a58b07f4c8604967047e5408bda414fbb7fc1ea47074b2c4542e0c8f7d5 WHIRLPOOL 870ae38143ad57711c1d31ff14e171e3abcf29b0990b5e113e377a976120346c46b5d5987aba3abd5a287bbd974b43560ca087f7f29416a71d0b756e5fd9dd48 EBUILD perlqt-4.10.1.ebuild 1474 SHA256 2dc69cd306f3d02fbb18dac208e5e5bd03f2e17f0a70d76e3ebe774b4be58f0d SHA512 1fda9a999024b801c317c0b5aad53b71e16ca03c124d0446b2830b11ea16305605d068468a889d4c3b6cad877b1c19cd33419be67bd846e1cfe59a7222bedcb4 WHIRLPOOL be0920a68d6620e50ffc3fda50ac11770de0802a747ef395f03fb3270811338252b49054512669edec2c076524e1885255780da925818fae895cff8225db6582 -MISC ChangeLog 8260 SHA256 be4af5247f141a5e7fb74b99c9c0fb0ae0ced3d368656d44f07893acb3da5370 SHA512 77ab4ae2729be6291e9adc2c5a463c2d9cc3529441bbf890075205a1e48f2ca9a8b7fb0f0b684cb362dd4df6b9514761741234a90b1c9317b91c9ce80b0ad98a WHIRLPOOL b31d3799b9e4de8469452ac2c30de77592b5181a017c17aec2f7108d1a6997de19e80482b92232f1f966df81f1e372d3fa3c8b6cf4635182676bd346e83635d4 +MISC ChangeLog 8382 SHA256 d904a9a388007079ee18318688577d69a9c054d62ae44934154afe08fa16c27b SHA512 a89de1e1fbe31a559ac54a02f27097c7a59098daf15808f487409236bb1b4d1a765f392d7e40f630b15af693cc0203b476a25d205ef4386a235bd0c7f044bf96 WHIRLPOOL 96a8a93c88838a9b663ce5a1ec251111724946e313261dc2cb3ffdd4bbfd47127c71dfb09deeab4eea909f216938a06674f968022c3a11366e1a4f54db009b29 MISC metadata.xml 807 SHA256 86529cbab16e7e43ce33dba9056a125bdff063e924da11b8191f1b607be27597 SHA512 b19bc36fe5ab17039abcf0fc1cdaa91021632a3e4ede58d799b22191b0c328d0d9cee13563790d0db986330a88f72bb0f1dc530aff398f0b6239d9318afcc1a8 WHIRLPOOL 10d2bff47d6d1f07d18f2db9a38f41477ab7477b710e7c24f82cb65d751933fd9f032444f820d367220de68cb7fa68b0c1251144b849d05f71f9e57a757f7bc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRWa+XAAoJELp701BxlEWffFcP/jip33Jl709eUp1Oc9OsKCZk -Ts22tC806n2o0uZDerHu+d3PdfjuOuD5krvkvaoCuxQyoL30qliJpn7gSqgumjQe -T0rMLCLEuwl3XecrczCtnt4Lhk8cYoDHqs0Bfc/UdGL/LmFPSFJzd0Zmhs+5Ehkx -fPK1XWOve/SKjPk9s2TA+R7tHPQp53gIJ503mDRoLN0WLxpeqaoT5x5kpQ85ai7G -AVw6MbbP6TAOzDHpOzq/SNiZKrTR4exic7LgepSVO/vqVdvuco+6cySVWvlMCS8s -kwZ4AqHMYhn+et2Q3bTnwr6HLzHfEexJysj5HNX1DZRGAC0C9mFzHafOVkOCYe9f -gnekXIw/wgixRfySLy/X/eAiCzoHZy3imRWO9kBwqa6aHmIwbayEnTP14LScOV6S -sweErqqw3oyKVUdTt5Z//Z96xKholcqHf5gxqhT5vHqhB8ytDtfBORj+Ksmy4Pb4 -mHl+Au//dEmdGG7PXSHrmLnYX0F4/Ph9xKumSME6n2tswWkCatAfAt6D0rx5gM/l -zCAM0GWXPIyGJ9fX0DRiZcnJ4qkd9oBMmB9966D1VK98ka9s5T28ZYyDTUJ5M6Dy -MsuB9lqdAYNTO6/uy7wsXWQsAEvupzjsPUg9b7xSGm4FjrUjnCC3V/IcnPtdqKRp -l6IR2FRoROuEK5t6BUYW -=vwUR +iQEcBAEBCAAGBQJRWtAXAAoJEMbwO6tnXQ0s8WMH/j6jnjYjJyxLRUoAM/qrSeRv +ElMngNvXyx2sm/6DK5kHXzxF5Wp3bcKh33ddx1drWJQyIMdawRFiVDTkQIfWeDAj +sIeBwYWCGv5pH1Nd+DYyapAx9/lYvTZXQ7/s7Fo+0qIWSMY9V+8Fltd5twC0QW3z +L9LtcL+T4DDH1lbwteQoFWMXz0IWAJblDQQ0Lg7wD9MMBpULH74lg7EfcO9F8oEp +aybYhDokT1B1Iuj4J05tPdCE5KlE5U31CaRBZeEklr4mHObCZt6QyJt1bbAixh4d +NrDL0/HoxgasJatX5CCrHVHpb93WbJzJfmVMk/l9eEqz9CXX5l4i+9WBNjm83cg= +=nOgX -----END PGP SIGNATURE----- diff --git a/kde-base/perlqt/files/perlqt-4.8.1-tests.patch b/kde-base/perlqt/files/perlqt-4.8.1-tests.patch deleted file mode 100644 index a2fe9d0b6fce..000000000000 --- a/kde-base/perlqt/files/perlqt-4.8.1-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN perlqt-4.8.1.orig/qtcore/t/CMakeLists.txt perlqt-4.8.1/qtcore/t/CMakeLists.txt ---- perlqt-4.8.1.orig/qtcore/t/CMakeLists.txt 2012-02-29 23:56:20.000000000 +0100 -+++ perlqt-4.8.1/qtcore/t/CMakeLists.txt 2012-04-01 17:41:58.071078670 +0200 -@@ -2,6 +2,6 @@ - macro_prove(perlqt_qtcore4_qapp ${CMAKE_CURRENT_SOURCE_DIR}/c_qapp.t) - macro_prove(perlqt_qtcore4_sigslot ${CMAKE_CURRENT_SOURCE_DIR}/d_sigslot.t) - macro_prove(perlqt_qtcore4_sigslot_inherit ${CMAKE_CURRENT_SOURCE_DIR}/e_sigslot_inherit.t) --macro_prove(perlqt_qtcore4_handlers ${CMAKE_CURRENT_SOURCE_DIR}/f_handlers.t) -+# macro_prove(perlqt_qtcore4_handlers ${CMAKE_CURRENT_SOURCE_DIR}/f_handlers.t) - - macro_prove(perlqt_qabstractitemmodel ${CMAKE_CURRENT_SOURCE_DIR}/qabstractitemmodel.t) -diff -ruN perlqt-4.8.1.orig/qttest/t/CMakeLists.txt perlqt-4.8.1/qttest/t/CMakeLists.txt ---- perlqt-4.8.1.orig/qttest/t/CMakeLists.txt 2012-02-29 23:56:20.000000000 +0100 -+++ perlqt-4.8.1/qttest/t/CMakeLists.txt 2012-04-01 17:42:32.225079478 +0200 -@@ -1,5 +1,5 @@ - # Class tests - macro_prove(perlqt_qttest4_load ${CMAKE_CURRENT_SOURCE_DIR}/a_loading.t) - --macro_prove(perlqt_qsignalspy ${CMAKE_CURRENT_SOURCE_DIR}/qsignalspy.t) -+# macro_prove(perlqt_qsignalspy ${CMAKE_CURRENT_SOURCE_DIR}/qsignalspy.t) - macro_prove(perlqt_qtesteventlist ${CMAKE_CURRENT_SOURCE_DIR}/qtesteventlist.t) |