summaryrefslogtreecommitdiff
path: root/audio/musicbox/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/musicbox/files')
-rw-r--r--audio/musicbox/files/patch-ListView.cpp26
-rw-r--r--audio/musicbox/files/patch-ListView.h17
-rw-r--r--audio/musicbox/files/patch-Makefile109
-rw-r--r--audio/musicbox/files/patch-MultiListBox.h10
-rw-r--r--audio/musicbox/files/patch-player.cpp60
-rw-r--r--audio/musicbox/files/patch-qktstreelist.cpp20
6 files changed, 0 insertions, 242 deletions
diff --git a/audio/musicbox/files/patch-ListView.cpp b/audio/musicbox/files/patch-ListView.cpp
deleted file mode 100644
index 729063cf2bb2..000000000000
--- a/audio/musicbox/files/patch-ListView.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- ListView.cpp.orig Wed Feb 17 09:17:11 1999
-+++ ListView.cpp Wed Feb 17 09:21:00 1999
-@@ -383,11 +383,11 @@
- if (item != NULL)
- temp = item;
-
-- lbl = new QLabel("歌星:",this);
-+ lbl = new QLabel("Artist:",this);
- topLayout->addWidget(lbl,0,0);
-- lbl = new QLabel("專輯名稱:",this);
-+ lbl = new QLabel("Album:",this);
- topLayout->addWidget(lbl,1,0);
-- lbl = new QLabel("發行公司:",this);
-+ lbl = new QLabel("Company:",this);
- topLayout->addWidget(lbl,2,0);
-
- Title = new QLabel(this);
-@@ -412,7 +412,7 @@
- connect(btn,SIGNAL(clicked()),this,SLOT(RemoveSong()));
- topLayout->addWidget(btn,4,1);
-
-- lbl = new QLabel("歌曲名稱:",this);
-+ lbl = new QLabel("Title:",this);
- topLayout->addWidget(lbl,4,2);
-
- edtSinger = new QLineEdit(this);
diff --git a/audio/musicbox/files/patch-ListView.h b/audio/musicbox/files/patch-ListView.h
deleted file mode 100644
index 5b15968ee7f3..000000000000
--- a/audio/musicbox/files/patch-ListView.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- ListView.h.orig Sun Nov 16 13:56:31 1997
-+++ ListView.h Wed Feb 18 10:31:19 2004
-@@ -12,12 +12,7 @@
- #include <qdialog.h>
- #include "MultiListBox.h"
-
--#ifdef FreeBSD
--#include <machine/soundcard.h>
--#endif
--#ifdef Linux
- #include <sys/soundcard.h>
--#endif
-
- #define DEVICE 0
- #define MIXER "/dev/mixer"
diff --git a/audio/musicbox/files/patch-Makefile b/audio/musicbox/files/patch-Makefile
deleted file mode 100644
index 8690d61572d8..000000000000
--- a/audio/musicbox/files/patch-Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
---- Makefile.orig Wed Nov 12 11:01:58 1997
-+++ Makefile Sun May 5 14:57:01 2002
-@@ -1,7 +1,8 @@
- # change following for your environment
--INC = /usr/X11R6/include/X11/qt
--LIB = /usr/X11R6/lib
--MOC = moc
-+#INC = /usr/X11R6/include/X11/qt1
-+INC = -I${X11BASE}/include -I${X11BASE}/include/X11/qt1
-+LIB = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+MOC = moc1
-
- # if you use freebsd
- CFLAGS = -DFreeBSD
-@@ -9,7 +10,7 @@
- #if you use linux
- #CFLAGS = -DLinux
-
--GCC = gcc
-+GCC ?= cc
-
- ALL = mplayer.o player.o ListView.o clock.o mclock.o mListView.o \
- filebrowse.o mfilebrowse.o qktstreelist.o mqktstreelist.o \
-@@ -18,69 +19,69 @@
- PKG = musicbox
-
- all: ${ALL}
-- ${GCC} ${ALL} -o ${PKG} -L${LIB} -I${INC} -lqt
-+ ${GCC} ${ALL} -o ${PKG} ${LIB} -lqt1 -lX11 -lXext
-
--player.o:
-- ${GCC} -c player.cpp -o player.o ${CFLAGS} -L${LIB} -I${INC}
-+player.o: player.cpp
-+ ${GCC} -c player.cpp -o player.o ${CFLAGS} ${INC}
-
- mplayer.o: mplayer.cpp
-- ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} -L${LIB} -I${INC}
-+ ${GCC} -c mplayer.cpp -o mplayer.o ${CFLAGS} ${INC}
-
- mplayer.cpp:
- ${MOC} player.h -o mplayer.cpp
-
- ListView.o:
-- ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} -L${LIB} -I${INC}
-+ ${GCC} -c ListView.cpp -o ListView.o ${CFLAGS} ${INC}
-
- mListView.o: mListView.cpp
-- ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} -L${LIB} -I${INC}
-+ ${GCC} -c mListView.cpp -o mListView.o ${CFLAGS} ${INC}
-
- mListView.cpp:
- ${MOC} ListView.h -o mListView.cpp
- clock.o:
-- ${GCC} -c clock.cpp -o clock.o -L${LIB} -I${INC}
-+ ${GCC} -c clock.cpp -o clock.o ${INC}
-
- mclock.cpp:
- ${MOC} clock.h -o mclock.cpp
-
- mclock.o: mclock.cpp
-- ${GCC} -c mclock.cpp -o mclock.o -L${LIB} -I${INC}
-+ ${GCC} -c mclock.cpp -o mclock.o ${INC}
-
- mfilebrowse.cpp:
- ${MOC} filebrowse.h -o mfilebrowse.cpp
-
- filebrowse.o :
-- ${GCC} -c filebrowse.cpp -o filebrowse.o -L${LIB} -I${INC}
-+ ${GCC} -c filebrowse.cpp -o filebrowse.o ${INC}
-
- mfilebrowse.o: mfilebrowse.cpp
-- ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o -L${LIB} -I${INC}
-+ ${GCC} -c mfilebrowse.cpp -o mfilebrowse.o ${INC}
-
- diskbrowse.o:
-- ${GCC} -c diskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c diskbrowse.cpp -o $@ ${INC}
-
- mdiskbrowse.o: mdiskbrowse.cpp
-- ${GCC} -c mdiskbrowse.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c mdiskbrowse.cpp -o $@ ${INC}
-
- mdiskbrowse.cpp:
- ${MOC} diskbrowse.h -o $@
-
- qktstreelist.o:
-- ${GCC} -c qktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c qktstreelist.cpp -o $@ ${INC}
-
- mqktstreelist.o: mqktstreelist.cpp
-- ${GCC} -c mqktstreelist.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c mqktstreelist.cpp -o $@ ${INC}
-
- mqktstreelist.cpp:
- ${MOC} qktstreelist.h -o $@
-
- MultiListBox.o:
-- ${GCC} -c MultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c MultiListBox.cpp -o $@ ${INC}
-
- mMultiListBox.cpp:
- ${MOC} MultiListBox.h -o $@
-
- mMultiListBox.o: mMultiListBox.cpp
-- ${GCC} -c mMultiListBox.cpp -o $@ -L${LIB} -I${INC}
-+ ${GCC} -c mMultiListBox.cpp -o $@ ${INC}
-
- clean:
- rm -f player mplayer.cpp *.o mclock.cpp mListView.cpp mfilebrowse.cpp \
diff --git a/audio/musicbox/files/patch-MultiListBox.h b/audio/musicbox/files/patch-MultiListBox.h
deleted file mode 100644
index 0f1a18e79446..000000000000
--- a/audio/musicbox/files/patch-MultiListBox.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- MultiListBox.h.orig Wed Nov 12 10:57:00 1997
-+++ MultiListBox.h Sun Dec 31 06:24:22 2000
-@@ -16,7 +16,6 @@
- Pic = i->Pic;
- Text = i->Text;
- }
-- setPixmap(QPixmap& p) {Pic = p;}
- int Width(MultiListBox *box);
- int Height(MultiListBox *box,int max_w);
- void Paint(QPainter *p,int w,int h,int flag=0);
diff --git a/audio/musicbox/files/patch-player.cpp b/audio/musicbox/files/patch-player.cpp
deleted file mode 100644
index 5afe8b464f71..000000000000
--- a/audio/musicbox/files/patch-player.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
---- player.cpp.orig Thu Oct 1 10:00:23 1998
-+++ player.cpp Wed Jun 9 00:56:30 1999
-@@ -72,7 +72,7 @@
- options = new QPopupMenu;
- AutoPlayID = options->insertItem( "&Auto Play", this, SLOT(AutoPlay()) );
- options->setItemChecked( AutoPlayID, isAutoPlay );
-- RepeatID = options->insertItem( "Re&peat", this, SLOT(RepeatPlay()) );
-+ RepeatID = options->insertItem( "&Repeat", this, SLOT(RepeatPlay()) );
- options->setCheckable(TRUE);
- menubar->insertItem( "&Options",options );
- menubar->insertSeparator();
-@@ -150,7 +150,7 @@
-
- QLabel *label;
- label = new QLabel( this );
-- label->setText("歌星:");
-+ label->setText("Artist:");
- label->setGeometry(5,133,125,30);
-
- edtName = new QLabel( this );
-@@ -158,7 +158,7 @@
- edtName->setGeometry(83,136,100,25);
-
- label = new QLabel( this );
-- label->setText("專輯名稱:");
-+ label->setText("Album:");
- label->setGeometry(5,173,125,30);
-
- edtAlbum = new QLabel( this );
-@@ -166,7 +166,7 @@
- edtAlbum->setGeometry(83,176,100,25);
-
- label = new QLabel( this );
-- label->setText("發行公司:");
-+ label->setText("Company:");
- label->setGeometry(5,213,125,30);
-
- edtPub = new QLabel( this );
-@@ -242,15 +242,13 @@
- song->setText(SongBox->text(SongBox->currentItem()));
- dclock->Start(SongBox->currentItem());
- if ((mp3_pid = fork()) == 0 ){
-- char **argv;
-- int i;
-- argv[0]=MP3_PLAYER;
-- argv[1]="-q";
-- argv[2]=(char *)LocBox->text(SongBox->currentItem());
-- argv[3]=NULL;
-- execvp(MP3_PLAYER,argv);
-+ execlp(MP3_PLAYER,
-+ MP3_PLAYER,
-+ "-q",
-+ (char *)LocBox->text(SongBox->currentItem()),
-+ NULL);
- QMessageBox::warning(this,"error","can't exec mpg123\n");
-- exit(1);
-+ _exit(1);
- }
- }
- }
diff --git a/audio/musicbox/files/patch-qktstreelist.cpp b/audio/musicbox/files/patch-qktstreelist.cpp
deleted file mode 100644
index 51bd04655ad6..000000000000
--- a/audio/musicbox/files/patch-qktstreelist.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- qktstreelist.cpp.orig Mon Nov 10 18:10:02 1997
-+++ qktstreelist.cpp Wed Jun 9 00:15:13 1999
-@@ -834,7 +834,7 @@
- QktsItemSearchInfo searchInfo;
- searchInfo.index = index;
- searchInfo.count = -1;
-- forEveryVisibleItem(QktsTreeList::findItemAt, &searchInfo);
-+ forEveryVisibleItem(&QktsTreeList::findItemAt, &searchInfo);
- return searchInfo.foundItem;
- }
-
-@@ -1340,7 +1340,7 @@
- QktsTreeListItem *item = treeRoot->getChild();
- do {
- while(item) {
-- if((func)(item, user)) return;
-+ if((this->*func)(item, user)) return;
- if(item->hasChild() && item->isExpanded()) {
- stack.push(item);
- item = item->getChild();