Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Santiago M. Mola (coldwind)" <coldwind@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/museek+/files: museek+-0.1.13-post_release_fixes.patch digest-museek+-0.1.13
Date: Sat, 22 Sep 2007 19:51:31
Message-Id: E1IZAcD-0000PM-3S@stork.gentoo.org
1 coldwind 07/09/22 19:26:09
2
3 Added: museek+-0.1.13-post_release_fixes.patch
4 digest-museek+-0.1.13
5 Log:
6 Bump to 0.1.13.
7 (Portage version: 2.1.3.9)
8
9 Revision Changes Path
10 1.1 net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch?rev=1.1&content-type=text/plain
14
15 Index: museek+-0.1.13-post_release_fixes.patch
16 ===================================================================
17 Index: museeq/CMakeLists.txt
18 ===================================================================
19 --- museeq/CMakeLists.txt (revisión: 735)
20 +++ museeq/CMakeLists.txt (copia de trabajo)
21 @@ -29,7 +29,7 @@
22 SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
23
24 ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
25 - COMMAND moc #${QT_MOC_EXECUTABLE}
26 + COMMAND /usr/qt/3/bin/moc #${QT_MOC_EXECUTABLE}
27 ARGS ${_tmp_FILE} -o ${_moc}
28 DEPENDS ${_tmp_FILE}
29 )
30 @@ -90,6 +90,7 @@
31 /usr/share/qt3/lib
32 C:/Progra~1/qt/lib
33 /usr/X11R6/lib
34 + /opt/qt/lib
35 )
36
37 IF(PREFIX)
38 @@ -304,8 +305,12 @@
39
40
41 add_executable(museeq ${MUSEEQ_SOURCES} ${MUSEEQ_MOC_HEADERS})
42 +set(LINK_LIBRARIES Mucipher ${QT_LIBRARIES})
43 +if (QSA)
44 + set(LINK_LIBRARIES ${LINK_LIBRARIES} ${QSA_LIBRARY})
45 +endif (QSA)
46
47 -target_link_libraries(museeq Mucipher ${QT_LIBRARIES} ${QSA_LIBRARY})
48 +target_link_libraries(museeq ${LINK_LIBRARIES})
49
50 install(
51 TARGETS museeq
52 @@ -331,13 +336,13 @@
53 )
54
55 file(GLOB_RECURSE THEME_DEFAULT default/*.png)
56 -install(FILES ${THEME_DEFAULT} DESTINATION ${DATADIR}/museek/museeq/default)
57 +install(FILES ${THEME_DEFAULT} DESTINATION ${DATADIR}/museek/museeq/icons/default)
58 file(GLOB_RECURSE THEME_BLUEBOX bluebox/*.png)
59 -install(FILES ${THEME_BLUEBOX} DESTINATION ${DATADIR}/museek/museeq/bluebox)
60 +install(FILES ${THEME_BLUEBOX} DESTINATION ${DATADIR}/museek/museeq/icons/bluebox)
61 file(GLOB_RECURSE THEME_SILK mikelabo-silk/*.png)
62 -install(FILES ${THEME_SILK} DESTINATION ${DATADIR}/museek/museeq/mikelabo-silk)
63 +install(FILES ${THEME_SILK} DESTINATION ${DATADIR}/museek/museeq/icons/mikelabo-silk)
64 file(GLOB_RECURSE THEME_TRI mikelabo-tri/*.png)
65 -install(FILES ${THEME_TRI} DESTINATION ${DATADIR}/museek/museeq/mikelabo-tri)
66 +install(FILES ${THEME_TRI} DESTINATION ${DATADIR}/museek/museeq/icons/mikelabo-tri)
67
68 set(ICONS
69 museeq.png
70 @@ -369,4 +374,4 @@
71 MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
72 else (NOT TRAYICON)
73 MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
74 -endif (NOT TRAYICON)
75 \ Sin fin-de-línea al final del archivo
76 +endif (NOT TRAYICON)
77 Index: museeq/mainwin.cpp
78 ===================================================================
79 --- museeq/mainwin.cpp (revisión: 735)
80 +++ museeq/mainwin.cpp (copia de trabajo)
81 @@ -119,13 +119,8 @@
82 mMenuSettings->setItemEnabled(1, true);
83
84 mMenuSettings->setItemEnabled(3, false);
85 - mMenuSettings->setItemChecked(3, museeq->mShowTickers);
86 - mMenuSettings->setItemEnabled(4, false);
87 - mMenuSettings->setItemChecked(4, museeq->mShowStatusLog);
88 - mMenuSettings->setItemChecked(5, museeq->mShowTimestamps);
89 - mMenuSettings->setItemEnabled(8, true);
90 - mMenuSettings->setItemChecked(8, museeq->mUsetray);
91
92 +
93 menuBar()->insertItem(tr("&Settings"), mMenuSettings);
94 mMenuModes = new QPopupMenu(this);
95 mMenuModes->insertItem( IMG("chatroom-small"), tr("&Chat Rooms"), this, SLOT(changeCMode()), 0, 0);
96 @@ -263,12 +258,8 @@
97
98 connect(museeq->driver(), SIGNAL(userStatus(const QString&, uint)), SLOT(slotUserStatus(const QString&, uint)));
99 QSettings settings;
100 - QString showStatusLog = settings.readEntry("/TheGraveyard.org/Museeq/showStatusLog");
101 - if (! showStatusLog.isEmpty() and (showStatusLog == "true" || showStatusLog == true)) {
102 - museeq->mShowStatusLog = true;
103 - } else if (! showStatusLog.isEmpty() and (showStatusLog == "false" || showStatusLog == false)) {
104 - museeq->mShowStatusLog = false;
105 - }
106 + museeq->mShowStatusLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showStatusLog", FALSE);
107 +
108 if ( ! museeq->mShowStatusLog)
109 mLog->hide();
110 QString exitdialog = settings.readEntry("/TheGraveyard.org/Museeq/ShowExitDialog");
111 @@ -326,9 +317,10 @@
112 museeq->mColorTrusted = settings.readEntry("/TheGraveyard.org/Museeq/colorTrusted");
113 museeq->mColorRemote = settings.readEntry("/TheGraveyard.org/Museeq/colorRemote");
114 museeq->mColorTime = settings.readEntry("/TheGraveyard.org/Museeq/colorTime");
115 - QString showTimestamps = settings.readEntry("/TheGraveyard.org/Museeq/showTimestamps");
116 - QString showIPinLog = settings.readEntry("/TheGraveyard.org/Museeq/showIPinLog");
117 - QString showAlertsInLog = settings.readEntry("/TheGraveyard.org/Museeq/showAlertsInLog");
118 + museeq->mShowTickers = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTickers", FALSE);
119 + museeq->mShowTimestamps = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTimestamps", FALSE);
120 + museeq->mIPLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showIPinLog", FALSE);
121 + museeq->mOnlineAlert = settings.readBoolEntry("/TheGraveyard.org/Museeq/showAlertsInLog", FALSE);
122
123 if (! museeq->mFontTime.isEmpty()) {
124 mSettingsDialog->STimeFont->setText(museeq->mFontTime);
125 @@ -357,28 +349,14 @@
126 if (! museeq->mColorTime.isEmpty()) {
127 mSettingsDialog->STimeText->setText(museeq->mColorTime);
128 }
129 - if (! showTimestamps.isEmpty() and (showTimestamps == "true" || showTimestamps == true)) {
130 - museeq->mShowTimestamps = true;
131 - mMenuSettings->setItemChecked(5, true);
132 - } else if (! showTimestamps.isEmpty() and (showTimestamps == "false" || showTimestamps == false)) {
133 - museeq->mShowTimestamps = false;
134 - mMenuSettings->setItemChecked(5, false);
135 - }
136 - if (! showIPinLog.isEmpty() and (showIPinLog == "true" || showIPinLog == true)) {
137 - mSettingsDialog->SIPLog->setChecked(true);
138 - museeq->mIPLog = true;
139 -
140 - } else if (! showIPinLog.isEmpty() and (showIPinLog == "false" || showIPinLog == false)){
141 - mSettingsDialog->SIPLog->setChecked(false);
142 - museeq->mIPLog = false;
143 - }
144 - if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "true" || showAlertsInLog == true)) {
145 - mSettingsDialog->SOnlineAlerts->setChecked(true);
146 - museeq->mOnlineAlert = true;
147 - } else if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "false" || showAlertsInLog == false)){
148 - mSettingsDialog->SOnlineAlerts->setChecked(false);
149 - museeq->mOnlineAlert = false;
150 - }
151 +
152 +
153 + mMenuSettings->setItemChecked(3, museeq->mShowTickers);
154 + mMenuSettings->setItemChecked(4, museeq->mShowStatusLog);
155 + mMenuSettings->setItemChecked(5, museeq->mShowTimestamps);
156 + mMenuSettings->setItemChecked(8, museeq->mUsetray);
157 + mSettingsDialog->SOnlineAlerts->setChecked(museeq->mOnlineAlert);
158 + mSettingsDialog->SIPLog->setChecked(museeq->mIPLog);
159 box->setEnabled(false);
160 daemon = new QProcess(this);
161 connect( daemon, SIGNAL(readyReadStdout()), this, SLOT(readFromStdout()) );
162 Index: museeq/system.h
163 ===================================================================
164 --- museeq/system.h (revisión: 741)
165 +++ museeq/system.h (copia de trabajo)
166 @@ -66,7 +66,7 @@
167 #endif
168
169
170 -#define HAVE_UINT
171 +/* #undef HAVE_UINT */
172 #ifndef HAVE_UINT
173 typedef unsigned int uint;
174 #endif
175 Index: Tools/mp3.c
176 ===================================================================
177 --- Tools/mp3.c (revisión: 735)
178 +++ Tools/mp3.c (copia de trabajo)
179 @@ -19,6 +19,7 @@
180
181 #include <system.h>
182
183 +#include <stdlib.h>
184 #include "mp3.h"
185
186 #define ENDIAN(head) ((head >> 24) | ((head & 0x00ff0000) >> 8) | ((head & 0x0000ff00) << 8) | (head << 24))
187
188
189
190 1.1 net-p2p/museek+/files/digest-museek+-0.1.13
191
192 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/digest-museek+-0.1.13?rev=1.1&view=markup
193 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/museek+/files/digest-museek+-0.1.13?rev=1.1&content-type=text/plain
194
195 Index: digest-museek+-0.1.13
196 ===================================================================
197 MD5 7aada627839578ebe525c54a1cef7dc4 museek+-0.1.13.tar.bz2 1186870
198 RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 museek+-0.1.13.tar.bz2 1186870
199 SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e museek+-0.1.13.tar.bz2 1186870
200
201
202
203 --
204 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups