summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-12-23 16:57:49 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-12-23 16:57:49 +0000
commit3302743ea08bb1c37e643e807f226cd5cfab980d (patch)
tree0d2a78d857f29e6b8fcb091606cff519fde1de69 /net-p2p/museek+/files
parentStable for amd64 wrt bug #297844 (diff)
downloadhistorical-3302743ea08bb1c37e643e807f226cd5cfab980d.tar.gz
historical-3302743ea08bb1c37e643e807f226cd5cfab980d.tar.bz2
historical-3302743ea08bb1c37e643e807f226cd5cfab980d.zip
Drop museek+. Per bug #287583
Diffstat (limited to 'net-p2p/museek+/files')
-rw-r--r--net-p2p/museek+/files/museek+-0.1.13-gcc43.patch124
-rw-r--r--net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch95
-rw-r--r--net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch163
3 files changed, 0 insertions, 382 deletions
diff --git a/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch b/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch
deleted file mode 100644
index b3a469a753f3..000000000000
--- a/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-gcc-4.3 compatibility, by Belegdol.
-http://www.museek-plus.org/changeset/743
---- a/museek+/trunk/sources/Museek/Museek.cc
-+++ b/museek+/trunk/sources/Museek/Museek.cc
-@@ -37,4 +37,5 @@
- #include <queue>
- #include <vector>
-+#include <cstdlib>
-
- using std::string;
-
---- a/museek+/trunk/sources/Museek/DistribManager.cc
-+++ b/museek+/trunk/sources/Museek/DistribManager.cc
-@@ -27,4 +27,6 @@
- #define MULOG_DOMAIN "Museek.DM"
- #include <Muhelp/Mulog.hh>
-+
-+#include <algorithm>
-
- using std::vector;
-
-
---- a/museek+/trunk/sources/Museek/PeerManager.hh
-+++ b/museek+/trunk/sources/Museek/PeerManager.hh
-@@ -96,5 +96,5 @@
- inline void set_uploading(Transfer* uploading) { mUploading = uploading; }
-
-- void push_download(uint path, const std::wstring& path);
-+ void push_download(uint path1, const std::wstring& path);
- void flush_downloads();
-
-
-
---- a/museek+/trunk/sources/Museek/TransferManager.cc
-+++ b/museek+/trunk/sources/Museek/TransferManager.cc
-@@ -37,4 +37,5 @@
- #include <vector>
- #include <iostream>
-+#include <algorithm>
-
- using std::string;
-
-
---- a/museek+/trunk/sources/Museek/PeerManager.cc
-+++ b/museek+/trunk/sources/Museek/PeerManager.cc
-@@ -33,4 +33,5 @@
- #include <queue>
- #include <vector>
-+#include <algorithm>
-
- using std::string;
-
-
---- a/museek+/trunk/sources/Muhelp/string_ext.hh
-+++ b/museek+/trunk/sources/Muhelp/string_ext.hh
-@@ -51,4 +51,5 @@
- #include <vector>
- #include <list>
-+#include <cstdlib>
-
- // Split a string into a list of strings
-
-
---- a/museek+/trunk/sources/Muhelp/Mulog.cc
-+++ b/museek+/trunk/sources/Muhelp/Mulog.cc
-@@ -20,4 +20,6 @@
- #include <system.h>
- #include <syslog.h>
-+
-+#include <cstdlib>
-
- #include <Muhelp/Mulog.hh>
-
-
---- a/museek+/trunk/sources/museekd/main.cc
-+++ b/museek+/trunk/sources/museekd/main.cc
-@@ -26,4 +26,5 @@
- #include <Muhelp/Mulog.hh>
- #include <fstream>
-+#include <cstdlib>
-
- using std::string;
-
-
---- a/museek+/trunk/sources/museekd/IfaceConnection.cc
-+++ b/museek+/trunk/sources/museekd/IfaceConnection.cc
-@@ -29,4 +29,5 @@
- #include <map>
- #include <vector>
-+#include <cstdlib>
-
- #define MULOG_DOMAIN "museekd.IL"
-
-
---- a/museek+/trunk/sources/Tools/muscan.cc
-+++ b/museek+/trunk/sources/Tools/muscan.cc
-@@ -27,4 +27,5 @@
-
- #include <iostream>
-+#include <cstdlib>
-
- using std::vector;
-
-
---- a/museek+/trunk/sources/Tools/scanner.cc
-+++ b/museek+/trunk/sources/Tools/scanner.cc
-@@ -19,4 +19,6 @@
-
- #include <system.h>
-+
-+#include <cstdlib>
-
- extern "C" {
-
-
---- a/museek+/trunk/sources/Tools/muscand.cc
-+++ b/museek+/trunk/sources/Tools/muscand.cc
-@@ -9,4 +9,6 @@
-
- #include <iostream>
-+#include <cstdlib>
-+#include <algorithm>
-
- using std::string;
diff --git a/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch b/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch
deleted file mode 100644
index c5f282cde693..000000000000
--- a/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- CMakeLists.txt 2007-09-23 13:10:33.000000000 +0200
-+++ CMakeLists.txt 2007-09-23 13:14:32.000000000 +0200
-@@ -261,7 +261,7 @@
- endif (NOT DIR_H)
-
- # Detect Vorbisfile library
--if (HAVE_VORBIS_H)
-+if (HAVE_VORBIS_H AND VORBIS)
- find_library(VORBIS_LIBRARIES NAMES vorbisfile PATHS /usr/lib /usr/local/lib)
- if (VORBIS_LIBRARIES)
- set(HAVE_VORBIS 1)
-@@ -270,9 +270,9 @@
- message(STATUS "Vorbisfile library wasn't found, ogg metadata will not be created")
- set(VORBIS_LIBRARIES "")
- endif (VORBIS_LIBRARIES)
--else (HAVE_VORBIS_H)
-+else (HAVE_VORBIS_H AND VORBIS)
- set(VORBIS_LIBRARIES "")
--endif (HAVE_VORBIS_H)
-+endif (HAVE_VORBIS_H AND VORBIS)
-
- set(CMAKE_REQUIRED_LIBRARIES)
-
-@@ -340,4 +340,4 @@
- add_subdirectory(museeq)
- else (C_MUSEEQ)
- message("!!! museeq will NOT be installed [NO_MUSEEQ=0]")
--endif (C_MUSEEQ)
-\ No hay ningún carácter de nueva línea al final del fichero
-+endif (C_MUSEEQ)
---- museeq/CMakeLists.txt 2007-09-23 13:10:33.000000000 +0200
-+++ museeq/CMakeLists.txt 2007-09-23 13:13:58.000000000 +0200
-@@ -1,9 +1,7 @@
- project(museeq) # the name of your project
-
- MESSAGE("DECLARATIONS: PREFIX (/usr), MANDIR (PREFIX/man), DATADIR (PREFIX/share), BINRELOC, TRAYICON
--Prefix declarations with -D and set them with either 1, 0 or a path.
--QSA is detected automatically
--")
-+Prefix declarations with -D and set them with either 1, 0 or a path.")
-
-
- cmake_minimum_required(VERSION 2.4.0)
-@@ -175,13 +173,17 @@
- int main() {
- QSInterpreter::defaultInterpreter()->hasFunction(\"\");
- }
--" QSA)
-+" HAVE_QSA)
-
- if (QSA)
--MESSAGE(STATUS "QSA available")
-- add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 )
-+ if (HAVE_QSA)
-+ MESSAGE(STATUS "QSA available")
-+ add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 )
-+ else (HAVE_QSA)
-+ MESSAGE(FATAL_ERROR "!!! QSA NOT available")
-+ endif (HAVE_QSA)
- else (QSA)
--MESSAGE("!!! QSA NOT available")
-+MESSAGE("!!! QSA disabled")
- endif (QSA)
-
- message(STATUS "moc binary:" ${QT_MOC_EXECUTABLE})
-@@ -369,4 +371,4 @@
- MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
- else (NOT TRAYICON)
- MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
--endif (NOT TRAYICON)
-\ No hay ningún carácter de nueva línea al final del fichero
-+endif (NOT TRAYICON)
---- Tools/CMakeLists.txt 2007-09-23 13:10:33.000000000 +0200
-+++ Tools/CMakeLists.txt 2007-09-23 13:11:55.000000000 +0200
-@@ -42,7 +42,7 @@
- )
- MESSAGE("--> muscan (file scanner) will be installed..")
- # To build, or not build muscand
--if (FAM_LIBRARIES AND FAM_H)
-+if (NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
-
- add_executable(muscand ${MUSCAND_SOURCES})
-
-@@ -68,9 +68,9 @@
- DESTINATION bin
- )
- MESSAGE("--> muscand (FAM-based file scanning daemon) will be installed..")
--else(FAM_LIBRARIES AND FAM_H)
-+else(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
- MESSAGE("!!! muscand will NOT be installed..")
--endif(FAM_LIBRARIES AND FAM_H)
-+endif(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H)
-
- target_link_libraries(
- muscan
diff --git a/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch b/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
deleted file mode 100644
index 4c5be3ff1636..000000000000
--- a/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Index: museeq/CMakeLists.txt
-===================================================================
---- museeq/CMakeLists.txt (revisión: 735)
-+++ museeq/CMakeLists.txt (copia de trabajo)
-@@ -29,7 +29,7 @@
- SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
-
- ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
-- COMMAND moc #${QT_MOC_EXECUTABLE}
-+ COMMAND /usr/qt/3/bin/moc #${QT_MOC_EXECUTABLE}
- ARGS ${_tmp_FILE} -o ${_moc}
- DEPENDS ${_tmp_FILE}
- )
-@@ -90,6 +90,7 @@
- /usr/share/qt3/lib
- C:/Progra~1/qt/lib
- /usr/X11R6/lib
-+ /opt/qt/lib
- )
-
- IF(PREFIX)
-@@ -304,8 +305,12 @@
-
-
- add_executable(museeq ${MUSEEQ_SOURCES} ${MUSEEQ_MOC_HEADERS})
-+set(LINK_LIBRARIES Mucipher ${QT_LIBRARIES})
-+if (QSA)
-+ set(LINK_LIBRARIES ${LINK_LIBRARIES} ${QSA_LIBRARY})
-+endif (QSA)
-
--target_link_libraries(museeq Mucipher ${QT_LIBRARIES} ${QSA_LIBRARY})
-+target_link_libraries(museeq ${LINK_LIBRARIES})
-
- install(
- TARGETS museeq
-@@ -331,13 +336,13 @@
- )
-
- file(GLOB_RECURSE THEME_DEFAULT default/*.png)
--install(FILES ${THEME_DEFAULT} DESTINATION ${DATADIR}/museek/museeq/default)
-+install(FILES ${THEME_DEFAULT} DESTINATION ${DATADIR}/museek/museeq/icons/default)
- file(GLOB_RECURSE THEME_BLUEBOX bluebox/*.png)
--install(FILES ${THEME_BLUEBOX} DESTINATION ${DATADIR}/museek/museeq/bluebox)
-+install(FILES ${THEME_BLUEBOX} DESTINATION ${DATADIR}/museek/museeq/icons/bluebox)
- file(GLOB_RECURSE THEME_SILK mikelabo-silk/*.png)
--install(FILES ${THEME_SILK} DESTINATION ${DATADIR}/museek/museeq/mikelabo-silk)
-+install(FILES ${THEME_SILK} DESTINATION ${DATADIR}/museek/museeq/icons/mikelabo-silk)
- file(GLOB_RECURSE THEME_TRI mikelabo-tri/*.png)
--install(FILES ${THEME_TRI} DESTINATION ${DATADIR}/museek/museeq/mikelabo-tri)
-+install(FILES ${THEME_TRI} DESTINATION ${DATADIR}/museek/museeq/icons/mikelabo-tri)
-
- set(ICONS
- museeq.png
-Index: museeq/mainwin.cpp
-===================================================================
---- museeq/mainwin.cpp (revisión: 735)
-+++ museeq/mainwin.cpp (copia de trabajo)
-@@ -119,13 +119,8 @@
- mMenuSettings->setItemEnabled(1, true);
-
- mMenuSettings->setItemEnabled(3, false);
-- mMenuSettings->setItemChecked(3, museeq->mShowTickers);
-- mMenuSettings->setItemEnabled(4, false);
-- mMenuSettings->setItemChecked(4, museeq->mShowStatusLog);
-- mMenuSettings->setItemChecked(5, museeq->mShowTimestamps);
-- mMenuSettings->setItemEnabled(8, true);
-- mMenuSettings->setItemChecked(8, museeq->mUsetray);
-
-+
- menuBar()->insertItem(tr("&Settings"), mMenuSettings);
- mMenuModes = new QPopupMenu(this);
- mMenuModes->insertItem( IMG("chatroom-small"), tr("&Chat Rooms"), this, SLOT(changeCMode()), 0, 0);
-@@ -263,12 +258,8 @@
-
- connect(museeq->driver(), SIGNAL(userStatus(const QString&, uint)), SLOT(slotUserStatus(const QString&, uint)));
- QSettings settings;
-- QString showStatusLog = settings.readEntry("/TheGraveyard.org/Museeq/showStatusLog");
-- if (! showStatusLog.isEmpty() and (showStatusLog == "true" || showStatusLog == true)) {
-- museeq->mShowStatusLog = true;
-- } else if (! showStatusLog.isEmpty() and (showStatusLog == "false" || showStatusLog == false)) {
-- museeq->mShowStatusLog = false;
-- }
-+ museeq->mShowStatusLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showStatusLog", FALSE);
-+
- if ( ! museeq->mShowStatusLog)
- mLog->hide();
- QString exitdialog = settings.readEntry("/TheGraveyard.org/Museeq/ShowExitDialog");
-@@ -326,9 +317,10 @@
- museeq->mColorTrusted = settings.readEntry("/TheGraveyard.org/Museeq/colorTrusted");
- museeq->mColorRemote = settings.readEntry("/TheGraveyard.org/Museeq/colorRemote");
- museeq->mColorTime = settings.readEntry("/TheGraveyard.org/Museeq/colorTime");
-- QString showTimestamps = settings.readEntry("/TheGraveyard.org/Museeq/showTimestamps");
-- QString showIPinLog = settings.readEntry("/TheGraveyard.org/Museeq/showIPinLog");
-- QString showAlertsInLog = settings.readEntry("/TheGraveyard.org/Museeq/showAlertsInLog");
-+ museeq->mShowTickers = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTickers", FALSE);
-+ museeq->mShowTimestamps = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTimestamps", FALSE);
-+ museeq->mIPLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showIPinLog", FALSE);
-+ museeq->mOnlineAlert = settings.readBoolEntry("/TheGraveyard.org/Museeq/showAlertsInLog", FALSE);
-
- if (! museeq->mFontTime.isEmpty()) {
- mSettingsDialog->STimeFont->setText(museeq->mFontTime);
-@@ -357,28 +349,14 @@
- if (! museeq->mColorTime.isEmpty()) {
- mSettingsDialog->STimeText->setText(museeq->mColorTime);
- }
-- if (! showTimestamps.isEmpty() and (showTimestamps == "true" || showTimestamps == true)) {
-- museeq->mShowTimestamps = true;
-- mMenuSettings->setItemChecked(5, true);
-- } else if (! showTimestamps.isEmpty() and (showTimestamps == "false" || showTimestamps == false)) {
-- museeq->mShowTimestamps = false;
-- mMenuSettings->setItemChecked(5, false);
-- }
-- if (! showIPinLog.isEmpty() and (showIPinLog == "true" || showIPinLog == true)) {
-- mSettingsDialog->SIPLog->setChecked(true);
-- museeq->mIPLog = true;
--
-- } else if (! showIPinLog.isEmpty() and (showIPinLog == "false" || showIPinLog == false)){
-- mSettingsDialog->SIPLog->setChecked(false);
-- museeq->mIPLog = false;
-- }
-- if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "true" || showAlertsInLog == true)) {
-- mSettingsDialog->SOnlineAlerts->setChecked(true);
-- museeq->mOnlineAlert = true;
-- } else if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "false" || showAlertsInLog == false)){
-- mSettingsDialog->SOnlineAlerts->setChecked(false);
-- museeq->mOnlineAlert = false;
-- }
-+
-+
-+ mMenuSettings->setItemChecked(3, museeq->mShowTickers);
-+ mMenuSettings->setItemChecked(4, museeq->mShowStatusLog);
-+ mMenuSettings->setItemChecked(5, museeq->mShowTimestamps);
-+ mMenuSettings->setItemChecked(8, museeq->mUsetray);
-+ mSettingsDialog->SOnlineAlerts->setChecked(museeq->mOnlineAlert);
-+ mSettingsDialog->SIPLog->setChecked(museeq->mIPLog);
- box->setEnabled(false);
- daemon = new QProcess(this);
- connect( daemon, SIGNAL(readyReadStdout()), this, SLOT(readFromStdout()) );
-Index: museeq/system.h
-===================================================================
---- museeq/system.h (revisión: 741)
-+++ museeq/system.h (copia de trabajo)
-@@ -66,7 +66,7 @@
- #endif
-
-
--#define HAVE_UINT
-+/* #undef HAVE_UINT */
- #ifndef HAVE_UINT
- typedef unsigned int uint;
- #endif
-Index: Tools/mp3.c
-===================================================================
---- Tools/mp3.c (revisión: 735)
-+++ Tools/mp3.c (copia de trabajo)
-@@ -19,6 +19,7 @@
-
- #include <system.h>
-
-+#include <stdlib.h>
- #include "mp3.h"
-
- #define ENDIAN(head) ((head >> 24) | ((head & 0x00ff0000) >> 8) | ((head & 0x0000ff00) << 8) | (head << 24))