Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ee088154705083534ae5caaf02faa153e7078f8c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ee088154705083534ae5caaf02faa153e7078f8c)
  • Date: Mon, 9 Oct 2006 04:43:23 -0500

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

audio-players/moc/DEPENDS | 2 -
audio-players/moc/DETAILS | 13 +++---
audio-players/moc/HISTORY | 5 ++
audio-players/moc/PRE_BUILD | 6 ---
audio-players/moc/search_for_dirs-2.3.patch | 53
----------------------------
5 files changed, 12 insertions(+), 67 deletions(-)

New commits:
commit ee088154705083534ae5caaf02faa153e7078f8c
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

moc 2.4.1

diff --git a/audio-players/moc/DEPENDS b/audio-players/moc/DEPENDS
index 927656e..6d2331f 100755
--- a/audio-players/moc/DEPENDS
+++ b/audio-players/moc/DEPENDS
@@ -6,7 +6,6 @@ optional_depends alsa-lib \
"--disable-alsatest" \
"for ALSA support" &&

-if [ "$DEV" == "y" ]; then
optional_depends JACK-DRIVER \
"" \
"--without-jack" \
@@ -16,7 +15,6 @@ optional_depends mpc \
"" \
"--without-musepack" \
"for musepack (mpc) support"
-fi &&

optional_depends libogg \
"" \
diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
index 1b36d14..73f6e6b 100755
--- a/audio-players/moc/DETAILS
+++ b/audio-players/moc/DETAILS
@@ -1,17 +1,18 @@
SPELL=moc
if [ "$DEV" == "y" ]; then
- VERSION=2.4.0-alpha1
+ VERSION=2.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/$SOURCE
-
SOURCE_HASH=sha512:862639c711734e967ae22446cb698f106d4c8a40fcb815a0fe47bd2fc2eb1ee32039ac31de307e8c448a15ed1cd7d8f769f898e72f0d8c43fd3f299b3da3e4cb:UPSTREAM_HASH
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-DEVEL
+ SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/$SOURCE
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-DEVEL
else
- VERSION=2.4.0
+ VERSION=2.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE
- SOURCE_GPG="DamianPietras.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
+ SOURCE_GPG="DamianPietras.gpg:${SOURCE}.sig"
SOURCE2=${SOURCE}.sig
SOURCE2_URL=ftp://ftp.daper.net/pub/soft/moc/stable/$SOURCE2
SOURCE2_IGNORE=signature
diff --git a/audio-players/moc/HISTORY b/audio-players/moc/HISTORY
index 7dd0e47..3cc9dda 100644
--- a/audio-players/moc/HISTORY
+++ b/audio-players/moc/HISTORY
@@ -1,3 +1,8 @@
+2006-10-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: updated both devel and stable to 2.4.1
+ * PRE_BUILD, search_for_dirs-2.3.patch: removed
+ * DEPENDS: stable and devel have the same depends now
+
2006-10-08 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 2.4.0 and SOURCE_GPG. Removed BUILD_API=1
* BUILD: Added option to disable UTF8 support. Wouldn't build
diff --git a/audio-players/moc/PRE_BUILD b/audio-players/moc/PRE_BUILD
deleted file mode 100755
index 9434a03..0000000
--- a/audio-players/moc/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-
-if [ "$DEV" == "n" ]; then
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/search_for_dirs-2.3.patch
-fi
diff --git a/audio-players/moc/search_for_dirs-2.3.patch
b/audio-players/moc/search_for_dirs-2.3.patch
deleted file mode 100644
index 145f9ae..0000000
--- a/audio-players/moc/search_for_dirs-2.3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: interface.c
-===================================================================
---- interface.c (revision 1679)
-+++ interface.c (revision 1680)
-@@ -2992,6 +2992,10 @@
- menu_driver (curr_menu, REQ_TOP);
- else if (cmd == KEY_CMD_MENU_LAST)
- menu_driver (curr_menu, REQ_BOTTOM);
-+ else if (cmd == KEY_CMD_HISTORY_UP)
-+ menu_driver (curr_menu, REQ_UP);
-+ else if (cmd == KEY_CMD_HISTORY_DOWN)
-+ menu_driver (curr_menu, REQ_DOWN);
- else if (ch == '\n' || cmd == KEY_CMD_CANCEL || ch == -1) {
- entry_disable ();
- update_info_win ();
-@@ -2999,8 +3003,11 @@
-
- if (ch == '\n' && entry.text[0] && menu_nitems(curr_menu))
- go_file ();
--
-- if (old_curr_menu) {
-+ int selected = menu_curritem(curr_menu);
-+ if ((selected < 0 && old_curr_menu) ||
-+ (curr_menu->nitems<=selected && old_curr_menu) ||
-+ (old_curr_menu && (menu_item_get_type(curr_menu,
selected))!=F_DIR))
-+ {
-
- /* restore the original menu */
- menu_free (curr_menu);
-@@ -3009,7 +3016,9 @@
- curr_menu = old_curr_menu;
- old_curr_menu = NULL;
- }
--
-+ else{
-+ old_curr_menu = NULL;
-+ }
- update_curr_file ();
- }
-
-Index: menu.c
-===================================================================
---- menu.c (revision 1679)
-+++ menu.c (revision 1680)
-@@ -421,7 +421,7 @@
- for (i = 0; i < menu->nitems; i++) {
- struct menu_item *item = &menu->items[i];
-
-- if ((item->type == F_SOUND || item->type == F_URL)
-+ if ((item->type == F_SOUND || item->type == F_URL ||
item->type == F_DIR)
- && strcasestr(menu->items[i].title, pattern))
{
- int added = menu_add_from_item (new, item);
-



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (ee088154705083534ae5caaf02faa153e7078f8c), Ladislav Hagara, 10/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page