diff options
author | Michael Palimaka <kensington@gentoo.org> | 2013-05-10 17:23:31 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2013-05-10 17:23:31 +0000 |
commit | 58e9d036623d10157c48b17c74494b88560df600 (patch) | |
tree | df5b895fff36fa7746c24ad973395f527f80a109 /kde-base | |
parent | Backport patch from upstream to fix build with USE="v4l" and Linux 3.9, wrt b... (diff) | |
download | historical-58e9d036623d10157c48b17c74494b88560df600.tar.gz historical-58e9d036623d10157c48b17c74494b88560df600.tar.bz2 historical-58e9d036623d10157c48b17c74494b88560df600.zip |
Remove unused patch.
Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/kstars/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kstars/Manifest | 17 | ||||
-rw-r--r-- | kde-base/kstars/files/kstars-4.10.1-build.patch | 137 |
3 files changed, 13 insertions, 147 deletions
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog index d5890d0b6f31..f3f6cafb6ae5 100644 --- a/kde-base/kstars/ChangeLog +++ b/kde-base/kstars/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kstars # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.271 2013/05/06 20:18:04 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.272 2013/05/10 17:23:10 kensington Exp $ + + 10 May 2013; Michael Palimaka <kensington@gentoo.org> + -files/kstars-4.10.1-build.patch: + Remove unused patch. *kstars-4.10.3 (06 May 2013) diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest index 96af4d0a38dc..819eb203889d 100644 --- a/kde-base/kstars/Manifest +++ b/kde-base/kstars/Manifest @@ -1,21 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX kstars-4.10.1-build.patch 3669 SHA256 cbeec42b9f4801684280e5b743b34d454d542d43b612cb1f267ace72a5339f08 SHA512 a53951a814c49082db1ce4724fc32228fd1a2fa5eb7209d4182d383355a8db45ba9e43bc4bc165b98b5b1f8bcd9cbe69ec32b41c43c12ef36291fba3d6fe160c WHIRLPOOL 3c5894842ce3e0261e6e592c581753308b54b508c003e3ded5eaa45ecbfc9ba9edcd793cb7808e8c515e5f6c01ecfe1bab78f9cb0a28f43780ee829cc8356241 DIST kstars-4.10.2.tar.xz 12470500 SHA256 3e9e2a1641be88cc5a2b36b0b1929f56f1ffcb6a935d2f627d3786e5d975065d SHA512 3f108d9ef9f9ba67466228e7897dfcfc532bdae11959b7c44433e68e73c5eeafd60f600ad8520428928b6b24acf32436b1ed29d0a8710f6269d290d19d952d11 WHIRLPOOL b25f76b6dbfc5a04b08224ce54890b9155b40bb4581355109d3a1dc6d461f4ec5898880d81ddac96d8ebbfdc63343a1f12f357908c19d75d7302ea21c99d6e27 DIST kstars-4.10.3.tar.xz 12490412 SHA256 21f2039b75d222e34c50ac943a280243963d72b61e1c019db49393e9b332fb06 SHA512 d5cff585d97257e6775564d5b420d77529f92fbf54f87f64a980d828ab9092dbb21c3f6427e3cfb84494fbf22ccca6176bff03c501e6679895fe74fcc3b83df0 WHIRLPOOL d26f34a1cd27cb26ae67145655962bc748f22527c448beaf9b8019e514f0c01fbff9f47faefaa59d2cab4e8f5f4ee65e847c588d2b187662bcc30f54b59f4102 EBUILD kstars-4.10.2.ebuild 743 SHA256 ffc57917e2a017c954d1a7feef91fc6fbe5640690a1e124e14b8c501eac558b5 SHA512 ffd049b6205ad9e3d601eeecb7e4195a34d846da466e958e0cc8688cbb7bf66649d574e7d323f605169cb97a76805f8413ea89e755c4f8163ccf12a66c49f3f6 WHIRLPOOL 9ea67a454baec5478822b03f9bef8f4c6077cd4cedce64060fda90accd6f0ed40a6032ebe354c070813c77bffd358215a36f6e385d8083e4aab8ad2ace559118 EBUILD kstars-4.10.3.ebuild 749 SHA256 2e1caa6947c5f1a6b2f6765f2bae8813c706adc8a13ded139386c9312aec6d9c SHA512 5e5bdbc1cebc5f68d8802bdde717d79b8d94bb8069d1149b40d40e5e01ec18735ad56f069d62c2fd21a6e96b06457a86297b00ffe481b9218ac7052f0fa7e1c4 WHIRLPOOL a03fdd31786a92f399d05b7d1eebcafe77fa057b780df1826d0ef335fb5062b2ec40ff84113646e6d96c2dbe2fb44281057fd78f08e1601141b482e9620785c5 -MISC ChangeLog 31891 SHA256 074aacacd30b9d3cc11c4daac7ae91fe6083846a524ce580ab862a21d787b42a SHA512 d20b340ee3dc64aa710cb1eba6587c7209d76abd7cb0d92ebb110ffa114d6ba3be08d6a2f23bdd1b33a92e3219e4570d93013e95d9363b39be1871f63d306395 WHIRLPOOL 54b7f3b33b15b15bf5b8b108aabd8919197e2650af4da13fda62552930b5d83c809c73b2a85524122ab037e20e6f9905b2ea910c5882b159e45abadedd8b37e5 +MISC ChangeLog 32013 SHA256 fba1a95cfc167df9d266dec7c0d8474aa650ff80355835eb50272285dcec737b SHA512 5605e6f8a4300811cc3338a6ed70c8224c4bbe822315a4de3a745a06b97fc52126f8ad682a484a05ece21dc1cef5763224614e92a6dfbd120bb3fb73ebf8b9ff WHIRLPOOL d30ef4014bb398521cba49d300e875c0b5dcdb4c199120d82708e61d88498569cb537f18337269b60813e3b831ed6002ac7a2755d71a4c6b072ef7f5836a6247 MISC metadata.xml 340 SHA256 689195a7a93cf44147d58061940bc74b4b0a4c1b44529e70d7010cc6d1ed6e7a SHA512 a2371776990f7c60629fd24e4a72f4f3d00dd0c6a4e7bb283e506ca4aa4dcef81861fb740ae61e6964e0bece9a2c694c8edf69bbf85ed14ec98498c80fb48204 WHIRLPOOL 02eac595120392ae604b0e5a63cdf31ab7612ef1be06f8bb867bb4678f6acd1c7908c20c09694e06fee4f2553abb53ceb47b363529ee8388f9b65633a88835c3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRiBBuAAoJEO+t9ga+3I3aLNYH/0m+EBwWqSyClExyMRY9eXQ4 -PvewCufNiHSSZREyzwhdOQo4MLg82UJ2aR94s7MUelwBw4RlNbdC0QmziIlJFkm4 -lvnQsN9R+3T2iHD4N/QCEzDkDKuIe8OsbwcTsoWx9a0Jf040Quq0xSSycG3XotaQ -6aLJp7D8+zMq4aq7ITFnWxcFOc+5b/RwuUZ/n2bnuwcVzuMa28wp2OBPraKq/R/1 -Zeyrw2sorJoWV4yZj6RmkBX7MRk9SG7msyMoFw5F2WNVmbNgtQ0mxdzb7696sogj -dRyPckIFfnbVtywbo8/dmIIiwiFnOnCS+fp/xSuHpP89dmQw3j+O77bMJAYRKrI= -=BqUW +iQEcBAEBCAAGBQJRjSzAAAoJEMbwO6tnXQ0s2R8IALrAzcGo/qSOuQrBH3a+GMXP +FF6QAg/0WGEvd7GyaquufekF99FE7yPW8R23W9sHZfqdBq8NodN46YZxNLXBjeiO +ghbILOtNl3bKQ7SIlhrGIlR/IwKZ3p2i2k8d9nXMjoQSuD3MAO/MVOi2Ql/lrLz7 +0wG+CtY8460xsZEzQ1tRGb90Nfst0UTaeCxTQTk84Hvv2HFGobo6anubt3pfKsaQ +UV/Y7YkLM/n4b00tl0dVSizgbRTFksHwnwmKeGwTQ9JIPXGSqeVpY8giFhxz0Xt8 +h7cCcCiv2dq02CCG3sEJzCdBWkeW6OjGo+v7979xb0oZzf0fDla8WtDWCl++3vo= +=i1hn -----END PGP SIGNATURE----- diff --git a/kde-base/kstars/files/kstars-4.10.1-build.patch b/kde-base/kstars/files/kstars-4.10.1-build.patch deleted file mode 100644 index b44db2528eaf..000000000000 --- a/kde-base/kstars/files/kstars-4.10.1-build.patch +++ /dev/null @@ -1,137 +0,0 @@ -From d9dfd9a2b3e337cf92a89e944ca14f2cf8a328d7 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Sat, 16 Mar 2013 00:37:27 +1100 -Subject: [PATCH] Fix building issues with cfitsio disabled. - -BUG: 316464 -REVIEW: 109477 ---- - kstars/CMakeLists.txt | 6 ++++-- - kstars/indi/indiccd.cpp | 9 +++++++++ - kstars/kstarsactions.cpp | 8 +++++--- - 3 files changed, 18 insertions(+), 5 deletions(-) - -diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt -index 52d35f2..2d00264 100644 ---- a/kstars/CMakeLists.txt -+++ b/kstars/CMakeLists.txt -@@ -53,6 +53,7 @@ if (INDI_FOUND) - indi/telescopewizard.ui - ) - -+if (CFITSIO_FOUND) - set(ekosui_SRCS - ekos/opsekos.ui - ekos/ekosmanager.ui -@@ -78,7 +79,8 @@ if (INDI_FOUND) - ekos/guide/scroll_graph.cpp - ekos/guide/vect.cpp - ) -- -+endif(CFITSIO_FOUND) -+ - include_directories(${INDI_INCLUDE_DIR}) - endif(INDI_FOUND) - -@@ -443,7 +445,7 @@ kde4_add_kcfg_files(kstars_SRCS ${kstars_KCFG_SRCS}) - #kde4_add_dcop_skels(kstars_SRCS kstarsinterface.h simclockinterface.h ) - - kde4_add_ui_files(kstars_SRCS -- ${indiui_SRCS} ${ekosui_SRCS} ${fitsui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS} ${kstars_dialogsui_SRCS} -+ ${indiui_SRCS} ${ui_SRCS} ${fitsui_SRCS} ${ekosui_SRCS} ${xplanetui_SRCS} ${kstars_optionsui_SRCS} ${kstars_dialogsui_SRCS} - ${printingui_SRCS} - thumbnailpicker.ui thumbnaileditor.ui oal/observeradd.ui oal/equipmentwriter.ui oal/execute.ui skycomponents/notifyupdatesui.ui - ) -diff --git a/kstars/indi/indiccd.cpp b/kstars/indi/indiccd.cpp -index 67311af..a578a1a 100644 ---- a/kstars/indi/indiccd.cpp -+++ b/kstars/indi/indiccd.cpp -@@ -7,6 +7,8 @@ - version 2 of the License, or (at your option) any later version. - */ - -+#include <config-kstars.h> -+ - #include <string.h> - - #include <KMessageBox> -@@ -15,8 +17,11 @@ - - #include <basedevice.h> - -+#ifdef HAVE_CFITSIO_H - #include "fitsviewer/fitsviewer.h" - #include "fitsviewer/fitscommon.h" -+#endif -+ - #include "clientmanager.h" - #include "streamwg.h" - #include "indiccd.h" -@@ -477,7 +482,9 @@ CCD::CCD(GDInterface *iPtr) : DeviceDecorator(iPtr) - - CCD::~CCD() - { -+#ifdef HAVE_CFITSIO_H - delete (fv); -+#endif - delete (streamWindow); - delete (primaryChip); - delete (guideChip); -@@ -755,6 +762,7 @@ void CCD::processBLOB(IBLOB* bp) - - void CCD::addFITSKeywords(QString filename) - { -+#ifdef HAVE_CFITSIO_H - int status=0; - - if (filter.isEmpty() == false) -@@ -780,6 +788,7 @@ void CCD::addFITSKeywords(QString filename) - - filter = ""; - } -+#endif - } - - void CCD::FITSViewerDestroyed() -diff --git a/kstars/kstarsactions.cpp b/kstars/kstarsactions.cpp -index 0d7eb37..1e76bc4 100644 ---- a/kstars/kstarsactions.cpp -+++ b/kstars/kstarsactions.cpp -@@ -86,10 +86,8 @@ - #include <config-kstars.h> - - #ifdef HAVE_INDI_H --#include "ekos/ekosmanager.h" - #include "indi/telescopewizardprocess.h" - #include "indi/opsindi.h" --#include "ekos/opsekos.h" - #include "indi/drivermanager.h" - #include "indi/guimanager.h" - #endif -@@ -104,7 +102,8 @@ - #ifdef HAVE_CFITSIO_H - #include "fitsviewer/fitsviewer.h" - #ifdef HAVE_INDI_H --//#include "ekos/ekos.h" -+#include "ekos/ekosmanager.h" -+#include "ekos/opsekos.h" - #endif - #endif - -@@ -444,10 +443,13 @@ void KStars::slotViewOps() { - opsindi = new OpsINDI (this); - dialog->addPage(opsindi, i18n("INDI"), "kstars"); - -+ #ifdef HAVE_CFITSIO_H - opsekos = new OpsEkos(this); - dialog->addPage(opsekos, i18n("Ekos"), "kstars"); - #endif - -+ #endif -+ - #ifdef HAVE_XPLANET - opsxplanet = new OpsXplanet( this ); - dialog->addPage(opsxplanet, i18n("Xplanet"), "kstars_xplanet"); --- -1.8.1.5 - |